diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index ae4ea18..1c9b563 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -32,13 +32,8 @@
 	<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
 	<!--% USE date %-->
 	<!--% calc = date.calc %-->
-	<!--% episodes = DBI.query("SELECT id, date FROM eps WHERE date >= date('now') ORDER BY id").get_all() %-->
-	<!--% ind = episodes.0.id %-->
-	<!--% FOREACH ep IN episodes %-->
-	<!--%     LAST IF ep.id != ind %-->
-	<!--%     last_date = ep.date.split('-') %-->
-	<!--%     ind = ind+1 %-->
-	<!--% END %-->
+	<!--% episodes = DBI.query(query_next_available_episode).get_all() %-->
+	<!--% last_date = episodes.0.date.split('-') %-->
 	<!--% offset = (calc.Day_of_Week(last_date.0,last_date.1,last_date.2) == 5 ? 3 : 1) %-->
 	<!--% slot_date = calc.Add_Delta_Days(last_date.0,last_date.1,last_date.2,offset) %-->
 	<!--% now = calc.Today() %-->
diff --git a/templates/queries-index-mysql.tpl.html b/templates/queries-index-mysql.tpl.html
index f8b95c1..1f29958 100644
--- a/templates/queries-index-mysql.tpl.html
+++ b/templates/queries-index-mysql.tpl.html
@@ -1,3 +1,15 @@
+<!--% query_next_available_episode = '
+    SELECT id, date FROM eps e WHERE id = (
+        SELECT  id + 1 FROM eps mo
+            WHERE NOT EXISTS (
+		SELECT NULL
+		FROM   eps mi
+		WHERE  mi.id = mo.id + 1
+            )
+        ORDER BY id
+        LIMIT 1) - 1
+    '
+%-->
 <!--% query_latest_episodes = '
 	WITH comment_tallies AS (
 		SELECT
diff --git a/templates/queries-index-sqlite.tpl.html b/templates/queries-index-sqlite.tpl.html
index dd9afeb..70ea1b6 100644
--- a/templates/queries-index-sqlite.tpl.html
+++ b/templates/queries-index-sqlite.tpl.html
@@ -1,3 +1,15 @@
+<!--% query_next_available_episode = '
+    SELECT id, date FROM eps e WHERE id = (
+        SELECT  id + 1 FROM eps mo
+            WHERE NOT EXISTS (
+		SELECT NULL
+		FROM   eps mi
+		WHERE  mi.id = mo.id + 1
+            )
+        ORDER BY id
+        LIMIT 1) - 1
+    '
+%-->
 <!--% query_latest_episodes = '
 	WITH comment_tallies AS (
 		SELECT