diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index fe64152..3949b21 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -255,7 +255,7 @@ final class ApiController extends Controller
         $element = $this->createTaskElementFromRequest($request, $task);
         $task->setStatus($element->getStatus());
         $task->setPriority($element->getPriority());
-        $task->due = $element->due;
+        $task->due        = $element->due;
         $task->completion = (int) ($request->getData('completion') ?? $task->completion);
 
         if ($task->getStatus() === TaskStatus::DONE) {
diff --git a/Controller/SearchController.php b/Controller/SearchController.php
index b700003..e6fc6e7 100644
--- a/Controller/SearchController.php
+++ b/Controller/SearchController.php
@@ -14,14 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\Tasks\Controller;
 
-use Modules\Tasks\Models\NavElementMapper;
-use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Model\Message\Redirect;
 use phpOMS\System\MimeType;
-use phpOMS\Uri\UriFactory;
 
 /**
  * Search class.
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index a73a321..2566fab 100755
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -40,22 +40,22 @@ final class TaskMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $columns = [
-        'task_id'         => ['name' => 'task_id',         'type' => 'int',      'internal' => 'id'],
-        'task_title'      => ['name' => 'task_title',      'type' => 'string',   'internal' => 'title'],
-        'task_desc'       => ['name' => 'task_desc',       'type' => 'string',   'internal' => 'description'],
-        'task_desc_raw'   => ['name' => 'task_desc_raw',   'type' => 'string',   'internal' => 'descriptionRaw'],
-        'task_type'       => ['name' => 'task_type',       'type' => 'int',      'internal' => 'type'],
-        'task_status'     => ['name' => 'task_status',     'type' => 'int',      'internal' => 'status'],
+        'task_id'             => ['name' => 'task_id',         'type' => 'int',      'internal' => 'id'],
+        'task_title'          => ['name' => 'task_title',      'type' => 'string',   'internal' => 'title'],
+        'task_desc'           => ['name' => 'task_desc',       'type' => 'string',   'internal' => 'description'],
+        'task_desc_raw'       => ['name' => 'task_desc_raw',   'type' => 'string',   'internal' => 'descriptionRaw'],
+        'task_type'           => ['name' => 'task_type',       'type' => 'int',      'internal' => 'type'],
+        'task_status'         => ['name' => 'task_status',     'type' => 'int',      'internal' => 'status'],
         'task_completion'     => ['name' => 'task_completion',     'type' => 'int',      'internal' => 'completion'],
-        'task_closable'   => ['name' => 'task_closable',   'type' => 'bool',     'internal' => 'isClosable'],
-        'task_editable'   => ['name' => 'task_editable',   'type' => 'bool',     'internal' => 'isEditable'],
-        'task_priority'   => ['name' => 'task_priority',   'type' => 'int',      'internal' => 'priority'],
-        'task_due'        => ['name' => 'task_due',        'type' => 'DateTime', 'internal' => 'due'],
-        'task_done'       => ['name' => 'task_done',       'type' => 'DateTime', 'internal' => 'done'],
-        'task_schedule'   => ['name' => 'task_schedule',   'type' => 'int',      'internal' => 'schedule'],
-        'task_start'      => ['name' => 'task_start',      'type' => 'DateTime', 'internal' => 'start'],
-        'task_created_by' => ['name' => 'task_created_by', 'type' => 'int',      'internal' => 'createdBy', 'readonly' => true],
-        'task_created_at' => ['name' => 'task_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
+        'task_closable'       => ['name' => 'task_closable',   'type' => 'bool',     'internal' => 'isClosable'],
+        'task_editable'       => ['name' => 'task_editable',   'type' => 'bool',     'internal' => 'isEditable'],
+        'task_priority'       => ['name' => 'task_priority',   'type' => 'int',      'internal' => 'priority'],
+        'task_due'            => ['name' => 'task_due',        'type' => 'DateTime', 'internal' => 'due'],
+        'task_done'           => ['name' => 'task_done',       'type' => 'DateTime', 'internal' => 'done'],
+        'task_schedule'       => ['name' => 'task_schedule',   'type' => 'int',      'internal' => 'schedule'],
+        'task_start'          => ['name' => 'task_start',      'type' => 'DateTime', 'internal' => 'start'],
+        'task_created_by'     => ['name' => 'task_created_by', 'type' => 'int',      'internal' => 'createdBy', 'readonly' => true],
+        'task_created_at'     => ['name' => 'task_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
     ];
 
     /**