diff --git a/server/books/schema/queries.py b/server/books/schema/queries.py
index 72f6b604..d08edd18 100644
--- a/server/books/schema/queries.py
+++ b/server/books/schema/queries.py
@@ -86,8 +86,8 @@ class ChapterNode(DjangoObjectType):
         user = info.context.user
         school_classes = user.school_classes.values_list('pk')
         by_parent = ContentBlock.get_by_parent(self).prefetch_related(
-            'visible_for__schoolclass').prefetch_related(
-            'hidden_for__schoolclass')
+            'visible_for').prefetch_related(
+            'hidden_for')
 
         if user.has_perm('users.can_manage_school_class_content'):  # teacher
             publisher_content_blocks = by_parent.filter(user_created=False)
@@ -185,8 +185,8 @@ class ModuleNode(DjangoObjectType):
 
     def resolve_objective_groups(self, root, **kwargs):
         return self.objective_groups.all() \
-            .prefetch_related('hidden_for__schoolclass') \
-            .prefetch_related('visible_for__schoolclass') \
+            .prefetch_related('hidden_for') \
+            .prefetch_related('visible_for') \
             .prefetch_related('objectives__objective_progress')