diff --git a/content/cities/airdrie/hear-canada.md b/content/cities/airdrie/hear-canada.md
new file mode 100644
index 000000000..612a7b74b
--- /dev/null
+++ b/content/cities/airdrie/hear-canada.md
@@ -0,0 +1,5 @@
+---
+title: "Hear Canada"
+url: /airdrie/hear-canada/
+shop: hearing aids
+---
\ No newline at end of file
diff --git a/content/cities/airdrie/iris-mackenzie-way-sw.md b/content/cities/airdrie/iris-mackenzie-way-sw.md
new file mode 100644
index 000000000..af6d53843
--- /dev/null
+++ b/content/cities/airdrie/iris-mackenzie-way-sw.md
@@ -0,0 +1,5 @@
+---
+title: "Iris"
+url: /airdrie/iris-mackenzie-way-sw/
+shop: optician
+---
\ No newline at end of file
diff --git a/content/cities/airdrie/mobil-mart-veterans-boulevard-ne.md b/content/cities/airdrie/mobil-mart-veterans-boulevard-ne.md
deleted file mode 100644
index 441d4aafb..000000000
--- a/content/cities/airdrie/mobil-mart-veterans-boulevard-ne.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 000000000..62829afe1
--- /dev/null
+++ b/content/cities/airdrie/mobil-mart-yankee-valley-road-se.md
@@ -0,0 +1,5 @@
+---
+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 e372bdf92..f1dbe6c24 100644
--- a/content/cities/calgary/_index.md
+++ b/content/cities/calgary/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Calgary
 url: /calgary/
-latitude: 51.116
-longitude: -114.069
+latitude: 51.141
+longitude: -114.13
 ---
\ 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
deleted file mode 100644
index 0150e64a6..000000000
--- a/content/cities/calgary/freedom-mobile-64-avenue-ne.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 000000000..20e4b2540
--- /dev/null
+++ b/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
@@ -0,0 +1,5 @@
+---
+title: "Freedom Mobile"
+url: /calgary/freedom-mobile-beddington-boulevard-nw/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/calgary/rivian-service-center.md b/content/cities/calgary/rivian-service-center.md
new file mode 100644
index 000000000..4921031df
--- /dev/null
+++ b/content/cities/calgary/rivian-service-center.md
@@ -0,0 +1,5 @@
+---
+title: "Rivian Service Center"
+url: /calgary/rivian-service-center/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/calgary/the-home-depot-sarcee-trail-nw.md b/content/cities/calgary/the-home-depot-16-avenue-nw.md
similarity index 52%
rename from content/cities/calgary/the-home-depot-sarcee-trail-nw.md
rename to content/cities/calgary/the-home-depot-16-avenue-nw.md
index 6933c47bf..87b21cf59 100644
--- a/content/cities/calgary/the-home-depot-sarcee-trail-nw.md
+++ b/content/cities/calgary/the-home-depot-16-avenue-nw.md
@@ -1,5 +1,5 @@
 ---
 title: "The Home Depot"
-url: /calgary/the-home-depot-sarcee-trail-nw/
+url: /calgary/the-home-depot-16-avenue-nw/
 shop: doityourself
 ---
\ No newline at end of file
diff --git a/content/cities/calgary/venture-motorworks-auto-mechanic.md b/content/cities/calgary/venture-motorworks-auto-mechanic.md
new file mode 100644
index 000000000..cf65fc632
--- /dev/null
+++ b/content/cities/calgary/venture-motorworks-auto-mechanic.md
@@ -0,0 +1,5 @@
+---
+title: "Venture Motorworks - Auto Mechanic"
+url: /calgary/venture-motorworks-auto-mechanic/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/edmonton/simons-170-street-nw.md b/content/cities/edmonton/simons-170-street-nw.md
deleted file mode 100644
index 13dcb038f..000000000
--- a/content/cities/edmonton/simons-170-street-nw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Simons"
-url: /edmonton/simons-170-street-nw/
-shop: clothes
----
\ No newline at end of file
diff --git a/content/cities/edmonton/simons-londonderry-mall-northwest.md b/content/cities/edmonton/simons-londonderry-mall-northwest.md
new file mode 100644
index 000000000..b5f3a6568
--- /dev/null
+++ b/content/cities/edmonton/simons-londonderry-mall-northwest.md
@@ -0,0 +1,5 @@
+---
+title: "Simons"
+url: /edmonton/simons-londonderry-mall-northwest/
+shop: clothes
+---
\ No newline at end of file
diff --git a/content/cities/fort-saskatchewan/_index.md b/content/cities/fort-saskatchewan/_index.md
index 8dd195c14..7f93490d4 100644
--- a/content/cities/fort-saskatchewan/_index.md
+++ b/content/cities/fort-saskatchewan/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Fort Saskatchewan
 url: /fort-saskatchewan/
