diff --git a/Models/ContentTypes/Page.Generated.cs b/Models/ContentTypes/Page.Generated.cs
index 1c3b6f7..f36cd46 100644
--- a/Models/ContentTypes/Page.Generated.cs
+++ b/Models/ContentTypes/Page.Generated.cs
@@ -14,6 +14,7 @@ public partial class Page
     {
         public const string Codename = "page";
         public const string BodyCodename = "body";
+        public const string CategoriesCodename = "categories";
         public const string ImageCodename = "image";
         public const string MetadataMetaDescriptionCodename = "metadata__meta_description";
         public const string MetadataMetaKeywordsCodename = "metadata__meta_keywords";
@@ -27,10 +28,12 @@ public partial class Page
         public const string MetadataTwitterSiteCodename = "metadata__twitter_site";
         public const string RelatedCodename = "related";
         public const string SettingsCodename = "settings";
+        public const string TagsCodename = "tags";
         public const string TitleCodename = "title";
         public const string UrlSlugCodename = "url_slug";
 
         public string Body { get; set; }
+        public IEnumerable<ITaxonomyTerm> Categories { get; set; }
         public IEnumerable<IAsset> Image { get; set; }
         public string MetadataMetaDescription { get; set; }
         public string MetadataMetaKeywords { get; set; }
@@ -45,6 +48,7 @@ public partial class Page
         public IEnumerable<object> Related { get; set; }
         public IEnumerable<IMultipleChoiceOption> Settings { get; set; }
         public IContentItemSystemAttributes System { get; set; }
+        public IEnumerable<ITaxonomyTerm> Tags { get; set; }
         public string Title { get; set; }
         public string UrlSlug { get; set; }
     }
diff --git a/Models/ContentTypes/Post.Generated.cs b/Models/ContentTypes/Post.Generated.cs
index 18416e6..98a403e 100644
--- a/Models/ContentTypes/Post.Generated.cs
+++ b/Models/ContentTypes/Post.Generated.cs
@@ -15,6 +15,7 @@ public partial class Post
         public const string Codename = "post";
         public const string AuthorCodename = "author";
         public const string BodyCodename = "body";
+        public const string CategoriesCodename = "categories";
         public const string ImageCodename = "image";
         public const string MetadataMetaDescriptionCodename = "metadata__meta_description";
         public const string MetadataMetaKeywordsCodename = "metadata__meta_keywords";
@@ -36,6 +37,7 @@ public partial class Post
 
         public IEnumerable<object> Author { get; set; }
         public string Body { get; set; }
+        public IEnumerable<ITaxonomyTerm> Categories { get; set; }
         public IEnumerable<IAsset> Image { get; set; }
         public string MetadataMetaDescription { get; set; }
         public string MetadataMetaKeywords { get; set; }
diff --git a/Pipelines/Pages.cs b/Pipelines/Pages.cs
index 3e0898c..d23509b 100644
--- a/Pipelines/Pages.cs
+++ b/Pipelines/Pages.cs
@@ -7,6 +7,7 @@
 using Statiq.Core;
 using Statiq.Razor;
 using Statiq.SearchIndex;
