3 files changed, 11 insertions, 6 deletions

diff --git a/templates/base.html b/templates/base.html
index 4b8ea1e..48d7c72 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -52,10 +52,8 @@ ${pageHeader()}
 $body$
 
             $if(section.is_blog)$
-                $if(pages.not_empty)$
-                    ${categoryRef()}
-                    ${pagelistByYear()}
-                $endif$
+                ${categoriesById()}
+                ${pagelistByYear()}
             $endif$
         </div>
     </main>
diff --git a/templates/categoriesByCount.html b/templates/categoriesByCount.html
new file mode 100644
index 0000000..871e3db
--- /dev/null
+++ b/templates/categoriesByCount.html
@@ -0,0 +1,7 @@
+$if(categories.by_count)$
+    <ul class="c-hlist">
+        $for(categories.by_count)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
+        $endfor$
+    </ul>
+$endif$
diff --git a/templates/categoryRef.html b/templates/categoriesById.html
index 58dc5fe..1f4f433 100644
--- a/templates/categoryRef.html
+++ b/templates/categoriesById.html
@@ -1,6 +1,6 @@
-$if(categories)$
+$if(categories.by_id)$
     <ul class="c-hlist">
-        $for(categories)$
+        $for(categories.by_id)$
             <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
         $endfor$
     </ul>