diff --git a/tests/model/test_error_summary.py b/tests/model/test_error_summary.py
index 425ab558618..467e0aa4d7d 100644
--- a/tests/model/test_error_summary.py
+++ b/tests/model/test_error_summary.py
@@ -105,37 +105,27 @@ def test_get_cleaned_line(line_raw, exp_line_cleaned):
     ),
     (
         (
-            "REFTEST PROCESS-CRASH "
-            "| application crashed [@ jemalloc_crash] "
-            "| http://10.0.2.2:8854/tests/dom/canvas/test/reftest/webgl-resize-test.html == "
-            "http://10.0.2.2:8854/tests/dom/canvas/test/reftest/wrapper.html?green.png"
+            "TEST-UNEXPECTED-FAIL "
+            "| /tests/dom/events/test/pointerevents/pointerevent_touch-action-table-test_touch-manual.html "
+            "| touch-action attribute test on the cell: assert_true: scroll received while shouldn't expected true got false"
         ),
         {
-            "path_end": "http://10.0.2.2:8854/tests/dom/canvas/test/reftest/webgl-resize-test.html",
-            "search_term": ["application crashed [@ jemalloc_crash]"],
+            "path_end": "/tests/dom/events/test/pointerevents/pointerevent_touch-action-table-test_touch-manual.html",
+            "search_term": ["pointerevent_touch-action-table-test_touch-manual.html"],
         },
     ),
     (
         (
             "REFTEST PROCESS-CRASH "
-            "| application crashed [@ jemalloc_crash] "
-            "| http://10.0.2.2:8854/tests/dom/canvas/test/reftest/webgl-resize-test.html != "
-            "http://10.0.2.2:8854/tests/dom/canvas/test/reftest/wrapper.html?green.png"
+            "| 844cb27a-6101-4b86-95c7-24e6d0be12a7 "
+            "| application crashed [@ mozilla::dom::Element::VerifySubtreeBloomFilter] "
+            "| layout/svg/crashtests/1443092.html"
         ),
         {
-            "path_end": "http://10.0.2.2:8854/tests/dom/canvas/test/reftest/webgl-resize-test.html",
-            "search_term": ["application crashed [@ jemalloc_crash]"],
-        },
-    ),
-    (
-        (
-            "TEST-UNEXPECTED-FAIL "
-            "| /tests/dom/events/test/pointerevents/pointerevent_touch-action-table-test_touch-manual.html "
-            "| touch-action attribute test on the cell: assert_true: scroll received while shouldn't expected true got false"
-        ),
-        {
-            "path_end": "/tests/dom/events/test/pointerevents/pointerevent_touch-action-table-test_touch-manual.html",
-            "search_term": ["pointerevent_touch-action-table-test_touch-manual.html"],
+            "path_end": "layout/svg/crashtests/1443092.html",
+            "search_term": [
+                "application crashed [@ mozilla::dom::Element::VerifySubtreeBloomFilter]"
+            ],
         },
     ),
 )
@@ -337,6 +327,7 @@ def test_get_crash_signature(line, exp_search_info):
     (
         (
             "REFTEST PROCESS-CRASH "
+            "| 844cb27a-6101-4b86-95c7-24e6d0be12a7 "
             "| application crashed [@ mozalloc_abort] "
             "| file:///home/worker/workspace/build/tests/reftest/tests/layout/reftests/font-inflation/video-1.html"
         ),
diff --git a/treeherder/model/error_summary.py b/treeherder/model/error_summary.py
index a09238fa576..694c8beb994 100644
--- a/treeherder/model/error_summary.py
+++ b/treeherder/model/error_summary.py
@@ -339,11 +339,12 @@ def get_error_search_term_and_path(error_line):
     if len(tokens) >= 3:
         is_crash = "PROCESS-CRASH" in tokens[0]
         # it's in the "FAILURE-TYPE | testNameOrFilePath | message" type format.
-        test_name_or_path = tokens[1]
         message = tokens[2]
         if is_crash:
-            test_name_or_path = tokens[2]
-            message = tokens[1]
+            # it's in the "FAILURE-TYPE | crash ID | message including crash signature | test path and name" type format.
+            test_name_or_path = tokens[3]
+        else:
+            test_name_or_path = tokens[1]
         # Leak failure messages are of the form:
         # leakcheck | .*\d+ bytes leaked (Object-1, Object-2, Object-3, ...)
         match = LEAK_RE.search(message)
diff --git a/ui/shared/BugFiler.jsx b/ui/shared/BugFiler.jsx
index 658f78f2209..47abaf13658 100644
--- a/ui/shared/BugFiler.jsx
+++ b/ui/shared/BugFiler.jsx
@@ -135,7 +135,7 @@ export class BugFilerClass extends React.Component {
       if (crashSignatures.length > 0) {
         isTestPath = false;
         const parts = summaryString.split(' | ');
-        summaryString = `${parts[0]} | single tracking bug`;
+        summaryString = `${parts[1]} | single tracking bug`;
         keywords.push('intermittent-testcase');
       }
 
diff --git a/ui/shared/InternalIssueFiler.jsx b/ui/shared/InternalIssueFiler.jsx
index 7a31aa18740..5d6a645fe9a 100644
--- a/ui/shared/InternalIssueFiler.jsx
+++ b/ui/shared/InternalIssueFiler.jsx
@@ -25,7 +25,7 @@ export class InternalIssueFilerClass extends React.Component {
 
     if (crashSignatures.length > 0) {
       const parts = summaryString.split(' | ');
-      summaryString = `${parts[0]} | single tracking bug`;
+      summaryString = `${parts[1]} | single tracking bug`;
     }
 
     const isAssertion = [