diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index bf29db6d..972b0ee5 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -17,7 +17,7 @@ class CategoriesController < ApplicationController
     @years = school_categories.map(&:year).map(&:to_i).sort
     @year = (params[:year] || @years.first).to_i
     @years.delete(@year)
-    @school_category = SchoolCategory.for(@school, @category).in(@year).first
+    @school_category = school_categories.in(@year).first
     @child_school_categories = SchoolCategory.for_parent_category(@school, @category).valid
     @questions = @category.questions
   end
diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb
index b00f0a96..ed71d94d 100644
--- a/app/controllers/schools_controller.rb
+++ b/app/controllers/schools_controller.rb
@@ -9,7 +9,12 @@ class SchoolsController < ApplicationController
   def show
     district = @school.district
     authenticate(district.name.downcase, "#{district.name.downcase}!")
+
     @school_categories = @school.school_categories.for_parent_category(@school, nil).valid.sort
+    @years = @school_categories.map(&:year).map(&:to_i).sort
+    @year = (params[:year] || @years.first).to_i
+    @years.delete(@year)
+    @school_categories.select { |sc| sc.year.to_i == @year }
   end
 
   def admin
diff --git a/lib/tasks/data.rake b/lib/tasks/data.rake
index 1d2b5496..1aac4af6 100644
--- a/lib/tasks/data.rake
+++ b/lib/tasks/data.rake
@@ -222,7 +222,7 @@ namespace :data do
         end
 
         district_name = row['District']
-        if district_name.blank?
+        if district_name.blank? && district_name == "NA"
           next
         end
         # district_name = row['To begin, please select your district.'] if district_name.nil?
@@ -230,7 +230,7 @@ namespace :data do
 
         school_name = row["School.#{district_name}"]
 
-        if school_name.blank?
+        if school_name.blank? && school_name == "NA"
           puts "BLANK SCHOOL NAME: #{district.name} - #{index}"
           next
         end