diff --git a/module/bug/model.php b/module/bug/model.php
index 1b5a24ca1b..20e587fbc3 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1502,7 +1502,6 @@ class bugModel extends model
             $bugQuery = str_replace($allProduct, '1', $this->session->bugQuery);
             $bugQuery = $bugQuery . ' AND `product`' . helper::dbIN($products);
         }
-        $bugQuery = $this->loadModel('search')->replaceDynamic($bugQuery);
         $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($bugQuery)
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)->page($pager)->fetchAll();
diff --git a/module/doc/control.php b/module/doc/control.php
index 84cf6842d0..0776da688b 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -105,7 +105,6 @@ class doc extends control
             }
             $docQuery = str_replace("`product` = 'all'", '1', $this->session->docQuery); // Search all producti.
             $docQuery = str_replace("`project` = 'all'", '1', $docQuery);                // Search all project.
-            $docQuery = $this->search->replaceDynamic($docQuery);
             $docs = $this->dao->select('*')->from(TABLE_DOC)->where($docQuery)
             ->andWhere('deleted')->eq(0)
             ->orderBy($sort)->page($pager)->fetchAll();
diff --git a/module/project/control.php b/module/project/control.php
index 9dce75a816..52ad1ece45 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -203,7 +203,6 @@ class project extends control
 
             $projectQuery = "`project`" . helper::dbIN(array_keys($this->projects));  
             $taskQuery    = str_replace("`project` = 'all'", $projectQuery, $this->session->taskQuery); // Search all project.
-            $taskQuery    = $this->search->replaceDynamic($taskQuery);
             $this->session->set('taskQueryCondition', $taskQuery);
             $this->session->set('taskOnlyCondition', true);
             $this->session->set('taskOrderBy', $sort);
diff --git a/module/search/model.php b/module/search/model.php
index 4cb0485303..e1c68986bc 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -112,6 +112,7 @@ class searchModel extends model
         }
 
         $where .=" ))";
+        $where  = $this->replaceDynamic($where);
 
         /* Save to session. */
         $querySessionName = $this->post->module . 'Query';
diff --git a/module/story/model.php b/module/story/model.php
index 390a272347..0522b1c53e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1130,7 +1130,6 @@ class storyModel extends model
         }
         $storyQuery = $storyQuery . ' AND `product`' . helper::dbIN(array_keys($products));
         if($projectID != '') $storyQuery .= " AND `status` != 'draft'"; 
-        $storyQuery = $this->loadModel('search')->replaceDynamic($storyQuery);
 
         return $this->getBySQL($queryProductID, $storyQuery, $orderBy, $pager);
     }
diff --git a/module/testcase/control.php b/module/testcase/control.php
index f8cbb4b82b..0e35e7772f 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -127,7 +127,6 @@ class testcase extends control
             }
             $caseQuery .= ')';
 
-            $caseQuery = $this->loadModel('search')->replaceDynamic($caseQuery);
             $this->view->cases = $this->dao->select('*')->from(TABLE_CASE)->where($caseQuery)
                 ->beginIF($queryProductID != 'all')->andWhere('product')->eq($productID)->fi()
                 ->andWhere('deleted')->eq(0)
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 85d1de3e57..935e84ee7a 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -292,7 +292,6 @@ class testtask extends control
                 $queryProductID = 'all';
             }
 
-            $caseQuery = $this->loadModel('search')->replaceDynamic($caseQuery);
             $caseQuery = preg_replace('/`(\w+)`/', 't2.`$1`', $caseQuery);
             $this->view->runs = $this->dao->select('t2.*,t1.*, t2.version as caseVersion')->from(TABLE_TESTRUN)->alias('t1')
                 ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')