diff --git a/content/cities/ambilly/_index.md b/content/cities/ambilly/_index.md
index 7e33e10d0..b2ccd83fc 100644
--- a/content/cities/ambilly/_index.md
+++ b/content/cities/ambilly/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Ambilly
 url: /ambilly/
-latitude: 46.194
+latitude: 46.196
 longitude: 6.228
 ---
\ No newline at end of file
diff --git a/content/cities/annecy/carrefour-city-place-annapurna.md b/content/cities/annecy/carrefour-city-place-annapurna.md
new file mode 100644
index 000000000..6bd821652
--- /dev/null
+++ b/content/cities/annecy/carrefour-city-place-annapurna.md
@@ -0,0 +1,5 @@
+---
+title: "Carrefour City"
+url: /annecy/carrefour-city-place-annapurna/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/annecy/carrefour-city-place-des-rhododendrons.md b/content/cities/annecy/carrefour-city-place-des-rhododendrons.md
deleted file mode 100644
index 990010696..000000000
--- a/content/cities/annecy/carrefour-city-place-des-rhododendrons.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Carrefour City"
-url: /annecy/carrefour-city-place-des-rhododendrons/
-shop: commodité
----
\ No newline at end of file
diff --git a/content/cities/annecy/carrefour-city.md b/content/cities/annecy/carrefour-city.md
index 24c6e1a9a..377ee4e3d 100644
--- a/content/cities/annecy/carrefour-city.md
+++ b/content/cities/annecy/carrefour-city.md
@@ -1,5 +1,5 @@
 ---
 title: "Carrefour City"
 url: /annecy/carrefour-city/
-shop: supermarché
+shop: commodité
 ---
\ No newline at end of file
diff --git a/content/cities/annemasse/burton.md b/content/cities/annemasse/burton.md
deleted file mode 100644
index 1605519d5..000000000
--- a/content/cities/annemasse/burton.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Burton"
-url: /annemasse/burton/
-shop: vêtements
----
\ No newline at end of file
diff --git a/content/cities/artemare/lecoserie-epicerie-bio-local-vrac.md b/content/cities/artemare/lecoserie-epicerie-bio-local-vrac.md
deleted file mode 100644
index c40e20aff..000000000
--- a/content/cities/artemare/lecoserie-epicerie-bio-local-vrac.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "L'Écoserie, épicerie BIO • LOCAL • VRAC"
-url: /artemare/lecoserie-epicerie-bio-local-vrac/
-shop: commodité
----
\ No newline at end of file
diff --git a/content/cities/artemare/lecoserie.md b/content/cities/artemare/lecoserie.md
new file mode 100644
index 000000000..46ae1f626
--- /dev/null
+++ b/content/cities/artemare/lecoserie.md
@@ -0,0 +1,5 @@
+---
+title: "L'Écoserie"
+url: /artemare/lecoserie/
+shop: commodité
+---
\ No newline at end of file
diff --git a/content/cities/bernin/_index.md b/content/cities/bernin/_index.md
index 717c93f81..ff836972f 100644
--- a/content/cities/bernin/_index.md
+++ b/content/cities/bernin/_index.md
@@ -2,5 +2,5 @@
 title: Bernin
 url: /bernin/
 latitude: 45.271
-longitude: 5.869
+longitude: 5.868
 ---
\ No newline at end of file
diff --git a/content/cities/chatel/intersport-chemin-de-sous-le-cret.md b/content/cities/chatel/intersport-chemin-de-sous-le-cret.md
new file mode 100644
index 000000000..9c126af51
--- /dev/null
+++ b/content/cities/chatel/intersport-chemin-de-sous-le-cret.md
@@ -0,0 +1,5 @@
+---
+title: "Intersport"
+url: /chatel/intersport-chemin-de-sous-le-cret/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/chatel/intersport-route-du-petit-chatel.md b/content/cities/chatel/intersport-route-du-petit-chatel.md
deleted file mode 100644
index 2b977bce9..000000000
--- a/content/cities/chatel/intersport-route-du-petit-chatel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Intersport"
-url: /chatel/intersport-route-du-petit-chatel/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/chazelles-sur-lyon/_index.md b/content/cities/chazelles-sur-lyon/_index.md
index 24801660a..14dfe5d99 100644
--- a/content/cities/chazelles-sur-lyon/_index.md
+++ b/content/cities/chazelles-sur-lyon/_index.md
@@ -2,5 +2,5 @@
 title: Chazelles-sur-Lyon
 url: /chazelles-sur-lyon/
 latitude: 45.638
-longitude: 4.39
+longitude: 4.392
 ---
\ No newline at end of file
diff --git a/content/cities/chezery-forens/_index.md b/content/cities/chezery-forens/_index.md
index aa4b1aefa..2c1dcc841 100644
--- a/content/cities/chezery-forens/_index.md
+++ b/content/cities/chezery-forens/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Chézery-Forens
 url: /chezery-forens/
-latitude: 46.22
+latitude: 46.221
 longitude: 5.866
 ---
\ No newline at end of file
diff --git a/content/cities/chezery-forens/le-ptit-chezery.md b/content/cities/chezery-forens/le-ptit-chezery.md
new file mode 100644
index 000000000..a5d74f261
--- /dev/null
+++ b/content/cities/chezery-forens/le-ptit-chezery.md
@@ -0,0 +1,5 @@
+---
+title: "Le p'tit Chézery"
+url: /chezery-forens/le-ptit-chezery/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/cublize/_index.md b/content/cities/cublize/_index.md
index 8cb69e7ef..27eeeb29e 100644
--- a/content/cities/cublize/_index.md
+++ b/content/cities/cublize/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Cublize
 url: /cublize/