+using System.Linq;
 
 namespace Kentico.Kontent.Statiq.Lumen.Pipelines
 {
@@ -19,6 +20,10 @@ public Pages(IDeliveryClient deliveryClient, SiteSettings site)
                 new Kontent<Page>(deliveryClient)
                     .OrderBy(Post.TitleCodename, SortOrder.Descending)
                     .WithQuery(new DepthParameter(2), new IncludeTotalCountParameter()),
+                new SetMetadata(nameof(Page.Tags),
+                    KontentConfig.Get<Page,string[]>(post => post.Tags?.Select(t => t.Codename).ToArray())),
+                new SetMetadata(nameof(Page.Categories),
+                    KontentConfig.Get<Page,string[]>(post => post.Categories?.Select(t => t.Codename).ToArray())),
                 new SetDestination(KontentConfig.Get((Page page) => new NormalizedPath(page.Url))),
                 new SetMetadata(SearchIndex.SearchItemKey, Config.FromDocument((doc, ctx) =>
                 {
diff --git a/Pipelines/Posts.cs b/Pipelines/Posts.cs
index 7e37651..0bf46b0 100644
--- a/Pipelines/Posts.cs
+++ b/Pipelines/Posts.cs
@@ -21,6 +21,8 @@ public Posts(IDeliveryClient deliveryClient, SiteSettings site)
                     .WithQuery(new DepthParameter(2), new IncludeTotalCountParameter()),
                 new SetMetadata(nameof(Post.Tags),
                     KontentConfig.Get<Post,string[]>(post => post.Tags?.Select(t => t.Codename).ToArray())),
+                new SetMetadata(nameof(Post.Categories),
+                    KontentConfig.Get<Post,string[]>(post => post.Categories?.Select(t => t.Codename).ToArray())),
                 new SetDestination(KontentConfig.Get((Post post)  => new NormalizedPath(post.Url))),
                 new SetMetadata(SearchIndex.SearchItemKey, Config.FromDocument((doc,ctx)=>
                 {
diff --git a/appsettings.json b/appsettings.json
index 375eb4c..25086ce 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -2,7 +2,7 @@
   "DeliveryOptions": {
     "ProjectId": "e10d7fbd-315f-01e2-20a5-e067cdf43f2f"
   },
-  "LinkHideExtensions": "true",
+  "LinkHideExtensions": false,
   "Host": "",
   "LinksUseHttps": true,
   "LinkRoot": "",
diff --git a/input/Shared/postbox.cshtml b/input/Shared/postbox.cshtml
index e6b5f75..0d868c8 100644
--- a/input/Shared/postbox.cshtml
+++ b/input/Shared/postbox.cshtml
@@ -9,13 +9,13 @@
 <div class="blog-grid-item">
     <div class="card h-100">
         <div class="maxthumb">
-            <a href="@Model.Url">
+            <a href="@Html.GetLink(Model.Url)">
                 @Html.Image(Model.Image, Model.Title, site.LazyImages, 580, 400, ImageFitMode.Crop, new { @class = "img-thumb" })
             </a>
         </div>
         <div class="card-body">
             <h2 class="card-title">
-                <a class="text-dark" href="@Model.Url">@Model.Title</a>
+                <a class="text-dark" href="@Html.GetLink(Model.Url)">@Model.Title</a>
                 @if (Model.Rating.HasValue)
                 {
     <div class="mb-2 mt-2 font-weight-normal">
diff --git a/input/Shared/related-posts.cshtml b/input/Shared/related-posts.cshtml
new file mode 100644
index 0000000..4275d1e
--- /dev/null
+++ b/input/Shared/related-posts.cshtml
@@ -0,0 +1,39 @@
+@using Kentico.Kontent.Statiq.Memoirs.Models
+@model Kentico.Kontent.Statiq.Memoirs.Models.Post
+<!-- Related Posts
+================================================== -->
+@if (!Model.Tags.Any() && !Model.Categories.Any() && !Model.Related.Any())
+{
+    return;
+}
+
+<div class="related-posts">  
+   
+    <h2 class="text-center mb-4">Explore more like this</h2>
+    
+    <div class="d-flex justify-content-center align-items-center">
+    
+    <!-- Categories -->
+    @foreach (var category in Model.Categories.OrderBy(c => c.Name))
+    {
+        <a class="smoothscroll badge badge-primary text-capitalize" href="@Html.GetLink($"/categories#{category.Codename}")">@category.Name</a>
+    }
+
+    <!-- Tags -->  
+    @foreach (var tag in Model.Tags.OrderBy(c => c.Name))
+    {
+        <a class="smoothscroll badge badge-primary text-capitalize" href="@Html.GetLink($"/tags#{tag.Codename}")">@tag.Name</a>
+    }
+
+    </div>
+
+    @if (Model.Related.Any())
+    {
+        <div class="blog-grid-container">
+            @foreach (IPageMetadata related in Model.Related.OfType<IPageMetadata>().Take(3))
+            {
+                <partial name="postbox" model="related"/>
+            }
+        </div>
+    }
+</div>
\ No newline at end of file
diff --git a/input/Shared/related-posts.html b/input/Shared/related-posts.html
deleted file mode 100644
index c35b749..0000000
--- a/input/Shared/related-posts.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- Related Posts
-================================================== -->
-<div class="{% unless page.categories == empty %} related-posts {% endunless %}">  
-
-    {% unless page.categories == empty %}
-    <h2 class="text-center mb-4">Explore more like this</h2>
-    {% endunless %}
-    
-    <div class="d-flex justify-content-center align-items-center">
-    
-    <!-- Categories -->
-    {% assign sortedCategories = page.categories | sort %}
-    {% for category in sortedCategories %}
-    <a class="smoothscroll badge badge-primary text-capitalize" href="{{site.baseurl}}/categories#{{ category | replace: " ","-" }}">{{ category }}</a>                
-    {% endfor %}
-
-    <!-- Tags -->  
-    {% assign sortedTags = page.tags | sort %}
-    {% for tag in sortedTags %}                
-    <a class="smoothscroll badge badge-primary text-capitalize" href="{{site.baseurl}}/tags#{{ tag | replace: " ","-" }}">{{ tag }}</a>               
-    {% endfor %}
-
-    </div>
-
-    {% assign maxRelated = 3 %}
-    {% assign minCommonTags =  1 %}
-    {% assign maxRelatedCounter = 0 %}
-    <div class="blog-grid-container">
-        {% for post in site.posts %}
-        
-            {% assign sameTagCount = 0 %}
-            {% assign commonTags = '' %}
-        
-            {% for category in post.categories %}
-            {% if post.url != page.url %}
-                {% if page.categories contains category %}
-                {% assign sameTagCount = sameTagCount | plus: 1 %}
-                {% capture tagmarkup %} {{ category }} {% endcapture %}
-                {% assign commonTags = commonTags | append: tagmarkup %}
-                {% endif %}
-            {% endif %}
-            {% endfor %}
-        
-            {% if sameTagCount >= minCommonTags %}
-            {% include postbox.html %}
-            {% assign maxRelatedCounter = maxRelatedCounter | plus: 1 %}
-            {% if maxRelatedCounter >= maxRelated %}
-                {% break %}
-            {% endif %}
-            {% endif %}
-        
-        {% endfor %}
-        </div>        
-</div>
\ No newline at end of file
diff --git a/input/post.cshtml b/input/post.cshtml
index 908f2d3..338d66d 100644
--- a/input/post.cshtml
+++ b/input/post.cshtml
@@ -30,10 +30,7 @@ else
 <partial name="Shared/_featured-image" model="Model.Image" />
 
 <!-- Content -->
-@* {% include article.html %} *@
-<div class="article-post">
-    @Html.Raw(Model.Body)
-</div>
+<partial name="Shared/_article" model="Model"/>
 
 <!-- Rating -->
 @if (Model.Rating.HasValue)
@@ -46,13 +43,13 @@ else
 <partial name="Shared/author-box" model="author" />
 
 <!-- Comments if not disabled with comments: false -->
-<partial name="comments" model="Model"/>
+<partial name="Shared/comments" model="Model"/>
 
 <!-- Share -->
 <partial name="Shared/share" model="Model" />
 
 <!-- Related Post -->
-{% include related-posts.html %}
+<partial name="Shared/related-posts" model="Model" />
 
 <!-- Review with LD-JSON, adapt it for your needs if you like, but make sure you test the generated HTML source code first:
 https://search.google.com/structured-data/testing-tool/u/0/