diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index 4a8e877b5..7b5159cc1 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -28,7 +28,13 @@ export default withFragments({
       created_at
       status
       tags {
-        id
+        tag {
+          name
+          created_at
+        }
+        assigned_by {
+          id
+        }
       }
       user {
         id
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index daa8389b3..d43bfd3d5 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -33,7 +33,13 @@ const extension = {
         comment {
           id
           tags {
-            name
+            tag {
+              name
+              created_at
+            }
+            assigned_by {
+              id
+            }
           }
         }
         errors {
@@ -46,7 +52,13 @@ const extension = {
         comment {
           id
           tags {
-            name
+            tag {
+              name
+              created_at
+            }
+            assigned_by {
+              id
+            }
           }
         }
         errors {
@@ -101,7 +113,13 @@ const extension = {
         status
         replyCount
         tags {
-          name
+          tag {
+            name
+            created_at
+          }
+          assigned_by {
+            id
+          }
         }
         user {
           id
diff --git a/graph/resolvers/tag_link.js b/graph/resolvers/tag_link.js
index 5c0d39587..11ee1350d 100644
--- a/graph/resolvers/tag_link.js
+++ b/graph/resolvers/tag_link.js
@@ -1,6 +1,6 @@
 const TagLink = {
   assigned_by({assigned_by}, _, {user, loaders: {Users}}) {
-    if (user && user.hasRole('ADMIN')) {
+    if (user && user.hasRoles('ADMIN')) {
       return Users.getByID.load(assigned_by);
     }
   }