diff --git a/layouts/partials/sidebar/nested-menu.html b/layouts/partials/sidebar/nested-menu.html
index 792ef5071..25e47c8d4 100644
--- a/layouts/partials/sidebar/nested-menu.html
+++ b/layouts/partials/sidebar/nested-menu.html
@@ -9,7 +9,7 @@
 {{ range $menu }}
   <li class="nav-category {{ if eq $page.RelPermalink .URL }}active{{end}}">
     {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-    <a href="{{ .URL }}">{{ .Name }} {{ $isV2 }}{{ if $isV2 }}{{ template "productTag" . }}{{ end }}</a>
+    <a href="{{ .URL }}">{{ .Name }} {{ if $isV2 }}{{ template "productTag" . }}{{ end }}</a>
     {{ if .HasChildren }}
       <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
       {{ range .Children }}
diff --git a/layouts/partials/topnav/version-selector.html b/layouts/partials/topnav/version-selector.html
index 4078c9999..af978059f 100644
--- a/layouts/partials/topnav/version-selector.html
+++ b/layouts/partials/topnav/version-selector.html
@@ -7,7 +7,7 @@
 <div class="dropdown">
   <p class="selected">{{ $currentVersion }}</p>
   <ul class="item-list">
-    <li><a href="https://github.com/influxdata/docs.influxdata.com" class="legacy" target="_blank">older</a></li>
+    <li><a href="https://archive.docs.influxdata.com/{{ $product }}/" class="legacy" target="_blank">older</a></li>
     {{ range (index .Site.Data.products $product).versions }}
       <li>
         <a href="/{{ $product }}/{{ . }}/" {{ if eq . $currentVersion }}class="active"{{ end }}>{{ . }}</a>