diff --git a/module/bug/control.php b/module/bug/control.php
index a27b5ff705..1b6a95e3a6 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -88,8 +88,8 @@ class bug extends control
         if($browseType == 'bymodule') setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', false, false);
         if($browseType != 'bymodule') $this->session->set('bugBrowseType', $browseType);
 
-        $moduleID  = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
-        $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
+        $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
+        $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu and save session. */
         $this->bug->setMenu($this->products, $productID, $branch, $moduleID, $browseType, $orderBy);
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index b72575dc16..a031ae8fe9 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -51,6 +51,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
 
         $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;
         $label  = "<span class='text'>{$menuItem->text}</span>";
+        if($this->session->bugBrowseType == 'bysearch') $browseType = 'all';
+        if($this->session->bugBrowseType != 'bysearch' && $browseType == 'bymodule') $browseType = $this->session->bugBrowseType;
         $label .= $menuBrowseType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
         $active = $menuBrowseType == $browseType ? 'btn-active-text' : '';
 
diff --git a/module/ci/model.php b/module/ci/model.php
index 444404042d..deb4fc23ed 100644
--- a/module/ci/model.php
+++ b/module/ci/model.php
@@ -131,7 +131,6 @@ class ciModel extends model
     public function sendRequest($url, $data, $userPwd = '')
     {
         if(!empty($data->PARAM_TAG)) $data->PARAM_REVISION = '';
-
         $response = common::http($url, $data, true, $userPwd);
         if(preg_match("!Location: .*item/(.*)/!", $response, $matches)) return $matches[1];
         return 0;
diff --git a/module/compile/model.php b/module/compile/model.php
index 0a074e556f..717ea6fd76 100644
--- a/module/compile/model.php
+++ b/module/compile/model.php
@@ -129,7 +129,7 @@ class compileModel extends model
         if(!$job) return false;
 
         $data = new stdclass();
-        $data->PARAM_TAG = $compile->tag;
+        $data->PARAM_TAG   = $compile->tag;
         $data->ZENTAO_DATA = "compile={$compile->id}";
 
         $buildUrl = $this->getBuildUrl($job);
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index ad8a559987..61b8e605d5 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -39,6 +39,7 @@ js::set('foldAll',       $lang->project->treeLevel['root']);
   </div>
   <div class="btn-toolbar pull-left">
     <?php
+    if($this->session->storyBrowseType == 'bysearch') $this->session->set('storyBrowseType', 'allstory');
     foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem)
     {
         if(isset($menuItem->hidden)) continue;