diff --git a/src/classes/feed.js b/src/classes/feed.js
index ff46f214..9c427e1e 100644
--- a/src/classes/feed.js
+++ b/src/classes/feed.js
@@ -40,7 +40,7 @@ export default class extends baseClass {
                 return true;
             }
             if (
-                value.startsWith('wrld_') &&
+                (value.startsWith('wrld_') || value.startsWith('grp_')) &&
                 String(row.location).toUpperCase().includes(value)
             ) {
                 return true;
diff --git a/src/classes/gameLog.js b/src/classes/gameLog.js
index 1dc5b195..b4b412fb 100644
--- a/src/classes/gameLog.js
+++ b/src/classes/gameLog.js
@@ -988,7 +988,7 @@ export default class extends baseClass {
                 return true;
             }
             if (
-                value.startsWith('wrld_') &&
+                (value.startsWith('wrld_') || value.startsWith('grp_')) &&
                 String(row.location).toUpperCase().includes(value)
             ) {
                 return true;
diff --git a/src/service/database.js b/src/service/database.js
index febde73f..93e0f09e 100644
--- a/src/service/database.js
+++ b/src/service/database.js
@@ -1333,7 +1333,7 @@ class Database {
 
     async lookupFeedDatabase(search, filters, vipList) {
         var search = search.replaceAll("'", "''");
-        if (search.startsWith('wrld_')) {
+        if (search.startsWith('wrld_') || search.startsWith('grp_')) {
             return Database.getFeedByInstanceId(search, filters, vipList);
         }
         var vipQuery = '';
@@ -1401,7 +1401,7 @@ class Database {
                     groupName: dbRow[8]
                 };
                 feedDatabase.unshift(row);
-            }, `SELECT * FROM ${Database.userPrefix}_feed_gps WHERE (display_name LIKE '%${search}%' OR world_name LIKE '%${search}%') ${vipQuery} ORDER BY id DESC LIMIT ${Database.maxTableSize}`);
+            }, `SELECT * FROM ${Database.userPrefix}_feed_gps WHERE (display_name LIKE '%${search}%' OR world_name LIKE '%${search}%' OR group_name LIKE '%${search}%') ${vipQuery} ORDER BY id DESC LIMIT ${Database.maxTableSize}`);
         }
         if (status) {
             await sqliteService.execute((dbRow) => {
@@ -1479,7 +1479,7 @@ class Database {
                     groupName: dbRow[8]
                 };
                 feedDatabase.unshift(row);
-            }, `SELECT * FROM ${Database.userPrefix}_feed_online_offline WHERE ((display_name LIKE '%${search}%' OR world_name LIKE '%${search}%') ${query}) ${vipQuery} ORDER BY id DESC LIMIT ${Database.maxTableSize}`);
+            }, `SELECT * FROM ${Database.userPrefix}_feed_online_offline WHERE ((display_name LIKE '%${search}%' OR world_name LIKE '%${search}%' OR group_name LIKE '%${search}%') ${query}) ${vipQuery} ORDER BY id DESC LIMIT ${Database.maxTableSize}`);
         }
         var compareByCreatedAt = function (a, b) {
             var A = a.created_at;
@@ -1657,7 +1657,7 @@ class Database {
 
     async lookupGameLogDatabase(search, filters, vipList = []) {
         var search = search.replaceAll("'", "''");
-        if (search.startsWith('wrld_')) {
+        if (search.startsWith('wrld_') || search.startsWith('grp_')) {
             return Database.getGameLogByLocation(search, filters);
         }
         let vipQuery = '';
@@ -1736,7 +1736,7 @@ class Database {
                     groupName: dbRow[6]
                 };
                 gamelogDatabase.unshift(row);
-            }, `SELECT * FROM gamelog_location WHERE world_name LIKE '%${search}%' ORDER BY id DESC LIMIT ${Database.maxTableSize}`);
+            }, `SELECT * FROM gamelog_location WHERE world_name LIKE '%${search}%' OR group_name LIKE '%${search}%' ORDER BY id DESC LIMIT ${Database.maxTableSize}`);
         }
         if (onplayerjoined || onplayerleft) {
             var query = '';