diff --git a/content/cities/airdrie/mobil-mart-veterans-boulevard-ne.md b/content/cities/airdrie/mobil-mart-veterans-boulevard-ne.md
new file mode 100644
index 000000000..441d4aafb
--- /dev/null
+++ b/content/cities/airdrie/mobil-mart-veterans-boulevard-ne.md
@@ -0,0 +1,5 @@
+---
+title: "Mobil Mart"
+url: /airdrie/mobil-mart-veterans-boulevard-ne/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/airdrie/mobil-mart-yankee-valley-road-se.md b/content/cities/airdrie/mobil-mart-yankee-valley-road-se.md
deleted file mode 100644
index 62829afe1..000000000
--- a/content/cities/airdrie/mobil-mart-yankee-valley-road-se.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Mobil Mart"
-url: /airdrie/mobil-mart-yankee-valley-road-se/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/calgary/_index.md b/content/cities/calgary/_index.md
index 8f417a7a4..2875fb4eb 100644
--- a/content/cities/calgary/_index.md
+++ b/content/cities/calgary/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Calgary
 url: /calgary/
-latitude: 51.104
-longitude: -114.188
+latitude: 51.141
+longitude: -114.069
 ---
\ No newline at end of file
diff --git a/content/cities/calgary/freedom-mobile-64-avenue-ne.md b/content/cities/calgary/freedom-mobile-64-avenue-ne.md
new file mode 100644
index 000000000..0150e64a6
--- /dev/null
+++ b/content/cities/calgary/freedom-mobile-64-avenue-ne.md
@@ -0,0 +1,5 @@
+---
+title: "Freedom Mobile"
+url: /calgary/freedom-mobile-64-avenue-ne/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md b/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
deleted file mode 100644
index 20e4b2540..000000000
--- a/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Freedom Mobile"
-url: /calgary/freedom-mobile-beddington-boulevard-nw/
-shop: mobile phone
----
\ No newline at end of file
diff --git a/content/cities/lloydminster/_index.md b/content/cities/lloydminster/_index.md
index b0d3ef555..ad1b9309d 100644
--- a/content/cities/lloydminster/_index.md
+++ b/content/cities/lloydminster/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lloydminster
 url: /lloydminster/
-latitude: 53.276
-longitude: -110.052
+latitude: 53.278
+longitude: -110.023
 ---
\ No newline at end of file
diff --git a/content/cities/lloydminster/sobeys-liquor-51-avenue.md b/content/cities/lloydminster/sobeys-liquor-51-avenue.md
new file mode 100644
index 000000000..fc5d388ec
--- /dev/null
+++ b/content/cities/lloydminster/sobeys-liquor-51-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "Sobeys Liquor"
+url: /lloydminster/sobeys-liquor-51-avenue/
+shop: alcohol
+---
\ No newline at end of file
diff --git a/content/cities/lloydminster/sobeys-liquor-ray-nelson-drive.md b/content/cities/lloydminster/sobeys-liquor-ray-nelson-drive.md
deleted file mode 100644
index 753a3e1c0..000000000
--- a/content/cities/lloydminster/sobeys-liquor-ray-nelson-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Sobeys Liquor"
-url: /lloydminster/sobeys-liquor-ray-nelson-drive/
-shop: alcohol
----
\ No newline at end of file
diff --git a/content/cities/manning/_index.md b/content/cities/manning/_index.md
index c9e4190bc..268f05f9d 100644
--- a/content/cities/manning/_index.md
+++ b/content/cities/manning/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Manning
 url: /manning/
-latitude: 56.922
-longitude: -117.631
+latitude: 56.921
+longitude: -117.632
 ---
\ No newline at end of file
diff --git a/content/cities/okotoks/_index.md b/content/cities/okotoks/_index.md
index 4ecb93295..d0f70c149 100644
--- a/content/cities/okotoks/_index.md
+++ b/content/cities/okotoks/_index.md
@@ -2,5 +2,5 @@
 title: Okotoks
 url: /okotoks/
 latitude: 50.726
-longitude: -113.982
+longitude: -113.978
 ---