-latitude: 46.019
-longitude: 4.378
+latitude: 46.016
+longitude: 4.377
 ---
\ No newline at end of file
diff --git a/content/cities/etaux/la-cie-du-dahu.md b/content/cities/etaux/la-cie-du-dahu.md
new file mode 100644
index 000000000..8f63cd722
--- /dev/null
+++ b/content/cities/etaux/la-cie-du-dahu.md
@@ -0,0 +1,5 @@
+---
+title: "La Cie du Dahu"
+url: /etaux/la-cie-du-dahu/
+shop: vin
+---
\ No newline at end of file
diff --git a/content/cities/eybens/le-ptit-festif.md b/content/cities/eybens/le-ptit-festif.md
new file mode 100644
index 000000000..62f014aec
--- /dev/null
+++ b/content/cities/eybens/le-ptit-festif.md
@@ -0,0 +1,5 @@
+---
+title: "Le P'tit Festif"
+url: /eybens/le-ptit-festif/
+shop: fête
+---
\ No newline at end of file
diff --git a/content/cities/fillinges/_index.md b/content/cities/fillinges/_index.md
index acd8e1e3f..d472776fb 100644
--- a/content/cities/fillinges/_index.md
+++ b/content/cities/fillinges/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Fillinges
 url: /fillinges/
-latitude: 46.151
-longitude: 6.32
+latitude: 46.154
+longitude: 6.321
 ---
\ No newline at end of file
diff --git a/content/cities/fontanil-cornillon/_index.md b/content/cities/fontanil-cornillon/_index.md
index 301281167..682505360 100644
--- a/content/cities/fontanil-cornillon/_index.md
+++ b/content/cities/fontanil-cornillon/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Fontanil-Cornillon
 url: /fontanil-cornillon/
-latitude: 45.246
+latitude: 45.245
 longitude: 5.658
 ---
\ No newline at end of file
diff --git a/content/cities/givors/cuir-center.md b/content/cities/givors/cuir-center.md
new file mode 100644
index 000000000..16697b4df
--- /dev/null
+++ b/content/cities/givors/cuir-center.md
@@ -0,0 +1,5 @@
+---
+title: "Cuir Center"
+url: /givors/cuir-center/
+shop: meubles
+---
\ No newline at end of file
diff --git a/content/cities/heyrieux/maison-rival.md b/content/cities/heyrieux/maison-rival.md
new file mode 100644
index 000000000..88c655e63
--- /dev/null
+++ b/content/cities/heyrieux/maison-rival.md
@@ -0,0 +1,5 @@
+---
+title: "Maison Rival"
+url: /heyrieux/maison-rival/
+shop: fruits de mer
+---
\ No newline at end of file
diff --git a/content/cities/la-clusaz/_index.md b/content/cities/la-clusaz/_index.md
index 46a572cf3..d4e34e56e 100644
--- a/content/cities/la-clusaz/_index.md
+++ b/content/cities/la-clusaz/_index.md
@@ -1,6 +1,6 @@
 ---
 title: La Clusaz
 url: /la-clusaz/
-latitude: 45.905
-longitude: 6.425
+latitude: 45.907
+longitude: 6.429
 ---
\ No newline at end of file
diff --git a/content/cities/lentigny/_index.md b/content/cities/lentigny/_index.md
index 1128c8d49..123ec92d9 100644
--- a/content/cities/lentigny/_index.md
+++ b/content/cities/lentigny/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lentigny
 url: /lentigny/
-latitude: 45.992
-longitude: 3.974
+latitude: 45.993
+longitude: 3.984
 ---
\ No newline at end of file
diff --git a/content/cities/mens/la-cave-de-la-halle-du-trieves.md b/content/cities/mens/la-cave-de-la-halle-du-trieves.md
new file mode 100644
index 000000000..59e8fbf1f
--- /dev/null
+++ b/content/cities/mens/la-cave-de-la-halle-du-trieves.md
@@ -0,0 +1,5 @@
+---
+title: "La Cave de la Halle du Trièves"
+url: /mens/la-cave-de-la-halle-du-trieves/
+shop: alcool
+---
\ No newline at end of file
diff --git a/content/cities/reignier-esery/_index.md b/content/cities/reignier-esery/_index.md
index 7debe9423..db9436a11 100644
--- a/content/cities/reignier-esery/_index.md
+++ b/content/cities/reignier-esery/_index.md
@@ -1,6 +1,6 @@
 ---
-title: Reignier-Ésery
+title: Reignier-Esery
 url: /reignier-esery/
-latitude: 46.136
-longitude: 6.269
+latitude: 46.138
+longitude: 6.27
 ---
\ No newline at end of file
diff --git a/content/cities/renage/_index.md b/content/cities/renage/_index.md
index 5b08fded7..a10516897 100644
--- a/content/cities/renage/_index.md
+++ b/content/cities/renage/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Renage
 url: /renage/
-latitude: 45.332
-longitude: 5.486
+latitude: 45.333
+longitude: 5.484
 ---