-latitude: 53.683
-longitude: -113.25
+latitude: 53.712
+longitude: -113.211
 ---
\ No newline at end of file
diff --git a/content/cities/girouxville/_index.md b/content/cities/girouxville/_index.md
new file mode 100644
index 000000000..36fb0de99
--- /dev/null
+++ b/content/cities/girouxville/_index.md
@@ -0,0 +1,6 @@
+---
+title: Girouxville
+url: /girouxville/
+latitude: 55.755
+longitude: -117.339
+---
\ No newline at end of file
diff --git a/content/cities/girouxville/boisvert-service-garage-ltd.md b/content/cities/girouxville/boisvert-service-garage-ltd.md
new file mode 100644
index 000000000..50337a1a3
--- /dev/null
+++ b/content/cities/girouxville/boisvert-service-garage-ltd.md
@@ -0,0 +1,5 @@
+---
+title: "Boisvert Service Garage Ltd"
+url: /girouxville/boisvert-service-garage-ltd/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/girouxville/every-now-and-then-antq-and-gftwr.md b/content/cities/girouxville/every-now-and-then-antq-and-gftwr.md
new file mode 100644
index 000000000..2095c8826
--- /dev/null
+++ b/content/cities/girouxville/every-now-and-then-antq-and-gftwr.md
@@ -0,0 +1,5 @@
+---
+title: "Every Now & Then Antq & Gftwr"
+url: /girouxville/every-now-and-then-antq-and-gftwr/
+shop: antiques
+---
\ No newline at end of file
diff --git a/content/cities/lacombe/_index.md b/content/cities/lacombe/_index.md
index 5fe242a8e..ef08c5760 100644
--- a/content/cities/lacombe/_index.md
+++ b/content/cities/lacombe/_index.md
@@ -2,5 +2,5 @@
 title: Lacombe
 url: /lacombe/
 latitude: 52.463
-longitude: -113.73
+longitude: -113.726
 ---
\ No newline at end of file
diff --git a/content/cities/lethbridge/7-eleven-columbia-boulevard-w.md b/content/cities/lethbridge/7-eleven-columbia-boulevard-w.md
new file mode 100644
index 000000000..0ef3c9e28
--- /dev/null
+++ b/content/cities/lethbridge/7-eleven-columbia-boulevard-w.md
@@ -0,0 +1,5 @@
+---
+title: "7-Eleven"
+url: /lethbridge/7-eleven-columbia-boulevard-w/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/lethbridge/7-eleven-mayor-magrath-drive-s.md b/content/cities/lethbridge/7-eleven-mayor-magrath-drive-s.md
deleted file mode 100644
index f1bf088db..000000000
--- a/content/cities/lethbridge/7-eleven-mayor-magrath-drive-s.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "7-Eleven"
-url: /lethbridge/7-eleven-mayor-magrath-drive-s/
-shop: convenience
----
\ 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/lloydminster/taits-cold-beer-and-liquor.md b/content/cities/lloydminster/taits-cold-beer-and-liquor.md
deleted file mode 100644
index eb8fc31a8..000000000
--- a/content/cities/lloydminster/taits-cold-beer-and-liquor.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Tait's Cold Beer & Liquor"
-url: /lloydminster/taits-cold-beer-and-liquor/
-shop: alcohol
----
\ No newline at end of file
diff --git a/content/cities/medicine-hat/daffys-automotive.md b/content/cities/medicine-hat/daffys-automotive.md
new file mode 100644
index 000000000..746f05aff
--- /dev/null
+++ b/content/cities/medicine-hat/daffys-automotive.md
@@ -0,0 +1,5 @@
+---
+title: "Daffy's Automotive"
+url: /medicine-hat/daffys-automotive/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/medicine-hat/habitat-for-humanity-restore.md b/content/cities/medicine-hat/habitat-for-humanity-restore.md
new file mode 100644
index 000000000..51b6e4b74
--- /dev/null
+++ b/content/cities/medicine-hat/habitat-for-humanity-restore.md
@@ -0,0 +1,5 @@
+---
+title: "Habitat for Humanity ReStore"
+url: /medicine-hat/habitat-for-humanity-restore/
+shop: charity
+---
\ No newline at end of file
diff --git a/content/cities/medicine-hat/restore.md b/content/cities/medicine-hat/restore.md
deleted file mode 100644
index 0e5e6a920..000000000
--- a/content/cities/medicine-hat/restore.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "ReStore"
-url: /medicine-hat/restore/
-shop: doityourself
----
\ No newline at end of file
diff --git a/content/cities/okotoks/_index.md b/content/cities/okotoks/_index.md
index b9abd1fa7..d0f70c149 100644
--- a/content/cities/okotoks/_index.md
+++ b/content/cities/okotoks/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Okotoks
 url: /okotoks/
