Include additional conditions for hashtags and project

src/galaxy/query_builder/builder.py

@@ -47,7 +47,19 @@ def create_hashtag_filter_query(project_ids, hashtags, cur, conn):
         for i in comment_filter_values
     ]
 
-    hashtag_filter = [*hashtag_tags_filters, *comment_tags_filters]
+    # Include cases for hasthags and comments found at the end of the string.
+    no_char_filter_values = [
+        *[f"%hotosm-project-{i}" for i in project_ids],
+        *[f"%{i}" for i in hashtags],
+    ]
+    no_char_filter_values = [
+        [cur.mogrify(filter_query, (k, i)).decode() for k in ("hashtags", "comment")]
+        for i in no_char_filter_values
+    ]
+
+    no_char_filter_values = [item for sublist in no_char_filter_values for item in sublist]
+
+    hashtag_filter = [*hashtag_tags_filters, *comment_tags_filters, *no_char_filter_values]
 
     hashtag_filter = [
         sql.SQL(f).format(hstore_column=sql.Identifier(HSTORE_COLUMN))