diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index 61f54c2c9..9d2e6f8f8 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -403,51 +403,17 @@ class ListInbox extends BaseListInbox
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
 
-        if ($dateFrom != "") {
-            if ($dateTo != "") {
-                if ($dateFrom == $dateTo) {
-                    $dateSame = $dateFrom;
-                    $dateFrom = $dateSame . " 00:00:00";
-                    $dateTo = $dateSame . " 23:59:59";
-                } else {
-                    $dateFrom = $dateFrom . " 00:00:00";
-                    $dateTo = $dateTo . " 23:59:59";
-                }
-
-                $criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
-                addAnd( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
-            } else {
-                $dateFrom = $dateFrom . " 00:00:00";
-
-                $criteria->add( ListInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
-            }
-        } elseif ($dateTo != "") {
-            $dateTo = $dateTo . " 23:59:59";
-
-            $criteria->add( ListInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
-        }
-
-        if ($newestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN ));
-        }
-
-        if ($oldestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
-        }
-
-        if ($filterStatus != '') {
-            switch ($filterStatus) {
-                case 'ON_TIME':
-                    $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM);
-                    break;
-                case 'AT_RISK':
-                    $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM);
-                    $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) >  0", Criteria::CUSTOM);
-                    break;
-                case 'OVERDUE':
-                    $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM);
-                    break;
-            }
+        switch ($filterStatus) {
+            case 'ON_TIME':
+                $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM);
+                break;
+            case 'AT_RISK':
+                $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM);
+                $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) >  0", Criteria::CUSTOM);
+                break;
+            case 'OVERDUE':
+                $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM);
+                break;
         }
     }
 
diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php
index 4ceea0c0a..cca44fe46 100644
--- a/workflow/engine/classes/model/ListParticipatedLast.php
+++ b/workflow/engine/classes/model/ListParticipatedLast.php
@@ -209,11 +209,11 @@ class ListParticipatedLast extends BaseListParticipatedLast
         $oldestthan     = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : '';
 
         switch ($filter) {
-            case 'read':
-                $criteria->add( ListParticipatedLastPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+            case 'started':
+                $criteria->add(ListParticipatedLastPeer::DEL_INDEX, 1, Criteria::EQUAL);
                 break;
-            case 'unread':
-                $criteria->add( ListParticipatedLastPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+            case 'completed':
+                $criteria->add( ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL);
                 break;
         }
 
@@ -226,8 +226,17 @@ class ListParticipatedLast extends BaseListParticipatedLast
             ))));
         }
 
-        if($filterStatus != ''){
-            $criteria->add(ListParticipatedLastPeer::APP_STATUS, '%' . $filterStatus . '%', Criteria::LIKE );
+        switch ($filterStatus) {
+            case 'ON_TIME':
+                $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM);
+                break;
+            case 'AT_RISK':
+                $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM);
+                $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) >  0", Criteria::CUSTOM);
+                break;
+            case 'OVERDUE':
+                $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM);
+                break;
         }
 
         if ($process != '') {
@@ -242,22 +251,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
             $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
-
-        if (!empty($dateFrom)) {
-            $criteria->add(ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
-        }
-        if (!empty($dateTo)) {
-            $dateTo = $dateTo . " 23:59:59";
-            $criteria->add(ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL);
-        }
-
-        if ($newestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN ));
-        }
-
-        if ($oldestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
-        }
     }
 
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '')
diff --git a/workflow/engine/methods/cases/proxyNewCasesList.php b/workflow/engine/methods/cases/proxyNewCasesList.php
index b92f02752..d56037a82 100644
--- a/workflow/engine/methods/cases/proxyNewCasesList.php
+++ b/workflow/engine/methods/cases/proxyNewCasesList.php
@@ -190,21 +190,21 @@ try {
     );
 
     $filtersData = array();
-    $filtersData['start']           = $filters['start'];
-    $filtersData['limit']           = $filters['limit'];
-    $filtersData['sort']            = G::toLower($filters['sort']);
-    $filtersData['dir']             = G::toLower($filters['dir']);
-    $filtersData['cat_uid']         = $filters['category'];
-    $filtersData['pro_uid']         = $filters['process'];
-    $filtersData['search']          = $filters['search'];
-    $filtersData['date_from']       = $filters['dateFrom'];
-    $filtersData['date_to']         = $filters['dateTo'];
-    $filtersData["action"]          = $filters["action"];
-    $filtersData["filterStatus"]    = $filters['filterStatus'];
+    $filtersData['start']        = $filters['start'];
+    $filtersData['limit']        = $filters['limit'];
+    $filtersData['sort']         = G::toLower($filters['sort']);
+    $filtersData['dir']          = G::toLower($filters['dir']);
+    $filtersData['cat_uid']      = $filters['category'];
+    $filtersData['pro_uid']      = $filters['process'];
+    $filtersData['search']       = $filters['search'];
+    $filtersData['date_from']    = $filters['dateFrom'];
+    $filtersData['date_to']      = $filters['dateTo'];
+    $filtersData["action"]       = $filters["action"];
+    $filtersData["filterStatus"] = $filters['filterStatus'];
 
     $response = array();
     $response['filters']        = $filtersData;
-    $response['totalCount']     = $list->countTotal($userUid, $filtersData);
+    $response['totalCount']     = $list->getCountList($userUid, $filtersData);
 
     $response = $filter->xssFilterHard($response);
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
index 88077e2aa..363d00a0b 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
@@ -201,7 +201,7 @@ class Lists {
         }
 
         if ($total) {
-            $total = $list->countTotal($userUid, $filters);
+            $total = $list->getCountList($userUid, $filters);
             return $total;
         }
 
@@ -249,7 +249,7 @@ class Lists {
             $response['filters']        = $filtersData;
             $response['data']           = $result;
             $filtersData['action']      = $filters["action"];
-            $response['totalCount']     = $list->countTotal($userUid, $filtersData);
+            $response['totalCount']     = $list->getCountList($userUid, $filtersData);
         } else {
             $response = $result;
         }
@@ -267,8 +267,8 @@ class Lists {
         $response = array();
         foreach ($list as $listObject => $item) {
             switch ($listObject) {
-                case 'ListInbox':
-                    $total = $this->$listObject->getCountList($userId, 'TO_DO');
+                case 'ListDraft':
+                    $total = $this->$listObject->getCountList($userId, array('action'=>'draft'));
                     array_push($response, (array('count' => $total, 'item' => $item)));
                     break;
                 /*----------------------------------********---------------------------------*/