diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 7ea98fd373..1adb46068f 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -181,7 +181,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
     </div>
   </div>
   <div class="main-col">
-    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
+    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox" data-module='bug'></div>
     <?php if(empty($bugs)):?>
     <div class="table-empty-tip">
       <p>
diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php
index 0754c275ca..d74a98e619 100644
--- a/module/bug/view/linkbugs.html.php
+++ b/module/bug/view/linkbugs.html.php
@@ -20,7 +20,7 @@
       <small class='text-muted'> <?php echo $lang->arrow . $lang->bug->linkBugs;?></small>
     </h2>
   </div>
-  <div id='queryBox' class='show divider'></div>
+  <div id='queryBox' data-module='bug' class='show divider'></div>
   <?php if($bugs2Link):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='linkBugsForm'>
     <table class='table tablesorter' id='bugList'>
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index ffba38c1be..218bf90bdd 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show'></div>
+<div id='queryBox' data-module='bug' class='show'></div>
 <div id='unlinkBugList'>
   <form class='main-table table-bug' data-ride='table' method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkBug', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
     <div class='table-header hl-primary text-primary strong'>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 6399a8a413..192bd79da9 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show'></div>
+<div id='queryBox' data-module='story' class='show'></div>
 <div id='unlinkStoryList'>
   <form class='main-table table-story' data-ride='table' method='post' id='unlinkedStoriesForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkStory', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
     <div class='table-header hl-primary text-primary strong'>
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index 63d0cdaa54..e8c4203281 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -81,7 +81,7 @@ js::set('flow',          $config->global->flow);
     </div>
   </div>
   <div class="main-col">
-    <div id='queryBox' class='cell <?php if($browseType =='bysearch') echo 'show';?>'></div>
+    <div id='queryBox' data-module='testcase' class='cell <?php if($browseType =='bysearch') echo 'show';?>'></div>
     <?php if(empty($cases)):?>
     <div class="table-empty-tip">
       <p>
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index ed6ae4b0ef..c13a60f165 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -52,7 +52,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
     </div>
   </div>
   <div class='main-col'>
-    <div class="cell" id="queryBox"></div>
+    <div class="cell" id="queryBox" data-module='user'></div>
     <form class='main-table table-user' data-ride='table' action='<?php echo $this->createLink('user', 'batchEdit', "deptID=$deptID")?>' method='post' id='userListForm'>
       <?php $canBatchEdit = common::hasPriv('user', 'batchEdit');?>
       <table class='table has-sort-head' id='userList'>
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index c39c4a6e03..3ee42be80f 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -34,7 +34,7 @@
   </div>
 </div>
 
-<div id='queryBox' class='cell <?php if($browseType =='bysearch') echo 'show';?>'></div>
+<div id='queryBox' data-module='action' class='cell <?php if($browseType =='bysearch') echo 'show';?>'></div>
 <div id='mainContent' class='main-content'>
   <div id='dynamics'>
     <?php $firstAction = '';?>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index d902d32cee..16f0bda852 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -26,7 +26,7 @@ var browseType = '<?php echo $browseType;?>';
   <?php include dirname(__FILE__) . '/browsebygrid.html.php';?>
   <?php else:?>
   <div class="main-col" data-min-width="400">
-    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
+    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox" data-module='doc'></div>
     <div class="panel block-files block-sm no-margin">
       <div class="panel-heading">
         <div class="panel-title font-normal">
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index 27522f24f3..950a1bf8a9 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -1,5 +1,5 @@
 <div class="main-col" data-min-width="400">
-<div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
+<div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox" data-module='doc'></div>
   <div class="panel block-files block-sm no-margin">
     <div class="panel-heading">
       <div class="panel-title font-normal">
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index 858d07282c..5c497bf2cf 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -14,7 +14,7 @@
 <div class='main-row split-row fade' id='mainRow'>
   <?php include './side.html.php';?>
   <div class="main-col" data-min-width="400">
-  <div class="cell" id="queryBox"></div>
+  <div class="cell" id="queryBox" data-module='doc'></div>
     <div class="row">
       <div class="col-sm-7">
         <div class="panel block-files block-sm" style="height: 290px;">
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index ec334307fe..38f9e0c0d1 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -22,7 +22,7 @@
   <?php include dirname(__FILE__) . '/objectlibsbylist.html.php';?>
   <?php else:?>
   <div class="main-col" data-min-width="400">
-  <div class="cell" id="queryBox"></div>
+  <div class="cell" id="queryBox" data-module='doc'></div>
     <div class="panel block-files block-sm no-margin">
       <div class="panel-heading">
         <div class="panel-title font-normal">
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index 8c90b46750..caa5926713 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -1,5 +1,5 @@
 <div class="main-col" data-min-width="400">
