diff --git a/layouts/glossary/single.html b/layouts/glossary/single.html
index 71149dbd8c8..cffe2d0dc4b 100644
--- a/layouts/glossary/single.html
+++ b/layouts/glossary/single.html
@@ -265,6 +265,7 @@
{{ range $index, $term := . }}
{{ $term_str := printf "%s" $term }}
{{ $term_clean := replace $term_str "\u00a0" " " }}
+ {{ $term_clean = replaceRE `[*\\]` "" $term_clean }}
{{ $term_clean = replaceRE "\\s*\\(.*\\)" "" $term_clean }}
{{ $term_clean = replace $term_clean " " "_" }}
{{ $term_clean = replaceRE "[^a-zA-Z0-9_]" "_" $term_clean }}
@@ -276,9 +277,9 @@
{{ end }}
{{ if $term_page }}
{{ $term_url := $term_page.RelPermalink }}
- {{ $related_links = $related_links | append (printf "%s" $term_url $term) }}
+ {{ $related_links = $related_links | append (printf "%s" $term_url ($term_str | htmlEscape | markdownify)) }}
{{ else }}
- {{ $related_links = $related_links | append $term }}
+ {{ $related_links = $related_links | append ($term_str | htmlEscape | markdownify | string) }}
{{ end }}
{{ end }}
{{ $related_links_string := delimit $related_links ", " | safeHTML }}