-latitude: 50.706
-longitude: -113.949
+latitude: 50.726
+longitude: -113.978
 ---
\ No newline at end of file
diff --git a/content/cities/olds/_index.md b/content/cities/olds/_index.md
index 7749a6016..2da8f0f77 100644
--- a/content/cities/olds/_index.md
+++ b/content/cities/olds/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Olds
 url: /olds/
-latitude: 51.796
-longitude: -114.129
+latitude: 51.794
+longitude: -114.12
 ---
\ No newline at end of file
diff --git a/content/cities/st-albert/dollarama.md b/content/cities/st-albert/dollarama.md
index bfda1699e..af9184954 100644
--- a/content/cities/st-albert/dollarama.md
+++ b/content/cities/st-albert/dollarama.md
@@ -1,5 +1,5 @@
 ---
 title: "Dollarama"
 url: /st-albert/dollarama/
-shop: general
+shop: variety store
 ---
\ No newline at end of file
diff --git a/content/cities/stony-plain/_index.md b/content/cities/stony-plain/_index.md
index 0c865b425..e107142a9 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.535
-longitude: -114.004
+latitude: 53.539
+longitude: -113.978
 ---
\ No newline at end of file
diff --git a/content/cities/westerose/_index.md b/content/cities/westerose/_index.md
index 5e7a1fa13..c9004060d 100644
--- a/content/cities/westerose/_index.md
+++ b/content/cities/westerose/_index.md
@@ -2,5 +2,5 @@
 title: Westerose
 url: /westerose/
 latitude: 52.961
-longitude: -114.028
+longitude: -114.027
 ---
\ No newline at end of file
diff --git a/data/cities/airdrie/bone-and-biscuit-co.yml b/data/cities/airdrie/bone-and-biscuit-co.yml
index c13ba933b..bb52f955c 100644
--- a/data/cities/airdrie/bone-and-biscuit-co.yml
+++ b/data/cities/airdrie/bone-and-biscuit-co.yml
@@ -7,5 +7,5 @@ city: Airdrie
 street: Mackenzie Way SW
 housenumber: "35"
 phone: ""
-opening_hours: ""
+opening_hours: Mo,Tu 10:00-18:00; We-Fr 10:00-19:00; Sa 11:00-18:00; Su 11:00-17:00
 website: ""
diff --git a/data/cities/airdrie/bronze-baxx.yml b/data/cities/airdrie/bronze-baxx.yml
index 67706c361..99e6bdcef 100644
--- a/data/cities/airdrie/bronze-baxx.yml
+++ b/data/cities/airdrie/bronze-baxx.yml
@@ -7,5 +7,5 @@ city: Airdrie
 street: Mackenzie Way SW
 housenumber: "35"
 phone: ""
-opening_hours: ""
+opening_hours: Mo-Th 10:00-21:00; Fr 10:00-20:00; Sa,Su 10:00-18:00
 website: ""
