diff --git a/builders/html/templates/category.cfm b/builders/html/templates/category.cfm
index cab6315bd..802465090 100644
--- a/builders/html/templates/category.cfm
+++ b/builders/html/templates/category.cfm
@@ -8,13 +8,22 @@
 	local.pages    = args.docTree.sortPagesByType( local.pages );
 
 	local.currentPageType = "";
-	local.pageTypeTitles = {
-		"function" = "Functions",
-		 "_method" = "Methods",
-		 "_object" = "Objects",
-		"tag"      = "Tags",
-		"category" = "Categories",
-	};
+	local.pageTypeTitles = [
+		"function" = { title="Functions", pages=0 },
+		"tag"      = { title="Tags", pages=0 },
+		 "_method" = { title="Methods", pages=0 },
+		 "_object" = { title="Objects", pages=0 },
+		"category" = { title="Categories", pages=0 },
+		"page"     = { title="Guides",pages=0 }
+	];
+
+	local.missingPageTypes = {};
+	loop array="#local.pages#" index="local.i" item="local.page" {
+		if ( !structKeyExists(local.pageTypeTitles, local.page.getPageType() ) ) {
+			throw "Unknown page type: [ #local.page.getPageType()# ]";
+		}
+		local.pageTypeTitles[local.page.getPageType()].pages++;
+	}
 </cfscript>
 
 
@@ -25,18 +34,17 @@
 	<cfif not pages.len()>
 		<p><em>There are no pages tagged with this category.</em></p>
 	<cfelse>
-		<cfloop array="#local.pages#" index="local.i" item="local.page">
-			<cfif local.page.getPageType() != local.currentPageType>
-				<cfif local.currentPageType.len()>
-					</ul>
-				</cfif>
-				<cfset local.currentPageType = local.page.getPageType()>
-				<h2>#( local.pageTypeTitles[ local.page.getPageType() ] ?: "Guides" )#</h2>
+		<cfloop collection="#local.pageTypeTitles#" key="local.pageTypeKey" value="local.pageType">
+			<cfif local.pageType.pages gt 0>
+				<h2>#( local.pageType.title )#</h2>
 				<ul class="list-unstyled">
+				<cfloop array="#local.pages#" index="local.i" item="local.page">
+					<cfif local.pageTypeKey eq local.page.getPageType()>
+						<li>[[#htmleditformat(local.page.getId())#]] #htmleditformat( getMetaDescription(local.page, local.page.getBody()) )#</li>
+					</cfif>
+				</cfloop>
+				</ul>
 			</cfif>
-
-			<li>[[#htmleditformat(local.page.getId())#]] #htmleditformat( getMetaDescription(local.page, local.page.getBody()) )#</li>
 		</cfloop>
-		</ul>
 	</cfif>
 </cfoutput>
\ No newline at end of file
diff --git a/docs/05.categories/090.esapi/category.md b/docs/05.categories/090.esapi/category.md
index 455c7764f..17683a51f 100644
--- a/docs/05.categories/090.esapi/category.md
+++ b/docs/05.categories/090.esapi/category.md
@@ -1,7 +1,8 @@
 ---
 title: Encode/Decode
 id: category-esapi
-related:
+categories:
+- category-core
 ---
 
-Enterprise Security API
+Used to prevent XSS, these functions use the ESAPI (Enterprise Security API) library to safely handle user input.