diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 21426d217..f37b507f9 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -56,7 +56,7 @@ router.get('/', (req, res, next) => {
       .then((ids) => assetIDWrap(Comment.find({
         id: {
           $in: ids
-        },
+        }
       })));
   } else {
     query = assetIDWrap(Comment.all());
diff --git a/routes/api/queue/index.js b/routes/api/queue/index.js
index 3edcbe1b4..1d788136a 100644
--- a/routes/api/queue/index.js
+++ b/routes/api/queue/index.js
@@ -58,10 +58,20 @@ router.get('/comments/rejected', /*authorization.needed('admin'),*/ (req, res, n
 router.get('/comments/flagged', authorization.needed('admin'), (req, res, next) => {
   const {asset_id} = req.query;
 
-  Comment.findIdsByActionType('flagged')
-    .then(ids => {
-      console.log(ids);
-      res.json(ids);
+  const assetIDWrap = (query) => {
+    if (asset_id) {
+      query = query.where('asset_id', asset_id);
+    }
+
+    return query;
+  };
+
+  Comment.findIdsByActionType('flag')
+    .then(ids => assetIDWrap(Comment.find({
+      id: { $in: ids }
+    })))
+    .then(([comments, users, actions]) => {
+      res.json({comments, users, actions});
     })
     .catch(error => {
       next(error);