diff --git a/templates/content-correspondent.tpl.html b/templates/content-correspondent.tpl.html
index d604db2..408dd28 100644
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@@ -13,31 +13,7 @@
 	<!--% hpr_show_count = hpr_show_count +1; %-->
 	<!--% END %-->
 
-	<!--% query_twt_show_count = DBI.prepare('
-		SELECT id
-		FROM twat_eps AS eps
-		WHERE eps.hostid = ?
-		')
-		%-->
-		<!--% query_twt_shows = DBI.prepare('
-			SELECT
-			eps.id,
-			CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
-			eps.date, eps.license, eps.duration,
-			eps.title, eps.summary, eps.tags,
-			eps.notes,
-			hosts.local_image,
-			hosts.hostid,
-			hosts.host, hosts.email, hosts.profile,
-			miniseries.name AS series, miniseries.id AS seriesid
-			FROM twat_eps AS eps
-			INNER JOIN hosts ON eps.hostid = hosts.hostid
-			INNER JOIN miniseries ON eps.series = miniseries.id
-			WHERE hosts.hostid = ?
-			ORDER BY eps.id DESC
-			')
-			%-->
-			<!--% twt_shows_to_count = query_twt_show_count.execute(id); %-->
+	<!--% 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 %-->
diff --git a/templates/queries-correspondent.tpl.html b/templates/queries-correspondent.tpl.html
index 3363afe..06eef61 100644
--- a/templates/queries-correspondent.tpl.html
+++ b/templates/queries-correspondent.tpl.html
@@ -22,3 +22,28 @@
 	WHERE eps.hostid = ? AND eps.date < date(\'now\', \'+1 days\')
 	'
 %-->
+<!--% query_twt_show_count = DBI.prepare('
+		SELECT id
+		FROM twat_eps AS eps
+		WHERE eps.hostid = ?
+		')
+%-->
+<!--% query_twt_shows = DBI.prepare('
+		SELECT
+			eps.id,
+			CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
+			eps.date, eps.license, eps.duration,
+			eps.title, eps.summary, eps.tags,
+			eps.notes,
+			hosts.local_image,
+			hosts.hostid,
+			hosts.host, hosts.email, hosts.profile,
+			miniseries.name AS series, miniseries.id AS seriesid
+		FROM twat_eps AS eps
+		INNER JOIN hosts ON eps.hostid = hosts.hostid
+		INNER JOIN miniseries ON eps.series = miniseries.id
+		WHERE hosts.hostid = ?
+		ORDER BY eps.id DESC
+		')
+%-->
+