diff --git a/module/product/model.php b/module/product/model.php
index dd414bc116..2c8b8d7f4b 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1136,13 +1136,12 @@ class productModel extends model
         $productIdList = ($this->app->tab == 'project' and empty($productID)) ? array_keys($products) : $productID;
         $branchParam   = ($this->app->tab == 'project' and empty($productID)) ? '' : $branch;
         $projectID     = ($this->app->tab == 'project' and empty($projectID)) ? $this->session->project : $projectID;
-        $productInfo   = $this->getById($productID);
 
         $this->config->product->search['actionURL'] = $actionURL;
         $this->config->product->search['queryID']   = $queryID;
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productIdList, $branchParam);
 
-        $product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $productInfo->name);
+        $product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]);
 
         $this->config->product->search['params']['product']['values'] = $product + array('all' => $this->lang->product->allProduct);
 
@@ -1188,6 +1187,8 @@ class productModel extends model
         }
         $this->config->product->search['params']['module']['values'] = array('' => '') + $modules;
 
+        $productInfo   = $this->getById($productID);
+
         if(!$productID or $productInfo->type == 'normal' or $this->app->tab == 'assetlib')
         {
             unset($this->config->product->search['fields']['branch']);