diff --git a/frontend/app/scripts/components/organisation/OrgCustomTagsListCmp.js b/frontend/app/scripts/components/organisation/OrgCustomTagsListCmp.js
index 3cd8116668..9025b3af1b 100644
--- a/frontend/app/scripts/components/organisation/OrgCustomTagsListCmp.js
+++ b/frontend/app/scripts/components/organisation/OrgCustomTagsListCmp.js
@@ -43,9 +43,6 @@
                         pageSize: self.filtering.context.pageSize,
                         filter: this.filtering.buildQuery(),
                         operations: [
-                            {
-                                '_name': 'listTag'
-                            },
                             {
                                 '_name': 'freetags'
                             }
diff --git a/frontend/app/scripts/services/api/TagSrv.js b/frontend/app/scripts/services/api/TagSrv.js
index 5c51d8eb2d..23918abc87 100644
--- a/frontend/app/scripts/services/api/TagSrv.js
+++ b/frontend/app/scripts/services/api/TagSrv.js
@@ -17,9 +17,8 @@
                         self.tagsDefaultColour = defaultColour;
 
                         return QuerySrv.query('v1', [
-                            { _name: 'listTag' },
                             { _name: 'freetags' },
-                            { _name: 'filter', _not: { '_field': 'colour', '_value': defaultColour } }
+                            { _name: 'filter', _ne: { '_field': 'colour', '_value': defaultColour } }
                         ], {
                             params: {
                                 name: 'list-tags'
diff --git a/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala
index 103dc91042..94841e27bd 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala
@@ -44,6 +44,7 @@ class TagCtrl @Inject() (
     (idOrName, graph, _) => tagSrv.get(idOrName)(graph)
   )
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
+    Query.init[Traversal.V[Tag]]("freetags", (graph, authContext) => tagSrv.startTraversal(graph).freetags(organisationSrv)(authContext)),
     Query[Traversal.V[Tag], Traversal.V[Tag]]("freetags", (tagSteps, authContext) => tagSteps.freetags(organisationSrv)(authContext)),
     Query.initWithParam[TagHint, Traversal[String, Vertex, Converter[String, Vertex]]](
       "tagAutoComplete",
diff --git a/thehive/app/org/thp/thehive/models/Tag.scala b/thehive/app/org/thp/thehive/models/Tag.scala
index ee98cc4f0e..a20fcbcd67 100644
--- a/thehive/app/org/thp/thehive/models/Tag.scala
+++ b/thehive/app/org/thp/thehive/models/Tag.scala
@@ -5,6 +5,7 @@ import org.thp.scalligraph.models.{DefineIndex, IndexType}
 
 @DefineIndex(IndexType.unique, "namespace", "predicate", "value")
 @DefineIndex(IndexType.fulltext, "namespace", "predicate", "value")
+@DefineIndex(IndexType.standard, "colour")
 @DefineIndex(IndexType.fulltextOnly, "description")
 @BuildVertexEntity
 case class Tag(