diff --git a/module/mr/control.php b/module/mr/control.php
index 0b4fb97725..633d4fe5b0 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -586,18 +586,19 @@ class mr extends control
         $this->config->bug->search['style']                             = 'simple';
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getForProducts(array($productID => $productID));
         $this->config->bug->search['params']['module']['values']        = $modules;
-        $this->config->bug->search['params']['project']['values']       = $this->product->getExecutionPairsByProduct($productID);
+        $this->config->bug->search['params']['execution']['values']     = $this->product->getExecutionPairsByProduct($productID);
         $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($productID, $branch                                                         = 0, $params                                                         = '');
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->loadModel('build')->getProductBuildPairs($productID, $branch                                                         = 0, $params                                                         = '');
 
         unset($this->config->bug->search['fields']['product']);
-        if($this->session->currentProductType == 'normal')
+        if($product->type == 'normal')
         {
             unset($this->config->bug->search['fields']['branch']);
             unset($this->config->bug->search['params']['branch']);
         }
         else
         {
+            $this->product->setMenu($productID, $branch);
             $this->config->bug->search['fields']['branch']           = $this->lang->product->branch;
             $branches                                                = array('' => '') + $this->loadModel('branch')->getPairs($productID, 'noempty');
             $this->config->bug->search['params']['branch']['values'] = $branches;
@@ -665,9 +666,10 @@ class mr extends control
         $modules = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'task');
 
         /* Build search form. */
-        $this->config->execution->search['actionURL']                  = $this->createLink('mr', 'link', "$MRID=$MRID&type=task&orderBy=$orderBy&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
-        $this->config->execution->search['queryID']                    = $queryID;
-        $this->config->execution->search['params']['module']['values'] = $modules;
+        $this->config->execution->search['actionURL']                     = $this->createLink('mr', 'link', "$MRID=$MRID&type=task&orderBy=$orderBy&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
+        $this->config->execution->search['queryID']                       = $queryID;
+        $this->config->execution->search['params']['module']['values']    = $modules;
+        $this->config->execution->search['params']['execution']['values'] = $this->product->getExecutionPairsByProduct($productID);
         $this->loadModel('search')->setSearchParams($this->config->execution->search);
 
         $MR           = $this->mr->getByID($MRID);