diff --git a/lib/zin/wg/featurebar/v1.php b/lib/zin/wg/featurebar/v1.php
index 200a7f89c7..2cbea6bed3 100644
--- a/lib/zin/wg/featurebar/v1.php
+++ b/lib/zin/wg/featurebar/v1.php
@@ -58,14 +58,15 @@ class featureBar extends wg
             $isActive = $item->name == $current;
 
             $moreSelects = array();
-            if($item->name == 'more' && !empty($lang->$currentModule->moreSelects))    $moreSelects = $lang->$currentModule->moreSelects;
+            if($item->name == 'more'  && !empty($lang->$currentModule->moreSelects))   $moreSelects = $lang->$currentModule->moreSelects;
             if(isset($lang->$currentModule->moreSelects[$currentMethod][$item->name])) $moreSelects = $lang->$currentModule->moreSelects[$currentMethod][$item->name];
+            if($item->name == 'QUERY' && !empty($lang->custom->queryList))             $moreSelects = $lang->custom->queryList;
             if(!empty($moreSelects))
             {
                 $activeText = $item->text;
 
                 $subItems = array();
-                $callback = $this->prop('moreMenuLinkCallback');
+                $callback = $this->prop($item->name == 'more' ? 'moreMenuLinkCallback' : 'queryMenuLinkCallback');
                 $callback = isset($callback[0]) ? $callback[0] : null;
 
                 foreach($moreSelects as $key => $text)
@@ -99,7 +100,6 @@ class featureBar extends wg
                 continue;
             }
 
-
             $items[] = array
             (
                 'text'   => $item->text,
diff --git a/module/bug/ui/browse.html.php b/module/bug/ui/browse.html.php
index d561de6cc5..4c8f0991c0 100644
--- a/module/bug/ui/browse.html.php
+++ b/module/bug/ui/browse.html.php
@@ -13,10 +13,12 @@ namespace zin;
 jsVar('productID', $product->id);
 jsVar('branch',    $branch);
 
+$queryMenuLink = createLink('bug', 'browse', "productID={$product->id}&branch={$branch}&browseType=bySearch&param={queryID}");
 featureBar
 (
-    set::current($browseType),
+    set::current($browseType == 'bysearch' ? $param : $browseType),
     set::linkParams("product=$product->id&branch=$branch&browseType={key}"),
+    set::queryMenuLinkCallback(fn($key) => str_replace('{queryID}', (string)$key, $queryMenuLink)),
     li(searchToggle())
 );