diff --git a/THANKS.md b/THANKS.md
index f758b2bcb..771d9b662 100644
--- a/THANKS.md
+++ b/THANKS.md
@@ -30,6 +30,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 <!-- markdownlint-enable -->
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
diff --git a/templates/_includes/smo_metadata.html b/templates/_includes/smo_metadata.html
index 927f0e47f..041937d31 100644
--- a/templates/_includes/smo_metadata.html
+++ b/templates/_includes/smo_metadata.html
@@ -12,14 +12,4 @@
 {% endif %}
 <meta name="twitter:title" content="{{ article.title|striptags|e }} {%if article.subtitle %} - {{ article.subtitle|striptags|e }} {% endif %}">
 <meta name="twitter:description" content="{{article.summary|striptags|e}}">
-{% if article.featured_image %}
-<meta property="og:image" content="{{article.featured_image}}" />
-<meta name="twitter:image" content="{{article.featured_image}}" >
-{% else %}
-{% from '_includes/_defaults.html' import FEATURED_IMAGE with context %}
-    {% if FEATURED_IMAGE %}
-<meta property="og:image" content="{{FEATURED_IMAGE}}" />
-<meta name="twitter:image" content="{{FEATURED_IMAGE}}" >
-    {% endif %}
-{% endif %}
 {% endmacro %}
diff --git a/templates/base.html b/templates/base.html
index 4b81c2d1f..be196e9ca 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,9 +21,21 @@
         <meta name="author" content="{{ AUTHOR }}" />
         {% endif %}
 
+        {% if article and article.featured_image %}
+        <meta property="og:image" content="{{article.featured_image}}" />
+        <meta name="twitter:image" content="{{article.featured_image}}" >
+        {% else %}
+        {% from '_includes/_defaults.html' import FEATURED_IMAGE with context %}
+            {% if FEATURED_IMAGE %}
+        <meta property="og:image" content="{{FEATURED_IMAGE}}" />
+        <meta name="twitter:image" content="{{FEATURED_IMAGE}}" >
+            {% endif %}
+        {% endif %}
+
         {% from '_includes/_defaults.html' import SITE_DESCRIPTION with context %}
         {% if SITE_DESCRIPTION %}
         <meta name="description" content="{% block head_description %}{{ SITE_DESCRIPTION|e }}{% endblock head_description %}" />
+        <meta name="twitter:description" content="{{SITE_DESCRIPTION|e}}">
         {% endif %}
         {% block meta_tags_in_head %}
         {% from '_includes/_defaults.html' import TWITTER_USERNAME with context %}
diff --git a/templates/index.html b/templates/index.html
index 316d52569..71a754279 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -15,18 +15,11 @@
 <meta name="twitter:title" content="{{ SITENAME|striptags|e }}">
 {% endif %}
 <meta property="og:url" content="{{ SITEURL }}" />
-{% from '_includes/_defaults.html' import SITE_DESCRIPTION with context %}
-{% if SITE_DESCRIPTION %}
-<meta property="og:description" content="{{SITE_DESCRIPTION|e}}" />
-<meta name="twitter:description" content="{{SITE_DESCRIPTION|e}}">
-{% endif %}
 <meta property="og:site_name" content="{{ SITENAME|striptags|e }}" />
 <meta property="og:article:author" content="{{ AUTHOR }}" />
-{% from '_includes/_defaults.html' import FEATURED_IMAGE with context %}
-{% if FEATURED_IMAGE %}
-<meta property="og:image" content="{{FEATURED_IMAGE}}" />
-<meta name="twitter:image" content="{{FEATURED_IMAGE}}" >
-{% endif %}
+<!-- Fill in Site Keywords-->
+<meta name="keywords" content="{% for tag, articles in tags|sort %} {{ tag }}, {% endfor %}" />
+
 {% endblock meta_tags_in_head %}
 
 {% block content %}