diff --git a/client/src/graphql/gql/fragments/instrumentParts.gql b/client/src/graphql/gql/fragments/instrumentParts.gql
new file mode 100644
index 00000000..73c2bb1e
--- /dev/null
+++ b/client/src/graphql/gql/fragments/instrumentParts.gql
@@ -0,0 +1,14 @@
+fragment InstrumentParts on InstrumentNode {
+  id
+  title
+  slug
+  bookmarks {
+    uuid
+    note {
+      id
+      text
+    }
+  }
+  type
+  contents
+}
diff --git a/client/src/graphql/gql/instrumentQuery.gql b/client/src/graphql/gql/instrumentQuery.gql
index 2f7f0e07..c89e8fcf 100644
--- a/client/src/graphql/gql/instrumentQuery.gql
+++ b/client/src/graphql/gql/instrumentQuery.gql
@@ -1,9 +1,6 @@
+#import "./fragments/instrumentParts.gql"
 query InstrumentQuery($slug: String!){
   instrument(slug: $slug) {
-    id
-    title
-    slug
-    type
-    contents
+    ...InstrumentParts
   }
 }
diff --git a/client/src/graphql/gql/instrumentQueryById.gql b/client/src/graphql/gql/instrumentQueryById.gql
new file mode 100644
index 00000000..f0fa658e
--- /dev/null
+++ b/client/src/graphql/gql/instrumentQueryById.gql
@@ -0,0 +1,6 @@
+#import "./fragments/instrumentParts.gql"
+query InstrumentQuery($id: ID!){
+  instrument(id: $id) {
+    ...InstrumentParts
+  }
+}
diff --git a/server/basicknowledge/queries.py b/server/basicknowledge/queries.py
index 6b079d0d..14360489 100644
--- a/server/basicknowledge/queries.py
+++ b/server/basicknowledge/queries.py
@@ -23,10 +23,10 @@ class BasicKnowledgeQuery(object):
 
     def resolve_instrument(self, info, **kwargs):
         slug = kwargs.get('slug')
-        room_id = kwargs.get('id')
+        instrument_id = kwargs.get('id')
 
-        if room_id is not None:
-            return get_object(BasicKnowledge, room_id)
+        if instrument_id is not None:
+            return get_object(BasicKnowledge, instrument_id)
         if slug is not None:
             return BasicKnowledge.objects.get(slug=slug)
         return None