diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb
index 6376ae3c..b00f0a96 100644
--- a/app/controllers/schools_controller.rb
+++ b/app/controllers/schools_controller.rb
@@ -9,7 +9,7 @@ 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).sort
+    @school_categories = @school.school_categories.for_parent_category(@school, nil).valid.sort
   end
 
   def admin
diff --git a/data/measures.json b/data/measures.json
index 9b6fe568..a742c223 100644
--- a/data/measures.json
+++ b/data/measures.json
@@ -210,7 +210,7 @@
       }
     }
   }, {
-    "title": "Indicators of Academic Learning",
+    "title": "Academic Learning",
     "blurb": "Are students developing academic dispositions and content knowledge?",
     "text": "This category measures how much students are learning core academic content, developing their own academic identities, and progressing along positive trajectories.  It considers factors like academic performance, engagement in school, problem solving, and college-going rates.",
     "sub": {
@@ -320,7 +320,7 @@
     }
   },
   {
-    "title": "Character and Wellbeing Outcomes",
+    "title": "Citizenship and Wellbeing",
     "blurb": "Are students healthy and well-rounded?",
     "text": "This category measures the development of traits relevant for full and rewarding lives-in society, the workplace, and their private lives.  It considers factors like perseverance and determination, participation in arts and literature, and social and emotional health.",
     "sub": {