diff --git a/module/bug/control.php b/module/bug/control.php
index ee20c28353..920fa963d6 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -208,13 +208,20 @@ class bug extends control
         $showBranch  = isset($this->config->bug->browse->showBranch) ? $this->config->bug->browse->showBranch : 1;
         $showModule  = !empty($this->config->datatable->bugBrowse->showModule) ? $this->config->datatable->bugBrowse->showModule : '';
         $productName = ($productID and isset($this->products[$productID])) ? $this->products[$productID] : $this->lang->product->allProduct;
+        
+        $product = $this->product->getById($productID);
+        if($product and $product->type != 'normal')
+        {
+            $this->app->loadLang('datatable');
+            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+        }
 
         /* Set view. */
         $this->view->title           = $productName . $this->lang->colon . $this->lang->bug->common;
         $this->view->position[]      = html::a($this->createLink('bug', 'browse', "productID=$productID"), $productName,'','title=' . $productName);
         $this->view->position[]      = $this->lang->bug->common;
         $this->view->productID       = $productID;
-        $this->view->product         = $this->product->getById($productID);
+        $this->view->product         = $product;
         $this->view->projectProducts = $this->product->getProducts($this->projectID);
         $this->view->productName     = $productName;
         $this->view->builds          = $this->loadModel('build')->getProductBuildPairs($productID);
