diff --git a/db/routines/vn/functions/address_getGeo.sql b/db/routines/vn/functions/address_getGeo.sql
index 04155c30c..248e8c787 100644
--- a/db/routines/vn/functions/address_getGeo.sql
+++ b/db/routines/vn/functions/address_getGeo.sql
@@ -14,9 +14,10 @@ BEGIN
 	SELECT p.geoFk INTO vGeoFk
 		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
-			JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode
+			JOIN postCode p ON p.townFk = t.id
 		WHERE a.id = vSelf
-		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC
+		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
+			(p.code = a.postalCode) DESC
 		LIMIT 1;
 
 	RETURN vGeoFk;
diff --git a/db/routines/vn/functions/client_getGeo.sql b/db/routines/vn/functions/client_getGeo.sql
index 067eb84bc..624becf1e 100644
--- a/db/routines/vn/functions/client_getGeo.sql
+++ b/db/routines/vn/functions/client_getGeo.sql
@@ -15,9 +15,9 @@ BEGIN
 		FROM client c
 			JOIN town t ON t.provinceFk = c.provinceFk
 			JOIN postCode p ON p.townFk = t.id
-				AND p.`code` = c.postcode
 		WHERE c.id = vSelf
-		ORDER BY (c.city SOUNDS LIKE t.`name`) DESC
+		ORDER BY (c.city SOUNDS LIKE t.name) DESC,
+			(p.code = c.postcode) DESC
 		LIMIT 1;
 
 	RETURN vGeoFk;
diff --git a/db/routines/vn/functions/supplier_getGeo.sql b/db/routines/vn/functions/supplier_getGeo.sql
index 93115d712..29b6736f3 100644
--- a/db/routines/vn/functions/supplier_getGeo.sql
+++ b/db/routines/vn/functions/supplier_getGeo.sql
@@ -15,9 +15,11 @@ BEGIN
 		FROM supplier s
 			JOIN town t ON t.provinceFk = s.provinceFk
 			JOIN postCode p ON p.townFk = t.id
-				AND p.`code` = s.postCode
+			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
 		WHERE s.id = vSelf
-		ORDER BY (s.city SOUNDS LIKE t.`name`) DESC
+		ORDER BY (s.city SOUNDS LIKE t.name) DESC,
+			(p.code = s.postCode) DESC,
+			(p.code = sad.postalCode) DESC
 		LIMIT 1;
 
 	RETURN vGeoFk;