diff --git a/search_engine_optimization/README.md b/search_engine_optimization/README.md
index 7864c2f..64076e4 100644
--- a/search_engine_optimization/README.md
+++ b/search_engine_optimization/README.md
@@ -21,14 +21,17 @@ Add automatically generated Search Engine Optimization to your Website
     <!-- Meta Keywords/Tags for Users to search for in Search Engines -->
     <meta name="keywords" content="
     {{- with .Params.tags }}
-        {{- range . -}}
+        {{- range $key, $item := . -}}
+            {{- if ne $key 0 -}}
+            ,
+            {{- end -}}
             {{ with $.Site.GetPage (printf "/%s/%s" "tags" . ) }}
-                {{- .Title -}},
+                {{- .Title -}}
             {{- end }}
-            {{- end }}
-        {{- else -}}
-            Tutorials, Tips, Linux, Bash, Docker
-    {{- end }}" />    
+        {{- end }}
+    {{- else -}}
+        Default, Keywords, That, Describe, Your, Page
+    {{- end }}" />   
 
     <!-- Canonical URLs -->
     <link rel="canonical" href="{{ .Permalink }}" />
diff --git a/search_engine_optimization/layouts/_default/baseof.html b/search_engine_optimization/layouts/_default/baseof.html
index 43f4443..51e2ea7 100644
--- a/search_engine_optimization/layouts/_default/baseof.html
+++ b/search_engine_optimization/layouts/_default/baseof.html
@@ -12,14 +12,17 @@
 <!-- Meta Keywords/Tags for Users to search for in Search Engines -->
 <meta name="keywords" content="
 {{- with .Params.tags }}
-    {{- range . -}}
+    {{- range $key, $item := . -}}
+        {{- if ne $key 0 -}}
+        ,
+        {{- end -}}
         {{ with $.Site.GetPage (printf "/%s/%s" "tags" . ) }}
-            {{- .Title -}},
+            {{- .Title -}}
         {{- end }}
-        {{- end }}
-    {{- else -}}
-        Tutorials, Tips, Linux, Bash, Docker
-{{- end }}" />    
+    {{- end }}
+{{- else -}}
+    Default, Keywords, That, Describe, Your, Page
+{{- end }}" />
 
 <!-- Canonical URLs -->
 <link rel="canonical" href="{{ .Permalink }}" />