diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index a55d54e08..5496fef71 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -209,10 +209,12 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         {
             $id = $object->id;
             $seo = str_slug($object->name);
+            $seo = str_replace('_','-',$seo);
             return \route('adv_detail_seo', [$id,$seo]);
         }
         $id = $object->getObject()->id;
         $seo = str_slug($object->getObject()->name);
+        $seo = str_replace('_','-',$seo);
         return \route('adv_detail_seo', [$id,$seo]);
     }
 
@@ -222,6 +224,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         {
             $id = $adv->id;
             $seo = str_slug($adv->name);
+            $seo = str_replace('_','-',$seo);
             return \route('adv_detail_seo', [$id,$seo]);
         }
     }
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index 8bfb63a1f..05b255460 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -156,6 +156,7 @@ class AdvsController extends PublicController
         }
 
         $adv = $advRepository->getListItemAdv($id);
+        $adv->meta_tags = explode(' ',$adv->name);
 
         $recommended_advs = $advRepository->getRecommendedAds($adv->id);
         foreach ($recommended_advs as $index => $ad) {
diff --git a/addons/default/visiosoft/default-theme/resources/config/settings.php b/addons/default/visiosoft/default-theme/resources/config/settings.php
new file mode 100644
index 000000000..2de12543c
--- /dev/null
+++ b/addons/default/visiosoft/default-theme/resources/config/settings.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'meta_tags' => [
+        'type' => 'anomaly.field_type.tags',
+        'config' => [
+            'default_value' => ['Openclassify'],
+        ],
+    ],
+];
diff --git a/addons/default/visiosoft/default-theme/resources/lang/en/setting.php b/addons/default/visiosoft/default-theme/resources/lang/en/setting.php
new file mode 100644
index 000000000..c3bef48fe
--- /dev/null
+++ b/addons/default/visiosoft/default-theme/resources/lang/en/setting.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'meta_tags' => [
+        'name' => 'Meta Keywords',
+    ],
+
+];
diff --git a/addons/default/visiosoft/default-theme/resources/lang/tr/setting.php b/addons/default/visiosoft/default-theme/resources/lang/tr/setting.php
new file mode 100644
index 000000000..ff5b693ff
--- /dev/null
+++ b/addons/default/visiosoft/default-theme/resources/lang/tr/setting.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'meta_tags' => [
+        'name' => 'Anahtar Kelimeler',
+    ],
+
+];
diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig
index 8fc8074a6..96b968b92 100644
--- a/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig
@@ -17,12 +17,13 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 <meta name="description" content="{{ trans(template.meta_description) }}"/>
 
+{% if app.request.pathInfo == "/" %}
+    <meta name="keywords" content="{% for tag in setting_value('visiosoft.theme.default::meta_tags') %}{{ tag }},{% endfor %}">
+{% else %}
+    <meta name="keywords" content="{% for tag in adv.meta_tags %}{{ tag }},{% endfor %}">
+{% endif %}
 
-<title>
-    {{ setting_value('streams::name', config_get('streams::distribution.name')) }}
-    &#8250;
-    {{ trans(template.meta_title) }}
-</title>
+<title>{{ setting_value('streams::name', config_get('streams::distribution.name')) }}|{{ trans(template.meta_title) }}</title>
 
 <!-- Favicon -->
 {#{{ favicons("theme::img/favicon.png") }}#}