\ No newline at end of file
diff --git a/content/cities/roanne/brune.md b/content/cities/roanne/brune.md
new file mode 100644
index 000000000..2a3a2d87f
--- /dev/null
+++ b/content/cities/roanne/brune.md
@@ -0,0 +1,5 @@
+---
+title: "Brune"
+url: /roanne/brune/
+shop: alcool
+---
\ No newline at end of file
diff --git a/content/cities/roanne/ecolo-cartouche.md b/content/cities/roanne/ecolo-cartouche.md
deleted file mode 100644
index 39546813a..000000000
--- a/content/cities/roanne/ecolo-cartouche.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Ecolo-Cartouche"
-url: /roanne/ecolo-cartouche/
-shop: copyshop
----
\ No newline at end of file
diff --git a/content/cities/saint-andre-le-gaz/_index.md b/content/cities/saint-andre-le-gaz/_index.md
index 2fd5a20d1..a7b5146bd 100644
--- a/content/cities/saint-andre-le-gaz/_index.md
+++ b/content/cities/saint-andre-le-gaz/_index.md
@@ -2,5 +2,5 @@
 title: Saint-André-le-Gaz
 url: /saint-andre-le-gaz/
 latitude: 45.543
-longitude: 5.524
+longitude: 5.525
 ---
\ No newline at end of file
diff --git a/content/cities/saint-georges-desperanche/_index.md b/content/cities/saint-georges-desperanche/_index.md
index 071142a81..acf9c72a2 100644
--- a/content/cities/saint-georges-desperanche/_index.md
+++ b/content/cities/saint-georges-desperanche/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Georges-d'Espéranche
 url: /saint-georges-desperanche/
-latitude: 45.556
-longitude: 5.078
+latitude: 45.555
+longitude: 5.082
 ---
\ No newline at end of file
diff --git a/content/cities/saint-jean-de-sixt/_index.md b/content/cities/saint-jean-de-sixt/_index.md
index 58c5fa04e..c8188b693 100644
--- a/content/cities/saint-jean-de-sixt/_index.md
+++ b/content/cities/saint-jean-de-sixt/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Jean-de-Sixt
 url: /saint-jean-de-sixt/
 latitude: 45.923
-longitude: 6.41
+longitude: 6.412
 ---
\ No newline at end of file
diff --git a/content/cities/saint-symphorien-sur-coise/_index.md b/content/cities/saint-symphorien-sur-coise/_index.md
index cbc158f11..e93a52abb 100644
--- a/content/cities/saint-symphorien-sur-coise/_index.md
+++ b/content/cities/saint-symphorien-sur-coise/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Symphorien-sur-Coise
 url: /saint-symphorien-sur-coise/
 latitude: 45.632
-longitude: 4.455
+longitude: 4.457
 ---
\ No newline at end of file
diff --git a/content/cities/thones/_index.md b/content/cities/thones/_index.md
index fc6924ccc..904b7deed 100644
--- a/content/cities/thones/_index.md
+++ b/content/cities/thones/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Thônes
 url: /thones/
-latitude: 45.882
-longitude: 6.326
+latitude: 45.881
+longitude: 6.325
 ---
\ No newline at end of file
diff --git a/content/cities/valaurie/_index.md b/content/cities/valaurie/_index.md
index b3da23093..485279214 100644
--- a/content/cities/valaurie/_index.md
+++ b/content/cities/valaurie/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Valaurie
 url: /valaurie/
-latitude: 44.418
-longitude: 4.802
+latitude: 44.419
+longitude: 4.803
 ---
\ No newline at end of file
diff --git a/content/cities/villard-de-lans/atelier-instrumental.md b/content/cities/villard-de-lans/atelier-instrumental.md
new file mode 100644
index 000000000..f4a170915
--- /dev/null
+++ b/content/cities/villard-de-lans/atelier-instrumental.md
@@ -0,0 +1,5 @@
+---
+title: "Atelier instrumental"
+url: /villard-de-lans/atelier-instrumental/
+shop: shop
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/aux-pieds-sensibles.md b/content/cities/villefranche-sur-saone/aux-pieds-sensibles.md
new file mode 100644
index 000000000..76ad4dd2c
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/aux-pieds-sensibles.md
@@ -0,0 +1,5 @@
+---
+title: "Aux pieds sensibles"
+url: /villefranche-sur-saone/aux-pieds-sensibles/
+shop: chaussures
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/divineo.md b/content/cities/villefranche-sur-saone/divineo.md
new file mode 100644
index 000000000..4e77ab546
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/divineo.md
@@ -0,0 +1,5 @@
+---
+title: "Divineo"
+url: /villefranche-sur-saone/divineo/
+shop: beauté
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/eram.md b/content/cities/villefranche-sur-saone/eram.md
new file mode 100644
index 000000000..66a78627e
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/eram.md
@@ -0,0 +1,5 @@
+---
+title: "Éram"
+url: /villefranche-sur-saone/eram/
+shop: chaussures
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/inedit.md b/content/cities/villefranche-sur-saone/inedit.md
new file mode 100644
index 000000000..198455012
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/inedit.md
@@ -0,0 +1,5 @@
+---
+title: "Inédit"
+url: /villefranche-sur-saone/inedit/
+shop: coiffeur
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/itaparica.md b/content/cities/villefranche-sur-saone/itaparica.md
new file mode 100644
index 000000000..6c4e493af
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/itaparica.md
@@ -0,0 +1,5 @@
+---
+title: "Itaparica"
+url: /villefranche-sur-saone/itaparica/
+shop: vêtements
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/la-boulangerie.md b/content/cities/villefranche-sur-saone/la-boulangerie.md
new file mode 100644
index 000000000..feb3a586b
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/la-boulangerie.md
@@ -0,0 +1,5 @@
+---
+title: "La boulangerie"
+url: /villefranche-sur-saone/la-boulangerie/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/le-tabac-des-calades.md b/content/cities/villefranche-sur-saone/le-tabac-des-calades.md
new file mode 100644
index 000000000..35b550632
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/le-tabac-des-calades.md
@@ -0,0 +1,5 @@
+---
+title: "Le tabac des Calades"
+url: /villefranche-sur-saone/le-tabac-des-calades/
+shop: marchand de journaux
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/loli-lola.md b/content/cities/villefranche-sur-saone/loli-lola.md
new file mode 100644
index 000000000..fbab7505e
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/loli-lola.md
@@ -0,0 +1,5 @@
+---
+title: "Loli Lola"
+url: /villefranche-sur-saone/loli-lola/
+shop: vêtements
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/medelices.md b/content/cities/villefranche-sur-saone/medelices.md
index 14d30adc7..d2e528fd2 100644
--- a/content/cities/villefranche-sur-saone/medelices.md
+++ b/content/cities/villefranche-sur-saone/medelices.md
@@ -1,5 +1,5 @@
 ---
