diff --git a/lib/zin/wg/featurebar/v1.php b/lib/zin/wg/featurebar/v1.php
index 2cbea6bed3..5d627c3bc0 100644
--- a/lib/zin/wg/featurebar/v1.php
+++ b/lib/zin/wg/featurebar/v1.php
@@ -71,13 +71,23 @@ class featureBar extends wg
 
                 foreach($moreSelects as $key => $text)
                 {
-                    $subItems[] = array
-                    (
-                        'text'   => $text,
-                        'active' => $key == $current,
-                        'url'    => ($callback instanceof \Closure) ? $callback($key, $text) : str_replace('{key}', $key, $link),
-                        'attrs'  => ['data-id' => $key, 'data-load' => 'table']
-                    );
+                    $subItem = array();
+                    $subItem['text']   = $text;
+                    $subItem['active'] = $key == $current;
+                    $subItem['url']    = ($callback instanceof \Closure) ? $callback($key, $text) : str_replace('{key}', $key, $link);
+                    $subItem['attrs']  = ['data-id' => $key, 'data-load' => 'table'];
+
+                    if($item->name == 'QUERY')
+                    {
+                        $closeLink = createLink('search', 'ajaxRemoveMenu', "queryID={$key}");
+                        $loadUrl   = $subItem['url'] . '#featureBar';
+
+                        $subItem['className']    = 'flex-auto';
+                        $subItem['rootClass']    = 'row gap-0';
+                        $subItem['rootChildren'] = array(jsRaw("zui.h('a', {className: 'ajax-submit', 'data-url': '{$closeLink}', 'data-load': '{$loadUrl}'}, zui.h('span', {className: 'close'}))"));
+                    }
+
+                    $subItems[] = $subItem;
 
                     if($key === $current)
                     {
diff --git a/module/search/control.php b/module/search/control.php
index 9b96bcaf11..a8587d9c95 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -174,6 +174,8 @@ class search extends control
     public function ajaxRemoveMenu($queryID)
     {
         $this->dao->update(TABLE_USERQUERY)->set('shortcut')->eq(0)->where('id')->eq($queryID)->exec();
+        if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+        return $this->send(array('result' => 'success'));
     }
 
     /**