diff --git a/templates/content-correspondent.tpl.html b/templates/content-correspondent.tpl.html
index 408dd28..9d3b867 100644
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@@ -3,22 +3,17 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS "queries-correspondent.tpl.html" %-->
 <!--% USE DBI(constants.driver) %-->
-<!--% results_hpr_shows = DBI.prepare(query_hpr_shows)
-	%-->
+<!--% results_hpr_shows = DBI.prepare(query_hpr_shows) %-->
 	<!--% results_hpr_show_count = DBI.prepare(query_hpr_show_count) %-->
-	<!--% hpr_shows_to_count = results_hpr_show_count.execute(id); %-->
+	<!--% hpr_result_status = results_hpr_show_count.execute(id); %-->
 	<!--% hpr_shows = results_hpr_shows.execute(id); %-->
-	<!--% hpr_show_count = 0 %-->
-	<!--% FOREACH show IN hpr_shows_to_count %-->
-	<!--% hpr_show_count = hpr_show_count +1; %-->
-	<!--% END %-->
+	<!--% hpr_show_count = results_hpr_show_count.fetchrow_array %-->
 
-	<!--% twt_shows_to_count = query_twt_show_count.execute(id); %-->
-			<!--% twt_shows = query_twt_shows.execute(id); %-->
-			<!--% twt_show_count = 0 %-->
-			<!--% FOREACH show IN twt_shows_to_count %-->
-			<!--% twt_show_count = twt_show_count +1; %-->
-			<!--% END %-->
+	<!--% results_hpr_shows = DBI.prepare(query_twt_shows) %-->
+	<!--% results_twt_show_count = DBI.prepare(query_twt_show_count) %-->
+	<!--% twt_result_status = results_twt_show_count.execute(id); %-->
+	<!--% twt_shows = results_hpr_shows.execute(id); %-->
+	<!--% twt_show_count = results_twt_show_count.fetchrow_array %-->
 
 			<!--% hosts = DBI.tie('hosts', 'hostid') %-->
 
diff --git a/templates/queries-correspondent.tpl.html b/templates/queries-correspondent.tpl.html
index 06eef61..87997ad 100644
--- a/templates/queries-correspondent.tpl.html
+++ b/templates/queries-correspondent.tpl.html
@@ -17,18 +17,18 @@
 	'
 %-->
 <!--% query_hpr_show_count = '
-	SELECT id
+	SELECT COUNT(id) as Tally
 	FROM eps
 	WHERE eps.hostid = ? AND eps.date < date(\'now\', \'+1 days\')
 	'
 %-->
-<!--% query_twt_show_count = DBI.prepare('
-		SELECT id
+<!--% query_twt_show_count = '
+		SELECT COUNT(id) as Tally
 		FROM twat_eps AS eps
 		WHERE eps.hostid = ?
-		')
+		'
 %-->
-<!--% query_twt_shows = DBI.prepare('
+<!--% query_twt_shows = '
 		SELECT
 			eps.id,
 			CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
@@ -44,6 +44,6 @@
 		INNER JOIN miniseries ON eps.series = miniseries.id
 		WHERE hosts.hostid = ?
 		ORDER BY eps.id DESC
-		')
+		'
 %-->