diff --git a/data/cities/airdrie/co-op-liquor-store-midtown-boulevard-sw.yml b/data/cities/airdrie/co-op-liquor-store-midtown-boulevard-sw.yml
index 3618633f7..82154e996 100644
--- a/data/cities/airdrie/co-op-liquor-store-midtown-boulevard-sw.yml
+++ b/data/cities/airdrie/co-op-liquor-store-midtown-boulevard-sw.yml
@@ -1,6 +1,6 @@
 id: 679185780
 type: node
-latitude: 51.28505
+latitude: 51.28511
 longitude: -114.02458
 postcode: T4B 4E7
 city: Airdrie
diff --git a/data/cities/airdrie/co-op-midtown-boulevard-sw.yml b/data/cities/airdrie/co-op-midtown-boulevard-sw.yml
index 46cea6f24..63db52424 100644
--- a/data/cities/airdrie/co-op-midtown-boulevard-sw.yml
+++ b/data/cities/airdrie/co-op-midtown-boulevard-sw.yml
@@ -1,7 +1,7 @@
 id: 804508722
 type: node
 latitude: 51.28511
-longitude: -114.02458
+longitude: -114.0248
 postcode: T4B 4E7
 city: Airdrie
 street: Midtown Boulevard SW
diff --git a/data/cities/airdrie/hear-canada.yml b/data/cities/airdrie/hear-canada.yml
new file mode 100644
index 000000000..81d366330
--- /dev/null
+++ b/data/cities/airdrie/hear-canada.yml
@@ -0,0 +1,11 @@
+id: 770455834
+type: node
+latitude: 51.29254
+longitude: -114.02447
+postcode: T4B 0V7
+city: Airdrie
+street: Mackenzie Way SW
+housenumber: "35"
+phone: ""
+opening_hours: Mo-Fr 08:30-16:30
+website: ""
diff --git a/data/cities/airdrie/iris-mackenzie-way-sw.yml b/data/cities/airdrie/iris-mackenzie-way-sw.yml
new file mode 100644
index 000000000..dd4f72553
--- /dev/null
+++ b/data/cities/airdrie/iris-mackenzie-way-sw.yml
@@ -0,0 +1,11 @@
+id: 770455828
+type: node
+latitude: 51.29196
+longitude: -114.02462
+postcode: T4B
+city: Airdrie
+street: Mackenzie Way SW
+housenumber: "132"
+phone: ""
+opening_hours: Mo,Tu,Fr 10:00-18:00; We,Th 12:00-20:00; Sa 10:00-17:00
+website: ""
diff --git a/data/cities/airdrie/mobil-mart-veterans-boulevard-ne.yml b/data/cities/airdrie/mobil-mart-veterans-boulevard-ne.yml
deleted file mode 100644
index 77337321b..000000000
--- a/data/cities/airdrie/mobil-mart-veterans-boulevard-ne.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 168056488
-type: node
-latitude: 51.30065
-longitude: -114.0093
-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
new file mode 100644
index 000000000..45a658ebe
--- /dev/null
+++ b/data/cities/airdrie/mobil-mart-yankee-valley-road-se.yml
@@ -0,0 +1,11 @@
+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 45a658ebe..77337321b 100644
--- a/data/cities/airdrie/mobil-mart.yml
+++ b/data/cities/airdrie/mobil-mart.yml
@@ -1,11 +1,11 @@
-id: 116236082
+id: 168056488
 type: node
-latitude: 51.27124
-longitude: -113.99059
-postcode: T4A 2E4
+latitude: 51.30065
+longitude: -114.0093
+postcode: T4B 3P2
 city: Airdrie
-street: Yankee Valley Road SE
-housenumber: "1050"
-phone: +1-403-887-1310
+street: Veterans Boulevard NE
+housenumber: "300"
+phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/airdrie/the-nails-bar.yml b/data/cities/airdrie/the-nails-bar.yml
index f85e27dca..1c832b003 100644
--- a/data/cities/airdrie/the-nails-bar.yml
+++ b/data/cities/airdrie/the-nails-bar.yml
@@ -7,5 +7,5 @@ city: Airdrie
 street: 1 Avenue NW
 housenumber: "409"
 phone: +1-403-980-1677
-opening_hours: ""
+opening_hours: Mo-Fr 10:00-19:00; Su 10:00-17:00; Sa 10:00-18:00
 website: ""
