diff --git a/module/bug/model.php b/module/bug/model.php
index f68eb96259..b2cf5064c2 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -131,8 +131,8 @@ class bugModel extends model
             ->where('status')->eq('active')
             ->andWhere('toTask')->eq(0)
             ->andWhere('tostory')->eq(0)
-            ->beginIF(!empty($products))->andWhere('product')->in($products)
-            ->beginIF(empty($products))->andWhere('project')->eq($projectID)
+            ->beginIF(!empty($products))->andWhere('product')->in($products)->fi()
+            ->beginIF(empty($products))->andWhere('project')->eq($projectID)->fi()
             ->andWhere('deleted')->eq(0)
             ->orderBy('id desc')
             ->page($pager)
@@ -834,8 +834,8 @@ class bugModel extends model
         return $this->dao->select('*')->from(TABLE_BUG)
             ->where('project')->in(array_keys($projects))
             ->andWhere('product')->eq($productID)
-            ->beginIF($status == 'unclosed')->andWhere('status')->ne('closed')
-            ->beginIF($status == 'unresolved')->andWhere('status')->eq('active')
+            ->beginIF($status == 'unclosed')->andWhere('status')->ne('closed')->fi()
+            ->beginIF($status == 'unresolved')->andWhere('status')->eq('active')->fi()
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)->page($pager)->fetchAll();
     }
diff --git a/module/project/control.php b/module/project/control.php
index 7d0454f7f6..d1ce48d1b6 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -390,7 +390,7 @@ class project extends control
             {
                 if($this->session->bugQuery == false) $this->session->set('bugQuery', ' 1 = 1');
             }
-            $bugQuery = str_replace("`product` = 'all'", helper::dbIN($products), $this->session->bugQuery); // Search all project.
+            $bugQuery = str_replace("`product` = 'all'", "`product`" . helper::dbIN(array_keys($products)), $this->session->bugQuery); // Search all project.
             $bugs = $this->project->getSearchBugs($products, $projectID, $bugQuery, $pager, 'id_desc');
         }
 
diff --git a/module/project/model.php b/module/project/model.php
index 283908ef14..462cf8a52e 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1011,8 +1011,8 @@ class projectModel extends model
             ->andWhere('status')->eq('active')
             ->andWhere('toTask')->eq(0)
             ->andWhere('tostory')->eq(0)
-            ->beginIF(!empty($products))->andWhere('product')->in(array_keys($products))
-            ->beginIF(empty($products))->andWhere('project')->eq($projectID)
+            ->beginIF(!empty($products))->andWhere('product')->in(array_keys($products))->fi()
+            ->beginIF(empty($products))->andWhere('project')->eq($projectID)->fi()
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)
             ->page($pager)