diff --git a/queries/1101147.yaml b/queries/1101147.yaml
index 96ccf0df..df766dde 100644
--- a/queries/1101147.yaml
+++ b/queries/1101147.yaml
@@ -1,4 +1,4 @@
 query: >
   message:"[ERROR] /opt/stack/new/devstack/exercises/"
   AND message:" server didn't become active!"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1209086.yaml b/queries/1209086.yaml
index 559d847a..626349d0 100644
--- a/queries/1209086.yaml
+++ b/queries/1209086.yaml
@@ -1,3 +1,3 @@
 query: >
   message:"Failure uploading file to container ex-swift"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1261182.yaml b/queries/1261182.yaml
index 476276ee..b198e1bf 100644
--- a/queries/1261182.yaml
+++ b/queries/1261182.yaml
@@ -2,4 +2,4 @@ query: >
   message:"[Fail] Couldn't ping server"
   AND (message:"[ERROR] /opt/stack/old/devstack/lib/neutron"
     OR message:"[ERROR] /opt/stack/new/devstack/lib/neutron")
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1263417.yaml b/queries/1263417.yaml
index d6aba93f..fc060ca8 100644
--- a/queries/1263417.yaml
+++ b/queries/1263417.yaml
@@ -1,3 +1,3 @@
 query: >
   message:"E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1265057.yaml b/queries/1265057.yaml
index 567f42f8..8371a91b 100644
--- a/queries/1265057.yaml
+++ b/queries/1265057.yaml
@@ -1,3 +1,3 @@
 query: >
   message:(+"[ERROR]" +"Horizon front page not functioning!")
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1266616.yaml b/queries/1266616.yaml
index f36265ad..2459dca8 100644
--- a/queries/1266616.yaml
+++ b/queries/1266616.yaml
@@ -1,3 +1,3 @@
 query: >
   message:"Failed to connect to 2001:4800:"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1266954.yaml b/queries/1266954.yaml
index ae6db4eb..11977704 100644
--- a/queries/1266954.yaml
+++ b/queries/1266954.yaml
@@ -1,3 +1,3 @@
 query: >
   message:" MismatchError: {u'binary': u'neutron-dhcp-agent'"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1270382.yaml b/queries/1270382.yaml
index a5056481..75031cc3 100644
--- a/queries/1270382.yaml
+++ b/queries/1270382.yaml
@@ -1,3 +1,3 @@
 query: >
   message:"Temporary failure in name resolution"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1270710.yaml b/queries/1270710.yaml
index 17c74d24..02804240 100644
--- a/queries/1270710.yaml
+++ b/queries/1270710.yaml
@@ -1,3 +1,3 @@
 query: >
-  tags:"console.html"
+  tags:"console"
   AND message:"download.py\", line 495"
diff --git a/queries/1272417.yaml b/queries/1272417.yaml
index 716f2823..fc83fce5 100644
--- a/queries/1272417.yaml
+++ b/queries/1272417.yaml
@@ -1,4 +1,4 @@
 query: >
   message:"Cannot fetch index base URL"
   AND message:"openstack"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1278988.yaml b/queries/1278988.yaml
index f886bd34..888848bf 100644
--- a/queries/1278988.yaml
+++ b/queries/1278988.yaml
@@ -1,3 +1,3 @@
 query: >
     message:"wrong fs type, bad option, bad superblock on /dev/loop2" AND
-    tags:"console.html"
+    tags:"console"
diff --git a/queries/1280464.yaml b/queries/1280464.yaml
index e2a24b15..353fc863 100644
--- a/queries/1280464.yaml
+++ b/queries/1280464.yaml
@@ -1,4 +1,4 @@
 query: >
-  tags:"console.html"
+  tags:"console"
   AND message:"mount: wrong fs type, bad option, bad superblock on /dev/loop1,"
   AND build_name:*-grenade-dsvm-neutron
diff --git a/queries/1282262.yaml b/queries/1282262.yaml
index b1d7a23e..a2362b47 100644
--- a/queries/1282262.yaml
+++ b/queries/1282262.yaml
@@ -1,4 +1,4 @@
 query: >
   message:"Permission denied:"
   AND message:"/opt/stack/"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1282724.yaml b/queries/1282724.yaml
index be6ae422..6e87560f 100644
--- a/queries/1282724.yaml
+++ b/queries/1282724.yaml
@@ -1,3 +1,3 @@
 query: >
   message:"559 Failure creating SWIFT_TENANT_TEST1"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1282772.yaml b/queries/1282772.yaml
index 8ccac328..b8b579de 100644
--- a/queries/1282772.yaml
+++ b/queries/1282772.yaml
@@ -1,3 +1,3 @@
 query: >
     message:"Remove dead screens with 'screen -wipe'."
-    AND tags:"console.html"
+    AND tags:"console"
diff --git a/queries/1285323.yaml b/queries/1285323.yaml
index 05e4377e..c7834c3c 100644
--- a/queries/1285323.yaml
+++ b/queries/1285323.yaml
@@ -2,5 +2,5 @@ query: >
     ((message:"+ echo \'The following services are still running:")
     OR
     (message:"Error: Service" AND message:"is not running"))
-    AND tags:"console.html"
+    AND tags:"console"
     AND NOT build_name:"check-grenade-dsvm-partial-ncpu"
diff --git a/queries/1289345.yaml b/queries/1289345.yaml
index b01e7052..5875d56b 100644
--- a/queries/1289345.yaml
+++ b/queries/1289345.yaml
@@ -1,3 +1,3 @@
 query: >
   message:"ImportError: cannot import name greenthread"
-  AND tags:"console.html"
+  AND tags:"console"
diff --git a/queries/1290080.yaml b/queries/1290080.yaml
index 84d39465..175a1338 100644
--- a/queries/1290080.yaml
+++ b/queries/1290080.yaml
@@ -1,4 +1,4 @@
 query: >
   message:"echo \'Not found" AND
   message:"cirros-0.3.1-x86_64-uec.tar.gz" AND
-  tags:"console.html"
+  tags:"console"