diff --git a/module/metric/model.php b/module/metric/model.php
index e6ed316fa4..66463255b1 100755
--- a/module/metric/model.php
+++ b/module/metric/model.php
@@ -1538,7 +1538,9 @@ class metricModel extends model
                     ->where('deleted')->eq(0)
                     ->andWhere('shadow')->eq(0)
                     ->andWhere('createdDate')->le($date)
-                    ->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
+                    ->andWhere("closedDate IS NOT NULL and YEAR(closedDate)!='0000'", true)
+                    ->orWhere('closedDate')->ge($date)
+                    ->markRight(1)
                     ->andWhere("vision LIKE '%{$vision}%'", true)
                     ->orWhere("vision IS NULL")->markRight(1)
                     ->fetchPairs();
@@ -1548,7 +1550,9 @@ class metricModel extends model
                     ->where('deleted')->eq(0)
                     ->andWhere('type')->eq('project')
                     ->andWhere('openedDate')->le($date)
-                    ->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
+                    ->andWhere("closedDate IS NOT NULL and YEAR(closedDate)!='0000'", true)
+                    ->orWhere('closedDate')->ge($date)
+                    ->markRight(1)
                     ->andWhere("vision LIKE '%{$vision}%'", true)
                     ->orWhere("vision IS NULL")->markRight(1)
                     ->fetchPairs();
@@ -1558,7 +1562,9 @@ class metricModel extends model
                     ->where('deleted')->eq(0)
                     ->andWhere('type')->in('sprint,stage,kanban')
                     ->andWhere('openedDate')->le($date)
-                    ->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
+                    ->andWhere("closedDate IS NOT NULL and YEAR(closedDate)!='0000'", true)
+                    ->orWhere('closedDate')->ge($date)
+                    ->markRight(1)
                     ->andWhere("vision LIKE '%{$vision}%'", true)
                     ->orWhere("vision IS NULL")->markRight(1)
                     ->fetchPairs();
diff --git a/module/pivot/tao.php b/module/pivot/tao.php
index 5173385469..5b10b79036 100644
--- a/module/pivot/tao.php
+++ b/module/pivot/tao.php
@@ -308,8 +308,8 @@ class pivotTao extends pivotModel
     {
         return $this->dao->select(<<<EOT
 t1.id,
-IF(t1.mode = '', t1.assignedTo, t4.account) AS user,
-IF(t1.mode = '', ROUND(t1.left, 2), ROUND(t4.left, 2)) AS 'left',
+CASE WHEN t1.mode = '' THEN t1.assignedTo ELSE t4.account END AS user,
+CASE WHEN t1.mode = '' THEN ROUND(t1.left, 2) ELSE ROUND(t4.left, 2) END AS left,
 t2.multiple,
 t2.id AS executionID,
 t2.name AS executionName,