diff --git a/output/elastic-recheck/1939023.yaml b/output/elastic-recheck/1939023.yaml
new file mode 100644
index 0000000..b177697
--- /dev/null
+++ b/output/elastic-recheck/1939023.yaml
@@ -0,0 +1,2 @@
+query: 'message:"RUN END RESULT_TIMED_OUT: [untrusted : opendev.org/openstack/tripleo-ci/playbooks/tripleo-ci/run-v3.yaml@master"'
+suppress-graph: false
diff --git a/output/elastic-recheck/No_valid_host_was_found.yaml b/output/elastic-recheck/No_valid_host_was_found.yaml
index 3687894..518e0fd 100644
--- a/output/elastic-recheck/No_valid_host_was_found.yaml
+++ b/output/elastic-recheck/No_valid_host_was_found.yaml
@@ -1,3 +1,3 @@
-msg: No valid host was found.
+msg: 'Nova failure: no valid host was found'
 query: message:"No valid host was found. There are not enough hosts" AND (tags:"console")
 suppress-graph: false
diff --git a/output/elastic-recheck/Test 1.yaml b/output/elastic-recheck/Test 1.yaml
deleted file mode 100644
index cc0587f..0000000
--- a/output/elastic-recheck/Test 1.yaml	
+++ /dev/null
@@ -1,3 +0,0 @@
-query: 'message:"ReadTimeoutError: HTTPConnectionPool" AND (tags:"console") AND voting:1 AND
-  build_status:SUCCESS  AND NOT build_name:neutron*'
-suppress-graph: false
diff --git a/output/elastic-recheck/Test 2.yaml b/output/elastic-recheck/Test 2.yaml
deleted file mode 100644
index 7cadf80..0000000
--- a/output/elastic-recheck/Test 2.yaml	
+++ /dev/null
@@ -1,3 +0,0 @@
-query: 'message:"ReadTimeoutError: HTTPConnectionPool" AND NOT (build_name:"neutron*") AND
-  (build_status:"SUCCESS") AND (tags:"console")'
-suppress-graph: false
diff --git a/output/elastic-recheck/curl_re.yaml b/output/elastic-recheck/curl_re.yaml
index 393dfdb..1b121bb 100644
--- a/output/elastic-recheck/curl_re.yaml
+++ b/output/elastic-recheck/curl_re.yaml
@@ -1,2 +1,3 @@
+msg: 'Failed to upload or get image: {}.'
 query: message:"couldn't open file"
 suppress-graph: false
diff --git a/output/elastic-recheck/overcloud_create_failed.yaml b/output/elastic-recheck/overcloud_create_failed.yaml
index 740d6c0..732b58e 100644
--- a/output/elastic-recheck/overcloud_create_failed.yaml
+++ b/output/elastic-recheck/overcloud_create_failed.yaml
@@ -1,2 +1,3 @@
+msg: 'Overcloud stack: FAILED.'
 query: message:"Stack overcloud CREATE_FAILED"
 suppress-graph: false
diff --git a/output/sova-pattern-generated.json b/output/sova-pattern-generated.json
index 6a589d2..6a92575 100644
--- a/output/sova-pattern-generated.json
+++ b/output/sova-pattern-generated.json
@@ -20,14 +20,14 @@
             {
                 "id": "overcloud_create_failed",
                 "logstash": "",
-                "msg": "overcloud_create_failed",
+                "msg": "Overcloud stack: FAILED.",
                 "pattern": "overcloud_create_failed",
                 "tag": "info"
             },
             {
                 "id": "curl_re",
                 "logstash": "",
-                "msg": "curl_re",
+                "msg": "Failed to upload or get image: {}.",
                 "pattern": "curl_re",
                 "tag": "info"
             },
@@ -59,24 +59,10 @@
                 "pattern": "Failed_to_download_yum_metadata",
                 "tag": "info"
             },
-            {
-                "id": "Test_1",
-                "logstash": "",
-                "msg": "Test_1",
-                "pattern": "Test_1",
-                "tag": "info"
-            },
-            {
-                "id": "Test_2",
-                "logstash": "",
-                "msg": "Test_2",
-                "pattern": "Test_2",
-                "tag": "info"
-            },
             {
                 "id": "No_valid_host_was_found",
                 "logstash": "",
-                "msg": "No valid host was found.",
+                "msg": "Nova failure: no valid host was found",
                 "pattern": "No_valid_host_was_found",
                 "tag": "info"
             },
