diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index 9b48e0809..09723b973 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -28,7 +28,7 @@ export default withFragments({
       created_at
       status
       tags {
-        name
+        id
       }
       user {
         id
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
index 0ed5e00b8..71a6ae2d4 100644
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ b/client/coral-framework/graphql/fragments/commentView.graphql
@@ -6,7 +6,7 @@ fragment commentView on Comment {
     created_at
     status
     tags {
-      name
+      id
     }
     user {
         id
diff --git a/client/coral-framework/graphql/mutations/addCommentTag.graphql b/client/coral-framework/graphql/mutations/addCommentTag.graphql
index 5fd63868e..a4ff36da4 100644
--- a/client/coral-framework/graphql/mutations/addCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/addCommentTag.graphql
@@ -3,7 +3,7 @@ mutation AddCommentTag ($id: ID!, $tag: String!) {
     comment {
       id
       tags {
-        name
+        id
       }
     }
     errors {
diff --git a/client/coral-framework/graphql/mutations/removeCommentTag.graphql b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
index 3826b0703..642466f00 100644
--- a/client/coral-framework/graphql/mutations/removeCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
@@ -3,7 +3,7 @@ mutation RemoveCommentTag ($id: ID!, $tag: String!) {
     comment {
       id
       tags {
-        name
+        id
       }
     }
     errors {
diff --git a/graph/loaders/settings.js b/graph/loaders/settings.js
index 9d777255f..83545821d 100644
--- a/graph/loaders/settings.js
+++ b/graph/loaders/settings.js
@@ -1,25 +1,11 @@
 const SettingsService = require('../../services/settings');
-const SettingModel = require('../../models/setting');
-
 const util = require('./util');
 
-/**
- * Search for tags based on their item_type.
- * @param  {String} item_type   the item type to search by
- * @return {Promise}            resolves to distinct items tags
- */
-const getByItemType = (_, item_type) => {
-  return SettingModel.distinct('tags.models', {item_type});
-};
-
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
  * @return {Object}         object of loaders
  */
-module.exports = (context) => ({
-  Settings: {
-    get: new util.SingletonResolver(() => SettingsService.retrieve()),
-    getTagsByItemType: (item_type) => getByItemType(context, item_type)
-  }
+module.exports = () => ({
+  Settings: new util.SingletonResolver(() => SettingsService.retrieve())
 });