-<div class="cell" id="queryBox"></div>
+<div class="cell" id="queryBox" data-module='doc'></div>
   <div class="panel block-files block-sm no-margin">
     <div class="panel-heading">
       <div class="panel-title font-normal">
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 8a7709bade..51617dcc8d 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -53,7 +53,6 @@
     </div>
   </div>
   <div class="main-col">
-    <div class="cell" id="queryBox"></div>
     <form class="main-table table-product" data-ride="table" method="post" id='productsForm' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
       <?php $canOrder = (common::hasPriv('product', 'updateOrder'))?>
       <?php $canBatchEdit = common::hasPriv('product', 'batchEdit'); ?>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 3d40e01592..3d099cb4ac 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -152,7 +152,7 @@
     </div>
   </div>
   <div class="main-col">
-    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
+    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox" data-module='story'></div>
     <?php if(empty($stories)):?>
     <div class="table-empty-tip">
       <p>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 1a98bfd447..cf9ef82001 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show no-margin'></div>
+<div id='queryBox' data-module='bug' class='show no-margin'></div>
 <div id='unlinkBugList'>
   <form class='main-table table-bug' data-ride='table' method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('productplan', 'linkBug', "planID=$plan->id&browseType=$browseType&param=$param&orderBy=$orderBy")?>'>
     <div class='table-header hl-primary text-primary strong'>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index c33d9c9208..199c4190da 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show no-margin'></div>
+<div id='queryBox' data-module='story' class='show no-margin'></div>
 <div id='unlinkStoryList'>
   <form class="main-table table-story" data-ride="table" method="post" target='hiddenwin' id='unlinkedStoriesForm' action="<?php echo $this->createLink('productplan', 'linkStory', "planID=$plan->id&browseType=$browseType&param=$param&orderBy=$orderBy")?>">
     <div class='table-header hl-primary text-primary strong'>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 3e9fa7fdb9..d6a5b61b7a 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -26,7 +26,7 @@
   </div>
 </div>
 <div id="mainContent">
-  <div class="cell <?php if($type == 'bysearch') echo 'show';?>" id="queryBox"></div>
+  <div class="cell <?php if($type == 'bysearch') echo 'show';?>" id="queryBox" data-module='bug'></div>
   <?php if(empty($bugs)):?>
   <div class="table-empty-tip">
     <p>
diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php
index 283b1d27a7..fda0e94a0b 100755
--- a/module/project/view/importbug.html.php
+++ b/module/project/view/importbug.html.php
@@ -24,7 +24,7 @@ var browseType = '<?php echo $browseType;?>';
 </div>
 <div id='mainContent'>
   <div class='cell space-sm'>
-    <div id='queryBox' class='show'></div>
+    <div id='queryBox' data-module='bug' class='show'></div>
   </div>
   <form class='main-table' method='post' target='hiddenwin' id='importBugForm' data-ride='table'>
     <table class='table has-sort-head table-fixed'>
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index 33294ba60b..e42f48b3e1 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -25,7 +25,7 @@
 </div>
 <div id="mainContent">
   <div class="cell space-sm">
-    <div id='queryBox' class='show no-margin'></div>
+    <div id='queryBox' data-module='story' class='show no-margin'></div>
   </div>
   <form class='main-table table-story' method='post' data-ride='table' id='linkStoryForm'>
     <table class='table table-fixed tablesorter' id='linkStoryList'> 
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 94d17aabfd..ee10ebf068 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -54,8 +54,8 @@
         echo "<i class='icon-plus'></i> {$lang->story->create} <span class='caret'></span>";
         echo '</button>';
         echo "<ul class='dropdown-menu pull-right' id='createActionMenu'>";
-        if(common::hasPriv('story', 'create')) echo '<li>' . html::a($this->createLink('story', 'create',  "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id"), $lang->story->create) . '</li>';
-        if(common::hasPriv('story', 'batchCreate')) echo '<li>' . html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id"), $lang->story->batchCreate) . '</li>';
+        if(common::hasPriv('story', 'create')) echo '<li>' . html::a($this->createLink('story', 'create',  "productID=$productID&branch=0&moduleID={$this->cookie->storyModuleParam}&story=0&project=$project->id"), $lang->story->create) . '</li>';
+        if(common::hasPriv('story', 'batchCreate')) echo '<li>' . html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID={$this->cookie->storyModuleParam}&story=0&project=$project->id"), $lang->story->batchCreate) . '</li>';
         echo '</ul>';
         echo '</div>';
     }
@@ -89,7 +89,7 @@
     </div>
   </div>
   <div class="main-col">
