diff --git a/layouts/index.html b/layouts/index.html
index 4bbbde398..31e7fab71 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -11,9 +11,11 @@ <h1>{{ .Params.heading }}<span class="fancy">.</span></h1>
     {{ if isset .Params "handle" }}
     <span class="handle">@{{ .Params.handle }}</span>
     {{ end }}
+    {{ if isset .Params "subheading" }}
     <h2>
       {{ .Params.subheading }}
     </h2>
+    {{ end }}
     <!-- Replace MEEEEE -->
 
     {{ partial "social-icons.html" .}}
diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html
index b9795c93e..a7b25199b 100644
--- a/layouts/taxonomy/tag.html
+++ b/layouts/taxonomy/tag.html
@@ -4,10 +4,11 @@
 
 {{ define "main" }}
   {{ $dateFormat := .Site.Params.dateFormat | default "Jan 2 2006" }}
+  {{ $blogDir := .Site.Params.blogDir | default "/blog" }}
 
   <div class="post-list__container">
     <div class="tag__header">
-      <a href="/blog">{{ i18n "all_posts" }}</a><span class="separator">/</span>
+      <a href="{{ $blogDir }}">{{ i18n "all_posts" }}</a><span class="separator">/</span>
       <h1 class="tag__term">{{ .Title }}</h1>
     </div>
     <ul class="post-list">