diff --git a/module/kanban/model.php b/module/kanban/model.php
index 21f05fd1fa..ace2549456 100755
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3219,18 +3219,19 @@ class kanbanModel extends model
      */
     public function moveCard(int $cardID, int $fromColID, int $toColID, int $fromLaneID, int $toLaneID, int $kanbanID = 0)
     {
-        $groupBy = ($this->session->executionGroupBy && ($this->app->tab == 'execution' || $this->config->vision == 'lite')) ? $this->session->executionGroupBy : '';
+        $groupBy = ($this->session->execGroupBy && ($this->app->tab == 'execution' || $this->config->vision == 'lite')) ? $this->session->execGroupBy : '';
 
         $fromCell = $this->dao->select('id,cards,lane')->from(TABLE_KANBANCELL)
             ->where('`column`')->eq($fromColID)
-            ->beginIF(!$groupBy || $groupBy == 'default')->andWhere('lane')->eq($fromLaneID)->fi()
+            ->beginIF((!$groupBy || $groupBy == 'default') && $fromLaneID)->andWhere('lane')->eq($fromLaneID)->fi()
             ->beginIF($groupBy && $groupBy != 'default')
-            ->andWhere('type')->eq($this->session->executionLaneType)
+            ->andWhere('type')->eq($this->session->execLaneType)
             ->andWhere('cards')->like("%,$cardID,%")
             ->fi()
             ->fetch();
 
         if($groupBy && $groupBy != 'default') $fromLaneID = $toLaneID = $fromCell->lane;
+        if(empty($fromLaneID) && $fromCell)   $fromLaneID = $toLaneID = $fromCell->lane;
         $fromCells[$fromCell->id] = $fromCell;
 
         /* Remove all cells with cardID in fromCell. */
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 9e1e07c04d..efd1a40df6 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -454,8 +454,10 @@ class upgrade extends control
             $position = strpos($left, "\n");
             if($position !== false) $log .= substr($left, 0, $position + 1);
         }
-        $log = trim($log);
-        return print(json_encode(array('log' => str_replace("\n", "<br />", htmlspecialchars($log)) . ($log ? '<br />' : ''), 'progress' => $progress, 'offset' => $offset + strlen($log))));
+
+        $offset += strlen($log);
+        $log     = trim($log);
+        return print(json_encode(array('log' => str_replace("\n", "<br />", htmlspecialchars($log)) . ($log ? '<br />' : ''), 'progress' => $progress, 'offset' => $offset)));
     }
 
     /**