diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb
index 88d504fa..9b8332ef 100644
--- a/app/controllers/schools_controller.rb
+++ b/app/controllers/schools_controller.rb
@@ -14,7 +14,7 @@ class SchoolsController < ApplicationController
     @years = @school_categories.map(&:year).map(&:to_i).sort
     @year = (params[:year] || @years.first).to_i
     @years.delete(@year)
-    # @school_categories = @school_categories.select { |sc| sc.year.to_i == @year }
+    @school_categories = @school_categories.select { |sc| sc.year.to_i == @year }
   end
 
   def admin
diff --git a/app/views/layouts/_school_header.html.haml b/app/views/layouts/_school_header.html.haml
index 2652aba2..035d876f 100644
--- a/app/views/layouts/_school_header.html.haml
+++ b/app/views/layouts/_school_header.html.haml
@@ -8,11 +8,14 @@
         Data from
         = "#{@year - 1}-#{@year}"
         school year.
-    -# if @years.present?
+    - if @years.present?
       %p
         Show year:
         - @years.each do |year|
-          = link_to("#{year - 1}-#{year}", school_category_path(@school_category.school, @school_category.category, year: year))
+          - if @school_category.present?
+            = link_to("#{year - 1}-#{year}", school_category_path(@school_category.school, @school_category.category, year: year))
+          - else
+            = link_to("#{year - 1}-#{year}", school_path(@school, year: year))
     - if @school.district.present?
       %p
         %strong District: