diff --git a/module/productplan/control.php b/module/productplan/control.php
index d5e598b55b..fe3ccd3de5 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -260,6 +260,9 @@ class productplan extends control
     {
         $this->session->set('bugList', $this->app->getURI(true));
 
+        $projects = $this->loadModel('project')->getPairs();
+        $projects[0] = '';
+
         if(!empty($_POST['bugs'])) $this->productplan->linkBug($planID);
 
         $this->loadModel('bug');
@@ -270,7 +273,7 @@ class productplan extends control
         $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Build the search form. */
-        $this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID={$plan->product}&browseType=bySearch&queryID=myQueryID");
+        $this->config->bug->search['actionURL'] = $this->createLink('productplan', 'linkBug', "planID=$planID&browseType=bySearch&queryID=myQueryID");   
         $this->config->bug->search['queryID']   = $queryID;
         $this->config->bug->search['params']['product']['values']       = array($productID => $products[$productID], 'all' => $this->lang->bug->allProduct);
         $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0);
@@ -281,7 +284,7 @@ class productplan extends control
 
         if($browseType == 'bySearch')
         {
-            $allBugs = $this->bug->getBySearch($plan->product, $queryID, 'id');
+            $allBugs = $this->bug->getBySearch($plan->product, $projects, $queryID, 'id_desc');
             foreach($allBugs as $key => $bug)
             {
                 if($bug->status != 'active') unset($allBugs[$key]);