diff --git a/db/changes/10081-agency/00-zone_getAvailable.sql b/db/changes/10081-agency/00-zone_getAvailable.sql
index dbca22600..4d030ae69 100644
--- a/db/changes/10081-agency/00-zone_getAvailable.sql
+++ b/db/changes/10081-agency/00-zone_getAvailable.sql
@@ -3,70 +3,14 @@ DROP PROCEDURE IF EXISTS `vn`.`zone_getAvailable`;
 DELIMITER $$
 CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`zone_getAvailable`(vAddress INT, vLanded DATE)
 BEGIN
-    DECLARE vHour TIME DEFAULT TIME(NOW());
-    
     CALL zone_getFromGeo(address_getGeo(vAddress));
-    
-	DELETE t FROM tmp.zone t
-		JOIN zoneExclusion e
-			ON e.zoneFk = t.id AND e.`day` = vLanded;
+    CALL zone_getOptionsForDate(vLanded);
 
-	DROP TEMPORARY TABLE IF EXISTS tAvailableZones;
-    CREATE TEMPORARY TABLE tAvailableZones
-		SELECT t.id zoneFk,
-				TIME(e.`hour`) `hour`,
-				e.travelingDays,
-				e.price,
-				e.bonus,
-                CASE
-					WHEN e.`from` IS NULL AND e.`to` IS NULL
-						THEN 3
-					WHEN e.`to` IS NULL
-						THEN 2
-						ELSE 1
-				END specificity
-			FROM tmp.zone t
-				JOIN zoneEvent e ON e.zoneFk = t.id
-			WHERE (e.`from` = vLanded AND e.`to` IS NULL)
-				OR (
-					(e.`from` IS NULL OR vLanded BETWEEN e.`from` AND e.`to`)
-					AND e.weekDays & (1 << WEEKDAY(vLanded))
-				);
+    SELECT * FROM tmp.zoneOption;
 
-	-- XXX: Compatibility with the deprecated #zoneCalendar table
-
-	INSERT INTO tAvailableZones
-		SELECT t.id zoneFk,
-				NULL,
-				NULL,
-				c.price,
-				c.bonus,
-                4
-			FROM tmp.zone t
-				JOIN zoneCalendar c ON c.zoneFk = t.id
-			WHERE c.delivered = vLanded;
-
-	DROP TEMPORARY TABLE tmp.zone;
-
-    UPDATE tAvailableZones t
-		JOIN zone z ON z.id = t.zoneFk
-		SET t.`hour` = IFNULL(t.`hour`, TIME(z.`hour`)),
-			t.travelingDays = IFNULL(t.travelingDays, z.travelingDays),
-			t.price = IFNULL(t.price, z.price),
-			t.bonus = IFNULL(t.bonus, z.bonus);
-    
-	DELETE FROM tAvailableZones
-		WHERE (@shipped := TIMESTAMPADD(DAY, -travelingDays, vLanded)) < CURDATE()
-			OR @shipped = CURDATE() AND vHour > `hour`;
-
-    SELECT *
-		FROM (
-			SELECT * FROM tAvailableZones
-            ORDER BY zoneFk, specificity
-		) t
-        GROUP BY zoneFk;
-
-	DROP TEMPORARY TABLE tAvailableZones;
+	DROP TEMPORARY TABLE
+		tmp.zone,
+        tmp.zoneOption;
 END$$
 DELIMITER ;
 
diff --git a/db/changes/10081-agency/00-zone_getFromGeo.sql b/db/changes/10081-agency/00-zone_getFromGeo.sql
index 4d087fc8a..244c73556 100644
--- a/db/changes/10081-agency/00-zone_getFromGeo.sql
+++ b/db/changes/10081-agency/00-zone_getFromGeo.sql
@@ -4,10 +4,10 @@ DELIMITER $$
 CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`zone_getFromGeo`(vGeoFk INT)
 BEGIN
 /**
- * Returns available zones for the passed address.
+ * Returns all zones which have the passed geo included.
  *
- * @param vAddress The address id
- * @return tmp.zone(id) The available zones
+ * @param vGeoFk The geo id
+ * @return tmp.zone(id) The list of zones
  */
  	DECLARE vChildFk INT DEFAULT vGeoFk;
  	DECLARE vParentFk INT;