-title: "MéÐélices"
+title: "MéDélices"
 url: /villefranche-sur-saone/medelices/
 shop: boulangerie
 ---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/melo-coiffure.md b/content/cities/villefranche-sur-saone/melo-coiffure.md
new file mode 100644
index 000000000..df40d5820
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/melo-coiffure.md
@@ -0,0 +1,5 @@
+---
+title: "Melo coiffure"
+url: /villefranche-sur-saone/melo-coiffure/
+shop: coiffeur
+---
\ No newline at end of file
diff --git a/content/cities/villefranche-sur-saone/vrac-en-scene.md b/content/cities/villefranche-sur-saone/vrac-en-scene.md
new file mode 100644
index 000000000..93266af5f
--- /dev/null
+++ b/content/cities/villefranche-sur-saone/vrac-en-scene.md
@@ -0,0 +1,5 @@
+---
+title: "Vrac en Scène"
+url: /villefranche-sur-saone/vrac-en-scene/
+shop: charcuterie
+---
\ No newline at end of file
diff --git a/data/cities/annecy/carrefour-city-place-des-rhododendrons.yml b/data/cities/annecy/carrefour-city-place-annapurna.yml
similarity index 53%
rename from data/cities/annecy/carrefour-city-place-des-rhododendrons.yml
rename to data/cities/annecy/carrefour-city-place-annapurna.yml
index bc6f29ce2..a2b46fa1e 100644
--- a/data/cities/annecy/carrefour-city-place-des-rhododendrons.yml
+++ b/data/cities/annecy/carrefour-city-place-annapurna.yml
@@ -1,11 +1,11 @@
-id: 339224771
+id: 341372774
 type: node
-latitude: 45.91878
-longitude: 6.1289
+latitude: 45.91736
+longitude: 6.13371
 postcode: "74000"
 city: Annecy
-street: Place des Rhododendrons
-housenumber: "5"
+street: Place Annapurna
+housenumber: "13"
 phone: ""
 opening_hours: Mo-Sa 07:00-21:00; Su 09:00-13:00
 website: ""
diff --git a/data/cities/annecy/carrefour-city.yml b/data/cities/annecy/carrefour-city.yml
index a2b46fa1e..bc6f29ce2 100644
--- a/data/cities/annecy/carrefour-city.yml
+++ b/data/cities/annecy/carrefour-city.yml
@@ -1,11 +1,11 @@
-id: 341372774
+id: 339224771
 type: node
-latitude: 45.91736
-longitude: 6.13371
+latitude: 45.91878
+longitude: 6.1289
 postcode: "74000"
 city: Annecy
-street: Place Annapurna
-housenumber: "13"
+street: Place des Rhododendrons
+housenumber: "5"
 phone: ""
 opening_hours: Mo-Sa 07:00-21:00; Su 09:00-13:00
 website: ""
diff --git a/data/cities/annemasse/burton.yml b/data/cities/annemasse/burton.yml
deleted file mode 100644
index fbb9c78c6..000000000
--- a/data/cities/annemasse/burton.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5314629013
-type: node
-latitude: 46.19356
-longitude: 6.23376
-postcode: "74100"
-city: Annemasse
-street: Rue de la Gare
-housenumber: "2"
-phone: ""
-opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off
-website: ""
diff --git a/data/cities/annemasse/lapeyre.yml b/data/cities/annemasse/lapeyre.yml
index 7cc90d9d5..fbac72796 100644
--- a/data/cities/annemasse/lapeyre.yml
+++ b/data/cities/annemasse/lapeyre.yml
@@ -1,7 +1,7 @@
 id: 86299293
 type: node
-latitude: 46.1983
-longitude: 6.26575
+latitude: 46.19826
+longitude: 6.26536
 postcode: "74100"
 city: Annemasse
 street: Rue des Buchillons
diff --git a/data/cities/annemasse/novasanit.yml b/data/cities/annemasse/novasanit.yml
index 1755af7ac..20c57d46a 100644
--- a/data/cities/annemasse/novasanit.yml
+++ b/data/cities/annemasse/novasanit.yml
@@ -1,7 +1,7 @@
 id: 158463244
 type: node
 latitude: 46.19558
