diff --git a/module/bug/config.php b/module/bug/config.php
index ad67ba65e3..2f7b5d18d1 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -168,7 +168,7 @@ $config->bug->datatable->fieldList['id']['required'] = 'yes';
 
 $config->bug->datatable->fieldList['product']['title']      = 'product';
 $config->bug->datatable->fieldList['product']['control']    = 'hidden';
-$config->bug->datatable->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs');
+$config->bug->datatable->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs', 'params' => '&0&&true');
 
 $config->bug->datatable->fieldList['module']['control']    = 'select';
 $config->bug->datatable->fieldList['module']['title']      = 'module';
diff --git a/module/bug/control.php b/module/bug/control.php
index 02c22ecfdc..8e91717447 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -196,7 +196,8 @@ class bug extends control
         /* Build the search form. */
         $actionURL = $this->createLink('bug', 'browse', "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID");
         $this->config->bug->search['onMenuBar'] = 'yes';
-        $this->bug->buildSearchForm($productID, $this->products, $queryID, $actionURL, $branch);
+        $searchProducts = $this->product->getPairs('', 0, '', true);
+        $this->bug->buildSearchForm($productID, $searchProducts, $queryID, $actionURL, $branch);
 
         $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;
@@ -321,7 +322,8 @@ class bug extends control
 
         $project = new stdclass();
 
-        $this->view->hiddenProduct = false;
+        $productInfo   = $this->product->getById($productID);
+        $hiddenProduct = false;
         if($this->app->tab == 'execution')
         {
             if(isset($output['executionID'])) $this->loadModel('execution')->setMenu($output['executionID']);
@@ -340,9 +342,10 @@ class bug extends control
                 $this->view->regionPairs   = $regionPairs;
                 $this->view->lanePairs     = $lanePairs;
             }
-            $projectID = $execution->project;
-            $project   = $this->loadModel('project')->getByID($projectID);
-            $this->view->hiddenProduct = empty($project->hasProduct);
+
+            $projectID     = $execution->project;
+            $project       = $this->loadModel('project')->getByID($projectID);
+            $hiddenProduct = empty($project->hasProduct);
         }
         else if($this->app->tab == 'project')
         {
@@ -356,12 +359,13 @@ class bug extends control
                 {
                     $this->lang->bug->execution = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->bug->execution);
                 }
-                $this->view->hiddenProduct = empty($project->hasProduct);
+                $hiddenProduct = empty($project->hasProduct);
             }
         }
         else
         {
             $this->qa->setMenu($this->products, $productID, $branch);
+            $hiddenProduct = $productInfo->shadow;
         }
 
         $this->view->users = $this->user->getPairs('devfirst|noclosed|nodeleted');
@@ -480,8 +484,7 @@ class bug extends control
         }
 
         /* Get product, then set menu. */
-        $productID   = $this->product->saveState($productID, $this->products);
-        $productInfo = $this->product->getById($productID);
+        $productID = $this->product->saveState($productID, $this->products);
 
         if($branch === '') $branch = (int)$this->cookie->preBranch;
 
@@ -686,6 +689,7 @@ class bug extends control
         $this->view->severity         = $severity;
         $this->view->type             = $type;
         $this->view->productInfo      = $productInfo;
+        $this->view->hiddenProduct    = $hiddenProduct;
         $this->view->branch           = $branch;
         $this->view->branches         = $branches;
         $this->view->blockID          = $blockID;
diff --git a/module/bug/model.php b/module/bug/model.php
index 98f11bebb6..535e2f5955 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2949,7 +2949,7 @@ class bugModel extends model
         }
         else
         {
-            $productParis  = $this->loadModel('product')->getPairs();
+            $productParis  = $this->loadModel('product')->getPairs('', 0, '', true);
             $productIDList = array_keys($productParis);
 
             if(!empty($productIDList))
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 5a288052a3..2ceb48eb99 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -209,7 +209,7 @@
           <div class='tab-pane active' id='legendBasicInfo'>
             <table class="table table-data">
               <tbody>
-                <?php if(empty($product->shadow)):?>
+                <?php if(!$product->shadow):?>
                 <tr>
                   <th class='w-90px'><?php echo $lang->story->product;?></th>
                   <td><?php echo html::a($this->createLink('product', 'view', "productID=$story->product"), $product->name);?></td>
@@ -242,7 +242,14 @@
                       foreach($modulePath as $key => $module)
                       {
                           $moduleTitle .= $module->name;
-                          if(!common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch&browseType=byModule&param=$module->id", $module->name, '', "data-app='product'")) echo $module->name;
+                          if($product->shadow)
+                          {
+                              echo $module->name;
+                          }
+                          else
+                          {
+                              common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch&browseType=byModule&param=$module->id", $module->name, '', "data-app='product'");
+                          }
                           if(isset($modulePath[$key + 1]))
                           {
                               $moduleTitle .= '/';
@@ -463,6 +470,7 @@
           <div class="tab-pane" id='legendRelated'>
             <table class="table table-data">
               <tbody>
+                <?php if($story->type == 'story'):?>
                 <?php if(!empty($fromBug)):?>
                 <tr>
                   <th><?php echo $lang->story->legendFromBug;?></th>
@@ -532,6 +540,7 @@
                     </ul>
                   </td>
                 </tr>
+                <?php endif;?>
                 <tr class='text-top linkStoryTr'>
                   <th><?php echo $lang->story->linkStories;?></th>
                   <td>
@@ -556,6 +565,7 @@
                     </ul>
                   </td>
                 </tr>
+                <?php if($story->type == 'story'):?>
                 <tr>
                   <th><?php echo $lang->story->linkMR;?></th>
                   <td class='pd-0'>
@@ -577,6 +587,7 @@
                     </ul>
                   </td>
                 </tr>
+                <?php endif;?>
               </tbody>
             </table>
           </div>