diff --git a/tests/etl/test_bugzilla.py b/tests/etl/test_bugzilla.py
index 85ad57ab8..f02686084 100644
--- a/tests/etl/test_bugzilla.py
+++ b/tests/etl/test_bugzilla.py
@@ -10,8 +10,8 @@ def test_bz_api_process(mock_bugzilla_api_request):
     process.run()
 
     # the number of rows inserted should equal to the number of bugs
-    assert Bugscache.objects.count() == 17
+    assert Bugscache.objects.count() == 25
 
     # test that a second ingestion of the same bugs doesn't insert new rows
     process.run()
-    assert Bugscache.objects.count() == 17
+    assert Bugscache.objects.count() == 25
diff --git a/tests/model/test_bugscache.py b/tests/model/test_bugscache.py
index 8061bb2b5..afa276aaf 100644
--- a/tests/model/test_bugscache.py
+++ b/tests/model/test_bugscache.py
@@ -50,6 +50,11 @@ BUG_SEARCHES = (
     ("should not be match_d", []),
     ("should not be match%d", []),
     ("should not be matche=d", []),
+    ("standalone-without-folder.html", [1690234]),
+    ("slash-folder.html", [1690235]),
+    ("backslash.html", [1690236]),
+    ("listitem-001.html", [1690345]),
+    ("match-at-start.html", [1690456]),
 )
 
 
diff --git a/tests/sample_data/bug_list.json b/tests/sample_data/bug_list.json
index 1fc5c8ab9..57fd566bc 100644
--- a/tests/sample_data/bug_list.json
+++ b/tests/sample_data/bug_list.json
@@ -176,6 +176,94 @@
       "last_change_time": "2016-07-25T01:04:15Z",
       "whiteboard": "text"
     },
+    {
+      "status": "NEW",
+      "id": 1690123,
+      "summary": "Intermittent different-standalone-without-folder.html | whitespace separated and trailing end of file name: no match",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
+    {
+      "status": "NEW",
+      "id": 1690234,
+      "summary": "Intermittent standalone-without-folder.html | whitespace separated and full file name: match",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
+    {
+      "status": "NEW",
+      "id": 1690124,
+      "summary": "Intermittent mock-folder-1/different-start-slash-folder.html | slash no match",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
+    {
+      "status": "NEW",
+      "id": 1690235,
+      "summary": "Intermittent mock-folder-2/slash-folder.html | slash match",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
+    {
+      "status": "NEW",
+      "id": 1690125,
+      "summary": "Intermittent mock-folder-3\\different-start-backslash.html | backslash no match",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
+    {
+      "status": "NEW",
+      "id": 1690236,
+      "summary": "Intermittent mock-folder-4\\backslash.html | backslash match",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
+    {
+      "status": "NEW",
+      "id": 1690345,
+      "summary": "Intermittent listitem-000.html,listitem-001.html,listitem-002.html | in comma separated list",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
+    {
+      "status": "NEW",
+      "id": 1690456,
+      "summary": "match-at-start.html | match at start",
+      "cf_crash_signature": "",
+      "keywords": ["intermittent-failure"],
+      "resolution": "",
+      "op_sys": "Unspecified",
+      "last_change_time": "2016-07-25T01:04:15Z",
+      "whiteboard": "text"
+    },
     {
       "status": "NEW",
       "id": 100,
diff --git a/treeherder/model/models.py b/treeherder/model/models.py
index 16f713a2c..9f911c3d1 100644
--- a/treeherder/model/models.py
+++ b/treeherder/model/models.py
@@ -273,7 +273,18 @@ class Bugscache(models.Model):
         )
 
         try:
-            open_recent = [model_to_dict(item, exclude=["modified"]) for item in recent_qs]
+            open_recent_match_string = [
+                model_to_dict(item, exclude=["modified"]) for item in recent_qs
+            ]
+            open_recent = [
+                match
+                for match in open_recent_match_string
+                if match["summary"].startswith(search_term)
+                or "/" + search_term in match["summary"]
+                or " " + search_term in match["summary"]
+                or "\\" + search_term in match["summary"]
+                or "," + search_term in match["summary"]
+            ]
         except ProgrammingError as e:
             newrelic.agent.record_exception()
             logger.error(
@@ -298,7 +309,18 @@ class Bugscache(models.Model):
         )
 
         try:
-            all_others = [model_to_dict(item, exclude=["modified"]) for item in all_others_qs]
+            all_others_match_string = [
+                model_to_dict(item, exclude=["modified"]) for item in all_others_qs
+            ]
+            all_others = [
+                match
+                for match in all_others_match_string
+                if match["summary"].startswith(search_term)
+                or "/" + search_term in match["summary"]
+                or " " + search_term in match["summary"]
+                or "\\" + search_term in match["summary"]
+                or "," + search_term in match["summary"]
+            ]
         except ProgrammingError as e:
             newrelic.agent.record_exception()
             logger.error(