diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 8a2530a..416125e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -108,7 +108,7 @@ final class ApiController extends Controller
     {
         /** @var NewsArticle $newsArticle */
         $newsArticle          = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute();
-        $newsArticle->publich = new \DateTime((string) ($request->getData('publish') ?? $newsArticle->publish->format('Y-m-d H:i:s')));
+        $newsArticle->publish = new \DateTime((string) ($request->getData('publish') ?? $newsArticle->publish->format('Y-m-d H:i:s')));
         $newsArticle->title   = (string) ($request->getData('title') ?? $newsArticle->title);
         $newsArticle->plain   = $request->getData('plain') ?? $newsArticle->plain;
         $newsArticle->content = Markdown::parse((string) ($request->getData('plain') ?? $newsArticle->plain));
@@ -160,7 +160,7 @@ final class ApiController extends Controller
     {
         $newsArticle            = new NewsArticle();
         $newsArticle->createdBy = new NullAccount($request->header->account);
-        $newsArticle->publich   = new \DateTime((string) ($request->getData('publish') ?? 'now'));
+        $newsArticle->publish   = new \DateTime((string) ($request->getData('publish') ?? 'now'));
         $newsArticle->title     = (string) ($request->getData('title') ?? '');
         $newsArticle->plain     = $request->getData('plain') ?? '';
         $newsArticle->content   = Markdown::parse((string) ($request->getData('plain') ?? ''));
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 4544cd1..7e654d8 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\News\Controller;
 
 use Modules\Dashboard\Models\DashboardElementInterface;
-use Modules\News\Models\NewsArticle;
 use Modules\News\Models\NewsArticleMapper;
 use Modules\News\Models\NewsSeen;
 use Modules\News\Models\NewsSeenMapper;
diff --git a/Models/NewsArticle.php b/Models/NewsArticle.php
index 6f148db..6982284 100755
--- a/Models/NewsArticle.php
+++ b/Models/NewsArticle.php
@@ -18,6 +18,7 @@ use Modules\Admin\Models\Account;
 use Modules\Admin\Models\NullAccount;
 use Modules\Comments\Models\CommentList;
 use Modules\Media\Models\Media;
+use Modules\Tag\Models\NullTag;
 use Modules\Tag\Models\Tag;
 use phpOMS\Contract\ArrayableInterface;
 use phpOMS\Localization\ISO639x1Enum;
diff --git a/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php
index e4bd0c7..e60e2f9 100755
--- a/Models/NewsArticleMapper.php
+++ b/Models/NewsArticleMapper.php
@@ -37,18 +37,18 @@ final class NewsArticleMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'news_id'           => ['name' => 'news_id',         'type' => 'int',      'internal' => 'id'],
-        'news_publish'      => ['name' => 'news_publish',    'type' => 'DateTime', 'internal' => 'publish'],
-        'news_title'        => ['name' => 'news_title',      'type' => 'string',   'internal' => 'title'],
-        'news_plain'        => ['name' => 'news_plain',      'type' => 'string',   'internal' => 'plain'],
-        'news_content'      => ['name' => 'news_content',    'type' => 'string',   'internal' => 'content'],
-        'news_lang'         => ['name' => 'news_lang',       'type' => 'string',   'internal' => 'language'],
-        'news_status'       => ['name' => 'news_status',     'type' => 'int',      'internal' => 'status'],
-        'news_type'         => ['name' => 'news_type',       'type' => 'int',      'internal' => 'type'],
-        'news_featured'     => ['name' => 'news_featured',   'type' => 'bool',     'internal' => 'isFeatured'],
-        'news_comment_list' => ['name' => 'news_comment_list',   'type' => 'int',     'internal' => 'comments'],
-        'news_created_at'   => ['name' => 'news_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
-        'news_created_by'   => ['name' => 'news_created_by', 'type' => 'int',      'internal' => 'createdBy', 'readonly' => true],
+        'news_id'           => ['name' => 'news_id',           'type' => 'int',               'internal' => 'id'],
+        'news_publish'      => ['name' => 'news_publish',      'type' => 'DateTime',          'internal' => 'publish'],
+        'news_title'        => ['name' => 'news_title',        'type' => 'string',            'internal' => 'title'],
+        'news_plain'        => ['name' => 'news_plain',        'type' => 'string',            'internal' => 'plain'],
+        'news_content'      => ['name' => 'news_content',      'type' => 'string',            'internal' => 'content'],
+        'news_lang'         => ['name' => 'news_lang',         'type' => 'string',            'internal' => 'language'],
+        'news_status'       => ['name' => 'news_status',       'type' => 'int',               'internal' => 'status'],
+        'news_type'         => ['name' => 'news_type',         'type' => 'int',               'internal' => 'type'],
+        'news_featured'     => ['name' => 'news_featured',     'type' => 'bool',              'internal' => 'isFeatured'],
+        'news_comment_list' => ['name' => 'news_comment_list', 'type' => 'int',               'internal' => 'comments'],
+        'news_created_at'   => ['name' => 'news_created_at',   'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
+        'news_created_by'   => ['name' => 'news_created_by',   'type' => 'int',               'internal' => 'createdBy', 'readonly' => true],
     ];
 
     /**
@@ -59,8 +59,8 @@ final class NewsArticleMapper extends DataMapperFactory
      */
     public const OWNS_ONE = [
         'comments' => [
-            'mapper'     => CommentListMapper::class,
-            'external'   => 'news_comment_list',
+            'mapper'   => CommentListMapper::class,
+            'external' => 'news_comment_list',
         ],
     ];
 
@@ -72,8 +72,8 @@ final class NewsArticleMapper extends DataMapperFactory
      */
     public const BELONGS_TO = [
         'createdBy' => [
-            'mapper'     => AccountMapper::class,
-            'external'   => 'news_created_by',
+            'mapper'   => AccountMapper::class,
+            'external' => 'news_created_by',
         ],
     ];
 
diff --git a/Models/NewsSeenMapper.php b/Models/NewsSeenMapper.php
index 69e70a1..2bab3a3 100755
--- a/Models/NewsSeenMapper.php
+++ b/Models/NewsSeenMapper.php
@@ -38,9 +38,9 @@ final class NewsSeenMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'news_seen_id'           => ['name' => 'news_seen_id',         'type' => 'int',      'internal' => 'id'],
-        'news_seen_at'           => ['name' => 'news_seen_at', 'type' => 'DateTime', 'internal' => 'seenAt'],
-        'news_seen_by'           => ['name' => 'news_seen_by', 'type' => 'int',      'internal' => 'seenBy'],
+        'news_seen_id' => ['name' => 'news_seen_id', 'type' => 'int',      'internal' => 'id'],
+        'news_seen_at' => ['name' => 'news_seen_at', 'type' => 'DateTime', 'internal' => 'seenAt'],
+        'news_seen_by' => ['name' => 'news_seen_by', 'type' => 'int',      'internal' => 'seenBy'],
     ];
 
     /**