-longitude: 6.26977
+longitude: 6.26975
 postcode: "74100"
 city: Annemasse
 street: Rue Germain Sommeiller
diff --git a/data/cities/annemasse/tamtam.yml b/data/cities/annemasse/tamtam.yml
index e95c9c7c5..e2ea7a592 100644
--- a/data/cities/annemasse/tamtam.yml
+++ b/data/cities/annemasse/tamtam.yml
@@ -1,7 +1,7 @@
 id: 885534289
 type: node
 latitude: 46.19574
-longitude: 6.26684
+longitude: 6.26683
 postcode: "74100"
 city: Annemasse
 street: Rue Germain Sommeiller
diff --git a/data/cities/arc-1800/precision-ski.yml b/data/cities/arc-1800/precision-ski.yml
index 660b430a8..9b30c3e0f 100644
--- a/data/cities/arc-1800/precision-ski.yml
+++ b/data/cities/arc-1800/precision-ski.yml
@@ -7,5 +7,5 @@ city: Arc 1800
 street: Galerie Pierre Menta
 housenumber: ""
 phone: ""
-opening_hours: ""
+opening_hours: Mo-Th 08:30-19:00; Fr-Sa 08:30-19:30; Su 08:30-19:00
 website: https://www.precisionski-rent.com/stations-ski/les-arcs/galerie-du-charvet
diff --git a/data/cities/artemare/lecoserie-epicerie-bio-local-vrac.yml b/data/cities/artemare/lecoserie.yml
similarity index 100%
rename from data/cities/artemare/lecoserie-epicerie-bio-local-vrac.yml
rename to data/cities/artemare/lecoserie.yml
diff --git a/data/cities/chanaz/proxi.yml b/data/cities/chanaz/proxi.yml
index 75487680a..889b17885 100644
--- a/data/cities/chanaz/proxi.yml
+++ b/data/cities/chanaz/proxi.yml
@@ -4,7 +4,7 @@ latitude: 45.80893
 longitude: 5.79407
 postcode: "73310"
 city: Chanaz
-street: Route du Canal
+street: ""
 housenumber: "159"
 phone: +33 4 79 35 11 20
 opening_hours: Tu-Sa 08:00-19:00; Su 08:00-12:30
diff --git a/data/cities/chanaz/terroir-cafe.yml b/data/cities/chanaz/terroir-cafe.yml
index 9c037b531..b6a8fd540 100644
--- a/data/cities/chanaz/terroir-cafe.yml
+++ b/data/cities/chanaz/terroir-cafe.yml
@@ -4,7 +4,7 @@ latitude: 45.80876
 longitude: 5.78947
 postcode: "73310"
 city: Chanaz
-street: Montée du Fort
+street: ""
 housenumber: "82"
 phone: +33 6 48 55 26 51
 opening_hours: ""
diff --git a/data/cities/chatel/intersport-chemin-de-sous-le-cret.yml b/data/cities/chatel/intersport-chemin-de-sous-le-cret.yml
new file mode 100644
index 000000000..6560732ed
--- /dev/null
+++ b/data/cities/chatel/intersport-chemin-de-sous-le-cret.yml
@@ -0,0 +1,11 @@
+id: 3170166357
+type: node
+latitude: 46.2669
+longitude: 6.84214
+postcode: "74390"
+city: Châtel
+street: Chemin de Sous le Crêt
+housenumber: "167"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/chatel/intersport-route-du-petit-chatel.yml b/data/cities/chatel/intersport-route-du-petit-chatel.yml
deleted file mode 100644
index fb2792d1f..000000000
--- a/data/cities/chatel/intersport-route-du-petit-chatel.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3170152869
-type: node
-latitude: 46.27714
-longitude: 6.83613
-postcode: "74390"
-city: Châtel
-street: Route du Petit Châtel
-housenumber: "115"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/chatel/intersport.yml b/data/cities/chatel/intersport.yml
index 6560732ed..fb2792d1f 100644
--- a/data/cities/chatel/intersport.yml
+++ b/data/cities/chatel/intersport.yml
@@ -1,11 +1,11 @@
-id: 3170166357
+id: 3170152869
 type: node
-latitude: 46.2669
-longitude: 6.84214
+latitude: 46.27714
+longitude: 6.83613
 postcode: "74390"
 city: Châtel
