diff --git a/district/templates/district/district_article_page.html b/district/templates/district/district_article_page.html
index a94a0dd8e32c91ff852144f30016a967aab1a412..dc29515a44b0f91db7709c3254c10b345746bee2 100644
--- a/district/templates/district/district_article_page.html
+++ b/district/templates/district/district_article_page.html
@@ -24,7 +24,7 @@
         </div>
         <div class="my-4">
           {% for tag in page.tags.all %}
-            <a href="{{ page.root_page.tags_page.url }}#{{ tag }}" class="btn btn--grey-125 btn--condensed">
+            <a href="{{ page.root_page.tags_page.url }}?tag={{ tag.slug }}" class="btn btn--grey-125 btn--condensed">
               <div class="btn__body ">{{ tag }}</div>
             </a>
           {% endfor %}
diff --git a/region/templates/region/region_article_page.html b/region/templates/region/region_article_page.html
index 39ba9ce55d2872c8a79e67d39b1f2396fb3ef6f6..3fe265d808f88c2738b4df37294a10a452e12eb5 100644
--- a/region/templates/region/region_article_page.html
+++ b/region/templates/region/region_article_page.html
@@ -24,7 +24,7 @@
         </div>
         <div class="my-4">
           {% for tag in page.tags.all %}
-            <a href="{{ page.root_page.tags_page.url }}#{{ tag }}" class="btn btn--grey-125 btn--condensed">
+            <a href="{{ page.root_page.tags_page.url }}?tag={{ tag.slug }}" class="btn btn--grey-125 btn--condensed">
               <div class="btn__body ">{{ tag }}</div>
             </a>
           {% endfor %}
diff --git a/shared/jekyll_import.py b/shared/jekyll_import.py
index d90a53918263ee76d18ecdb8e05c8e8427695bb4..96fe829fe898afb6a48c6e9511cbc07697693577 100644
--- a/shared/jekyll_import.py
+++ b/shared/jekyll_import.py
@@ -499,6 +499,11 @@ class JekyllArticleImporter:
             meta_dict.update({key: value})
         return meta_dict
 
+    @staticmethod
+    def handle_tags(article, meta):
+        for tag_name in meta.get("tags", []):
+            article.tags.add(tag_name)
+
     def import_post(self, file_path):
 
         with open(os.path.join(self.path, file_path), "rt") as f:
@@ -556,9 +561,6 @@ class JekyllArticleImporter:
         article.seo_title = article.title + self.title_suffix
         article.search_description = meta.get("description", "")
 
-        # for tag in meta['tags']:
-        #     article.tags.add(tag)
-
         if meta.get("image", None):
             article.image, log_message = get_or_create_image(
                 self.path, meta["image"], self.collection, self.repo_name
@@ -586,6 +588,8 @@ class JekyllArticleImporter:
             self.skipped_counter += 1
             return article
 
+        self.handle_tags(article, meta)
+
         self.success_counter += 1
         return article