diff --git a/common/modules/product/CatalogUrlManager.php b/common/modules/product/CatalogUrlManager.php
index 2bee6f7..d74edc0 100755
--- a/common/modules/product/CatalogUrlManager.php
+++ b/common/modules/product/CatalogUrlManager.php
@@ -102,6 +102,8 @@ class CatalogUrlManager implements UrlRuleInterface {
     public function createUrl($manager, $route, $params)
     {
 
+
+
         if (!in_array($route, $this->route_map)) {
             return false;
         }
@@ -131,10 +133,13 @@ class CatalogUrlManager implements UrlRuleInterface {
                 break;
 
             case 'catalog/product':
+
                 if (!empty($params['product'])) {
                     $product_alias = is_object($params['product']) ? $params['product']->alias : strtolower($params['product']);
+                    $url = 'product/'. $product_alias;
+                } else {
+                    $url = 'product/';
                 }
-                $url = 'product/'. $product_alias;
 
                 if (!empty($params) && ($query = http_build_query($params)) !== '') {
                     $url .= '?' . $query;
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 21e835c..6ed4a8b 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -108,6 +108,7 @@ return [
             ],
         ],*/
         'urlManager'   => [
+            'baseUrl' => 'http://rukzachok.com.ua',
             'enablePrettyUrl' => true,
             'showScriptName'  => false,
             'rules'           => [
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 3815062..9c69fe4 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -78,8 +78,8 @@ $this->registerJs("
         <title><?= Seo::widget([ 'row'=>'title'])?></title>
         <?= Seo::widget([ 'row'=>'description'])?>
         <?= Seo::widget([ 'row'=>'meta'])?>
-        <?= $this->registerLinkTag(['rel' => 'canonical', 'href' => Url::canonical()]); ?>
-        <link rel="shortcut icon" href="<?= Yii::$app->request->baseUrl ?>/img/favicon.ico" type="image/x-icon"/>
+        <?php $this->registerLinkTag(['rel' => 'canonical', 'href' => Yii::$app->urlManager->baseUrl.Yii::$app->request->url ]); ?>
+        <link rel="shortcut icon" href="<?= Yii::$app->urlManager->baseUrl ?>/img/favicon.ico" type="image/x-icon"/>
         <?php $this->head () ?>
 
         <!-- SOCIAL ICON -->
--
libgit2 0.21.4