@@ -541,6 +527,13 @@
                 "msg": "Tempest tests failed",
                 "pattern": "Tempest_tests_failed",
                 "tag": "info"
+            },
+            {
+                "id": "periodic_fs35_wallaby_times_out",
+                "logstash": "",
+                "msg": "periodic_fs35_wallaby_times_out",
+                "pattern": "periodic_fs35_wallaby_times_out",
+                "tag": "info"
             }
         ],
         "errors": [
@@ -921,14 +914,6 @@
             "name": "Failed_to_download_yum_metadata",
             "regex": "All\\ mirrors\\ were\\ tried"
         },
-        {
-            "name": "Test_1",
-            "regex": "ReadTimeoutError: HTTPConnectionPool"
-        },
-        {
-            "name": "Test_2",
-            "regex": "ReadTimeoutError:\\ HTTPConnectionPool"
-        },
         {
             "name": "No_valid_host_was_found",
             "regex": "No\\ valid\\ host\\ was\\ found\\.\\ There\\ are\\ not\\ enough\\ hosts"
@@ -1394,6 +1379,10 @@
         {
             "name": "container_pull_error",
             "regex": "error\\ creating\\ build\\ container:\\ Error\\ reading\\ signatures:\\ Get"
+        },
+        {
+            "name": "periodic_fs35_wallaby_times_out",
+            "regex": "RUN\\ END\\ RESULT_TIMED_OUT:\\ \\[untrusted\\ :\\ opendev\\.org/openstack/tripleo\\-ci/playbooks/tripleo\\-ci/run\\-v3\\.yaml@master"
         }
     ]
 }
diff --git a/samples/errors-testing.err b/samples/errors-testing.err
index 287495e..fb0319f 100644
--- a/samples/errors-testing.err
+++ b/samples/errors-testing.err
@@ -130,3 +130,4 @@ denied
 err.detail="invalid checksum digest format"
 Failed to call refresh
 Stderr: 'level=debug msg="Pull Policy for pull [PullIfNewer]"\nerror creating build container: Error reading signatures: Get
+RUN END RESULT_TIMED_OUT: [untrusted : opendev.org/openstack/tripleo-ci/playbooks/tripleo-ci/run-v3.yaml@master
diff --git a/src/data/queries.yml b/src/data/queries.yml
index a5bafc0..ce128aa 100644
--- a/src/data/queries.yml
+++ b/src/data/queries.yml
@@ -6,9 +6,10 @@ queries:
     msg: "IGNORE THIS QUERY. This is a query which should return some value always - to check if the webpage is working properly."
     regex: "post.yaml"
   - id: overcloud_create_failed
-    name: "Overcloud stack: FAILED."
+    msg: "Overcloud stack: FAILED."
     pattern: "Stack overcloud CREATE_FAILED"
   - id: curl_re
+    msg: "Failed to upload or get image: {}."
     pattern: "couldn't open file"
     regex: 'curl. .*? couldn.t open file "(.*?)"'
   - id: ReadTimeoutError_HTTPConnectionPool
@@ -27,18 +28,9 @@ queries:
     pattern: "All mirrors were tried"
     tags: console
     url: https://bugs.launchpad.net/tripleo/+bug/1929461
-  - id: Test 1
-    logstash: 'message:"ReadTimeoutError: HTTPConnectionPool" AND (tags:"console") AND voting:1 AND build_status:SUCCESS  AND NOT build_name:neutron*'
-    regex: "ReadTimeoutError: HTTPConnectionPool"
-    tags: console
-  - build_status: SUCCESS
-    id: Test 2
-    not_build_name: "neutron*"
-    pattern: "ReadTimeoutError: HTTPConnectionPool"
-    tags: console
   # sova_id_3
   - id: No_valid_host_was_found
-    msg: "No valid host was found."
+    msg: "Nova failure: no valid host was found"
     pattern: "No valid host was found. There are not enough hosts"
     sova_tag: console
     tags: console
@@ -737,3 +729,7 @@ queries:
     pattern: 'error creating build container: Error reading signatures: Get'
     sova_tag: logstash
     url: https://bugs.launchpad.net/tripleo/+bug/1938718
+  - id: periodic fs35 wallaby times out
+    pattern: "RUN END RESULT_TIMED_OUT: [untrusted : opendev.org/openstack/tripleo-ci/playbooks/tripleo-ci/run-v3.yaml@master"
+    sova_tag: console
+    url: https://bugs.launchpad.net/tripleo/+bug/1939023