diff --git a/module/execution/control.php b/module/execution/control.php
index f12500c06f..5273669242 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -700,7 +700,7 @@ class execution extends control
         $this->loadModel('build');
         if($type == 'bysearch')
         {
-            $builds = $this->loadModel('build')->getExecutionBuildsBySearch($executionID, 0, $pager);
+            $builds = $this->loadModel('build')->getExecutionBuildsBySearch($executionID, (int)$param, $pager);
         }
         else
         {
diff --git a/module/project/model.php b/module/project/model.php
index 63423d1f8a..8302c6ec82 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -974,9 +974,9 @@ class projectModel extends model
 
         $this->config->build->search['module']    = $type == 'project' ? 'projectBuild' : 'executionBuild';
         $this->config->build->search['actionURL'] = helper::createLink($this->app->rawModule, $this->app->rawMethod, "projectID=$projectID&type=bysearch&queryID=myQueryID");
-        $this->config->build->search['queryID']   = $queryID;
+        $this->config->build->search['queryID']   = (int)$queryID;
         $this->config->build->search['params']['product']['values'] = $products;
-        $this->config->build->search['params']['system']['values']  = $this->loadModel('system')->getPairs((int)$productID, '0');
+        $this->config->build->search['params']['system']['values']  = $this->loadModel('system')->getPairs($queryID ? 0 : (int)$productID, '0');
 
         $this->loadModel('search')->setSearchParams($this->config->build->search);
         return true;