-    <div id='queryBox' class='cell <?php if($type =='bysearch') echo 'show';?>'></div>
+    <div id='queryBox' data-module='story' class='cell <?php if($type =='bysearch') echo 'show';?>'></div>
     <?php if(empty($stories)):?>
     <div class="table-empty-tip">
       <p>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 35898d85e9..6fd0f61b35 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -170,7 +170,7 @@ js::set('browseType', $browseType);
     </div>
   </div>
   <div class="main-col">
-    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
+    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox" data-module='task'></div>
     <?php if(empty($tasks)):?>
     <div class="table-empty-tip">
       <p>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 3f2016ffbe..eca2e98338 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -141,7 +141,7 @@
       </div>
     </div>
   </div>
-  <div id='queryBox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
+  <div id='queryBox' data-module='task' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
 </div>
 <?php
 $headerHooks = glob(dirname(dirname(__FILE__)) . "/ext/view/featurebar.*.html.hook.php");
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index f1062e3151..1d6406dc1a 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show'></div>
+<div id='queryBox' data-module='bug' class='show'></div>
 <?php
 $releaseBugs = $type == 'bug' ? $release->bugs : $release->leftBugs;
 $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index 0175207b05..f9d4b127c2 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show'></div>
+<div id='queryBox' data-module='story' class='show'></div>
 <div id='unlinkStoryList'>
   <form class='main-table' method='post' target='hiddenwin' id='unlinkedStoriesForm' action='<?php echo $this->createLink('release', 'linkStory', "releaseID=$release->id&browseType=$browseType&param=$param")?>' data-ride='table'>
     <div class='table-header hl-primary text-primary strong'>
