diff --git a/db/update18.6.sql b/db/update18.6.sql
index bde4b95c66..f1ec7bdfa6 100644
--- a/db/update18.6.sql
+++ b/db/update18.6.sql
@@ -36,3 +36,6 @@ MODIFY COLUMN `subject` text NOT NULL AFTER `ccList`,
 DROP INDEX `objectType_toList_status`,
 ADD INDEX `objectType`(`objectType` ASC),
 ADD INDEX `status`(`status` ASC);
+
+CREATE INDEX deleted ON zt_bug (deleted);
+CREATE INDEX product_status_deleted ON zt_bug (product,status,deleted);
diff --git a/module/bug/control.php b/module/bug/control.php
index e6c40bc45c..3176abe253 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -172,7 +172,7 @@ class bug extends control
         }
         else
         {
-            $executions = $this->loadModel('execution')->getPairs($this->projectID, 'all', 'empty|withdelete|hideMultiple');
+            $executions = $this->loadModel('execution')->fetchPairs($this->projectID, 'all', 'empty|withdelete|hideMultiple');
             if($this->config->cache->enable) $this->cache->set($cacheKey, $executions);
         }
 
@@ -234,7 +234,6 @@ class bug extends control
         $this->view->position[]      = $this->lang->bug->common;
         $this->view->productID       = $productID;
         $this->view->product         = $product;
-        $this->view->projectProducts = $this->product->getProducts($this->projectID);
         $this->view->productName     = $productName;
         $this->view->builds          = $this->loadModel('build')->getBuildPairs($productID, $branch);
         $this->view->releasedBuilds  = $this->loadModel('release')->getReleasedBuilds($productID, $branch);
diff --git a/module/bug/model.php b/module/bug/model.php
index 2064de5abf..9dd0347c69 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2861,7 +2861,8 @@ class bugModel extends model
             ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
             ->andWhere('deleted')->eq(0)
             ->beginIF(!$this->app->user->admin)->andWhere('project')->in('0,' . $this->app->user->view->projects)->fi()
-            ->orderBy($orderBy)->page($pager)
+            ->orderBy($orderBy)
+            ->page($pager)
             ->fetchAll();
     }