diff --git a/module/product/control.php b/module/product/control.php
index 012364ab35..1a0ac20628 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -145,7 +145,7 @@ class product extends control
         $project   = $this->loadModel('project')->getByID($projectID);
         $branchID  = $this->productZen->getBranchID($product, $branch);
         $orderBy   = $orderBy ? $orderBy : $cookieOrderBy;
-        $branch    = $branchID ?? $branch;
+        $branch    = $branchID ? $branchID : $branch;
 
         /* ATTENTION: be careful to change the order of follow sentences. */
         $this->productZen->setMenu4Browse($projectID, $productID, $branch, $storyType);
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index 376ded7b8e..911314825a 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -195,12 +195,7 @@ $fnGenerateSideBar();
 featureBar
 (
     set::current($browseType),
-    set::linkParams("productID={$productID}&browseType={key}"),
-    set::moreMenuLinkCallback(function($browseType) use($projectIDParam, $productID, $branch, $storyType)
-    {
-        global $app;
-        return createLink($app->rawModule, $app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType={$browseType}&param=0&storyType=$storyType");
-    }),
+    set::link(createLink($app->rawModule, $app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType={key}&param=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID")),
     li(searchToggle(set::module('story')))
 );