diff --git a/_includes/index.html b/_includes/index.html
index 21c321494..5a70ee55d 100644
--- a/_includes/index.html
+++ b/_includes/index.html
@@ -3,7 +3,7 @@
   {% capture path %}{{url}}index.html{% endcapture %}
   {% assign_page link_data = path %}
 <div>
-  <h2><a href="{{ site.baseurl }}{{ url }}">{{ link_data.title }}</a></h2>
+  <h2><a href="{{ site.baseurl }}{{ url }}">{{ link_data.title_nav | or:link_data.title }}</a></h2>
   <p>{{ link_data.description_short | or:link_data.description }}</p>
 </div>
 {% endfor %}
diff --git a/advanced/index.md b/advanced/index.md
index 3e5b2d663..460a09660 100644
--- a/advanced/index.md
+++ b/advanced/index.md
@@ -5,6 +5,11 @@ title_nav: Advanced topics
 description: Information and guides for developers wanting to build advanced capabilities into TinyMCE.
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "advanced" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'advanced'" | first | map: "pages" %}
 {% include index.html links=links %}
diff --git a/cloud-deployment-guide/index.md b/cloud-deployment-guide/index.md
index cf1490959..5763846f9 100644
--- a/cloud-deployment-guide/index.md
+++ b/cloud-deployment-guide/index.md
@@ -5,6 +5,11 @@ title_nav: Cloud deployment guide
 description: Start here for Tiny Cloud.
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "cloud-deployment-guide" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'cloud-deployment-guide'" | first | map: "pages" %}
-{% include index.html links=links %}
+{% include index.html links=links %}
\ No newline at end of file
diff --git a/configure/index.md b/configure/index.md
index 4b8cd23f5..10768abbc 100644
--- a/configure/index.md
+++ b/configure/index.md
@@ -6,6 +6,11 @@ description_short: The most customizable rich text editor.
 description: TinyMCE is not only the most advanced rich text editor it's also the most customizable.
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "configure" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'configure'" | first | map: "pages" %}
-{% include index.html links=links %}
+{% include index.html links=links %}
\ No newline at end of file
diff --git a/demo/index.md b/demo/index.md
index e8ed73c0e..0af33b1ae 100644
--- a/demo/index.md
+++ b/demo/index.md
@@ -12,6 +12,11 @@ redirect_from:
   - /example-tutorial/
   - /try-tinymce/
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "demo" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'demo'" | first | map: "pages" %}
-{% include index.html links=links %}
+{% include index.html links=links %}
\ No newline at end of file
diff --git a/enterprise/index.md b/enterprise/index.md
index 7f163e2bb..6e7454e64 100644
--- a/enterprise/index.md
+++ b/enterprise/index.md
@@ -5,6 +5,11 @@ title_nav: Premium features
 description: Premium features from the makers of TinyMCE.
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "enterprise" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'enterprise'" | first | map: "pages" %}
 {% include index.html links=links %}
diff --git a/general-configuration-guide/index.md b/general-configuration-guide/index.md
index 651440163..c50c328ce 100644
--- a/general-configuration-guide/index.md
+++ b/general-configuration-guide/index.md
@@ -5,6 +5,11 @@ title_nav: Introduction &amp; getting started
 description: New to self-hosting TinyMCE? Start here.
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "general-configuration-guide" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'general-configuration-guide'" | first | map: "pages" %}
 {% include index.html links=links %}
diff --git a/integrations/index.md b/integrations/index.md
index ed3094399..027d641c0 100644
--- a/integrations/index.md
+++ b/integrations/index.md
@@ -5,6 +5,11 @@ title_nav: Integrations
 description: Faster development with integrations of TinyMCE into your favorite framework or CMS.
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "integrations" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'integrations'" | first | map: "pages" %}
 {% include index.html links=links %}
diff --git a/plugins/index.md b/plugins/index.md
index 3aabb6446..773dec9f6 100644
--- a/plugins/index.md
+++ b/plugins/index.md
@@ -6,6 +6,11 @@ description_short: This section will help you configure and extend your editor i
 description: TinyMCE is an incredibly powerful, flexible and customizable rich text editor. This section will help you configure and extend your editor instance.
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "plugins" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'plugins'" | first | map: "pages" %}
 {% include index.html links=links %}
diff --git a/release-notes/index.md b/release-notes/index.md
index eaa9675fa..c4bbe8c92 100644
--- a/release-notes/index.md
+++ b/release-notes/index.md
@@ -5,6 +5,11 @@ title_nav: Release notes for TinyMCE 5
 keywords: releasenotes newfeatures deleted technologypreview bugfixes knownissues
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "release-notes" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'release-notes'" | first | map: "pages" %}
 {% include index.html links=links %}
\ No newline at end of file
diff --git a/tinydrive/index.md b/tinydrive/index.md
index 1652a3dc8..f9c2c2fbd 100644
--- a/tinydrive/index.md
+++ b/tinydrive/index.md
@@ -5,6 +5,11 @@ title_nav: Tiny Drive
 description: Tiny Drive
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "tinydrive" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'tinydrive'" | first | map: "pages" %}
 {% include index.html links=links %}
diff --git a/ui-components/index.md b/ui-components/index.md
index 7a61a79b8..f9b1bccfd 100644
--- a/ui-components/index.md
+++ b/ui-components/index.md
@@ -6,7 +6,12 @@ description: The configurable UI components available for customization.
 keywords: toolbar toolbarbuttons buttons toolbarbuttonsapi
 type: folder
 ---
+{% assign navigaton = site.data.nav %}
+{% for entry in navigaton %}
+  {% if entry.url == "ui-components" %}
+    {% assign links = entry.pages %}
+  {% endif %}
+{% endfor %}
 
-{% assign links = site.data | where_exp:"nav", "nav.url == 'ui-components'" | first | map: "pages" %}
 {% include index.html links=links %}