@@ -40,6 +40,7 @@ BEGIN
     DROP TEMPORARY TABLE IF EXISTS tmp.zone;
     CREATE TEMPORARY TABLE tmp.zone
 		(INDEX (id))
+		ENGINE = MEMORY
         SELECT id FROM (
 			SELECT zoneFk id, isIncluded
 				FROM (
diff --git a/db/changes/10081-agency/00-zone_getOptionsForDate.sql b/db/changes/10081-agency/00-zone_getOptionsForDate.sql
new file mode 100644
index 000000000..11c912f9c
--- /dev/null
+++ b/db/changes/10081-agency/00-zone_getOptionsForDate.sql
@@ -0,0 +1,79 @@
+
+DROP PROCEDURE IF EXISTS `vn`.`zone_getOptionsForDate`;
+DELIMITER $$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`zone_getOptionsForDate`(vLanded DATE)
+BEGIN
+/**
+ * Gets computed options for the passed zones and delivery date.
+ *
+ * @table tmp.zones(id) The zones ids
+ * @param vLanded The delivery date
+ * @return tmp.zoneOption The computed options
+ */
+    DECLARE vHour TIME DEFAULT TIME(NOW());
+
+	DROP TEMPORARY TABLE IF EXISTS tTemp;
+    CREATE TEMPORARY TABLE tTemp
+		ENGINE = MEMORY
+		SELECT t.id zoneFk,
+				TIME(e.`hour`) `hour`,
+				e.travelingDays,
+				e.price,
+				e.bonus,
+                CASE
+					WHEN e.`from` IS NULL AND e.`to` IS NULL
+						THEN 3
+					WHEN e.`to` IS NULL
+						THEN 2
+						ELSE 1
+				END specificity
+			FROM tmp.zone t
+				JOIN zoneEvent e ON e.zoneFk = t.id
+			WHERE (e.`from` = vLanded AND e.`to` IS NULL)
+				OR (
+					(e.`from` IS NULL OR vLanded BETWEEN e.`from` AND e.`to`)
+					AND e.weekDays & (1 << WEEKDAY(vLanded))
+				);
+
+	-- XXX: Compatibility with the deprecated #zoneCalendar table
+
+	INSERT INTO tTemp
+		SELECT t.id zoneFk,
+				NULL,
+				NULL,
+				c.price,
+				c.bonus,
+                4
+			FROM tmp.zone t
+				JOIN zoneCalendar c ON c.zoneFk = t.id
+			WHERE c.delivered = vLanded;
+
+	DELETE t FROM tTemp t
+		JOIN zoneExclusion e
+			ON e.zoneFk = t.zoneFk AND e.`day` = vLanded;
+
+    UPDATE tTemp t
+		JOIN zone z ON z.id = t.zoneFk
+		SET t.`hour` = IFNULL(t.`hour`, TIME(z.`hour`)),
+			t.travelingDays = IFNULL(t.travelingDays, z.travelingDays),
+			t.price = IFNULL(t.price, z.price),
+			t.bonus = IFNULL(t.bonus, z.bonus);
+    
+	DELETE FROM tTemp
+		WHERE (@shipped := TIMESTAMPADD(DAY, -travelingDays, vLanded)) < CURDATE()
+			OR @shipped = CURDATE() AND vHour > `hour`;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
+    CREATE TEMPORARY TABLE tmp.zoneOption
+		ENGINE = MEMORY
+		SELECT *
+			FROM (
+				SELECT * FROM tTemp
+				ORDER BY zoneFk, specificity
+			) t
+			GROUP BY zoneFk;
+
+	DROP TEMPORARY TABLE tTemp;
+END$$
+DELIMITER ;
+