diff --git a/data/cities/airdrie/the-vape-warehouse.yml b/data/cities/airdrie/the-vape-warehouse.yml
index 9f3e0edf0..4742cfdb8 100644
--- a/data/cities/airdrie/the-vape-warehouse.yml
+++ b/data/cities/airdrie/the-vape-warehouse.yml
@@ -7,5 +7,5 @@ city: Airdrie
 street: Edwards Way SW
 housenumber: "191"
 phone: ""
-opening_hours: ""
+opening_hours: Mo-Fr 10:00-19:00; Sa 10:00-18:00; Su 11:00-17:00
 website: ""
diff --git a/data/cities/calgary/freedom-mobile-64-avenue-ne.yml b/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
deleted file mode 100644
index 773cbe116..000000000
--- a/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 000000000..5208466c1
--- /dev/null
+++ b/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
@@ -0,0 +1,11 @@
+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 5208466c1..773cbe116 100644
--- a/data/cities/calgary/freedom-mobile.yml
+++ b/data/cities/calgary/freedom-mobile.yml
@@ -1,11 +1,11 @@
-id: 8793422147
+id: 8796945780
 type: node
-latitude: 51.12697
-longitude: -114.07355
-postcode: T3K 2A8
+latitude: 51.10932
+longitude: -114.04099
+postcode: T2E 7P4
 city: Calgary
-street: Beddington Boulevard NW
-housenumber: "8120"
-phone: +1 403-402-5555
+street: 64 Avenue NE
+housenumber: "901"
+phone: "+14039037799"
 opening_hours: ""
-website: https://www.freedommobile.ca
+website: "+14039037799"
diff --git a/data/cities/calgary/rivian-service-center.yml b/data/cities/calgary/rivian-service-center.yml
new file mode 100644
index 000000000..2929deb26
--- /dev/null
+++ b/data/cities/calgary/rivian-service-center.yml
@@ -0,0 +1,11 @@
+id: 12343578019
+type: node
+latitude: 50.95278
+longitude: -113.97327
+postcode: AB T2C2K2
+city: Calgary
+street: 112 Avenue South-East
+housenumber: "4398"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/calgary/save-on-foods-naa-plaza-sw.yml b/data/cities/calgary/save-on-foods-naa-plaza-sw.yml
index 7db447599..01203ba88 100644
--- a/data/cities/calgary/save-on-foods-naa-plaza-sw.yml
+++ b/data/cities/calgary/save-on-foods-naa-plaza-sw.yml
@@ -1,7 +1,7 @@
 id: 781622247
 type: node
-latitude: 51.08027
-longitude: -114.19668
+latitude: 51.08028
+longitude: -114.19657
 postcode: T3B 2S6
 city: Calgary
 street: Na'a Plaza SW
diff --git a/data/cities/calgary/shell-uxbridge-drive-nw.yml b/data/cities/calgary/shell-uxbridge-drive-nw.yml
index 8436750a2..b3f58830b 100644
--- a/data/cities/calgary/shell-uxbridge-drive-nw.yml
+++ b/data/cities/calgary/shell-uxbridge-drive-nw.yml
@@ -8,4 +8,4 @@ street: Uxbridge Drive NW
 housenumber: "1820"
 phone: +1 403-289-7091
 opening_hours: 24/7
-website: http://shell.ca
+website: https://www.shell.ca/
diff --git a/data/cities/calgary/the-home-depot-16-avenue-nw.yml b/data/cities/calgary/the-home-depot-16-avenue-nw.yml
new file mode 100644
index 000000000..f575a503f
--- /dev/null
+++ b/data/cities/calgary/the-home-depot-16-avenue-nw.yml
@@ -0,0 +1,11 @@
+id: 34623011
+type: node
+latitude: 51.06715
+longitude: -114.10599
+postcode: T2M 0L8
+city: Calgary
+street: 16 Avenue NW
+housenumber: "1818"
+phone: ""
+opening_hours: ""
+website: http://www.homedepot.ca
diff --git a/data/cities/calgary/the-home-depot-sarcee-trail-nw.yml b/data/cities/calgary/the-home-depot-sarcee-trail-nw.yml
deleted file mode 100644
index 94dd64074..000000000
--- a/data/cities/calgary/the-home-depot-sarcee-trail-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 51112022
-type: node
-latitude: 51.15425
-longitude: -114.16015
-postcode: T3R 0A1
-city: Calgary
-street: Sarcee Trail NW
-housenumber: "11732"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/calgary/the-home-depot.yml b/data/cities/calgary/the-home-depot.yml
index f575a503f..94dd64074 100644
--- a/data/cities/calgary/the-home-depot.yml
+++ b/data/cities/calgary/the-home-depot.yml
@@ -1,11 +1,11 @@
-id: 34623011
+id: 51112022
 type: node
