diff --git a/list.tmpl b/list.tmpl
index 65e5ad9..e90cb2f 100644
--- a/list.tmpl
+++ b/list.tmpl
@@ -92,7 +92,7 @@ pre {
 		{{ if $hasentries }}<h4 class="version">{{ $tar }} <span class="small">({{$version.Timestamp.Format "02 Jan 06"}})</span></h4> {{ end }}
 		{{ if $hasfeatures }}
 		<h5 class="features">Features</h5>
-		{{- range $sorter.Sort ($features.ByCategory $cat) }}
+		{{- range $sorter.Sort ($features.ByCategoryAndTarget $cat $tar) }}
 		  <details>
 		    <summary>
 		      {{ if .IsHandled }}<span title="assigned to {{.Handler.Name}}">🥷</span>{{else}}<span title="unassigned">❓</span>{{end}}
@@ -105,7 +105,7 @@ pre {
 		{{ end }}
 		{{ if $hasissues }}
 	        <h5 class="issues">Issues</h5>
-	        {{- range $sorter.Sort ($issues.ByCategory $cat) }}
+	        {{- range $sorter.Sort ($issues.ByCategoryAndTarget $cat $tar) }}
 		<details>
 		  <summary>
 		    {{ if .IsHandled }}<span title="assigned to {{.Handler.Name}}">🥷</span>{{else}}<span title="unassigned">❓</span>{{end}}