diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index a597e8d..8e2ae1d 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -186,7 +186,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response));
 
-        $list = WikiCategoryMapper::getByApp($app)->where('name/language', $response->getLanguage())->execute();
+        $list = WikiCategoryMapper::getAll()->with('name')->where('app', $app)->where('name/language', $response->getLanguage())->execute();
         $view->setData('categories', $list);
 
         return $view;
@@ -298,7 +298,14 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response));
 
-        $categories = WikiCategoryMapper::getByParentAndApp($request->hasData('category') ? (int) $request->getData('category') : null, $app)->where('name/language', $response->getLanguage())->execute();;
+        $categories = WikiCategoryMapper::getByParentAndApp(
+            $request->hasData('category')
+                ? (int) $request->getData('category')
+                : null,
+                $app)
+            ->where('name/language', $response->getLanguage())
+            ->execute();
+
         $view->setData('categories', $categories);
         $view->setData('document', $document);
         $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission(
diff --git a/Models/WikiCategoryMapper.php b/Models/WikiCategoryMapper.php
index c19ac29..3cdbb4a 100755
--- a/Models/WikiCategoryMapper.php
+++ b/Models/WikiCategoryMapper.php
@@ -34,10 +34,10 @@ final class WikiCategoryMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'wiki_category_id'         => ['name' => 'wiki_category_id',     'type' => 'int',    'internal' => 'id'],
-        'wiki_category_app'        => ['name' => 'wiki_category_app',    'type' => 'int',    'internal' => 'app'],
-        'wiki_category_virtual'    => ['name' => 'wiki_category_virtual',    'type' => 'string',    'internal' => 'virtualPath'],
-        'wiki_category_parent'     => ['name' => 'wiki_category_parent', 'type' => 'int',    'internal' => 'parent'],
+        'wiki_category_id'      => ['name' => 'wiki_category_id',      'type' => 'int',    'internal' => 'id'],
+        'wiki_category_app'     => ['name' => 'wiki_category_app',     'type' => 'int',    'internal' => 'app'],
+        'wiki_category_virtual' => ['name' => 'wiki_category_virtual', 'type' => 'string', 'internal' => 'virtualPath'],
+        'wiki_category_parent'  => ['name' => 'wiki_category_parent',  'type' => 'int',    'internal' => 'parent'],
     ];
 
     /**
@@ -48,11 +48,11 @@ final class WikiCategoryMapper extends DataMapperFactory
      */
     public const HAS_MANY = [
         'name' => [
-            'mapper'            => WikiCategoryL11nMapper::class,
-            'table'             => 'wiki_category_l11n',
-            'self'              => 'wiki_category_l11n_category',
-            'column'            => 'name',
-            'external'          => null,
+            'mapper'   => WikiCategoryL11nMapper::class,
+            'table'    => 'wiki_category_l11n',
+            'self'     => 'wiki_category_l11n_category',
+            'column'   => 'name',
+            'external' => null,
         ],
     ];
 
@@ -64,12 +64,12 @@ final class WikiCategoryMapper extends DataMapperFactory
      */
     public const BELONGS_TO = [
         'parent' => [
-            'mapper'     => self::class,
-            'external'   => 'wiki_category_parent',
+            'mapper'   => self::class,
+            'external' => 'wiki_category_parent',
         ],
         'app' => [
-            'mapper'     => WikiAppMapper::class,
-            'external'   => 'wiki_category_app',
+            'mapper'   => WikiAppMapper::class,
+            'external' => 'wiki_category_app',
         ],
     ];
 
@@ -101,7 +101,7 @@ final class WikiCategoryMapper extends DataMapperFactory
      * Get by parent.
      *
      * @param null|int $value Parent value id
-     * @param int $app   App
+     * @param int      $app   App
      *
      * @return ReadMapper
      *
diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php
index d013db8..d4bcb78 100755
--- a/Models/WikiDocMapper.php
+++ b/Models/WikiDocMapper.php
@@ -17,7 +17,6 @@ namespace Modules\Knowledgebase\Models;
 use Modules\Media\Models\MediaMapper;
 use Modules\Tag\Models\TagMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
-use phpOMS\DataStorage\Database\Query\Builder;
 
 /**
  * Mapper class.