diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 40977c0..bcb6f66 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -299,7 +299,7 @@ final class ApiController extends Controller
     public function apiWikiDocGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
-        $doc = WikiDocMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $doc = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $this->createStandardReturnResponse($request, $response, $doc);
     }
 
@@ -319,7 +319,7 @@ final class ApiController extends Controller
     public function apiWikiDocUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiDoc $old */
-        $old = WikiDocMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $old = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $new = $this->updateDocFromRequest($request, clone $old);
         $this->updateModel($request->header->account, $old, $new, WikiDocMapper::class, 'doc', $request->getOrigin());
 
@@ -371,7 +371,7 @@ final class ApiController extends Controller
     public function apiWikiDocDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
-        $doc = WikiDocMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $doc = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
 
         $this->deleteModel($request->header->account, $doc, WikiDocMapper::class, 'doc', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $doc);
@@ -466,7 +466,7 @@ final class ApiController extends Controller
         /** @var \Modules\Knowledgebase\Models\WikiCategory $category */
         $category = WikiCategoryMapper::get()
             ->with('name')
-            ->where('id', (int) $request->getData('id'))
+            ->where('id', $request->getDataInt('id') ?? 0)
             ->where('name/language', ISO639x1Enum::_EN)
             ->execute();
 
@@ -489,7 +489,7 @@ final class ApiController extends Controller
     public function apiWikiCategoryUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiCategory $old */
-        $old = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $old = WikiCategoryMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $new = $this->updateCategoryFromRequest($request, clone $old);
 
         $this->updateModel($request->header->account, $old, $new, WikiCategoryMapper::class, 'category', $request->getOrigin());
@@ -531,7 +531,7 @@ final class ApiController extends Controller
     public function apiWikiCategoryDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiCategory $category */
-        $category = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $category = WikiCategoryMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
 
         $this->deleteModel($request->header->account, $category, WikiCategoryMapper::class, 'category', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $category);
@@ -617,7 +617,7 @@ final class ApiController extends Controller
     public function apiWikiAppGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiApp $app */
-        $app = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $app = WikiAppMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $this->createStandardReturnResponse($request, $response, $app);
     }
 
@@ -637,7 +637,7 @@ final class ApiController extends Controller
     public function apiWikiAppUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiApp $old */
-        $old = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $old = WikiAppMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $new = $this->updateAppFromRequest($request, clone $old);
 
         $this->updateModel($request->header->account, $old, $new, WikiAppMapper::class, 'app', $request->getOrigin());
@@ -676,7 +676,7 @@ final class ApiController extends Controller
     public function apiWikiAppDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         /** @var \Modules\Knowledgebase\Models\WikiApp $app */
-        $app = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $app = WikiAppMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
 
         $this->deleteModel($request->header->account, $app, WikiAppMapper::class, 'app', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $app);
@@ -705,7 +705,7 @@ final class ApiController extends Controller
         }
 
         /** @var BaseStringL11n $old */
-        $old = WikiCategoryL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $old = WikiCategoryL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $new = $this->updateCategoryL11nFromRequest($request, clone $old);
 
         $this->updateModel($request->header->account, $old, $new, WikiCategoryL11nMapper::class, 'category_l11n', $request->getOrigin());
@@ -775,7 +775,7 @@ final class ApiController extends Controller
         }
 
         /** @var BaseStringL11n $categoryL11n */
-        $categoryL11n = WikiCategoryL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $categoryL11n = WikiCategoryL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $this->deleteModel($request->header->account, $categoryL11n, WikiCategoryL11nMapper::class, 'category_l11n', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $categoryL11n);
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b63e18f..05bfc95 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -154,7 +154,7 @@ final class BackendController extends Controller
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response);
 
         $view->data['app'] = WikiAppMapper::get()
-            ->where('id', (int) $request->getData('id'))
+            ->where('id', $request->getDataInt('id') ?? 0)
             ->execute();
 
         return $view;
@@ -233,7 +233,7 @@ final class BackendController extends Controller
 
         $view->data['category'] = WikiCategoryMapper::get()
             ->with('name')
-            ->where('id', (int) $request->getData('id'))
+            ->where('id', $request->getDataInt('id') ?? 0)
             ->where('name/language', $response->header->l11n->language)
             ->execute();
 
@@ -380,7 +380,7 @@ final class BackendController extends Controller
             ->with('tags')
             ->with('tags/title')
             ->with('files')
-            ->where('id', (int) $request->getData('id'))
+            ->where('id', $request->getDataInt('id') ?? 0)
             ->where('language', $request->header->l11n->language)
             ->where('tags/title/language', $response->header->l11n->language)
             ->execute();
diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php
index 607a22d..9cb5f78 100755
--- a/Theme/Backend/wiki-doc-create.tpl.php
+++ b/Theme/Backend/wiki-doc-create.tpl.php
@@ -17,7 +17,7 @@ use Modules\Knowledgebase\Models\WikiStatus;
 use phpOMS\Uri\UriFactory;
 
 /** @var \Modules\Knowledgebase\Models\WikiDoc $wiki */
-$wiki      = $this->getData('doc') ?? new NullWikiDoc();
+$wiki      = $this->data['doc'] ?? new NullWikiDoc();
 $isNewDoc  = $wiki->id === 0;
 $languages = \phpOMS\Localization\ISO639Enum::getConstants();
 
@@ -35,12 +35,12 @@ echo $this->data['nav']->render(); ?>
 
             <section class="portlet">
                 <div class="portlet-body">
-                    <?= $this->getData('editor')->render('iWiki'); ?>
+                    <?= $this->data['editor']->render('iWiki'); ?>
                 </div>
             </section>
 
             <div class="box wf-100">
-            <?= $this->getData('editor')->getData('text')->render('iWiki', 'plain', 'docForm', $wiki->docRaw, $wiki->doc); ?>
+            <?= $this->data['editor']->data['text']->render('iWiki', 'plain', 'docForm', $wiki->docRaw, $wiki->doc); ?>
             </div>
         </div>
     </div>
@@ -104,7 +104,7 @@ echo $this->data['nav']->render(); ?>
                 <!--
                 <div class="form-group">
                     <?= $this->getHtml('Tags', 'Tag'); ?>
-                    <?= $this->getData('tagSelector')->render('iTag', 'tag', 'fEditor', false); ?>
+                    <?= $this->data['tagSelector']->render('iTag', 'tag', 'fEditor', false); ?>
                 </div>
                 -->
             </div>
diff --git a/Theme/Backend/wiki-doc-view.tpl.php b/Theme/Backend/wiki-doc-view.tpl.php
index 1a7d59d..216685f 100644
--- a/Theme/Backend/wiki-doc-view.tpl.php
+++ b/Theme/Backend/wiki-doc-view.tpl.php
@@ -22,7 +22,7 @@ use Modules\Knowledgebase\Models\NullWikiDoc;
 $categories = $this->data['categories'] ?? [];
 
 /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
-$doc = $this->getData('document') ?? new NullWikiDoc();
+$doc = $this->data['document'] ?? new NullWikiDoc();
 
 /** @var bool $editable */
 $editable = $this->data['editable'];