\ No newline at end of file
diff --git a/content/cities/stony-plain/_index.md b/content/cities/stony-plain/_index.md
index e107142a9..0c865b425 100644
--- a/content/cities/stony-plain/_index.md
+++ b/content/cities/stony-plain/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Stony Plain
 url: /stony-plain/
-latitude: 53.539
-longitude: -113.978
+latitude: 53.535
+longitude: -114.004
 ---
\ No newline at end of file
diff --git a/content/cities/tsuutina/_index.md b/content/cities/tsuutina/_index.md
index 416fcb5f6..0f2800fb5 100644
--- a/content/cities/tsuutina/_index.md
+++ b/content/cities/tsuutina/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Tsuut'ina
 url: /tsuutina/
-latitude: 50.999
-longitude: -114.163
+latitude: 51
+longitude: -114.162
 ---
\ No newline at end of file
diff --git a/data/cities/airdrie/mobil-mart-veterans-boulevard-ne.yml b/data/cities/airdrie/mobil-mart-veterans-boulevard-ne.yml
new file mode 100644
index 000000000..f7975791d
--- /dev/null
+++ b/data/cities/airdrie/mobil-mart-veterans-boulevard-ne.yml
@@ -0,0 +1,11 @@
+id: 168056488
+type: node
+latitude: 51.30065
+longitude: -114.00933
+postcode: T4B 3P2
+city: Airdrie
+street: Veterans Boulevard NE
+housenumber: "300"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/airdrie/mobil-mart-yankee-valley-road-se.yml b/data/cities/airdrie/mobil-mart-yankee-valley-road-se.yml
deleted file mode 100644
index 45a658ebe..000000000
--- a/data/cities/airdrie/mobil-mart-yankee-valley-road-se.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 116236082
-type: node
-latitude: 51.27124
-longitude: -113.99059
-postcode: T4A 2E4
-city: Airdrie
-street: Yankee Valley Road SE
-housenumber: "1050"
-phone: +1-403-887-1310
-opening_hours: ""
-website: ""
diff --git a/data/cities/airdrie/mobil-mart.yml b/data/cities/airdrie/mobil-mart.yml
index f7975791d..45a658ebe 100644
--- a/data/cities/airdrie/mobil-mart.yml
+++ b/data/cities/airdrie/mobil-mart.yml
@@ -1,11 +1,11 @@
-id: 168056488
+id: 116236082
 type: node
-latitude: 51.30065
-longitude: -114.00933
-postcode: T4B 3P2
+latitude: 51.27124
+longitude: -113.99059
+postcode: T4A 2E4
 city: Airdrie
-street: Veterans Boulevard NE
-housenumber: "300"
-phone: ""
+street: Yankee Valley Road SE
+housenumber: "1050"
+phone: +1-403-887-1310
 opening_hours: ""
 website: ""
diff --git a/data/cities/calgary/calgary-co-op-macleod-trail-food-centre.yml b/data/cities/calgary/calgary-co-op-macleod-trail-food-centre.yml
index 06551ba2e..21673a7f0 100644
--- a/data/cities/calgary/calgary-co-op-macleod-trail-food-centre.yml
+++ b/data/cities/calgary/calgary-co-op-macleod-trail-food-centre.yml
@@ -4,7 +4,7 @@ latitude: 50.97422
 longitude: -114.06971
 postcode: T2H 0M5
 city: Calgary
-street: Macleod Trail Southeast
+street: Macleod Trail S
 housenumber: "8818"
 phone: +1 403-299-4292
 opening_hours: Mo - Su 08:00-22:00
diff --git a/data/cities/calgary/community-natural-foods.yml b/data/cities/calgary/community-natural-foods.yml
index b674a4dac..b47076769 100644
--- a/data/cities/calgary/community-natural-foods.yml
+++ b/data/cities/calgary/community-natural-foods.yml
@@ -4,7 +4,7 @@ latitude: 50.9984
 longitude: -114.06615
 postcode: T2H 0B4
 city: Calgary
-street: 61st Ave SW
+street: 61 Avenue SW
 housenumber: "202"
 phone: +1 403-930-6363
 opening_hours: Mo-Sa 09:00-21:00; Su 09:00-19:00