-latitude: 51.06715
-longitude: -114.10599
-postcode: T2M 0L8
+latitude: 51.15425
+longitude: -114.16015
+postcode: T3R 0A1
 city: Calgary
-street: 16 Avenue NW
-housenumber: "1818"
+street: Sarcee Trail NW
+housenumber: "11732"
 phone: ""
 opening_hours: ""
-website: http://www.homedepot.ca
+website: ""
diff --git a/data/cities/calgary/venture-motorworks-auto-mechanic.yml b/data/cities/calgary/venture-motorworks-auto-mechanic.yml
new file mode 100644
index 000000000..e8ac26ed9
--- /dev/null
+++ b/data/cities/calgary/venture-motorworks-auto-mechanic.yml
@@ -0,0 +1,11 @@
+id: 12330524808
+type: node
+latitude: 51.05538
+longitude: -113.99274
+postcode: T2A 6T3
+city: Calgary
+street: 28 St NE
+housenumber: "416"
+phone: +1-403-910-6259
+opening_hours: ""
+website: https://venturemotorworks.ca/
diff --git a/data/cities/eckville/lux-leaf-cannabis.yml b/data/cities/eckville/lux-leaf-cannabis.yml
index 01aa4e60a..4d9def878 100644
--- a/data/cities/eckville/lux-leaf-cannabis.yml
+++ b/data/cities/eckville/lux-leaf-cannabis.yml
@@ -8,4 +8,4 @@ street: 50 Avenue
 housenumber: "4856"
 phone: "+14037462336"
 opening_hours: ""
-website: http://luxleaf.ca
+website: https://luxleaf.ca/
diff --git a/data/cities/edmonton/simons-170-street-nw.yml b/data/cities/edmonton/simons-170-street-nw.yml
deleted file mode 100644
index 304044a25..000000000
--- a/data/cities/edmonton/simons-170-street-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6997404289
-type: node
-latitude: 53.52351
-longitude: -113.62802
-postcode: T5T 4M2
-city: Edmonton
-street: 170 Street NW
-housenumber: "8882"
-phone: +1-780-487-3630
-opening_hours: Mo-Sa 10:00-21:00; Su 11:00-18:00
-website: https://simons.ca/en/stores/alberta/west-edmonton-mall--a13091
diff --git a/data/cities/edmonton/simons-londonderry-mall-northwest.yml b/data/cities/edmonton/simons-londonderry-mall-northwest.yml
new file mode 100644
index 000000000..c7c55fd9a
--- /dev/null
+++ b/data/cities/edmonton/simons-londonderry-mall-northwest.yml
@@ -0,0 +1,11 @@
+id: 6991288686
+type: node
+latitude: 53.60366
+longitude: -113.44499
+postcode: T5C 3C8
+city: Edmonton
+street: Londonderry Mall NorthWest
+housenumber: "1"
+phone: +1-780-633-9880
+opening_hours: Mo-Fr 10:00-21:00; Sa 09:30-17:30; Su 11:00-17:00
+website: https://simons.ca/en/stores/alberta/londonderry-mall--a26897
diff --git a/data/cities/edmonton/simons.yml b/data/cities/edmonton/simons.yml
index c7c55fd9a..304044a25 100644
--- a/data/cities/edmonton/simons.yml
+++ b/data/cities/edmonton/simons.yml
@@ -1,11 +1,11 @@
-id: 6991288686
+id: 6997404289
 type: node
-latitude: 53.60366
-longitude: -113.44499
-postcode: T5C 3C8
+latitude: 53.52351
+longitude: -113.62802
+postcode: T5T 4M2
 city: Edmonton