-street: Chemin de Sous le Crêt
-housenumber: "167"
+street: Route du Petit Châtel
+housenumber: "115"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/chezery-forens/le-ptit-chezery.yml b/data/cities/chezery-forens/le-ptit-chezery.yml
new file mode 100644
index 000000000..d35cf8db8
--- /dev/null
+++ b/data/cities/chezery-forens/le-ptit-chezery.yml
@@ -0,0 +1,11 @@
+id: 5084207588
+type: node
+latitude: 46.22083
+longitude: 5.86628
+postcode: "01410"
+city: Chézery-Forens
+street: Route de Confort
+housenumber: "120"
+phone: ""
+opening_hours: Tu-Su 07:15-12:15; Tu,Sa 16:30-18:30
+website: ""
diff --git a/data/cities/etaux/la-cie-du-dahu.yml b/data/cities/etaux/la-cie-du-dahu.yml
new file mode 100644
index 000000000..885c728b8
--- /dev/null
+++ b/data/cities/etaux/la-cie-du-dahu.yml
@@ -0,0 +1,11 @@
+id: 12426523586
+type: node
+latitude: 46.06305
+longitude: 6.29262
+postcode: "74800"
+city: Etaux
+street: Route du Clos du May
+housenumber: "309"
+phone: "0668789814"
+opening_hours: ""
+website: http://www.laciedudahu.fr/
diff --git a/data/cities/eybens/le-ptit-festif.yml b/data/cities/eybens/le-ptit-festif.yml
new file mode 100644
index 000000000..a83266387
--- /dev/null
+++ b/data/cities/eybens/le-ptit-festif.yml
@@ -0,0 +1,11 @@
+id: 7394403049
+type: node
+latitude: 45.15779
+longitude: 5.74965
+postcode: "38320"
+city: Eybens
+street: Rue Frédéric Chopin
+housenumber: "18"
+phone: +33 4 76 51 34 90
+opening_hours: Mo-Fr 10:00-12:30, 14:00-19:00; Sa 10:00-19:00
+website: https://www.leptitfestif.fr/nos-magasins/magasin-le-ptit-festif-eybens
diff --git a/data/cities/givors/cuir-center.yml b/data/cities/givors/cuir-center.yml
new file mode 100644
index 000000000..8a6b6816b
--- /dev/null
+++ b/data/cities/givors/cuir-center.yml
@@ -0,0 +1,11 @@
+id: 66655113
+type: node
+latitude: 45.58155
+longitude: 4.74091
+postcode: "69700"
+city: Givors
+street: Rue de la Paix
+housenumber: "22"
+phone: +33 4 78 07 96 70
+opening_hours: Mo 14:30-19:00; Tu-Fr 10:00-12:30, 14:00-19:00; Sa 10:00-19:00
+website: https://www.cuircenter.com/fr-FR/lyon-givors/sCC141.html
diff --git a/data/cities/grenoble/carrefour-city.yml b/data/cities/grenoble/carrefour-city.yml
index c585fe2e5..3916ca8f8 100644
--- a/data/cities/grenoble/carrefour-city.yml
+++ b/data/cities/grenoble/carrefour-city.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: Cours Jean Jaurès
 housenumber: "31"
 phone: ""
-opening_hours: Su 09:00-12:30; Mo-Sa 07:00-21:00
+opening_hours: Mo-Sa 07:00-21:00; Su 09:00-20:00
 website: https://www.carrefour.fr/magasin/city-grenoble-jaures-31
diff --git a/data/cities/grenoble/onglart.yml b/data/cities/grenoble/onglart.yml
index 57189a9a1..876c0c778 100644
--- a/data/cities/grenoble/onglart.yml
+++ b/data/cities/grenoble/onglart.yml
@@ -6,6 +6,6 @@ postcode: "38100"
 city: Grenoble
 street: Avenue Jean Perrot
 housenumber: "29"
-phone: ""
+phone: "+33476428313"
 opening_hours: Tu-Th 09:00-12:00,14:00-19:00; Fr-Sa 09:00-18:00
 website: http://onglerie-grenoble.fr/
diff --git a/data/cities/heyrieux/maison-rival.yml b/data/cities/heyrieux/maison-rival.yml
new file mode 100644
index 000000000..cccfb96df
--- /dev/null
+++ b/data/cities/heyrieux/maison-rival.yml
@@ -0,0 +1,11 @@
+id: 12422336101
+type: node
+latitude: 45.63062
+longitude: 5.06256
+postcode: "38540"
+city: Heyrieux
+street: Avenue Général Leclerc
+housenumber: "27"
+phone: +33 4 78 36 23 25
+opening_hours: ""
+website: ""
diff --git a/data/cities/les-arcs-1950/precision-ski.yml b/data/cities/les-arcs-1950/precision-ski.yml
index 87127f7a3..21d562e2b 100644
--- a/data/cities/les-arcs-1950/precision-ski.yml
+++ b/data/cities/les-arcs-1950/precision-ski.yml
@@ -7,5 +7,5 @@ city: Les Arcs 1950
 street: ""
 housenumber: ""
 phone: +33 4 79 41 96 31
-opening_hours: Mo-Su 09:00-19:00
+opening_hours: Mo-Th 08:30-19:00; Fr-Sa 08:30-19:30; Su 08:30-19:00
 website: https://www.precisionski-rent.com/stations-ski/les-arcs/precision-1950
