diff --git a/app/Providers/TemplateServiceProvider.php b/app/Providers/TemplateServiceProvider.php
index 8ca241a5..6c30bf40 100644
--- a/app/Providers/TemplateServiceProvider.php
+++ b/app/Providers/TemplateServiceProvider.php
@@ -45,28 +45,30 @@ class TemplateServiceProvider extends ServiceProvider
 
     public function registerTemplatePaths($publicTemplates)
     {
-        $modules = Module::all()
-                         ->pluck('id', 'alias');
+        $modules = Module::where('enabled', true)
+                         ->get()
+                         ->pluck('id', 'alias')
+                         ->toArray();
 
         /**
          * @var $registrator TemplateRegistrator
          */
         $registrator = $this->app->make('registerTemplateDir');
+
         foreach ($publicTemplates as $template) {
             // setup some global variables
             $module = strtolower($template['module']);
             $alias = isset($template['alias']) ? $template['alias'] : $module;
             $namespace = isset($template['namespace']) ? $template['namespace'] : strtolower($template['module']);
 
-            if (!$modules->get($alias)) {
+            if (!isset($modules[$alias])) {
                 continue;
             }
 
             // register path with current template name
-
             $registrator->setNamespace($namespace);
-            $registrator->setModuleId($modules->get($alias));
-            $registrator->register('resources/views/modules/' . $module, 'visitor', $template['templateName']);
+            $registrator->setModuleId($modules[$alias]);
+            $registrator->register('resources/views/modules/' . $alias, 'visitor', $template['templateName']);
         }
 
         // register also global resources/views/visitor directory
diff --git a/templates/Binarity/Handler.php b/templates/Binarity/Handler.php
index 190e2350..032aaea0 100644
--- a/templates/Binarity/Handler.php
+++ b/templates/Binarity/Handler.php
@@ -2,7 +2,6 @@
 namespace Templates\Binarity;
 
 use App\CMS\Contracts\Modules\TemplateHandler;
-use App\Http\Requests\Request;
 use App\Models\Content\Content;
 use App\Models\Module;
 use App\Models\User;
@@ -76,10 +75,12 @@ class Handler implements TemplateHandler
             ],
             [
                 'module'       => 'ArticleList',
+                'alias'        => 'blog-articlelist',
                 'templateName' => 'articlelist::module.templatePath'
             ],
             [
                 'module'       => 'Article',
+                'alias'        => 'blog-article',
                 'templateName' => 'article::module.templatePath'
             ],
         ];
@@ -112,7 +113,7 @@ class Handler implements TemplateHandler
      * This way we can do almost whatever we want - even in template
      *
      * @param Content $content
-     * @param $request
+     * @param         $request
      */
     public static function beforeSave(Content & $content, $inputData)
     {