-street: Londonderry Mall NorthWest
-housenumber: "1"
-phone: +1-780-633-9880
-opening_hours: Mo-Fr 10:00-21:00; Sa 09:30-17:30; Su 11:00-17:00
-website: https://simons.ca/en/stores/alberta/londonderry-mall--a26897
+street: 170 Street NW
+housenumber: "8882"
+phone: +1-780-487-3630
+opening_hours: Mo-Sa 10:00-21:00; Su 11:00-18:00
+website: https://simons.ca/en/stores/alberta/west-edmonton-mall--a13091
diff --git a/data/cities/girouxville/boisvert-service-garage-ltd.yml b/data/cities/girouxville/boisvert-service-garage-ltd.yml
new file mode 100644
index 000000000..942ce942e
--- /dev/null
+++ b/data/cities/girouxville/boisvert-service-garage-ltd.yml
@@ -0,0 +1,11 @@
+id: 1334555714
+type: node
+latitude: 55.75262
+longitude: -117.33784
+postcode: AB T0H 1S0
+city: Girouxville
+street: 50th Street
+housenumber: "4807"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/girouxville/every-now-and-then-antq-and-gftwr.yml b/data/cities/girouxville/every-now-and-then-antq-and-gftwr.yml
new file mode 100644
index 000000000..375de45bd
--- /dev/null
+++ b/data/cities/girouxville/every-now-and-then-antq-and-gftwr.yml
@@ -0,0 +1,11 @@
+id: 1334313051
+type: node
+latitude: 55.75501
+longitude: -117.3388
+postcode: AB T0H 1S0
+city: Girouxville
+street: 50th Street
+housenumber: ""
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/lacombe/nowco-home-hardware.yml b/data/cities/lacombe/nowco-home-hardware.yml
index 4efc778da..5e28fd818 100644
--- a/data/cities/lacombe/nowco-home-hardware.yml
+++ b/data/cities/lacombe/nowco-home-hardware.yml
@@ -1,7 +1,7 @@
-id: 6518701635
+id: 864763152
 type: node
-latitude: 52.46327
-longitude: -113.73037
+latitude: 52.4632
+longitude: -113.73007
 postcode: T4L 1Y1
 city: Lacombe
 street: 50 Avenue
diff --git a/data/cities/lethbridge/7-eleven-columbia-boulevard-w.yml b/data/cities/lethbridge/7-eleven-columbia-boulevard-w.yml
new file mode 100644
index 000000000..25e52f3cc
--- /dev/null
+++ b/data/cities/lethbridge/7-eleven-columbia-boulevard-w.yml
@@ -0,0 +1,11 @@
+id: 8702066198
+type: node
+latitude: 49.67043
+longitude: -112.89034
+postcode: T1K 5J9
+city: Lethbridge
+street: Columbia Boulevard W
+housenumber: "680"
+phone: +1-403-360-3772
+opening_hours: 24/7
+website: https://stores.7-eleven.ca/store/38349
diff --git a/data/cities/lethbridge/7-eleven-mayor-magrath-drive-s.yml b/data/cities/lethbridge/7-eleven-mayor-magrath-drive-s.yml
deleted file mode 100644
index a5686a4f3..000000000
--- a/data/cities/lethbridge/7-eleven-mayor-magrath-drive-s.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8581122605
-type: node
-latitude: 49.67316
-longitude: -112.80103
-postcode: T1K 2R9
-city: Lethbridge
-street: Mayor Magrath Drive S
-housenumber: "2004"
-phone: +1-403-327-4070
-opening_hours: 24/7
-website: https://stores.7-eleven.ca/store/15638
diff --git a/data/cities/lethbridge/7-eleven.yml b/data/cities/lethbridge/7-eleven.yml
index 25e52f3cc..a5686a4f3 100644
--- a/data/cities/lethbridge/7-eleven.yml
+++ b/data/cities/lethbridge/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 8702066198
+id: 8581122605
 type: node
-latitude: 49.67043
-longitude: -112.89034
-postcode: T1K 5J9
+latitude: 49.67316
+longitude: -112.80103
+postcode: T1K 2R9
 city: Lethbridge
-street: Columbia Boulevard W
-housenumber: "680"
-phone: +1-403-360-3772
+street: Mayor Magrath Drive S
+housenumber: "2004"
+phone: +1-403-327-4070
 opening_hours: 24/7
