diff --git a/module/product/control.php b/module/product/control.php
index d0979fc36a..f39c73fd2f 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -78,7 +78,7 @@ class product extends control
         $this->product->setMenu($this->products, $productID, $branch);
 
         $this->app->loadLang('my');
-        $this->view->projectStats  = $this->loadModel('project')->getProjectStats($status, $productID, $branch);
+        $this->view->projectStats = $this->loadModel('project')->getExecutionStats(0, 'undone', $productID, $branch);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->product->project;
         $this->view->position[] = $this->products[$productID];
diff --git a/module/project/control.php b/module/project/control.php
index 5d404e952b..abfbee44b9 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2597,7 +2597,7 @@ class project extends control
                 unset($fields[$key]);
             }
 
-            $projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, null, $this->session->PRJ);
+            $projectStats = $this->project->getExecutionStats($this->session->PRJ, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'path_asc,id_asc');
             $users        = $this->loadModel('user')->getPairs('noletter');
             foreach($projectStats as $i => $project)
             {
diff --git a/module/project/model.php b/module/project/model.php
index d7079a7df3..360a6ba56c 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1101,7 +1101,7 @@ class projectModel extends model
             $executions = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
                 ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
                 ->where('t1.product')->eq($productID)
-                ->andWhere('t2.project')->eq($projectID)
+                ->beginIF($projectID)->andWhere('t2.project')->eq($projectID)->fi()
                 ->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi()
                 ->beginIF($status != 'all' and $status != 'undone')->andWhere('t2.status')->eq($status)->fi()
                 ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()