diff --git a/module/product/control.php b/module/product/control.php
index 0adc83f41a..950b82e9df 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -329,7 +329,7 @@ class product extends control
         $this->view->productName     = $productName;
         $this->view->moduleID        = $moduleID;
         $this->view->stories         = $stories;
-        $this->view->plans           = $this->loadModel('productplan')->getPairs($productID, $branch === 'all' ? '' : $branch, '', true);
+        $this->view->plans           = $this->loadModel('productplan')->getPairs($productID, ($branch === 'all' or empty($branch)) ? '' : $branch, '', true);
         $this->view->productPlans    = isset($productPlans) ? array(0 => '') + $productPlans : array();
         $this->view->summary         = $this->product->summary($stories, $storyType);
         $this->view->moduleTree      = $moduleTree;
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index ca7d6172d0..177da446b5 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -494,9 +494,9 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
             </ul>
           </div>
 
+          <?php if(($product->type != 'normal' and $branchID != 'all') or $product->type == 'normal'):?>
           <?php $isShowModuleBTN = ($this->app->tab == 'project' and $browseType != 'bybranch') ? false : true;?>
           <?php if($canBatchChangeModule and $productID and $isShowModuleBTN):?>
-          <?php if(($product->type != 'normal' and $branchID != 'all') or $product->type == 'normal')?>
           <div class="btn-group dropup">
             <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->moduleAB;?> <span class="caret"></span></button>
             <?php $withSearch = count($modules) > 8;?>
@@ -554,6 +554,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
             </div>
           </div>
           <?php endif;?>
+          <?php endif;?>
 
           <?php if($canBatchAssignTo):?>
           <div class="btn-group dropup">