diff --git a/data/cities/calgary/freedom-mobile-64-avenue-ne.yml b/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
new file mode 100644
index 000000000..773cbe116
--- /dev/null
+++ b/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
@@ -0,0 +1,11 @@
+id: 8796945780
+type: node
+latitude: 51.10932
+longitude: -114.04099
+postcode: T2E 7P4
+city: Calgary
+street: 64 Avenue NE
+housenumber: "901"
+phone: "+14039037799"
+opening_hours: ""
+website: "+14039037799"
diff --git a/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml b/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
deleted file mode 100644
index 5208466c1..000000000
--- a/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8793422147
-type: node
-latitude: 51.12697
-longitude: -114.07355
-postcode: T3K 2A8
-city: Calgary
-street: Beddington Boulevard NW
-housenumber: "8120"
-phone: +1 403-402-5555
-opening_hours: ""
-website: https://www.freedommobile.ca
diff --git a/data/cities/calgary/freedom-mobile.yml b/data/cities/calgary/freedom-mobile.yml
index 773cbe116..5208466c1 100644
--- a/data/cities/calgary/freedom-mobile.yml
+++ b/data/cities/calgary/freedom-mobile.yml
@@ -1,11 +1,11 @@
-id: 8796945780
+id: 8793422147
 type: node
-latitude: 51.10932
-longitude: -114.04099
-postcode: T2E 7P4
+latitude: 51.12697
+longitude: -114.07355
+postcode: T3K 2A8
 city: Calgary
-street: 64 Avenue NE
-housenumber: "901"
-phone: "+14039037799"
+street: Beddington Boulevard NW
+housenumber: "8120"
+phone: +1 403-402-5555
 opening_hours: ""
-website: "+14039037799"
+website: https://www.freedommobile.ca
diff --git a/data/cities/calgary/incredigrow-north.yml b/data/cities/calgary/incredigrow-north.yml
index 1ecad33c9..064c44dc2 100644
--- a/data/cities/calgary/incredigrow-north.yml
+++ b/data/cities/calgary/incredigrow-north.yml
@@ -4,7 +4,7 @@ latitude: 51.0811
 longitude: -114.01041
 postcode: T2E 6Z3
 city: Calgary
-street: 32nd Avenue NE
+street: 32 Avenue NE
 housenumber: "2015"
 phone: +1 403-230-0065
 opening_hours: ""
diff --git a/data/cities/calgary/napa-auto-parts.yml b/data/cities/calgary/napa-auto-parts.yml
index b655d27b2..708855ce3 100644
--- a/data/cities/calgary/napa-auto-parts.yml
+++ b/data/cities/calgary/napa-auto-parts.yml
@@ -4,7 +4,7 @@ latitude: 51.07668
 longitude: -114.0058
 postcode: T2E 7M1
 city: Calgary
-street: 23 ST NE
+street: 23 Street NE
 housenumber: "2727"
 phone: +1 403-250-7334
 opening_hours: Mo-Fr 08:00-19:00,Sa-Su 09:00-17:00
diff --git a/data/cities/edmonton/celebration-decor.yml b/data/cities/edmonton/celebration-decor.yml
index 53e06cd9a..0d47b9b21 100644
--- a/data/cities/edmonton/celebration-decor.yml
+++ b/data/cities/edmonton/celebration-decor.yml
@@ -4,7 +4,7 @@ latitude: 53.51491
 longitude: -113.57683
 postcode: T5R 3K9
 city: Edmonton
-street: 80 Avenue Northwest
+street: 80 Avenue NW
 housenumber: "14804"
 phone: +1 780-984-9191
 opening_hours: ""
diff --git a/data/cities/edmonton/the-tile-installations-specialists.yml b/data/cities/edmonton/the-tile-installations-specialists.yml
index 98e6641f3..15a5a1582 100644
--- a/data/cities/edmonton/the-tile-installations-specialists.yml
+++ b/data/cities/edmonton/the-tile-installations-specialists.yml
@@ -4,7 +4,7 @@ latitude: 53.62726
 longitude: -113.41454
 postcode: T5Y 0L0
 city: Edmonton
