diff --git a/Theme/Backend/help-module-list.tpl.php b/Theme/Backend/help-module-list.tpl.php
index 7541497..1d3c048 100755
--- a/Theme/Backend/help-module-list.tpl.php
+++ b/Theme/Backend/help-module-list.tpl.php
@@ -57,8 +57,7 @@ $tableView->setObjects($modules);
 
                     ++$count;
                     $url = UriFactory::build(
-                        '{/lang}/backend/help/module/single?id={$module}',
-                        ['$module' => $module->getInternalName()]
+                        '{/lang}/backend/help/module/single?id=' . $module->getInternalName()
                     );
                 ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
diff --git a/Theme/Backend/help-module.tpl.php b/Theme/Backend/help-module.tpl.php
index 08172ef..ad8a4f6 100755
--- a/Theme/Backend/help-module.tpl.php
+++ b/Theme/Backend/help-module.tpl.php
@@ -2,7 +2,11 @@
     <div class="col-xs-12 col-md-8 col-lg-9">
         <section class="portlet">
             <div class="portlet-body">
-                <article><?= $this->data['content']; ?></article>
+                <?php if (empty($this->data['content'])) : ?>
+                    <img height="100%" width="100%" src="Web/Backend/img/under_construction.svg">
+                <?php else : ?>
+                    <article><?= $this->data['content']; ?></article>
+                <?php endif; ?>
             </div>
         </section>
     </div>
@@ -12,7 +16,7 @@
             <a tabindex="0" class="button" href="<?= \phpOMS\Uri\UriFactory::build('{/lang}/backend/help/module/single?id={?id}'); ?>"><?= $this->getHtml('Module'); ?></a>
         </div>
 
-        <?php if ($this->hasData('navigation')) : ?>
+        <?php if (!empty($this->data['navigation'] ?? '')) : ?>
         <section class="portlet">
             <div class="portlet-body">
                 <article><?= $this->data['navigation']; ?></article>
@@ -20,7 +24,7 @@
         </section>
         <?php endif; ?>
 
-        <?php if ($this->hasData('devNavigation')) : ?>
+        <?php if (!empty($this->data['devNavigation'] ?? '')) : ?>
         <section class="portlet">
             <div class="portlet-body">
                 <article><?= $this->data['devNavigation']; ?></article>
diff --git a/tests/Controller/SearchControllerTest.php b/tests/Controller/SearchControllerTest.php
index b62e426..598b0a1 100755
--- a/tests/Controller/SearchControllerTest.php
+++ b/tests/Controller/SearchControllerTest.php
@@ -100,6 +100,6 @@ final class SearchControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('search', ':help introduction');
 
         $this->module->searchHelp($request, $response);
-        self::assertGreaterThan(0, \count($response->get('')));
+        self::assertGreaterThan(0, \count($response->getData('')));
     }
 }