-website: https://stores.7-eleven.ca/store/38349
+website: https://stores.7-eleven.ca/store/15638
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/lloydminster/taits-cold-beer-and-liquor.yml b/data/cities/lloydminster/taits-cold-beer-and-liquor.yml
deleted file mode 100644
index d5c5cf4bb..000000000
--- a/data/cities/lloydminster/taits-cold-beer-and-liquor.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 642051276
-type: node
-latitude: 53.29065
-longitude: -110.00626
-postcode: T9V 0X3
-city: Lloydminster
-street: 50 Avenue
-housenumber: "5528"
-phone: +1-780-875-1071
-opening_hours: Mo-Sa 10:00-22:00; Su 10:00-18:00
-website: ""
diff --git a/data/cities/medicine-hat/daffys-automotive.yml b/data/cities/medicine-hat/daffys-automotive.yml
new file mode 100644
index 000000000..28d05e23b
--- /dev/null
+++ b/data/cities/medicine-hat/daffys-automotive.yml
@@ -0,0 +1,11 @@
+id: 10972467061
+type: node
+latitude: 50.0189
+longitude: -110.70992
+postcode: T1A 8B7
+city: Medicine Hat
+street: 10 Ave SW
+housenumber: "2139"
+phone: +1 403-526-8636
+opening_hours: Mo-Th 07:30-17:00, Fr 07:30-12:00
+website: https://daffysautomotive.com
diff --git a/data/cities/medicine-hat/fabutan-8-street-northwest.yml b/data/cities/medicine-hat/fabutan-8-street-northwest.yml
index cb982a6f0..9c737d08a 100644
--- a/data/cities/medicine-hat/fabutan-8-street-northwest.yml
+++ b/data/cities/medicine-hat/fabutan-8-street-northwest.yml
@@ -1,7 +1,7 @@
 id: 5344191740
 type: node
 latitude: 50.04968
-longitude: -110.68817
+longitude: -110.68821
 postcode: T1A 6N9
 city: Medicine Hat
 street: 8 Street Northwest
diff --git a/data/cities/medicine-hat/restore.yml b/data/cities/medicine-hat/habitat-for-humanity-restore.yml
similarity index 100%
rename from data/cities/medicine-hat/restore.yml
rename to data/cities/medicine-hat/habitat-for-humanity-restore.yml
diff --git a/data/cities/medicine-hat/nest-home-decor-and-flooring.yml b/data/cities/medicine-hat/nest-home-decor-and-flooring.yml
index 2cf242ff0..678b18908 100644
--- a/data/cities/medicine-hat/nest-home-decor-and-flooring.yml
+++ b/data/cities/medicine-hat/nest-home-decor-and-flooring.yml
@@ -1,7 +1,7 @@
 id: 553445163
 type: node
 latitude: 50.0496
-longitude: -110.68729
+longitude: -110.68733
 postcode: T1A 5R2
 city: Medicine Hat
 street: Division Avenue North
diff --git a/data/cities/medicine-hat/scissors-and-sun-hair-andtanning-salon.yml b/data/cities/medicine-hat/scissors-and-sun-hair-andtanning-salon.yml
index f929ec5ab..99b79099a 100644
--- a/data/cities/medicine-hat/scissors-and-sun-hair-andtanning-salon.yml
+++ b/data/cities/medicine-hat/scissors-and-sun-hair-andtanning-salon.yml
@@ -1,7 +1,7 @@
 id: 553445162
 type: node
 latitude: 50.0496
-longitude: -110.6873
+longitude: -110.68733
 postcode: T1A 5Y3
 city: Medicine Hat
 street: Division Avenue North
diff --git a/data/cities/rocky-mountain-house/co-op-home-centre.yml b/data/cities/rocky-mountain-house/co-op-home-centre.yml
index bbc0fbf68..63e13ad1d 100644
--- a/data/cities/rocky-mountain-house/co-op-home-centre.yml
+++ b/data/cities/rocky-mountain-house/co-op-home-centre.yml
@@ -1,7 +1,7 @@
-id: 510563857
+id: 12329470437
 type: node
-latitude: 52.36678
-longitude: -114.90752
+latitude: 52.36629
+longitude: -114.90694
 postcode: ""
 city: Rocky Mountain House
 street: 45 Street