diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 3708212f4..8ab1eb811 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -27,7 +27,7 @@ <h2 class="single-title" itemprop="name headline">
         <span title="{{ $title }}" class="icon-repost">{{- $icon | partial "plugin/icon.html" -}}</span>
       {{- end -}}
     {{- end -}}
-    <a href="{{ .RelPermalink }}">{{ .Title }}</a>
+    <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
   </h2>
 
   {{- /* Meta */ -}}
diff --git a/layouts/partials/single/collection-list.html b/layouts/partials/single/collection-list.html
index b58524482..c2627591c 100644
--- a/layouts/partials/single/collection-list.html
+++ b/layouts/partials/single/collection-list.html
@@ -4,9 +4,7 @@
 {{- if .Params.collections | and $params.collectionList -}}
   {{- $collectionTerms := .GetTerms "collections" -}}
   {{- range $collectionTerms -}}
-    {{- $pages := .Pages -}}
-    {{- $prev := cond $.Site.Params.navigationReverse ($pages.Next $) ($pages.Prev $) -}}
-    {{- $next := cond $.Site.Params.navigationReverse ($pages.Prev $) ($pages.Next $) -}}
+    {{- $pages := (where .Pages "Params.Weight" "!=" nil) | append (where .Pages "Params.Weight" "eq" nil).ByDate -}}
     {{- $open := eq (index $collectionTerms 0) . -}}
     {{- $currentKey := 0 -}}
 
@@ -30,7 +28,7 @@
             {{- end -}}
           </ul>
           <div class="collection-nav-simple">
-            {{- with $prev -}}
+            {{- with $pages.Next $ -}}
               <a href="{{ .RelPermalink }}" class="collection-nav-item" rel="prev" title="{{ .LinkTitle }}">
                 {{- dict "Class" "fa-solid fa-angle-left fa-fw" | partial "plugin/icon.html" -}}
               </a>
@@ -38,7 +36,7 @@
               {{- dict "Class" "fa-solid fa-angle-left fa-fw collection-nav-item text-secondary" | partial "plugin/icon.html" -}}
             {{- end -}}
             <span class="text-secondary">{{ add $currentKey 1 }}/{{ $pages.Len }}</span>
-            {{- with $next -}}
+            {{- with $pages.Prev $ -}}
               <a href="{{ .RelPermalink }}" class="collection-nav-item" rel="next" title="{{ .LinkTitle }}">
                 {{- dict "Class" "fa-solid fa-angle-right fa-fw" | partial "plugin/icon.html" -}}
               </a>
diff --git a/layouts/partials/single/collection-nav.html b/layouts/partials/single/collection-nav.html
index cd1cfe5dd..dae4c6ec5 100644
--- a/layouts/partials/single/collection-nav.html
+++ b/layouts/partials/single/collection-nav.html
@@ -12,18 +12,17 @@
     -}}
     <div class="collection-card">
       <div class="collection-title text-secondary">
-        {{ dict "Collections" $termLink | T "single.includedIn.collections" | safeHTML }} {{ .Pages.Len }}
+        {{- dict "Collections" $termLink | T "single.includedIn.collections" | safeHTML }} {{ .Pages.Len -}}
       </div>
       <div class="collection-nav">
-        {{- $prev := cond $.Site.Params.navigationReverse (.Pages.Next $) (.Pages.Prev $) -}}
-        {{- $next := cond $.Site.Params.navigationReverse (.Pages.Prev $) (.Pages.Next $) -}}
-        {{- with $prev -}}
+        {{- $pages := (where .Pages "Params.Weight" "!=" nil) | append (where .Pages "Params.Weight" "eq" nil).ByDate -}}
+        {{- with $pages.Next $ -}}
           <a href="{{ .RelPermalink }}" class="collection-nav-item" rel="prev" title="{{ .LinkTitle }}">
             {{- dict "Class" "fa-solid fa-angle-left fa-fw" | partial "plugin/icon.html" -}}
             <span>{{- .LinkTitle -}}</span>
           </a>
         {{- end -}}
-        {{- with $next -}}
+        {{- with $pages.Prev $ -}}
           <a href="{{ .RelPermalink }}" class="collection-nav-item" rel="next" title="{{ .LinkTitle }}">
             <span>{{- .LinkTitle -}}</span>
             {{- dict "Class" "fa-solid fa-angle-right fa-fw" | partial "plugin/icon.html" -}}