diff --git a/templates/queries-correspondent.tpl.html b/templates/queries-correspondent.tpl.html
index 87997add..bd0f6377 100644
--- a/templates/queries-correspondent.tpl.html
+++ b/templates/queries-correspondent.tpl.html
@@ -1,5 +1,12 @@
-<!--% query_hpr_shows = '
-		SELECT
+<!--% query_hpr_shows = 'WITH
+	comment_tallies AS (	
+		SELECT 
+			eps_id,
+			COUNT(eps_id) AS eps_tally
+		FROM comments
+		GROUP BY eps_id 
+	)
+	SELECT
 		eps.id,
 		eps.explicit,
 		eps.date, eps.license, eps.duration,
@@ -8,10 +15,12 @@
 		hosts.local_image,
 		hosts.hostid,
 		hosts.host, hosts.email, hosts.profile,
-		miniseries.name AS series, miniseries.id AS seriesid
+		miniseries.name AS series, miniseries.id AS seriesid,
+		COALESCE(comment_tallies.eps_tally,0) AS commentsTally
 	FROM eps
 	INNER JOIN hosts ON eps.hostid = hosts.hostid
 	INNER JOIN miniseries ON eps.series = miniseries.id
+	LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
 	WHERE hosts.hostid = ? AND eps.date < date(\'now\', \'+1 days\')
 	ORDER BY eps.id + 0 DESC
 	'
diff --git a/templates/queries-episodes.tpl.html b/templates/queries-episodes.tpl.html
index d2f846bd..9905fb17 100644
--- a/templates/queries-episodes.tpl.html
+++ b/templates/queries-episodes.tpl.html
@@ -1,14 +1,24 @@
-<!--% query_episodes = 'SELECT
+<!--% query_episodes = 'WITH
+	comment_tallies AS (	
+		SELECT 
+			eps_id,
+			COUNT(eps_id) AS eps_tally
+		FROM comments
+		GROUP BY eps_id 
+	)
+	SELECT
         eps.id,
         eps.explicit,
         eps.date, eps.license, eps.title, eps.summary,
         eps.duration, eps.notes, eps.tags,
         hosts.hostid,
         hosts.host, hosts.email, hosts.local_image,
-        miniseries.name AS series, miniseries.id AS seriesid
+        miniseries.name AS series, miniseries.id AS seriesid,
+		COALESCE(comment_tallies.eps_tally,0) AS commentsTally
     FROM eps
         INNER JOIN hosts ON eps.hostid = hosts.hostid
         INNER JOIN miniseries ON eps.series = miniseries.id
+		LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
         WHERE eps.date <= date(\'now\')
         ORDER BY eps.id + 0 DESC'
 %-->