diff --git a/data/cities/mens/la-cave-de-la-halle-du-trieves.yml b/data/cities/mens/la-cave-de-la-halle-du-trieves.yml
new file mode 100644
index 000000000..998183ad6
--- /dev/null
+++ b/data/cities/mens/la-cave-de-la-halle-du-trieves.yml
@@ -0,0 +1,11 @@
+id: 4337666635
+type: node
+latitude: 44.81822
+longitude: 5.75135
+postcode: "38710"
+city: Mens
+street: Place de la Halle
+housenumber: "13"
+phone: +33 4 76 34 14 60
+opening_hours: We-Fr 10:00-18:00; Sa 09:30-18:30
+website: https://lacavedelahalledutrieves.fr/
diff --git a/data/cities/roanne/brune.yml b/data/cities/roanne/brune.yml
new file mode 100644
index 000000000..7ae691899
--- /dev/null
+++ b/data/cities/roanne/brune.yml
@@ -0,0 +1,11 @@
+id: 9850974321
+type: node
+latitude: 46.03944
+longitude: 4.07236
+postcode: "42300"
+city: Roanne
+street: Place Georges Clémenceau
+housenumber: "2"
+phone: ""
+opening_hours: Tu-We 15:00-22:00; Th 15:00-23:00; Fr-Sa 10:00-12:30,15:00-23:00
+website: ""
diff --git a/data/cities/roanne/ecolo-cartouche.yml b/data/cities/roanne/ecolo-cartouche.yml
deleted file mode 100644
index 57a306af0..000000000
--- a/data/cities/roanne/ecolo-cartouche.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9280524177
-type: node
-latitude: 46.04453
-longitude: 4.07093
-postcode: "42300"
-city: Roanne
-street: Avenue de Paris
-housenumber: "59"
-phone: +33 4 77 78 13 52
-opening_hours: Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:30-12:00,13:30- 18:00
-website: https://www.ecolo-cartouche.fr
diff --git a/data/cities/saint-etienne/la-vie-claire.yml b/data/cities/saint-etienne/la-vie-claire.yml
index 768f6438f..db40d1048 100644
--- a/data/cities/saint-etienne/la-vie-claire.yml
+++ b/data/cities/saint-etienne/la-vie-claire.yml
@@ -8,4 +8,4 @@ street: Cours Victor Hugo
 housenumber: "25"
 phone: "+33477378214"
 opening_hours: Mo-Sa 08:30-13:00,14:30-19:30
-website: https://www.lavieclaire.com/magasin-bio/saint-etienne.html
+website: https://magasins.lavieclaire.com/lavieclaire/fr/store/france/auvergne-rhone-alpes/loire/saint-etienne/saint-etienne/14225
diff --git a/data/cities/saint-gingolph/casino-shop.yml b/data/cities/saint-gingolph/casino-shop.yml
index 4d570f39f..e97a997af 100644
--- a/data/cities/saint-gingolph/casino-shop.yml
+++ b/data/cities/saint-gingolph/casino-shop.yml
@@ -1,6 +1,6 @@
 id: 66784328
 type: node
-latitude: 46.3935
+latitude: 46.39351
 longitude: 6.80111
 postcode: "74500"
 city: Saint-Gingolph
diff --git a/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml b/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml
index 1639bb93e..125165164 100644
--- a/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml
+++ b/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml
@@ -6,6 +6,6 @@ postcode: "42170"
 city: Saint-Just-Saint-Rambert
 street: Chemin du Béchet
 housenumber: "29"
-phone: 04 77 52 17 45
+phone: ""
 opening_hours: ""
-website: https://www.brasseriedelaloire.fr/
+website: ""
diff --git a/data/cities/tignes-le-lac/ski-republic.yml b/data/cities/tignes-le-lac/ski-republic.yml
index 26683d098..95dde99ac 100644
--- a/data/cities/tignes-le-lac/ski-republic.yml
+++ b/data/cities/tignes-le-lac/ski-republic.yml
@@ -7,5 +7,5 @@ city: Tignes le Lac
 street: Route du Lavachet
 housenumber: ""
 phone: ""
-opening_hours: ""
+opening_hours: Mo 08:30-19:00; Tu-Th 08:30-12:30, 15:30-19:00; Fr-Su 08:30-19:30
 website: https://www.ski-republic.com/stations-ski/tignes/lavachet
diff --git a/data/cities/tignes-val-claret/ski-republic-borsat.yml b/data/cities/tignes-val-claret/ski-republic-borsat.yml
index f8fe02bc0..12afedf44 100644
--- a/data/cities/tignes-val-claret/ski-republic-borsat.yml
+++ b/data/cities/tignes-val-claret/ski-republic-borsat.yml
@@ -7,5 +7,5 @@ city: Tignes Val-Claret
 street: Rue du Val Claret
 housenumber: ""
 phone: +33 4 79 06 49 31
-opening_hours: Jan-Dec PH,Mo-Su 10:00-19:00
+opening_hours: Mo 08:30-19:00; Tu-Th 08:30-12:30, 15:30-19:00; Fr-Su 08:30-19:30
 website: https://www.ski-republic.com/stations-ski/tignes/le-borsat
diff --git a/data/cities/valmeinier/intersport-2.yml b/data/cities/valmeinier/intersport-2.yml
index 79c4830fb..1d0a951ee 100644
--- a/data/cities/valmeinier/intersport-2.yml
+++ b/data/cities/valmeinier/intersport-2.yml
@@ -1,7 +1,7 @@
-id: 3213779131
+id: 3170514204
 type: node
-latitude: 45.17455
-longitude: 6.49336
+latitude: 45.17573
+longitude: 6.49398
 postcode: "73450"
 city: Valmeinier
 street: ""
diff --git a/data/cities/valmeinier/intersport.yml b/data/cities/valmeinier/intersport.yml
index 1d0a951ee..79c4830fb 100644
--- a/data/cities/valmeinier/intersport.yml
+++ b/data/cities/valmeinier/intersport.yml
@@ -1,7 +1,7 @@
-id: 3170514204
+id: 3213779131
 type: node
-latitude: 45.17573
-longitude: 6.49398
+latitude: 45.17455
+longitude: 6.49336
 postcode: "73450"
 city: Valmeinier
 street: ""
