diff --git a/library/Notifications/Web/Control/SearchBar/ObjectSuggestions.php b/library/Notifications/Web/Control/SearchBar/ObjectSuggestions.php
index 956bd378c..04e083339 100644
--- a/library/Notifications/Web/Control/SearchBar/ObjectSuggestions.php
+++ b/library/Notifications/Web/Control/SearchBar/ObjectSuggestions.php
@@ -231,10 +231,9 @@ protected function queryTags(Model $model, string $searchTerm): Query
 
     protected function matchSuggestion($path, $label, $searchTerm)
     {
-        if (preg_match('/[_.](id|uuid)$/', $path)) {
+        if (preg_match('/[_.](id|uuid)$/', $path, $matches)) {
             // Only suggest exotic columns if the user knows about them
-            $trimmedSearch = trim($searchTerm, ' *');
-            return substr($path, -strlen($trimmedSearch)) === $trimmedSearch;
+            return $matches[1] === trim($searchTerm, ' *');
         }
 
         return parent::matchSuggestion($path, $label, $searchTerm);