diff --git a/module/search/model.php b/module/search/model.php
index 09aff5165d..fa67677d55 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -357,6 +357,20 @@ class searchModel extends model
         return $query;
     }
 
+    /**
+     * Get a query.
+     *
+     * @param  int    $queryID
+     * @access public
+     * @return string
+     */
+    public function getById()
+    {
+        $query = $this->dao->findByID($queryID)->from(TABLE_USERQUERY)->fetch();
+        if(!$query) return false;
+        return $query;
+    }
+
     /**
      * Save current query to db.
      *
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 4b1efa682f..538d356e77 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -228,7 +228,7 @@ foreach($fieldParams as $fieldName => $param)
         <ul>
           <?php foreach($queries as $queryID => $queryName):?>
           <?php if(empty($queryID)) continue;?>
-          <?php $query = $this->search->getQuery($queryID);?>
+          <?php $query = $this->search->getById($queryID);?>
           <li><?php echo html::a("javascript:executeQuery($queryID)", $queryName . ((common::hasPriv('search', 'deleteQuery') and $this->app->user->account == $query->account) ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID' title='{$queryName}'");?></li>
           <?php endforeach;?>
         </ul>
@@ -363,7 +363,9 @@ $(function()
     var setDateField = function(query, fieldNO)
     {
         var $period = $('#selectPeriod');
-        if($period.length) $period.remove();
+
+        // bug #21650
+        // if($period.length) $period.remove();
 
         <?php
         $selectPeriod  = "<ul id='selectPeriod' class='dropdown-menu'>";