diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5fa04bb..f214be1 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -100,7 +100,7 @@ final class ApiController extends Controller
         }
 
         $media = $data['media'] ?? MediaMapper::get()
-            ->where('id', (int) $request->getData('id'))
+            ->where('id', $request->getDataInt('id') ?? 0)
             ->execute();
 
         /** @var \Model\Setting $template */
@@ -498,9 +498,9 @@ final class ApiController extends Controller
             return $media;
         }
 
-        $app->eventManager->triggerSimilar('PRE:Module:Media-media-create', '', $media);
+        $app->eventManager->triggerSimilar('PRE:Media-media-create', '', $media);
         MediaMapper::create()->execute($media);
-        $app->eventManager->triggerSimilar('POST:Module:Media-media-create', '',
+        $app->eventManager->triggerSimilar('POST:Media-media-create', '',
             [
                 $account,
                 null, $media,
@@ -657,7 +657,7 @@ final class ApiController extends Controller
         }
 
         /** @var Media $old */
-        $old = MediaMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $old = MediaMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $new = $this->updateMediaFromRequest($request, clone $old);
 
         $this->updateModel($request->header->account, $old, $new, MediaMapper::class, 'media', $request->getOrigin());
@@ -1241,7 +1241,7 @@ final class ApiController extends Controller
 
         if ($request->hasData('id')) {
             /** @var Media $media */
-            $media    = MediaMapper::get()->where('id', (int) $request->getData('id'))->execute();
+            $media    = MediaMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
             $filePath = $media->getAbsolutePath();
         } else {
             $path  = \urldecode($request->getDataString('path') ?? '');
diff --git a/Theme/Backend/media-file-create.tpl.php b/Theme/Backend/media-file-create.tpl.php
index b8fb860..435a3a1 100755
--- a/Theme/Backend/media-file-create.tpl.php
+++ b/Theme/Backend/media-file-create.tpl.php
@@ -28,12 +28,12 @@ use phpOMS\Uri\UriFactory;
 
         <section class="portlet">
             <div class="portlet-body">
-                <?= $this->getData('editor')->render('editor'); ?>
+                <?= $this->data['editor']->render('editor'); ?>
             </div>
         </section>
 
         <div class="box">
-            <?= $this->getData('editor')->getData('text')->render('editor', 'content', 'fEditor'); ?>
+            <?= $this->data['editor']->data['text']->render('editor', 'content', 'fEditor'); ?>
         </div>
     </div>
 
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index 5780fc5..d566713 100755
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -22,7 +22,7 @@ include __DIR__ . '/template-functions.php';
 /**
  * @var \phpOMS\Views\View $this
  */
-$mediaPath = \urldecode($this->getData('path') ?? '/');
+$mediaPath = \urldecode($this->data['path'] ?? '/');
 
 /** @var \Modules\Media\Models\Media[] $media */
 $media = $this->data['media'] ?? [];