diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 8e60eaf..9142503 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -40,6 +40,8 @@ use phpOMS\System\MimeType;
 use phpOMS\Utils\Parser\Markdown\Markdown;
 use phpOMS\Utils\StringUtils;
 use phpOMS\Views\View;
+use Modules\Media\Models\Collection;
+use Modules\Media\Models\CollectionMapper;
 
 /**
  * Helper controller class.
@@ -274,6 +276,7 @@ final class ApiController extends Controller
             $files[] = new NullMedia($db);
         }
 
+        /** @var Collection $collection */
         $collection = $this->app->moduleManager->get('Media')->createMediaCollectionFromMedia(
             (string) ($request->getData('name') ?? ''),
             (string) ($request->getData('description') ?? ''),
@@ -281,6 +284,9 @@ final class ApiController extends Controller
             $request->getHeader()->getAccount()
         );
 
+        $collection->setPath('/Modules/Media/Files/Modules/Helper/' . ( (string) ($request->getData('name') ?? '')));
+        $collection->setVirtualPath('/Modules/Helper');
+
         if ($collection instanceof NullCollection) {
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
             $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Template', 'Couldn\'t create collection for template', null);
@@ -288,6 +294,8 @@ final class ApiController extends Controller
             return;
         }
 
+        CollectionMapper::create($collection);
+
         $template = $this->createTemplateFromRequest($request, $collection->getId());
 
         $this->app->moduleManager->get('Admin')->createAccountModelPermission(
@@ -384,6 +392,9 @@ final class ApiController extends Controller
             $request->getHeader()->getAccount()
         );
 
+        $collection->setPath('/Modules/Media/Files/Modules/Helper/' . ( (string) ($request->getData('name') ?? '')));
+        $collection->setVirtualPath('/Modules/Helper');
+
         if ($collection instanceof NullCollection) {
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
             $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Report', 'Couldn\'t create collection for report', null);
@@ -391,6 +402,8 @@ final class ApiController extends Controller
             return;
         }
 
+        CollectionMapper::create($collection);
+
         $report = $this->createReportFromRequest($request, $response, $collection->getId());
 
         $this->app->moduleManager->get('Admin')->createAccountModelPermission(
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b2d616a..eedbeaf 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -57,12 +57,12 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Helper/Theme/Backend/helper-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response));
 
-        if ($request->getData('ptype') === '-') {
+        if ($request->getData('ptype') === 'p') {
             $view->setData('reports',
                 TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
                     ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
             );
-        } elseif ($request->getData('ptype') === '+') {
+        } elseif ($request->getData('ptype') === 'n') {
             $view->setData('reports',
                 TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
                     ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)
diff --git a/Theme/Backend/helper-list.tpl.php b/Theme/Backend/helper-list.tpl.php
index b808e9f..bd93f47 100755
--- a/Theme/Backend/helper-list.tpl.php
+++ b/Theme/Backend/helper-list.tpl.php
@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $templates = $this->getData('reports');
 
-$previous = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \reset($templates)->getId() . '&ptype=-';
-$next     = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \end($templates)->getId() . '&ptype=+';
+$previous = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \reset($templates)->getId() . '&ptype=p';
+$next     = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \end($templates)->getId() . '&ptype=n';
 
 echo $this->getData('nav')->render(); ?>
 
diff --git a/tests/EventCourse/EventCourse.tpl.php b/tests/EventCourse/EventCourse.tpl.php
index e92a706..839be4f 100755
--- a/tests/EventCourse/EventCourse.tpl.php
+++ b/tests/EventCourse/EventCourse.tpl.php
@@ -26,7 +26,7 @@ require 'Worker.php';
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2" checked>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
         <div class="tab">
             <div class="box">
                 <table class="default">
@@ -195,7 +195,7 @@ require 'Worker.php';
                 </table>
             </div>
         </div>
-        <input type="radio" id="c-tab-2" name="tabular-2">
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
         <div class="tab">
             <section class="box">
                 <table class="default">
@@ -270,7 +270,7 @@ require 'Worker.php';
                 </table>
             </section>
         </div>
-        <input type="radio" id="c-tab-3" name="tabular-2">
+        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : '' ?>>
         <div class="tab">
             <section class="box">
                 <table class="default">
@@ -318,7 +318,7 @@ require 'Worker.php';
                 </table>
             </section>
         </div>
-        <input type="radio" id="c-tab-4" name="tabular-2">
+        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : '' ?>>
         <div class="tab">
             <section class="box">
                 <table class="default">
@@ -389,7 +389,7 @@ require 'Worker.php';
                 </table>
             </section>
         </div>
-        <input type="radio" id="c-tab-5" name="tabular-2">
+        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : '' ?>>
         <div class="tab">
             <section class="box">
                 <table class="default">