diff --git a/module/search/control.php b/module/search/control.php
index cedf05a029..656c9268f1 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -24,13 +24,16 @@ class search extends control
      */
     public function buildForm($module = '', $searchFields = '', $fieldParams = '', $actionURL = '', $queryID = 0)
     {
-        $queryID      = (empty($module) and empty($queryID)) ? $this->session->searchParams['queryID'] : $queryID;
-        $module       = empty($module) ?       $this->session->searchParams['module'] : $module;
-        $searchFields = empty($searchFields) ? json_decode($this->session->searchParams['searchFields'], true) : $searchFields;
-        $fieldParams  = empty($fieldParams) ?  json_decode($this->session->searchParams['fieldParams'], true)  : $fieldParams;
-        $actionURL    = empty($actionURL) ?    $this->session->searchParams['actionURL'] : $actionURL;
-        $style        = isset($_SESSION['searchParams']['style']) ? $this->session->searchParams['style'] : '';
-        $onMenuBar    = isset($_SESSION['searchParams']['onMenuBar']) ? $this->session->searchParams['onMenuBar'] : '';
+        $module       = empty($module) ? $this->session->searchParams['module'] : $module;
+        $searchParams = $module . 'searchParams';
+        $queryID      = (empty($module) and empty($queryID)) ? $this->session->$searchParams['queryID'] : $queryID;
+        $searchFields = empty($searchFields) ? json_decode($this->session->$searchParams['searchFields'], true) : $searchFields;
+        $fieldParams  = empty($fieldParams) ?  json_decode($this->session->$searchParams['fieldParams'], true)  : $fieldParams;
+        $actionURL    = empty($actionURL) ?    $this->session->$searchParams['actionURL'] : $actionURL;
+        $style        = isset($_SESSION[$searchParams]['style']) ? $this->session->$searchParams['style'] : '';
+        $onMenuBar    = isset($_SESSION[$searchParams]['onMenuBar']) ? $this->session->$searchParams['onMenuBar'] : '';
+
+        $_SESSION['searchParams']['module'] = $module;
         $this->search->initSession($module, $searchFields, $fieldParams);
 
         $this->view->module       = $module;
diff --git a/module/search/model.php b/module/search/model.php
index d1165d6f4e..6bdad6d5b4 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -23,9 +23,9 @@ class searchModel extends model
      */
     public function setSearchParams($searchConfig)
     {
+        $module = $searchConfig['module'];
         if(isset($this->config->bizVersion))
         {
-            $module = $searchConfig['module'];
             if($module == 'projectStory') $module = 'story';
             if($module == 'projectBug')   $module = 'bug';
 
@@ -65,7 +65,7 @@ class searchModel extends model
         $searchParams['onMenuBar']    = zget($searchConfig, 'onMenuBar', 'no');
         $searchParams['queryID']      = isset($searchConfig['queryID']) ? $searchConfig['queryID'] : 0;
 
-        $this->session->set('searchParams', $searchParams);
+        $this->session->set($module . 'searchParams', $searchParams);
     }
 
     /**
@@ -77,11 +77,13 @@ class searchModel extends model
     public function buildQuery()
     {
         /* Init vars. */
-        $where       = '';
-        $groupItems  = $this->config->search->groupItems;
-        $groupAndOr  = strtoupper($this->post->groupAndOr);
-        $fieldParams = json_decode($this->session->searchParams['fieldParams']);
-        $scoreNum    = 0;
+        $where        = '';
+        $groupItems   = $this->config->search->groupItems;
+        $groupAndOr   = strtoupper($this->post->groupAndOr);
+        $module       = $this->session->searchParams['module'];
+        $searchParams = $module . 'searchParams';
+        $fieldParams  = json_decode($this->session->$searchParams['fieldParams']);
+        $scoreNum     = 0;
 
         if($groupAndOr != 'AND' and $groupAndOr != 'OR') $groupAndOr = 'AND';
 
@@ -222,7 +224,7 @@ class searchModel extends model
         $hasProject = false;
         $hasUser    = false;
 
-        $fields     = array_keys($fields);
+        $fields = array_keys($fields);
         foreach($fields as $fieldName)
         {
             if(empty($params[$fieldName])) continue;
@@ -233,7 +235,7 @@ class searchModel extends model
 
         if($hasUser)
         {
-            $users        = $this->loadModel('user')->getPairs('realname|noclosed');
+            $users = $this->loadModel('user')->getPairs('realname|noclosed');
             $users['$@me'] = $this->lang->search->me;
         }
         if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs();
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index 799b6e8c6f..a90f3e6601 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -23,7 +23,7 @@
       <?php endif;?>
     </h2>
   </div>
-  <div id='queryBox' class='show divider'></div>
+  <div id='queryBox' data-module='story' class='show divider'></div>
   <form method='post' target='hiddenwin' id='linkStoryForm' class='main-table table-story'>
     <?php if($stories2Link):?>
     <table class='table tablesorter table-bordered' id='storyList'>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 60fd556ff3..df5298eb6e 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -41,7 +41,7 @@ js::set('suiteID',        $suiteID);
     </div>
   </div>
   <div class='main-col'>
-    <div id='queryBox' class='cell<?php if($browseType == 'bysearch') echo ' show';?>'></div>
+    <div id='queryBox' data-module='testcase' class='cell<?php if($browseType == 'bysearch') echo ' show';?>'></div>
     <?php if(empty($cases)):?>
     <?php $useDatatable = '';?>
     <div class="table-empty-tip">
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 6ddd4f5d7c..ca8735f551 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -20,7 +20,7 @@
     </div>
   </div>
 </div>
-<div id='queryBox' class='show cell'></div>
+<div id='queryBox' data-module='testcase' class='show cell'></div>
 <div id='mainContent'>
   <form class='main-table' method='post' target='hiddenwin' id='importFromLib' data-ride='table'>
     <table class='table has-sort-head table-fixed'>
diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php
index e0877ea3bd..96639df73a 100644
--- a/module/testcase/view/linkcases.html.php
+++ b/module/testcase/view/linkcases.html.php
@@ -20,7 +20,7 @@
       <small class='text-muted'> <?php echo $lang->arrow . $lang->testcase->linkCases;?></small>
     </h2>
   </div>
-  <div id='queryBox' class='show divider'></div>
+  <div id='queryBox' data-module='testcase' class='show divider'></div>
   <?php if($cases2Link):?>
   <form class='main-table' method='post' target='hiddenwin' id='linkCasesForm' data-ride='table'>
     <table class='table tablesorter' id='caseList'>
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index f21e2e71f3..dbf468b62d 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -24,7 +24,7 @@
     </div>
   </div>
 </div>
-<div class="cell show" id="queryBox"></div>
+<div class="cell show" id="queryBox" data-module='testcase'></div>
 <div id='mainContent'>
   <form class='main-table table-testcase' data-ride='table' method='post'>
     <div class="table-header">
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 70a043dc47..28bb8361ad 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -23,7 +23,7 @@
     <div class='cell'><?php echo $moduleTree;?></div>
   </div>
   <div class='main-col'>
-    <div class="cell" id="queryBox"></div>
+    <div class="cell" id="queryBox" data-module='testcase'></div>
     <?php
     $datatableId  = $this->moduleName . ucfirst($this->methodName);
     $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index b6255e1c15..96e486235a 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -66,7 +66,7 @@
     <?php if($type == 'all') echo "<a class='btn btn-link querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'></i>{$lang->testcase->bySearch}</a>";?>
   </div>
 </div>
-<div class="cell show" id="queryBox"></div>
+<div class="cell show" id="queryBox" data-module='testcase'></div>
 <div id='mainContent'>
   <form class='main-table table-case' data-ride='table' method='post' id='linkCaseForm'>
     <table class='table tablesorter'>