diff --git a/assets/js/index.js b/assets/js/index.js
index 26f78b721..7bfa6c56c 100644
--- a/assets/js/index.js
+++ b/assets/js/index.js
@@ -108,7 +108,7 @@ Source:
         {{ else -}}
           description: {{ .Summary | plainify | jsonify }},
         {{ end -}}
-        content: {{ .Content | jsonify }}
+        content: {{ .Plain | jsonify }}
       })
       {{ if ne (add $index 1) $len -}}
         .add(
diff --git a/layouts/_default/_markup/.gitkeep b/layouts/_default/_markup/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
new file mode 100644
index 000000000..8abeac6c8
--- /dev/null
+++ b/layouts/_default/_markup/render-heading.html
@@ -0,0 +1 @@
+<h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ .Text | safeHTML }} <a href="#{{ .Anchor | safeURL }}" class="anchor" aria-hidden="true">#</a></h{{ .Level }}>
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index 5c58c5419..28bb90b24 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -31,7 +31,7 @@ <h1>{{ .Title }}</h1>
 				{{ partial "sidebar/docs-toc.html" . }}
 			</nav>
 			{{ end -}}
-			{{ partial "main/headline-hash.html" .Content }}
+			{{ .Content }}
 			{{ if .Site.Params.editPage -}}
 				{{ partial "main/edit-page.html" . }}
 			{{ end -}}
@@ -45,4 +45,4 @@ <h1>{{ .Title }}</h1>
 			-->
 		</main>
 	</div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/main/headline-hash.html b/layouts/partials/main/headline-hash.html
deleted file mode 100644
index 826fa32d3..000000000
--- a/layouts/partials/main/headline-hash.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ . | replaceRE "(<h[2-9] id=\"([^\"]+)\".+)(</h[2-9]+>)" `${1}<a href="#${2}" class="anchor" aria-hidden="true">#</a> ${3}` | safeHTML }}
\ No newline at end of file