diff --git a/data/cities/villard-de-lans/atelier-instrumental.yml b/data/cities/villard-de-lans/atelier-instrumental.yml
new file mode 100644
index 000000000..ec3781fc6
--- /dev/null
+++ b/data/cities/villard-de-lans/atelier-instrumental.yml
@@ -0,0 +1,11 @@
+id: 12421256323
+type: node
+latitude: 45.06991
+longitude: 5.55101
+postcode: "38250"
+city: Villard-de-Lans
+street: Rue de la Paix
+housenumber: "30"
+phone: ""
+opening_hours: '"Sur rendez-vous"'
+website: ""
diff --git a/data/cities/villefranche-sur-saone/aux-pieds-sensibles.yml b/data/cities/villefranche-sur-saone/aux-pieds-sensibles.yml
new file mode 100644
index 000000000..2bb56f4fc
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/aux-pieds-sensibles.yml
@@ -0,0 +1,11 @@
+id: 11400069570
+type: node
+latitude: 45.99335
+longitude: 4.71901
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Nationale
+housenumber: "223"
+phone: ""
+opening_hours: Mo-Sa 09:00-12:00, 14:30-19:00
+website: ""
diff --git a/data/cities/villefranche-sur-saone/divineo.yml b/data/cities/villefranche-sur-saone/divineo.yml
new file mode 100644
index 000000000..1285d7ec1
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/divineo.yml
@@ -0,0 +1,11 @@
+id: 9180074041
+type: node
+latitude: 45.98559
+longitude: 4.71846
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue de la Gare
+housenumber: "9"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/villefranche-sur-saone/eram.yml b/data/cities/villefranche-sur-saone/eram.yml
new file mode 100644
index 000000000..9babb307f
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/eram.yml
@@ -0,0 +1,11 @@
+id: 11438448570
+type: node
+latitude: 45.9915
+longitude: 4.71888
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Nationale
+housenumber: "431"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/villefranche-sur-saone/inedit.yml b/data/cities/villefranche-sur-saone/inedit.yml
new file mode 100644
index 000000000..109da4a77
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/inedit.yml
@@ -0,0 +1,11 @@
+id: 10076450818
+type: node
+latitude: 45.98776
+longitude: 4.71655
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue de la République
+housenumber: "116"
+phone: ""
+opening_hours: Tu-Fr 08:30-18:30; Sa 08:00-17:00
+website: https://www.planity.com/inedit-69400-villefranche-sur-saone
diff --git a/data/cities/villefranche-sur-saone/itaparica.yml b/data/cities/villefranche-sur-saone/itaparica.yml
new file mode 100644
index 000000000..5bf9c9ff2
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/itaparica.yml
@@ -0,0 +1,11 @@
+id: 11438400771
+type: node
+latitude: 45.99251
+longitude: 4.71894
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Nationale
+housenumber: "317"
+phone: ""
+opening_hours: Mo-Th, Sa 09:30-12:00, 14:00-19:00; Fr 09:30-19:00
+website: https://www.itaparica.fr
diff --git a/data/cities/villefranche-sur-saone/la-boulangerie.yml b/data/cities/villefranche-sur-saone/la-boulangerie.yml
new file mode 100644
index 000000000..3d3c7ebbf
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/la-boulangerie.yml
@@ -0,0 +1,11 @@
+id: 11400056372
+type: node
+latitude: 45.99206
+longitude: 4.7187
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Nationale
+housenumber: "364"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/villefranche-sur-saone/le-tabac-des-calades.yml b/data/cities/villefranche-sur-saone/le-tabac-des-calades.yml
new file mode 100644
index 000000000..c487c1edf
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/le-tabac-des-calades.yml
@@ -0,0 +1,11 @@
+id: 9040175818
+type: node
+latitude: 45.98883
+longitude: 4.71837
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Nationale
+housenumber: "736"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/villefranche-sur-saone/loli-lola.yml b/data/cities/villefranche-sur-saone/loli-lola.yml
new file mode 100644
index 000000000..71280ccbc
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/loli-lola.yml
@@ -0,0 +1,11 @@
+id: 11438448670
+type: node
+latitude: 45.99176
+longitude: 4.7189
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Nationale
+housenumber: "401"
+phone: ""
+opening_hours: Tu-Fr 10:00-12:45, 14:00-19:00; Sa 09:45-12:45, 14:00-19:00
+website: ""
diff --git a/data/cities/villefranche-sur-saone/melo-coiffure.yml b/data/cities/villefranche-sur-saone/melo-coiffure.yml
new file mode 100644
index 000000000..580e1bcdd
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/melo-coiffure.yml
@@ -0,0 +1,11 @@
+id: 10081635117
+type: node
+latitude: 45.98399
+longitude: 4.73114
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Émile Zola
+housenumber: "778"
+phone: ""
+opening_hours: Mo-Tu 09:00-19:00; Th-Fr 09:00-19:00; Sa 08:00-17:00
+website: ""
diff --git a/data/cities/villefranche-sur-saone/vrac-en-scene.yml b/data/cities/villefranche-sur-saone/vrac-en-scene.yml
new file mode 100644
index 000000000..c575f27ff
--- /dev/null
+++ b/data/cities/villefranche-sur-saone/vrac-en-scene.yml
@@ -0,0 +1,11 @@
+id: 5879945640
+type: node
+latitude: 45.99306
+longitude: 4.71896
+postcode: "69400"
+city: Villefranche-sur-Saône
+street: Rue Nationale
+housenumber: "255"
+phone: ""
+opening_hours: Tu-Sa 09:00-19:00; Mo 14:00-19:00
+website: ""