diff --git a/scripts/docs/templates/api_menu.template.html b/scripts/docs/templates/api_menu.template.html
index 75452d3d2f..9cd013e797 100644
--- a/scripts/docs/templates/api_menu.template.html
+++ b/scripts/docs/templates/api_menu.template.html
@@ -5,10 +5,10 @@
     <@ else @>
 {% elsif page.versionHref == "<$ ver.href $>" %}
     <@ endif @>
-  {% include v2/api_menu_<$ ver.name $>.html %}
+  {% include v2_fluid/api_menu_flat_<$ ver.name $>.html %}
   <@ endif @>
 <@ endfor @>
 <# make the last case always be to show latest version #>
 {% else %}
-  {% include v2/api_menu_<$ version.latest.name $>.html %}
+  {% include v2_fluid/api_menu_flat_<$ version.latest.name $>.html %}
 {% endif %}
diff --git a/scripts/docs/templates/api_menu_flat_version.template.html b/scripts/docs/templates/api_menu_flat_version.template.html
index b5e1e12f80..92633f8932 100644
--- a/scripts/docs/templates/api_menu_flat_version.template.html
+++ b/scripts/docs/templates/api_menu_flat_version.template.html
@@ -1,4 +1,4 @@
 <@ for doc in docs @><@ if doc.URL @>
-<li class="{% if page.id == '{{<$ doc.name $> | slugify: 'pretty'}}' %}active{% endif %}">
-  <a href="<$ doc.URL $>"><$ doc.name $></a>
+<li class="{% if page.id == '{{<$ doc.name $> | slugify}}' %}active{% endif %}">
+  <a href="/<$ doc.URL $>"><$ doc.name $></a>
 </li><@ endif @><@ endfor @>
diff --git a/scripts/docs/templates/api_version_select.template.html b/scripts/docs/templates/api_version_select.template.html
index 93ccc9ddc3..6bb438084a 100644
--- a/scripts/docs/templates/api_version_select.template.html
+++ b/scripts/docs/templates/api_version_select.template.html
@@ -1,4 +1,6 @@
-<select name="version" id="version-toggle">
+<select name="version"
+        id="version-toggle"
+        onchange="window.location.href=this.options[this.selectedIndex].value">
 <@ for ver in version.list @>
   <option
    value="<$ ver.href $>/{% if page.path != ''%}{{page.path}}{% else %}api/{% endif %}"
diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html
index aafa5201ee..2556e73ee5 100644
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -4,7 +4,7 @@ version: "<$ version.current.name $>"
 versionHref: "<$ version.current.href $>"
 path: "<$ doc.path $>"
 category: api
-id: "{{<$ doc.name $> | slugify: 'pretty'}}"
+id: "{{<$ doc.name $> | slugify}}"
 title: "<@ if doc.docType == "directive" @><$ doc.name | dashCase $><@ else @><$ doc.name $><@ endif @>"
 header_sub_title: "<$ doc.docType | capital $> in module <$ doc.module $>"
 doc: "<$ doc.name $>"