diff --git a/client/cypress/integration/e2e/new-student.spec.js b/client/cypress/integration/e2e/new-student.spec.js
index 6af340a4..7bb93106 100644
--- a/client/cypress/integration/e2e/new-student.spec.js
+++ b/client/cypress/integration/e2e/new-student.spec.js
@@ -1,6 +1,5 @@
 import {mockUpdateOnboardingProgress} from '../../support/helpers';
 
-const schema = require('../../fixtures/schema.json');
 const me = require('../../fixtures/me.new-student.json');
 
 describe('New student', () => {
diff --git a/client/src/graphql/gql/fragments/chapterParts.gql b/client/src/graphql/gql/fragments/chapterParts.gql
index 7a8901eb..d5f9d765 100644
--- a/client/src/graphql/gql/fragments/chapterParts.gql
+++ b/client/src/graphql/gql/fragments/chapterParts.gql
@@ -9,19 +9,11 @@ fragment ChapterParts on ChapterNode {
     }
   }
   titleHiddenFor {
-    edges {
-      node {
-        id
-        name
-      }
-    }
+    id
+    name
   }
   descriptionHiddenFor {
-    edges {
-      node {
-        id
-        name
-      }
-    }
+    id
+    name
   }
 }
diff --git a/client/src/graphql/gql/fragments/contentBlockInterfaceParts.gql b/client/src/graphql/gql/fragments/contentBlockInterfaceParts.gql
index 6a386e33..3ea3e8bd 100644
--- a/client/src/graphql/gql/fragments/contentBlockInterfaceParts.gql
+++ b/client/src/graphql/gql/fragments/contentBlockInterfaceParts.gql
@@ -1,5 +1,4 @@
 fragment ContentBlockInterfaceParts on ContentBlockInterface {
-  id
   title
   type
   contents
diff --git a/client/src/graphql/gql/fragments/contentBlockParts.gql b/client/src/graphql/gql/fragments/contentBlockParts.gql
index c6bc8b6d..13938c55 100644
--- a/client/src/graphql/gql/fragments/contentBlockParts.gql
+++ b/client/src/graphql/gql/fragments/contentBlockParts.gql
@@ -1,4 +1,5 @@
 fragment ContentBlockParts on ContentBlockNode {
+  id
   slug
   userCreated
   mine
diff --git a/client/src/graphql/gql/fragments/objectiveGroupParts.gql b/client/src/graphql/gql/fragments/objectiveGroupParts.gql
index ffb8d11e..f8bbd1b5 100644
--- a/client/src/graphql/gql/fragments/objectiveGroupParts.gql
+++ b/client/src/graphql/gql/fragments/objectiveGroupParts.gql
@@ -3,11 +3,7 @@ fragment ObjectiveGroupParts on ObjectiveGroupNode {
   title
   displayTitle
   hiddenFor {
-    edges {
-      node {
-        id
-        name
-      }
-    }
+    id
+    name
   }
 }
diff --git a/client/src/graphql/gql/fragments/objectiveParts.gql b/client/src/graphql/gql/fragments/objectiveParts.gql
index e8957a39..d6893128 100644
--- a/client/src/graphql/gql/fragments/objectiveParts.gql
+++ b/client/src/graphql/gql/fragments/objectiveParts.gql
@@ -4,19 +4,11 @@ fragment ObjectiveParts on ObjectiveNode {
   mine
   userCreated
   hiddenFor {
-    edges {
-      node {
-        id
-        name
-      }
-    }
+    id
+    name
   }
   visibleFor {
-    edges {
-      node {
-        id
-        name
-      }
-    }
+    id
+    name
   }
 }
diff --git a/client/src/graphql/gql/mutations/mutateContentBlock.gql b/client/src/graphql/gql/mutations/mutateContentBlock.gql
index 6934a065..06a097c8 100644
--- a/client/src/graphql/gql/mutations/mutateContentBlock.gql
+++ b/client/src/graphql/gql/mutations/mutateContentBlock.gql
@@ -6,7 +6,6 @@ mutation MutateContentBlock($input: MutateContentBlockInput!) {
     contentBlock {
       ...ContentBlockParts
       ...ContentBlockInterfaceParts
-
     }
   }
 }
diff --git a/client/src/graphql/gql/queries/snapshots/detail.gql b/client/src/graphql/gql/queries/snapshots/detail.gql
index 409d27e7..e61dfa74 100644
--- a/client/src/graphql/gql/queries/snapshots/detail.gql
+++ b/client/src/graphql/gql/queries/snapshots/detail.gql
@@ -14,6 +14,7 @@ query SnapshotDetail($id: ID!) {
       titleHidden
       descriptionHidden
       contentBlocks {
+        id
         ...ContentBlockInterfaceParts
         hidden
       }
diff --git a/server/books/tests/test_create_snapshot.py b/server/books/tests/test_create_snapshot.py
index 440e555a..7c8c46fc 100644
--- a/server/books/tests/test_create_snapshot.py
+++ b/server/books/tests/test_create_snapshot.py
@@ -11,9 +11,9 @@ from users.models import User, SchoolClass
 MODULE_QUERY = """
 query ModulesQuery($slug: String!) {
   module(slug: $slug) {
-      id
-      title
-      chapters {
+    id
+    title
+    chapters {
         edges {
             node {
                 id
@@ -29,7 +29,7 @@ query ModulesQuery($slug: String!) {
                 }
             }
         }
-      }
+    }
   }  
 }
 """