diff --git a/README-CyBOK-Scenarios-Indexed.md b/README-CyBOK-Scenarios-Indexed.md
index 07f7f62ac..63a2b46a4 100644
--- a/README-CyBOK-Scenarios-Indexed.md
+++ b/README-CyBOK-Scenarios-Indexed.md
@@ -12,13 +12,13 @@ You can browse the list below in terms of the [CyBOK Knowledge Areas, and Topics
 
 # Scenarios Indexed By CyBOK Knowledge Area (KA)
 
-[Authentication, Authorisation &amp; Accountability (AAA)](#authentication,-authorisation-amp;-accountability-aaa)</br>
-[Operating Systems &amp; Virtualisation (OSV)](#operating-systems-amp;-virtualisation-osv)</br>
-[Web &amp; Mobile Security (WAM)](#web-amp;-mobile-security-wam)</br>
+[Authentication, Authorisation &amp; Accountability (AAA)](#authentication,-authorisation--accountability-aaa)</br>
+[Operating Systems &amp; Virtualisation (OSV)](#operating-systems--virtualisation-osv)</br>
+[Web &amp; Mobile Security (WAM)](#web--mobile-security-wam)</br>
 [Software Security (SS)](#software-security-ss)</br>
 [Network Security (NS)](#network-security-ns)</br>
-[Security Operations &amp; Incident Management (SOIM)](#security-operations-amp;-incident-management-soim)</br>
-[Malware &amp; Attack Technology (MAT)](#malware-amp;-attack-technology-mat)</br>
+[Security Operations &amp; Incident Management (SOIM)](#security-operations--incident-management-soim)</br>
+[Malware &amp; Attack Technology (MAT)](#malware--attack-technology-mat)</br>
 [Adversarial Behaviours (AB)](#adversarial-behaviours-ab)</br>
 [Forensics (F)](#forensics-f)</br>
 [Cyber-Physical Systems Security (CPS)](#cyber-physical-systems-security-cps)</br>
diff --git a/lib/CyBOK/template_CyBOK_scenarios.md.erb b/lib/CyBOK/template_CyBOK_scenarios.md.erb
index 8df135da8..b804b72b1 100644
--- a/lib/CyBOK/template_CyBOK_scenarios.md.erb
+++ b/lib/CyBOK/template_CyBOK_scenarios.md.erb
@@ -16,7 +16,7 @@ You can browse the list below in terms of the [CyBOK Knowledge Areas, and Topics
 KA_TOPIC_SCENARIOS_HASH.each{|ka,hash|
 ka_title = "#{CyBOK_ACRONYMS[ka]} (#{ka})"
 -%>
-[<%= ka_title %>](#<%= ka_title.downcase.delete('&\/().').gsub(/ /, '-') %>)</br>
+[<%= ka_title %>](#<%= ka_title.downcase.gsub(/&amp;/, '').delete('&\/().').gsub(/ /, '-') %>)</br>
 <%
 } -%>
 <%