diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue
index c8c20a33..59c60b67 100644
--- a/client/src/components/Chapter.vue
+++ b/client/src/components/Chapter.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="chapter">
     <h3>{{chapter.title}}</h3>
-    <content-block :contentBlock="contentBlock" :key="contentBlock.id" v-for="contentBlock in chapter.contentBlocks.edges">
+    <content-block :contentBlock="contentBlock" :key="contentBlock.id" v-for="contentBlock in chapter.contentBlocks">
     </content-block>
 
   </div>
diff --git a/client/src/components/Module.vue b/client/src/components/Module.vue
index 5f7e9a9d..6c21777a 100644
--- a/client/src/components/Module.vue
+++ b/client/src/components/Module.vue
@@ -8,9 +8,9 @@
     </div>
 
     <h3>Lernziele</h3>
-    <objective-group v-for="group in module.objectivegroupSet.edges" :key="group.id" :group="group"></objective-group>
+    <objective-group v-for="group in module.objectivegroupSet" :key="group.id" :group="group"></objective-group>
 
-    <chapter :chapter="chapter" v-for="chapter in module.chapters.edges" :key="chapter.id"></chapter>
+    <chapter :chapter="chapter" v-for="chapter in module.chapters" :key="chapter.id"></chapter>
     <h3>1.1 Lehrbeginn</h3>
     <h4>Das Interview</h4>
     <h4>Tipp</h4>
diff --git a/client/src/components/ObjectiveGroup.vue b/client/src/components/ObjectiveGroup.vue
index c354fbc6..96a8d9fe 100644
--- a/client/src/components/ObjectiveGroup.vue
+++ b/client/src/components/ObjectiveGroup.vue
@@ -3,7 +3,7 @@
     <h4>{{group.title}}</h4>
 
     <ul class="objective-group__objective-list">
-      <li class="objective-group__objective" v-for="objective in group.objectiveSet.edges" :key="objective.id">
+      <li class="objective-group__objective" v-for="objective in group.objectiveSet" :key="objective.id">
         {{objective.text}}
       </li>
     </ul>
diff --git a/client/src/main.js b/client/src/main.js
index e60a66c1..a03b83f8 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -19,10 +19,11 @@ EdgesNodePlugin.install = function (Vue, options) {
     if (typeof collection === 'object') {
       let newObj = {}
       for (const k in collection) {
-        if (k === 'node') {
+        if (k === 'edges' || k === 'node') {
           newObj = getRidOfEdges(collection[k])
         } else {
           newObj[k] = getRidOfEdges(collection[k])
+          delete newObj[k]['__typename']
         }
       }
       return newObj
diff --git a/client/src/pages/index.vue b/client/src/pages/index.vue
index 93cc458b..1d727c65 100644
--- a/client/src/pages/index.vue
+++ b/client/src/pages/index.vue
@@ -16,6 +16,7 @@
 </template>
 
 <script>
+  import Vue from 'vue'
   import ALL_MODULES from '@/graphql/gql/allModules.gql'
 
   export default {
@@ -32,7 +33,7 @@
         manual: true,
         result({data, loading, networkStatus}) {
           if (!loading) {
-            this.modules = data.modules.edges.map(node => node.node);
+            this.modules = Vue.getRidOfEdges(data).modules
           }
         }
       }
diff --git a/client/src/pages/module.vue b/client/src/pages/module.vue
index ea1021ef..b67668d1 100644
--- a/client/src/pages/module.vue
+++ b/client/src/pages/module.vue
@@ -19,7 +19,7 @@
         result({data, loading, networkStatus}) {
           if (!loading) {
             const purgedData = Vue.getRidOfEdges(data)
-            this.module = purgedData.modules.edges[0]
+            this.module = purgedData.modules[0]
           }
         }
       }