-street: 167 Ave NW
+street: 167 Avenue NW
 housenumber: "5119"
 phone: +1 587-333-9800
 opening_hours: Mo-Fr 08:00-17:00
diff --git a/data/cities/lacombe/husky.yml b/data/cities/lacombe/husky.yml
index ee7a98c51..4062bc541 100644
--- a/data/cities/lacombe/husky.yml
+++ b/data/cities/lacombe/husky.yml
@@ -1,7 +1,7 @@
-id: 544328251
+id: 1341959951
 type: node
-latitude: 52.46455
-longitude: -113.72714
+latitude: 52.46429
+longitude: -113.72754
 postcode: T0C 1S0
 city: Lacombe
 street: AB-2A
diff --git a/data/cities/lloydminster/sobeys-liquor-51-avenue.yml b/data/cities/lloydminster/sobeys-liquor-51-avenue.yml
new file mode 100644
index 000000000..3ad0912e3
--- /dev/null
+++ b/data/cities/lloydminster/sobeys-liquor-51-avenue.yml
@@ -0,0 +1,11 @@
+id: 5906917352
+type: node
+latitude: 53.27097
+longitude: -110.0077
+postcode: T9V 2C3
+city: Lloydminster
+street: 51 Avenue
+housenumber: "3601"
+phone: +1-780-871-0567
+opening_hours: Mo-Th 10:00-23:00; Fr-Sa 10:00-00:00; Su 10:00-20:00
+website: https://liquor.sobeys.com/stores/lloydminster-36-st/
diff --git a/data/cities/lloydminster/sobeys-liquor-ray-nelson-drive.yml b/data/cities/lloydminster/sobeys-liquor-ray-nelson-drive.yml
deleted file mode 100644
index 4cd6a9616..000000000
--- a/data/cities/lloydminster/sobeys-liquor-ray-nelson-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5808072183
-type: node
-latitude: 53.27729
-longitude: -110.05328
-postcode: T9V 2X1
-city: Lloydminster
-street: Ray Nelson Drive
-housenumber: "7415"
-phone: +1-780-875-7117
-opening_hours: Mo-Th 10:00-23:00, Fr-Sa 10:00-00:00, Su 10:00-20:00
-website: https://liquor.sobeys.com/stores/lloydminster/
diff --git a/data/cities/lloydminster/sobeys-liquor.yml b/data/cities/lloydminster/sobeys-liquor.yml
index 3ad0912e3..4cd6a9616 100644
--- a/data/cities/lloydminster/sobeys-liquor.yml
+++ b/data/cities/lloydminster/sobeys-liquor.yml
@@ -1,11 +1,11 @@
-id: 5906917352
+id: 5808072183
 type: node
-latitude: 53.27097
-longitude: -110.0077
-postcode: T9V 2C3
+latitude: 53.27729
+longitude: -110.05328
+postcode: T9V 2X1
 city: Lloydminster
-street: 51 Avenue
-housenumber: "3601"
-phone: +1-780-871-0567
-opening_hours: Mo-Th 10:00-23:00; Fr-Sa 10:00-00:00; Su 10:00-20:00
-website: https://liquor.sobeys.com/stores/lloydminster-36-st/
+street: Ray Nelson Drive
+housenumber: "7415"
+phone: +1-780-875-7117
+opening_hours: Mo-Th 10:00-23:00, Fr-Sa 10:00-00:00, Su 10:00-20:00
+website: https://liquor.sobeys.com/stores/lloydminster/
diff --git a/data/cities/red-deer/legacy-branding-co.yml b/data/cities/red-deer/legacy-branding-co.yml
index dfbf44c34..10f81e41e 100644
--- a/data/cities/red-deer/legacy-branding-co.yml
+++ b/data/cities/red-deer/legacy-branding-co.yml
@@ -4,7 +4,7 @@ latitude: 52.28067
 longitude: -113.81115
 postcode: T4N 3V5
 city: Red Deer
-street: 48ave
+street: 48 Avenue
 housenumber: "6013"
 phone: +1 403 342 2278
 opening_hours: Mo-Fr 09:00-17:00