diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index 3b9741e6b..abdf0b05c 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -14,7 +14,8 @@
     </header>
     <article>
         <h1>All {{.Title}}</h1>
-        {{partial "page-list.html" .Pages.ByLastmod.Reverse }}
+        {{partial "page-list.html" .Paginator.Pages.ByLastmod.Reverse }}
+        {{ template "_internal/pagination.html" .}}
     </article>
     {{partial "contact.html" .}}
 </div>
diff --git a/layouts/partials/graph.html b/layouts/partials/graph.html
index cd5577f4d..f0893569e 100644
--- a/layouts/partials/graph.html
+++ b/layouts/partials/graph.html
@@ -146,7 +146,7 @@
     .attr("fill", color)
     .style("cursor", "pointer")
     .on("click", (_, d) => {
-      window.location.href = {{.Site.BaseURL}} + d.id.replace(" ", "-").replace("%20", "-");
+      window.location.href = {{.Site.BaseURL}} + decodeURI(d.id).replace(/[\s_]+/g, '-')
     })
     .on("mouseover", function (_, d) {
       d3.selectAll(".node")
@@ -204,7 +204,7 @@
   const labels = graphNode.append("text")
     .attr("dx", 12)
     .attr("dy", ".35em")
-    .text((d) => content[d.id.replace("%20", "-")]?.title || "Untitled")
+    .text((d) => content[decodeURI(d.id).replace(/[\s_]+/g, '-')]?.title || "Untitled")
     .style("opacity", 0)
     .style("pointer-events", "none")
     .call(drag(simulation));