diff --git a/elasticRecheck.py b/elasticRecheck.py
index 98e5aceb..29c66e8a 100755
--- a/elasticRecheck.py
+++ b/elasticRecheck.py
@@ -130,12 +130,12 @@ class Classifier():
             if results['hits']['total'] > 0:
                     break
             else:
-                time.sleep(5)
+                time.sleep(40)
         print "READY!"
         for x in self.queries:
             print "Looking for bug: https://bugs.launchpad.net/bugs/%s" % x['bug']
-            query = self._apply_template(self.targeted_template, x['query'],
-                    change_number, patch_number)
+            query = self._apply_template(self.targeted_template, (x['query'],
+                    change_number, patch_number))
             results = self.es.search(query, size='1')
             print results
             if results['hits']['total']>0:
@@ -157,7 +157,7 @@ def main():
         if bug_number is None:
             print "unable to classify failure"
         else:
-            print "Found bug: https://bugs.launchpad.net/bugs/%d" % bug_number
+            print "Found bug: https://bugs.launchpad.net/bugs/%s" % bug_number
 
 if __name__ == "__main__":
     main()
diff --git a/queries.json b/queries.json
index 77328adb..d16878b6 100644
--- a/queries.json
+++ b/queries.json
@@ -3,6 +3,10 @@
         "bug": "1211915",
         "query": "@message:\"ConnectionFailed: Connection to neutron failed: Maximum attempts reached\" AND @fields.filename:\"console.html\""
     },
+    {
+        "bug": "1221987",
+        "query": "@tags:\"logs/screen-n-sch.txt\" AND @message:(tempest* AND \"Setting instance to ERROR state\")"
+    },
     {
         "bug": "1218391",
         "query": "@message:\"Cannot 'createImage'\" AND @fields.filename:\"console.html\" AND @fields.build_status:\"FAILURE\""
diff --git a/tests/test_classifier.py b/tests/test_classifier.py
index 94327d84..4f9a0d32 100644
--- a/tests/test_classifier.py
+++ b/tests/test_classifier.py
@@ -11,8 +11,12 @@ class TestClassifier(testtools.TestCase):
     def test_read_qeuries_file(self):
         self.assertNotEqual(self.classifier.queries, None)
 
-
     def test_elasticSearch(self):
         self.classifier.test()
         self.classifier.last_failures()
         #self.assertFalse(True)
+
+    def test_classify(self):
+        bug_number = self.classifier.classify('46581', '1')
+        self.assertEqual(bug_number, '1211915')
+