diff --git a/layouts/partials/footer/site-footer.html b/layouts/partials/footer/site-footer.html
index 43a5179..44415e6 100644
--- a/layouts/partials/footer/site-footer.html
+++ b/layouts/partials/footer/site-footer.html
@@ -1,6 +1,7 @@
 <footer class="footer">
     {{ partial "footer/select-lang" . }}
     {{ partial "footer/links-social.html" . }}
+    {{ partial "footer/links-feed.html" . }}
     {{ partial "footer/go-to-top" . }}
     <hr />
 
diff --git a/layouts/partials/head/scripts.html b/layouts/partials/head/scripts.html
index dba8cde..4566f39 100644
--- a/layouts/partials/head/scripts.html
+++ b/layouts/partials/head/scripts.html
@@ -880,7 +880,7 @@
                   descDiv = document.createElement('div');
                   descDiv.setAttribute('class', 'menu-item__desc');
                   descDiv.innerHTML = result.item.description;
-                } else {
+                } else if (result.item.content) {
                   descDiv = document.createElement('div');
                   descDiv.setAttribute('class', 'menu-item__desc');
                   descDiv.innerHTML = result.item.content.substring(0, 150);
diff --git a/layouts/partials/service/google-analytics.html b/layouts/partials/service/google-analytics.html
index 3527c0e..4059359 100644
--- a/layouts/partials/service/google-analytics.html
+++ b/layouts/partials/service/google-analytics.html
@@ -1,4 +1,22 @@
-{{ if not .Site.IsServer }}
-  {{ template "_internal/google_analytics.html" . }}
-  {{ template "_internal/google_analytics_async.html" . }}
-{{ end }}
\ No newline at end of file
+{{ if and (.Site.Params.googleAnalytics) (not .Site.IsServer) }}
+  <script>
+    {{ $googleAnalyticsId := .Site.Params.googleAnalytics }}
+    var googleAnalyticsId = JSON.parse({{ $googleAnalyticsId | jsonify }});
+
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script");
+      hm.src = "https://www.googletagmanager.com/gtag/js?id=" + googleAnalyticsId;
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', {{ .Site.Params.googleAnalytics }});
+  </script>
+{{ end }}
+
diff --git a/layouts/partials/summary/card.html b/layouts/partials/summary/card.html
index ed8187d..0339bd3 100644
--- a/layouts/partials/summary/card.html
+++ b/layouts/partials/summary/card.html
@@ -11,6 +11,13 @@
       &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
       {{ end }}
     </h6>
+    <div class="summary-card__tags">
+      {{ with .Params.tags }}
+        {{ range . }}
+          <span class="tag">{{ . }}</span>
+        {{ end }}
+      {{ end }}
+    </div>
   </header>
   <div class="summary-card__content">
     <div class="summary-card__text p2">
diff --git a/layouts/partials/summary/classic.html b/layouts/partials/summary/classic.html
index db71419..9d80c02 100644
--- a/layouts/partials/summary/classic.html
+++ b/layouts/partials/summary/classic.html
@@ -28,6 +28,20 @@
           &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
           {{ end }}
         </h6>
+        {{ with .Params.tags }}
+          <div class="summary-card__tags">
+            {{ $length := len . }}
+            {{ $lastIndex := sub $length 1 }}
+            {{ range $index, $tag := . }}
+              {{ if $tag }}
+                <a href="{{ $.Site.BaseURL }}/tags/{{ $tag | urlize }}" class="tag">#{{ $tag }}</a>
+                {{ if ne $index $lastIndex }}
+                  <span class="tag-delimiter">&middot;</span>
+                {{ end }}
+              {{ end }}
+            {{ end }}
+          </div>
+        {{ end }}
       </header>
       <div>
         <div class="summary-classic__text p2">