diff --git a/module/common/model.php b/module/common/model.php
index bd0356c27a..65de33a5fa 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2332,6 +2332,7 @@ EOD;
 
             if(empty($acls['views'])) return true;
             $menu = isset($lang->navGroup->$module) ? $lang->navGroup->$module : $module;
+            if($menu == 'my' && $method == 'team') $menu = 'system'; // Fix bug #18642.
             $menu = strtolower($menu);
             if($menu != 'qa' and !isset($lang->$menu->menu)) return true;
             if(($menu == 'my' && $method != 'team')or $menu == 'index' or $module == 'tree') return true;
diff --git a/module/search/model.php b/module/search/model.php
index 09aff5165d..770c90cc3f 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -399,7 +399,6 @@ class searchModel extends model
     public function deleteQuery($queryID)
     {
         $this->dao->delete()->from(TABLE_USERQUERY)->where('id')->eq($queryID)->andWhere('account')->eq($this->app->user->account)->exec();
-        echo 'success';
     }
 
     /**
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 4b1efa682f..7af76e8e24 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -546,6 +546,7 @@ $(function()
     if($('#formType').val() == 'more') expandForm(true);
     $searchForm.on('click', '.user-query .icon-close', function(e)
     {
+        e.preventDefault(); // Fix bug #21572.
         var $query = $(this).closest('.user-query');
         var queryId = $query.data('queryId');
         var deleteQueryLink = $.createLink('search', 'deleteQuery', 'queryID=' + queryId);