diff --git a/config/filter.php b/config/filter.php
index b678df7326..1476bd9f18 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -169,7 +169,7 @@ $filter->my->contribute->cookie['pagerMyDoc']         = 'int';
 $filter->bug->batchcreate->cookie['preBranch'] = 'reg::word';
 $filter->bug->browse->cookie['bugModule']      = 'int';
 $filter->bug->browse->cookie['bugBranch']      = 'int';
-$filter->bug->browse->cookie['treeBranch']     = 'int';
+$filter->bug->browse->cookie['treeBranch']     = 'reg::word';
 $filter->bug->browse->cookie['preBranch']      = 'reg::word';
 $filter->bug->browse->cookie['qaBugOrder']     = 'reg::orderBy';
 $filter->bug->browse->cookie['windowWidth']    = 'int';
@@ -209,7 +209,7 @@ $filter->product->browse->cookie['preProductID']      = 'int';
 $filter->product->browse->cookie['productStoryOrder'] = 'reg::orderBy';
 $filter->product->browse->cookie['storyModule']       = 'int';
 $filter->product->browse->cookie['storyBranch']       = 'int';
-$filter->product->browse->cookie['treeBranch']        = 'int';
+$filter->product->browse->cookie['treeBranch']        = 'reg::word';
 $filter->product->default->cookie['lastProduct']      = 'int';
 $filter->product->default->cookie['preProductID']     = 'int';
 $filter->product->index->cookie['preBranch']          = 'reg::word';
diff --git a/module/product/control.php b/module/product/control.php
index eb4021760a..aa6a60210a 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -158,7 +158,7 @@ class product extends control
             if($this->app->tab == 'project') setcookie('storyModuleParam', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $_COOKIE['storyBranch'] = 0;
             setcookie('storyBranch', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
-            if($browseType == '') setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            if($browseType == '') setcookie('treeBranch', $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
         }
         if($browseType == 'bybranch') setcookie('storyBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
 
@@ -180,12 +180,12 @@ class product extends control
         $createModuleLink = $storyType == 'story' ? 'createStoryLink' : 'createRequirementLink';
         if($browseType == '')
         {
-            setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            setcookie('treeBranch', $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $browseType = 'unclosed';
         }
         else
         {
-            $branch = (int)$this->cookie->treeBranch;
+            $branch = $this->cookie->treeBranch;
         }
 
         /* If in project story and not chose product, get project story mdoules. */
diff --git a/module/story/control.php b/module/story/control.php
index 53037f7eb2..6aebfcb8ec 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -165,7 +165,7 @@ class story extends control
             {
                 setcookie('storyModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
                 $branchID  = $this->post->branch  ? $this->post->branch  : $branch;
-                $response['locate'] = $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=unclosed&param=0&type=$type&orderBy=id_desc");
+                $response['locate'] = $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=&param=0&type=$type&orderBy=id_desc");
                 if($this->session->storyList and $this->app->tab != 'product') $response['locate'] = $this->session->storyList;
             }
             else