diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index 1c8e240e4..ce5818de6 100755
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -426,12 +426,27 @@ class Home extends Controller
             $dataList['dir']      = $dir;
             $dataList['sort']     = $sort;
             $dataList['category'] = $category;
+            $dataList['action']   = $type;
             /*----------------------------------********---------------------------------*/
             if (true) {
                 //In enterprise version this block of code should always be executed
                 //In community version this block of code is deleted and is executed the other
                 $list = new \ProcessMaker\BusinessModel\Lists();
-                $cases = $list->getList('inbox', $dataList);
+                $listName = 'inbox';
+                switch ($type) {
+                    case 'draft':
+                    case 'todo':
+                        $listName = 'inbox';
+                        $cases = $list->getList($listName, $dataList);
+                        break;
+                    case 'unassigned':
+                        $case = new \ProcessMaker\BusinessModel\Cases();
+                        $cases = $case->getList($dataList);
+                        foreach ($cases['data'] as &$value) {
+                            $value = array_change_key_case($value, CASE_UPPER);
+                        }
+                        break;
+                }
             } else {
             /*----------------------------------********---------------------------------*/
                 $case = new \ProcessMaker\BusinessModel\Cases();
@@ -439,14 +454,14 @@ class Home extends Controller
                 foreach ($cases['data'] as &$value) {
                     $value = array_change_key_case($value, CASE_UPPER);
                 }
-                if(!isset($cases['totalCount'])){
-                    $cases['totalCount'] = $cases['total'];
-                }
             /*----------------------------------********---------------------------------*/
             }
             /*----------------------------------********---------------------------------*/
 
         }
+        if(!isset($cases['totalCount'])){
+            $cases['totalCount'] = $cases['total'];
+        }
 
         // formating & complitting apps data with 'Notes'
         foreach ($cases['data'] as $i => $row) {