diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 54a5451a9..775613b1c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,4 @@
 {{ define "main" }}
-{{$title := .Title}}
 <span id="page-top"></span>
 <main class="main">
 	<article class="content" id="{{.Title | urlize}}">
@@ -8,11 +7,6 @@
 			{{- partial "page-title.html" . -}}
 			{{- partial "content-header-links.html" . -}}
 			{{- partial "tags.html" . -}}
-			<!-- temporary WIP badge; should be removed before site launch -->
-			<!-- {{- if .Params.wip -}}
-			<div id="beingreviewed">WIP</div>
-			{{- end -}} -->
-			{{ $title := .Title }}
 		</header>
 		<div class="body-copy" data-section={{.Section | urlize}}>
 		{{.Content}}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 15f851808..289ca4b25 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -6,7 +6,7 @@
 		</header>
 		<div class="body-copy taxonomies">
 			{{ $data := .Data }}
-			{{ $dataPlural := .Title | urlize}}
+			{{ $dataPlural := add (.Title | urlize) "/"}}
 			{{ $base := $.Site.BaseURL }}
 			<table class="terms-table">
 				<thead>
@@ -17,8 +17,10 @@
 				</thead>
 			<tbody>
 			{{ range $key, $value := .Data.Terms.Alphabetical }}
+			{{$val := $value.Name | urlize}}
+			{{$valurl := add $dataPlural $val}}
 			<tr>
-				<td><a href="{{ $base }}{{ $dataPlural }}/{{$value.Name | urlize}}">{{ $value.Name }}</a></td>
+				<td><a href="{{ $valurl | relURL}}">{{ $value.Name }}</a></td>
 				<td>{{ $value.Count }}</td>
 			</tr>
 	    {{ end }}