diff --git a/module/bug/model.php b/module/bug/model.php
index 8e8b91b1a1..cc0f36232b 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2648,7 +2648,7 @@ class bugModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $bug, $users, $builds, $branches, $modulePairs, $executions = array(), $plans = array(), $stories = array(), $tasks = array(), $mode = 'datatable')
+    public function printCell($col, $bug, $users, $builds, $branches, $modulePairs, $executions = array(), $plans = array(), $stories = array(), $tasks = array(), $mode = 'datatable', $showBranch = '')
     {
         /* Check the product is closed. */
         $canBeChanged = common::canBeChanged('bug', $bug);
@@ -2751,7 +2751,7 @@ class bugModel extends model
                 echo "<span class='$class'>" . zget($this->lang->bug->confirmedList, $bug->confirmed, $bug->confirmed) . "</span> ";
                 break;
             case 'title':
-                if($bug->branch and isset($branches[$bug->branch]))    echo "<span class='label label-outline label-badge'>{$branches[$bug->branch]}</span> ";
+                if($bug->branch and isset($branches[$bug->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$bug->branch]}</span> ";
                 if($bug->module and isset($modulePairs[$bug->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$bug->module]}</span> ";
                 echo $canView ? html::a($bugLink, $bug->title, null, "style='color: $bug->color'") : "<span style='color: $bug->color'>{$bug->title}</span>";
                 break;
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index b32720fd99..0538e2f3e6 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -264,7 +264,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
         <tbody>
           <?php foreach($bugs as $bug):?>
           <tr data-id='<?php echo $bug->id?>'>
-            <?php foreach($setting as $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?>
+            <?php foreach($setting as $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table', $showBranch);?>
           </tr>
           <?php endforeach;?>
         </tbody>
diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 36b079d931..22ace63748 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -1,6 +1,6 @@
 <?php $currentModule = $this->moduleName;?>
-<?php $currentMethod = ucfirst($this->methodName);?>
-<?php $datatableId = $currentModule . $currentMethod;?>
+<?php $currentMethod = $this->methodName;?>
+<?php $datatableId = $currentModule . ucfirst($this->methodName);?>
 
 <style>
 #setShowModule {margin-left: 30px;}
diff --git a/module/product/control.php b/module/product/control.php
index c3e927356b..b7d627f633 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -210,7 +210,6 @@ class product extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         $product = $this->product->getById($productID);
-
         if($product and $product->type != 'normal')
         {
             $this->app->loadLang('datatable');
@@ -271,10 +270,10 @@ class product extends control
 
         $this->config->product->search['onMenuBar'] = 'yes';
         $this->product->buildSearchForm($productID, $this->products, $queryID, $actionURL);
-
         $showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : '';
         $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array();
-        $this->view->showBranch  = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
+        $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
+        $this->view->showBranch  = $showBranch;
 
         $productName = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $this->lang->product->all : $this->products[$productID];
 
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index e69b1d120b..0dfef92a4d 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -313,7 +313,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
           <?php foreach($stories as $story):?>
           <tr data-id='<?php echo $story->id?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0);?>'>
             <?php $story->from = $from;?>
-            <?php foreach($setting as $key => $value) $this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table');?>
+            <?php foreach($setting as $key => $value) $this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType = 'story', $showBranch);?>
           </tr>
           <?php if(!empty($story->children)):?>
           <?php $i = 0;?>
@@ -322,7 +322,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
           <?php $class  = $i == 0 ? ' table-child-top' : '';?>
           <?php $class .= ($i + 1 == count($story->children)) ? ' table-child-bottom' : '';?>
           <tr class='table-children<?php echo $class;?> parent-<?php echo $story->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>'>
-            <?php foreach($setting as $key => $value) $this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType);?>
+            <?php foreach($setting as $key => $value) $this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType, $showBranch);?>
           </tr>
           <?php $i ++;?>
           <?php endforeach;?>
diff --git a/module/story/model.php b/module/story/model.php
index 73d7bcb362..0a34ec6ce1 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3718,7 +3718,7 @@ class storyModel extends model
             case 'title':
                 if($storyType == 'requirement') echo '<span class="label label-badge label-light">SR</span> ';
                 if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}";
-                if(isset($branches[$story->branch]) and !empty($showBranch)) echo "<span class='label label-outline label-badge'>{$branches[$story->branch]}</span> ";
+                if(isset($branches[$story->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$story->branch]}</span> ";
                 if($story->module and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
                 if($story->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->story->children . '">' . $this->lang->story->childrenAB . '</span> ';
                 echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-app='$tab'") : "<span style='color: $story->color'>{$story->title}</span>";
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 51043dba74..aca496a338 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -187,13 +187,20 @@ class testcase extends control
             $moduleTree = $this->tree->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createCaseLink'), '', $branch);
         }
 
+        $product = $this->product->getById($productID);
+        if($product and $product->type != 'normal')
+        {
+            $this->app->loadLang('datatable');
+            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+        }
+
         /* Assign. */
         $tree = $moduleID ? $this->tree->getByID($moduleID) : '';
         $this->view->title         = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common;
         $this->view->position[]    = html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]);
         $this->view->position[]    = $this->lang->testcase->common;
         $this->view->productID     = $productID;
-        $this->view->product       = $this->product->getById($productID);
+        $this->view->product       = $product;
         $this->view->productName   = $this->products[$productID];
         $this->view->modules       = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch);
         $this->view->moduleTree    = $moduleTree;
diff --git a/module/testcase/model.php b/module/testcase/model.php
index ad374b9e53..a4af76ea1a 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1463,7 +1463,7 @@ class testcaseModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $case, $users, $branches, $modulePairs = array(), $browseType = '', $mode = 'datatable')
+    public function printCell($col, $case, $users, $branches, $modulePairs = array(), $browseType = '', $mode = 'datatable', $showBranch = '')
     {
         /* Check the product is closed. */
         $canBeChanged = common::canBeChanged('case', $case);
@@ -1521,7 +1521,7 @@ class testcaseModel extends model
                 echo "</span>";
                 break;
             case 'title':
-                if($case->branch) echo "<span class='label label-info label-outline'>{$branches[$case->branch]}</span> ";
+                if($case->branch and $showBranch) echo "<span class='label label-info label-outline'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
                 echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]", '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";
                 break;
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index beedfee56a..9b40ef3ca2 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -111,7 +111,7 @@ js::set('suiteID',        $suiteID);
         <tbody>
           <?php foreach($cases as $case):?>
           <tr data-id='<?php echo $case->id?>'>
-            <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?>
+            <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table'), $showBranch;?>
           </tr>
           <?php endforeach;?>
         </tbody>