diff --git a/content/v2.0/reference/flux/functions/all-functions.md b/content/v2.0/reference/flux/functions/all-functions.md
index 49ad31e2a..804cd2385 100644
--- a/content/v2.0/reference/flux/functions/all-functions.md
+++ b/content/v2.0/reference/flux/functions/all-functions.md
@@ -8,4 +8,6 @@ menu:
 weight: 299
 ---
 
+This list below contains all documented Flux functions:
+
 {{< list-all-functions >}}
diff --git a/layouts/shortcodes/children.html b/layouts/shortcodes/children.html
index 45e8e6f2e..41c8ca65d 100644
--- a/layouts/shortcodes/children.html
+++ b/layouts/shortcodes/children.html
@@ -27,7 +27,7 @@
 
 	<ul>
 	{{ range $pages.ByWeight }}
-		{{ $title := replaceRE `\(\)\ function` "" .Title }}
+		{{ $title := replaceRE `\ function` "" .Title }}
 		<li><a href="{{ .RelPermalink }}">{{ $title }}</a></li>
 	{{ end }}
 	<ul>
diff --git a/layouts/shortcodes/list-all-functions.html b/layouts/shortcodes/list-all-functions.html
index 9095b4c32..9777486b6 100644
--- a/layouts/shortcodes/list-all-functions.html
+++ b/layouts/shortcodes/list-all-functions.html
@@ -1,7 +1,13 @@
 {{ $currentVersion := (index (findRE "[^/]+.*?" .Page.URL) 0) }}
-{{ $menuID := print (replaceRE `\.` "_" $currentVersion) "_ref" }}
 {{ $functionsPath := print "/" $currentVersion "/reference/flux/functions" }}
 
-{{ $currentVersion}}
-{{ $menuID }}
-{{ $functionsPath }}
+<ul>
+{{ range where $.Site.RegularPages.ByTitle "Section" $currentVersion }}
+  {{ if in .Title "() function"  }}
+    {{ $title := replaceRE `\ function` "" .Title }}
+    <li>
+      <a href="{{ .URL }}">{{ $title }}</a>
+    </li>
+  {{ end }}
+{{ end }}
+</ul>