diff --git a/app/Console/Commands/ScheduleRunCommand.php b/app/Console/Commands/ScheduleRunCommand.php
index 09a91c08e..0d402ad1a 100755
--- a/app/Console/Commands/ScheduleRunCommand.php
+++ b/app/Console/Commands/ScheduleRunCommand.php
@@ -1,9 +1,13 @@
 <?php
+
 namespace App\Console\Commands;
+
+use Bootstrap;
 use Illuminate\Support\Carbon;
 use Illuminate\Console\Scheduling\ScheduleRunCommand as BaseCommand;
 use Maveriks\WebApplication;
 use ProcessMaker\Model\TaskScheduler;
+
 class ScheduleRunCommand extends BaseCommand
 {
     use AddParametersTrait;
@@ -50,7 +54,7 @@ class ScheduleRunCommand extends BaseCommand
                 if (!$win) {
                     $body = str_replace(" -c"," " . $user . " -c", $p->body);
                 }
-                $that->schedule->exec($body)->cron($p->expression)->between($starting, $ending)->timezone($timezone)->when(function () use ($p) {
+                $schedule = $that->schedule->exec($body)->cron($p->expression)->between($starting, $ending)->timezone($timezone)->when(function () use ($p) {
                     $now = Carbon::now();
                     $result = false;
                     $datework = Carbon::createFromFormat('Y-m-d H:i:s', $p->last_update);
@@ -88,7 +92,11 @@ class ScheduleRunCommand extends BaseCommand
                         return $result;
                     }
                     return true;
-                })->onOneServer();
+                });
+                $config = Bootstrap::getSystemConfiguration();
+                if (intval($config['on_one_server_enable']) === 1) {
+                    $schedule->onOneServer();
+                }
             }
         });
         parent::handle();
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
index 85c812eb1..3b9ee52c2 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
@@ -78,7 +78,6 @@ class Home
         $sort = explode(',', $sort);
         $properties['sort'] = $sort[0];
         $properties['dir'] = $sort[1];
-        $properties['sendBy'] = $sendBy;
         $list->setProperties($properties);
         $result = [];
         $result['data'] = DateTime::convertUtcToTimeZone($list->getData($callback));
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index 87c838d15..8c3e69bb3 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -83,7 +83,8 @@ class System
         'report_table_floating_number' => 4,
         'report_table_double_number' => 4,
         'ext_ajax_timeout' => 600000,
-        'disable_task_manager_routing_async' => '0'
+        'disable_task_manager_routing_async' => '0',
+        'on_one_server_enable' => 0
     ];
 
     /**
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Metrics.php b/workflow/engine/src/ProcessMaker/Services/Api/Metrics.php
index ee1acf8e5..0e84bbb04 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Metrics.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Metrics.php
@@ -132,12 +132,14 @@ class Metrics extends Api
             $listInbox->setProperties($properties);
 
             $listDraft = new Draft();
+            $listDraft->setUserUid($usrUid);
             $listDraft->setProperties($properties);
 
             $listPaused = new Paused();
             $listPaused->setProperties($properties);
 
             $listUnassigned = new Unassigned();
+            $listUnassigned->setUserUid($usrUid);
             $listUnassigned->setProperties($properties);
 
             $casesInbox = $listInbox->getCounter();