diff --git a/db/routines/vn/functions/address_getGeo.sql b/db/routines/vn/functions/address_getGeo.sql
index 248e8c787..0800d226a 100644
--- a/db/routines/vn/functions/address_getGeo.sql
+++ b/db/routines/vn/functions/address_getGeo.sql
@@ -15,6 +15,7 @@ BEGIN
 		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
 			JOIN postCode p ON p.townFk = t.id
+			JOIN zoneGeo zg ON zg.id = p.geoFk
 		WHERE a.id = vSelf
 		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
 			(p.code = a.postalCode) DESC
diff --git a/db/routines/vn/functions/client_getGeo.sql b/db/routines/vn/functions/client_getGeo.sql
index 624becf1e..e16653ee5 100644
--- a/db/routines/vn/functions/client_getGeo.sql
+++ b/db/routines/vn/functions/client_getGeo.sql
@@ -15,6 +15,7 @@ BEGIN
 		FROM client c
 			JOIN town t ON t.provinceFk = c.provinceFk
 			JOIN postCode p ON p.townFk = t.id
+			JOIN zoneGeo zg ON zg.id = p.geoFk
 		WHERE c.id = vSelf
 		ORDER BY (c.city SOUNDS LIKE t.name) DESC,
 			(p.code = c.postcode) DESC
diff --git a/db/routines/vn/functions/supplier_getGeo.sql b/db/routines/vn/functions/supplier_getGeo.sql
index 29b6736f3..10ca5b8b8 100644
--- a/db/routines/vn/functions/supplier_getGeo.sql
+++ b/db/routines/vn/functions/supplier_getGeo.sql
@@ -16,6 +16,7 @@ BEGIN
 			JOIN town t ON t.provinceFk = s.provinceFk
 			JOIN postCode p ON p.townFk = t.id
 			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
+			JOIN zoneGeo zg ON zg.id = p.geoFk
 		WHERE s.id = vSelf
 		ORDER BY (s.city SOUNDS LIKE t.name) DESC,
 			(p.code = s.postCode) DESC,
diff --git a/db/versions/11346-yellowPhormium/00-address.sql b/db/versions/11346-yellowPhormium/00-address.sql
index 2f8033b0a..6837e0d86 100644
--- a/db/versions/11346-yellowPhormium/00-address.sql
+++ b/db/versions/11346-yellowPhormium/00-address.sql
@@ -10,6 +10,7 @@ CREATE OR REPLACE TEMPORARY TABLE tmp.tAddressGeo
 		FROM vn.address a
 			JOIN vn.town t ON t.provinceFk = a.provinceFk
 			JOIN vn.postCode p ON p.townFk = t.id
+			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
 		GROUP BY a.id
 		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC,
 			(p.code = a.postalCode) DESC;
diff --git a/db/versions/11346-yellowPhormium/01-client.sql b/db/versions/11346-yellowPhormium/01-client.sql
index 855d873f9..a95d21efa 100644
--- a/db/versions/11346-yellowPhormium/01-client.sql
+++ b/db/versions/11346-yellowPhormium/01-client.sql
@@ -13,6 +13,7 @@ CREATE OR REPLACE TEMPORARY TABLE tmp.tClientGeo
 		FROM vn.client c
 			JOIN vn.town t ON t.provinceFk = c.provinceFk
 			JOIN vn.postCode p ON p.townFk = t.id
+			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
 		GROUP BY c.id
 		ORDER BY (c.city SOUNDS LIKE t.`name`) DESC,
 			(p.code = c.postcode) DESC;
diff --git a/db/versions/11346-yellowPhormium/02-supplier.sql b/db/versions/11346-yellowPhormium/02-supplier.sql
index 9a0cd5b42..a28e7d680 100644
--- a/db/versions/11346-yellowPhormium/02-supplier.sql
+++ b/db/versions/11346-yellowPhormium/02-supplier.sql
@@ -13,6 +13,7 @@ CREATE OR REPLACE TEMPORARY TABLE tmp.tSupplierGeo
 			JOIN vn.town t ON t.provinceFk = s.provinceFk
 			JOIN vn.postCode p ON p.townFk = t.id
 			LEFT JOIN vn.supplierAddress sad ON sad.supplierFk = s.id
+			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
 		GROUP BY s.id
 		ORDER BY (s.city SOUNDS LIKE t.`name`) DESC,
 			(p.code = s.postCode) DESC,