diff --git a/module/bug/control.php b/module/bug/control.php
index d7446de714..6e6348c587 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -47,7 +47,7 @@ class bug extends control
         $this->loadModel('task');
 
         /* Set bug menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/caselib/control.php b/module/caselib/control.php
index 9ae755c498..3795d7bd97 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -32,7 +32,7 @@ class caselib extends control
         parent::__construct($moduleName, $methodName);
 
         /* Set testtask menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 1982955bcc..7930134d2e 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -54,7 +54,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
         echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=0"), $lang->product->all)  . "</li>";
         foreach($projectProducts as $product)
         {
-            echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=$product->id&branch=0&browseType=$browseType"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
+            echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=$product->id&branch=0"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
         }
         ?>
       </ul>
diff --git a/module/story/model.php b/module/story/model.php
index d9c7db408a..5097a7d8d8 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2374,7 +2374,7 @@ class storyModel extends model
                 ->beginIF($excludeStories)->andWhere('t2.id')->notIN($excludeStories)->fi()
                 ->beginIF($execution->type == 'project')
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)
-                ->andWhere('t2.branch')->eq($branch)->fi()
+                ->beginIF($type == 'bybranch')->andWhere('t2.branch')->eq($branch)->fi()
                 ->beginIF(isset($statusFeatureList) and in_array($type, array_keys($statusFeatureList)))->andWhere('t2.status')->eq($type)->fi()
                 ->beginIF(isset($otherFeatureList) and in_array($type, array_keys($otherFeatureList)))->andWhere('t2.' . substr($type, 0, -2))->eq($this->app->user->account)->fi()
                 ->beginIF($type == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 788439648e..29bf802202 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -41,7 +41,7 @@ class testcase extends control
         $this->loadModel('user');
 
         /* Set test case menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/testreport/control.php b/module/testreport/control.php
index 35b61ff0f5..9c19c3a3d5 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -37,7 +37,7 @@ class testreport extends control
         $this->app->loadLang('report');
 
         /* Set testreport menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 845cae0030..e5748e0109 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -32,7 +32,7 @@ class testsuite extends control
        parent::__construct($moduleName, $methodName);
 
        /* Set testtask menu group. */
-       $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+       $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
        if(!$this->projectID)
        {
            $this->app->loadConfig('qa');
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 52fae1f206..8681a803a4 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -38,7 +38,7 @@ class testtask extends control
         parent::__construct($moduleName, $methodName);
 
         /* Set testtask menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');