diff --git a/content/cities/aigueblanche/_index.md b/content/cities/aigueblanche/_index.md
index ebe52bd82..dc81220ed 100644
--- a/content/cities/aigueblanche/_index.md
+++ b/content/cities/aigueblanche/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Aigueblanche
 url: /aigueblanche/
-latitude: 45.502
-longitude: 6.503
+latitude: 45.503
+longitude: 6.502
 ---
\ No newline at end of file
diff --git a/content/cities/annecy/_index.md b/content/cities/annecy/_index.md
index 4dfcd067b..50c992683 100644
--- a/content/cities/annecy/_index.md
+++ b/content/cities/annecy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Annecy
 url: /annecy/
-latitude: 45.919
-longitude: 6.129
+latitude: 45.91
+longitude: 6.118
 ---
\ No newline at end of file
diff --git a/content/cities/annecy/carrefour-city-place-annapurna.md b/content/cities/annecy/carrefour-city-place-des-rhododendrons.md
similarity index 75%
rename from content/cities/annecy/carrefour-city-place-annapurna.md
rename to content/cities/annecy/carrefour-city-place-des-rhododendrons.md
index 24c6e1a9a..377ee4e3d 100644
--- a/content/cities/annecy/carrefour-city-place-annapurna.md
+++ b/content/cities/annecy/carrefour-city-place-des-rhododendrons.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/annecy/carrefour-city.md b/content/cities/annecy/carrefour-city.md
index 377ee4e3d..24c6e1a9a 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: commodité
+shop: supermarché
 ---
\ No newline at end of file
diff --git a/content/cities/annecy/go-sport.md b/content/cities/annecy/go-sport.md
index d45e36bcb..a8fd09410 100644
--- a/content/cities/annecy/go-sport.md
+++ b/content/cities/annecy/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /annecy/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/annemasse/histoire-dor-allee-francois-truffaut.md b/content/cities/annemasse/histoire-dor-rue-de-la-resistance.md
similarity index 100%
rename from content/cities/annemasse/histoire-dor-allee-francois-truffaut.md
rename to content/cities/annemasse/histoire-dor-rue-de-la-resistance.md
diff --git a/content/cities/bernin/_index.md b/content/cities/bernin/_index.md
index ff836972f..717c93f81 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.868
+longitude: 5.869
 ---
\ No newline at end of file
diff --git a/content/cities/chambery/go-sport.md b/content/cities/chambery/go-sport.md
index 16fcee26a..72908bc78 100644
--- a/content/cities/chambery/go-sport.md
+++ b/content/cities/chambery/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /chambery/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/echirolles/go-sport.md b/content/cities/echirolles/go-sport.md
index df69e7c04..bb4cd66d4 100644
--- a/content/cities/echirolles/go-sport.md
+++ b/content/cities/echirolles/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /echirolles/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/epagny-metz-tessy/go-sport.md b/content/cities/epagny-metz-tessy/go-sport.md
index d8d5f2d14..ff65d8b51 100644
--- a/content/cities/epagny-metz-tessy/go-sport.md
+++ b/content/cities/epagny-metz-tessy/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /epagny-metz-tessy/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/etrembieres/go-sport.md b/content/cities/etrembieres/go-sport.md
index 8a7eda5b6..5be626795 100644
--- a/content/cities/etrembieres/go-sport.md
+++ b/content/cities/etrembieres/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /etrembieres/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/givors/go-sport.md b/content/cities/givors/go-sport.md
index 2a3cb5867..dac39279d 100644
--- a/content/cities/givors/go-sport.md
+++ b/content/cities/givors/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /givors/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/grenoble/_index.md b/content/cities/grenoble/_index.md
index ab4f2ee24..ad4ae9438 100644
--- a/content/cities/grenoble/_index.md
+++ b/content/cities/grenoble/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Grenoble
 url: /grenoble/
-latitude: 45.188
-longitude: 5.729
+latitude: 45.185
+longitude: 5.72
 ---
\ No newline at end of file
diff --git a/content/cities/grenoble/go-sport.md b/content/cities/grenoble/go-sport.md
index 47641f5c3..63bec8391 100644
--- a/content/cities/grenoble/go-sport.md
+++ b/content/cities/grenoble/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /grenoble/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/grenoble/kuoni-et-univairmer.md b/content/cities/grenoble/kuoni-et-univairmer.md
deleted file mode 100644
index 7c85b470b..000000000
--- a/content/cities/grenoble/kuoni-et-univairmer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Kuoni & Univairmer"
-url: /grenoble/kuoni-et-univairmer/
-shop: agence de voyage
----
\ No newline at end of file
diff --git a/content/cities/grenoble/la-fournee.md b/content/cities/grenoble/la-fournee.md
new file mode 100644
index 000000000..4d69a4369
--- /dev/null
+++ b/content/cities/grenoble/la-fournee.md
@@ -0,0 +1,5 @@
+---
+title: "La fournée"
+url: /grenoble/la-fournee/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/grenoble/univairmer.md b/content/cities/grenoble/univairmer.md
new file mode 100644
index 000000000..0966e8f75
--- /dev/null
+++ b/content/cities/grenoble/univairmer.md
@@ -0,0 +1,5 @@
+---
+title: "Univairmer"
+url: /grenoble/univairmer/
+shop: agence de voyage
+---
\ No newline at end of file
diff --git a/content/cities/la-clusaz/_index.md b/content/cities/la-clusaz/_index.md
index d4e34e56e..46a572cf3 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.907
-longitude: 6.429
+latitude: 45.905
+longitude: 6.425
 ---
\ No newline at end of file
diff --git a/content/cities/la-clusaz/go-sport.md b/content/cities/la-clusaz/go-sport.md
index 7e18702a9..7531429c4 100644
--- a/content/cities/la-clusaz/go-sport.md
+++ b/content/cities/la-clusaz/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /la-clusaz/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/les-carroz-d-araches/go-sport.md b/content/cities/les-carroz-d-araches/go-sport.md
index 929f6073d..77275a0a3 100644
--- a/content/cities/les-carroz-d-araches/go-sport.md
+++ b/content/cities/les-carroz-d-araches/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /les-carroz-d-araches/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/lisle-dabeau/go-sport.md b/content/cities/lisle-dabeau/go-sport.md
index add429ccb..b5aaf20f7 100644
--- a/content/cities/lisle-dabeau/go-sport.md
+++ b/content/cities/lisle-dabeau/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /lisle-dabeau/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/lyon/delavegas.md b/content/cities/lyon/delavegas.md
new file mode 100644
index 000000000..99470b510
--- /dev/null
+++ b/content/cities/lyon/delavegas.md
@@ -0,0 +1,5 @@
+---
+title: "Delavegas"
+url: /lyon/delavegas/
+shop: commodité
+---
\ No newline at end of file
diff --git a/content/cities/montelimar/_index.md b/content/cities/montelimar/_index.md
index f7b3e33e2..029b22d8e 100644
--- a/content/cities/montelimar/_index.md
+++ b/content/cities/montelimar/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Montélimar
 url: /montelimar/
-latitude: 44.554
-longitude: 4.749
+latitude: 44.533
+longitude: 4.734
 ---
\ No newline at end of file
diff --git a/content/cities/morzine/go-sport.md b/content/cities/morzine/go-sport.md
index 8fb72b4e4..8c711edfd 100644
--- a/content/cities/morzine/go-sport.md
+++ b/content/cities/morzine/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /morzine/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/neydens/go-sport.md b/content/cities/neydens/go-sport.md
index f3f3141ae..1f96af180 100644
--- a/content/cities/neydens/go-sport.md
+++ b/content/cities/neydens/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /neydens/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/oyonnax/atelier-velo-collaboratif.md b/content/cities/oyonnax/atelier-velo-collaboratif.md
new file mode 100644
index 000000000..056e73b80
--- /dev/null
+++ b/content/cities/oyonnax/atelier-velo-collaboratif.md
@@ -0,0 +1,5 @@
+---
+title: "Atelier vélo collaboratif"
+url: /oyonnax/atelier-velo-collaboratif/
+shop: shop
+---
\ No newline at end of file
diff --git a/content/cities/publier/go-sport.md b/content/cities/publier/go-sport.md
index cc8d982c0..724b63ce4 100644
--- a/content/cities/publier/go-sport.md
+++ b/content/cities/publier/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /publier/go-sport/
 shop: sports
 ---
\ 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/saint-alban-leysse/betm.md b/content/cities/saint-alban-leysse/betm.md
deleted file mode 100644
index 8848e8a7f..000000000
--- a/content/cities/saint-alban-leysse/betm.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "B&M"
-url: /saint-alban-leysse/betm/
-shop: shop
----
\ No newline at end of file
diff --git a/content/cities/saint-christo-en-jarez/_index.md b/content/cities/saint-christo-en-jarez/_index.md
index 6e3fd363e..9afc3bbe9 100644
--- a/content/cities/saint-christo-en-jarez/_index.md
+++ b/content/cities/saint-christo-en-jarez/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Christo-en-Jarez
 url: /saint-christo-en-jarez/
-latitude: 45.547
-longitude: 4.489
+latitude: 45.544
+longitude: 4.486
 ---
\ No newline at end of file
diff --git a/content/cities/saint-etienne/atelier-de-la-souris-verte.md b/content/cities/saint-etienne/atelier-de-la-souris-verte.md
new file mode 100644
index 000000000..724fa4d0d
--- /dev/null
+++ b/content/cities/saint-etienne/atelier-de-la-souris-verte.md
@@ -0,0 +1,5 @@
+---
+title: "Atelier de la Souris Verte"
+url: /saint-etienne/atelier-de-la-souris-verte/
+shop: vélo
+---
\ No newline at end of file
diff --git a/content/cities/saint-gervais-les-bains/go-sport.md b/content/cities/saint-gervais-les-bains/go-sport.md
index a68b8f6da..fb5b03940 100644
--- a/content/cities/saint-gervais-les-bains/go-sport.md
+++ b/content/cities/saint-gervais-les-bains/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /saint-gervais-les-bains/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/saint-jean-darves/_index.md b/content/cities/saint-jean-darves/_index.md
index 113030e2c..442120d8c 100644
--- a/content/cities/saint-jean-darves/_index.md
+++ b/content/cities/saint-jean-darves/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Jean-d'Arves
 url: /saint-jean-darves/
 latitude: 45.214
-longitude: 6.263
+longitude: 6.264
 ---
\ No newline at end of file
diff --git a/content/cities/saint-just-saint-rambert/_index.md b/content/cities/saint-just-saint-rambert/_index.md
index 3ae855ea2..d59a8c991 100644
--- a/content/cities/saint-just-saint-rambert/_index.md
+++ b/content/cities/saint-just-saint-rambert/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Just-Saint-Rambert
 url: /saint-just-saint-rambert/
-latitude: 45.5
-longitude: 4.241
+latitude: 45.495
+longitude: 4.245
 ---
\ No newline at end of file
diff --git a/content/cities/saint-martin-dheres/rexel.md b/content/cities/saint-martin-dheres/rexel.md
index 6681efc2b..2508ae820 100644
--- a/content/cities/saint-martin-dheres/rexel.md
+++ b/content/cities/saint-martin-dheres/rexel.md
@@ -1,5 +1,5 @@
 ---
 title: "Rexel"
 url: /saint-martin-dheres/rexel/
-shop: magasin de variétés
+shop: électrique
 ---
\ No newline at end of file
diff --git a/content/cities/saint-pierre-de-chandieu/_index.md b/content/cities/saint-pierre-de-chandieu/_index.md
index 4ed0b659f..cdf1baafe 100644
--- a/content/cities/saint-pierre-de-chandieu/_index.md
+++ b/content/cities/saint-pierre-de-chandieu/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Pierre-de-Chandieu
 url: /saint-pierre-de-chandieu/
 latitude: 45.645
-longitude: 5.011
+longitude: 5.012
 ---
\ 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 e93a52abb..cbc158f11 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.457
+longitude: 4.455
 ---
\ No newline at end of file
diff --git a/content/cities/scionzier/boulanger-cluses.md b/content/cities/scionzier/boulanger-cluses.md
new file mode 100644
index 000000000..2003f5140
--- /dev/null
+++ b/content/cities/scionzier/boulanger-cluses.md
@@ -0,0 +1,5 @@
+---
+title: "Boulanger Cluses"
+url: /scionzier/boulanger-cluses/
+shop: électronique
+---
\ No newline at end of file
diff --git a/content/cities/scionzier/so-bio-scionzier.md b/content/cities/scionzier/so-bio-scionzier.md
new file mode 100644
index 000000000..b2c2be304
--- /dev/null
+++ b/content/cities/scionzier/so-bio-scionzier.md
@@ -0,0 +1,5 @@
+---
+title: "So.bio Scionzier"
+url: /scionzier/so-bio-scionzier/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/tarare/espace-auto-tarare.md b/content/cities/tarare/espace-auto-tarare.md
deleted file mode 100644
index 7d03c8b4a..000000000
--- a/content/cities/tarare/espace-auto-tarare.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Espace auto Tarare"
-url: /tarare/espace-auto-tarare/
-shop: voiture
----
\ No newline at end of file
diff --git a/content/cities/tarare/les-marchands-dencre.md b/content/cities/tarare/les-marchands-dencre.md
deleted file mode 100644
index 52ee757b5..000000000
--- a/content/cities/tarare/les-marchands-dencre.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Les Marchands d'Encre"
-url: /tarare/les-marchands-dencre/
-shop: tatouage
----
\ No newline at end of file
diff --git a/content/cities/tarare/orenzo.md b/content/cities/tarare/orenzo.md
index dcba2839d..da8a24c9f 100644
--- a/content/cities/tarare/orenzo.md
+++ b/content/cities/tarare/orenzo.md
@@ -1,5 +1,5 @@
 ---
 title: "Orenzo"
 url: /tarare/orenzo/
-shop: vêtements
+shop: vacant
 ---
\ No newline at end of file
diff --git a/content/cities/tarare/rendez-vous-nature.md b/content/cities/tarare/rendez-vous-nature.md
deleted file mode 100644
index 4dcf498aa..000000000
--- a/content/cities/tarare/rendez-vous-nature.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Rendez-vous nature"
-url: /tarare/rendez-vous-nature/
-shop: alimentation saine
----
\ No newline at end of file
diff --git a/content/cities/thoiry/go-sport.md b/content/cities/thoiry/go-sport.md
index f8b7dc21f..b9ed0a757 100644
--- a/content/cities/thoiry/go-sport.md
+++ b/content/cities/thoiry/go-sport.md
@@ -1,5 +1,5 @@
 ---
-title: "GO Sport"
+title: "Go Sport"
 url: /thoiry/go-sport/
 shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/thurins/_index.md b/content/cities/thurins/_index.md
index 6967fc1cf..08a19d953 100644
--- a/content/cities/thurins/_index.md
+++ b/content/cities/thurins/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Thurins
 url: /thurins/
-latitude: 45.68
-longitude: 4.647
+latitude: 45.673
+longitude: 4.608
 ---
\ No newline at end of file
diff --git a/content/cities/valaurie/_index.md b/content/cities/valaurie/_index.md
index b3da23093..f6e6e15a6 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.417
+longitude: 4.806
 ---
\ No newline at end of file
diff --git a/content/cities/vienne/marionnaud-parfumerie-place-francois-mitterrand.md b/content/cities/vienne/marionnaud-parfumerie-rue-ponsard.md
similarity index 81%
rename from content/cities/vienne/marionnaud-parfumerie-place-francois-mitterrand.md
rename to content/cities/vienne/marionnaud-parfumerie-rue-ponsard.md
index 5f4cafa4c..29761466f 100644
--- a/content/cities/vienne/marionnaud-parfumerie-place-francois-mitterrand.md
+++ b/content/cities/vienne/marionnaud-parfumerie-rue-ponsard.md
@@ -1,5 +1,5 @@
 ---
 title: "Marionnaud parfumerie"
 url: /vienne/marionnaud-parfumerie/
-shop: beauté
+shop: parfumerie
 ---
\ No newline at end of file
diff --git a/content/cities/vienne/marionnaud-parfumerie.md b/content/cities/vienne/marionnaud-parfumerie.md
index 29761466f..5f4cafa4c 100644
--- a/content/cities/vienne/marionnaud-parfumerie.md
+++ b/content/cities/vienne/marionnaud-parfumerie.md
@@ -1,5 +1,5 @@
 ---
 title: "Marionnaud parfumerie"
 url: /vienne/marionnaud-parfumerie/
-shop: parfumerie
+shop: beauté
 ---
\ No newline at end of file
diff --git a/data/cities/annecy/carrefour-city-place-annapurna.yml b/data/cities/annecy/carrefour-city-place-des-rhododendrons.yml
similarity index 53%
rename from data/cities/annecy/carrefour-city-place-annapurna.yml
rename to data/cities/annecy/carrefour-city-place-des-rhododendrons.yml
index fdd21050e..3a7806e36 100644
--- a/data/cities/annecy/carrefour-city-place-annapurna.yml
+++ b/data/cities/annecy/carrefour-city-place-des-rhododendrons.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: ""
\ No newline at end of file
diff --git a/data/cities/annecy/carrefour-city.yml b/data/cities/annecy/carrefour-city.yml
index 3a7806e36..fdd21050e 100644
--- a/data/cities/annecy/carrefour-city.yml
+++ b/data/cities/annecy/carrefour-city.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: ""
\ No newline at end of file
diff --git a/data/cities/annemasse/histoire-dor-allee-francois-truffaut.yml b/data/cities/annemasse/histoire-dor-allee-francois-truffaut.yml
deleted file mode 100644
index b0b0263d1..000000000
--- a/data/cities/annemasse/histoire-dor-allee-francois-truffaut.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4579827772
-type: node
-latitude: 46.1966
-longitude: 6.2368
-postcode: "74100"
-city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 2
-phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml b/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml
new file mode 100644
index 000000000..6d56fe95b
--- /dev/null
+++ b/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml
@@ -0,0 +1,11 @@
+id: 4565378166
+type: node
+latitude: 46.19592
+longitude: 6.25349
+postcode: "74100"
+city: Annemasse
+street: "Rue de la Résistance"
+housenumber: 14
+phone: ""
+opening_hours: "Mo-Sa 09:00-20:00; Su off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/annemasse/histoire-dor.yml b/data/cities/annemasse/histoire-dor.yml
index 6d56fe95b..b0b0263d1 100644
--- a/data/cities/annemasse/histoire-dor.yml
+++ b/data/cities/annemasse/histoire-dor.yml
@@ -1,11 +1,11 @@
-id: 4565378166
+id: 4579827772
 type: node
-latitude: 46.19592
-longitude: 6.25349
+latitude: 46.1966
+longitude: 6.2368
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: "Allée François Truffaut"
+housenumber: 2
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00; Su off"
+opening_hours: "Mo-Sa 10:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml b/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml
index d662457f8..0f8c1b7d2 100644
--- a/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml
+++ b/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml
@@ -7,5 +7,5 @@ city: Cluses
 street: "avenue de Châtillon"
 housenumber: 14
 phone: ""
-opening_hours: "Mo-Su 08:30-13:00, 15:00-19:30"
+opening_hours: "Mo-Sa 08:30-13:00, 15:00-19:00; Su 08:30-13:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/epagny-metz-tessy/go-sport.yml b/data/cities/epagny-metz-tessy/go-sport.yml
index c06896d17..657182613 100644
--- a/data/cities/epagny-metz-tessy/go-sport.yml
+++ b/data/cities/epagny-metz-tessy/go-sport.yml
@@ -3,7 +3,7 @@ type: way
 latitude: 45.93552
 longitude: 6.08326
 postcode: "74330"
-city: Epagny Metz-Tessy
+city: Épagny Metz-Tessy
 street: "Avenue du Centre"
 housenumber: 92
 phone: ""
diff --git a/data/cities/evian-les-bains/eni.yml b/data/cities/evian-les-bains/eni.yml
index 7065f585f..e1158d1eb 100644
--- a/data/cities/evian-les-bains/eni.yml
+++ b/data/cities/evian-les-bains/eni.yml
@@ -1,7 +1,7 @@
-id: 871175894
-type: way
-latitude: 46.39907
-longitude: 6.57961
+id: 11171711837
+type: node
+latitude: 46.39905
+longitude: 6.57964
 postcode: "74500"
 city: Évian-les-Bains
 street: "Avenue Anna de Noailles"
diff --git a/data/cities/fontaine/le-fournil-patissier.yml b/data/cities/fontaine/le-fournil-patissier.yml
index cf06b9860..8f6e81de0 100644
--- a/data/cities/fontaine/le-fournil-patissier.yml
+++ b/data/cities/fontaine/le-fournil-patissier.yml
@@ -7,5 +7,5 @@ city: Fontaine
 street: "Avenue Aristide Briand"
 housenumber: 31
 phone: ""
-opening_hours: ""
+opening_hours: "Tu-Sa 07:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/givors/go-sport.yml b/data/cities/givors/go-sport.yml
index ae8c1b2ca..aa536c38d 100644
--- a/data/cities/givors/go-sport.yml
+++ b/data/cities/givors/go-sport.yml
@@ -4,7 +4,7 @@ latitude: 45.58533
 longitude: 4.75439
 postcode: "69700"
 city: Givors
-street: "Rue de la paix"
+street: "Rue de la Paix"
 housenumber: 1
 phone: ""
 opening_hours: "Tu-Sa 09:00-20:00"
diff --git a/data/cities/grenoble/la-fournee.yml b/data/cities/grenoble/la-fournee.yml
new file mode 100644
index 000000000..9dfe1e531
--- /dev/null
+++ b/data/cities/grenoble/la-fournee.yml
@@ -0,0 +1,11 @@
+id: 3936398688
+type: node
+latitude: 45.17985
+longitude: 5.71661
+postcode: ""
+city: Grenoble
+street: "Cours de la Libération et du Général de Gaulle"
+housenumber: 5
+phone: ""
+opening_hours: "Mo-Su 06:00-21:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/kuoni-et-univairmer.yml b/data/cities/grenoble/univairmer.yml
similarity index 77%
rename from data/cities/grenoble/kuoni-et-univairmer.yml
rename to data/cities/grenoble/univairmer.yml
index 9c5ace18c..5076ad50a 100644
--- a/data/cities/grenoble/kuoni-et-univairmer.yml
+++ b/data/cities/grenoble/univairmer.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Avenue Alsace Lorraine"
 housenumber: 15
 phone: "+33 4 85 19 00 03"
-opening_hours: ""
+opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-13:30,14:00-17:30"
 website: "https://www.kuoni.fr/agences/"
\ No newline at end of file
diff --git a/data/cities/lisle-dabeau/go-sport.yml b/data/cities/lisle-dabeau/go-sport.yml
index 9f9e33d3d..f1813953a 100644
--- a/data/cities/lisle-dabeau/go-sport.yml
+++ b/data/cities/lisle-dabeau/go-sport.yml
@@ -4,7 +4,7 @@ latitude: 45.61563
 longitude: 5.22411
 postcode: "38080"
 city: L'Isle-d'Abeau
-street: "Zac de Saint-Hubert"
+street: "ZAC de Saint-Hubert"
 housenumber: 
 phone: ""
 opening_hours: "Mo-Sa 10:00-19:00"
diff --git a/data/cities/lyon/delavegas.yml b/data/cities/lyon/delavegas.yml
new file mode 100644
index 000000000..8c8607166
--- /dev/null
+++ b/data/cities/lyon/delavegas.yml
@@ -0,0 +1,11 @@
+id: 10178603668
+type: node
+latitude: 45.73576
+longitude: 4.85303
+postcode: "69008"
+city: Lyon
+street: "Route de Vienne"
+housenumber: 140
+phone: ""
+opening_hours: "Tu-Sa 09:00-19:30; Su 09:00-12:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/moutiers/delapierre.yml b/data/cities/moutiers/delapierre.yml
index c4f3ab90f..c84162893 100644
--- a/data/cities/moutiers/delapierre.yml
+++ b/data/cities/moutiers/delapierre.yml
@@ -7,5 +7,5 @@ city: Moûtiers
 street: "Rue Cardinale"
 housenumber: 66
 phone: ""
-opening_hours: ""
+opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-17:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/moutiers/pat-a-tric.yml b/data/cities/moutiers/pat-a-tric.yml
index 4ff388ed7..afb891492 100644
--- a/data/cities/moutiers/pat-a-tric.yml
+++ b/data/cities/moutiers/pat-a-tric.yml
@@ -7,5 +7,5 @@ city: Moûtiers
 street: "Grande Rue"
 housenumber: 102
 phone: ""
-opening_hours: ""
+opening_hours: "Tu-Sa 09:00-12:00,14:30-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/moutiers/weldom.yml b/data/cities/moutiers/weldom.yml
index 71645ba94..a2a1194e4 100644
--- a/data/cities/moutiers/weldom.yml
+++ b/data/cities/moutiers/weldom.yml
@@ -7,5 +7,5 @@ city: Moûtiers
 street: "Rue des Érables"
 housenumber: 
 phone: "+33 4 79 24 44 89"
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-19:00"
+opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/oyonnax/atelier-velo-collaboratif.yml b/data/cities/oyonnax/atelier-velo-collaboratif.yml
new file mode 100644
index 000000000..49ab5da5c
--- /dev/null
+++ b/data/cities/oyonnax/atelier-velo-collaboratif.yml
@@ -0,0 +1,11 @@
+id: 11177292442
+type: node
+latitude: 46.25619
+longitude: 5.65405
+postcode: "01100"
+city: Oyonnax
+street: "Rue Anatole France"
+housenumber: 152
+phone: "+33 6 51 26 10 42"
+opening_hours: "Sa-Sa 09:00-12:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-alban-leysse/betm.yml b/data/cities/saint-alban-leysse/betm.yml
deleted file mode 100644
index 554f378a7..000000000
--- a/data/cities/saint-alban-leysse/betm.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7200716517
-type: node
-latitude: 45.57185
-longitude: 5.95085
-postcode: "73230"
-city: Saint-Alban-Leysse
-street: "Rue de la Martiniere"
-housenumber: 
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/saint-etienne/atelier-de-la-souris-verte.yml b/data/cities/saint-etienne/atelier-de-la-souris-verte.yml
new file mode 100644
index 000000000..336ded514
--- /dev/null
+++ b/data/cities/saint-etienne/atelier-de-la-souris-verte.yml
@@ -0,0 +1,11 @@
+id: 9069362807
+type: node
+latitude: 45.43997
+longitude: 4.3966
+postcode: "42000"
+city: Saint-Étienne
+street: "Avenue Denfert-Rochereau"
+housenumber: 1
+phone: ""
+opening_hours: "We 16:00-20:00; Tu 18:00-21:00"
+website: "https://mastodon.green/@sourisverte"
\ No newline at end of file
diff --git a/data/cities/scionzier/boulanger-cluses.yml b/data/cities/scionzier/boulanger-cluses.yml
new file mode 100644
index 000000000..5812c5047
--- /dev/null
+++ b/data/cities/scionzier/boulanger-cluses.yml
@@ -0,0 +1,11 @@
+id: 11163891581
+type: node
+latitude: 46.06955
+longitude: 6.54963
+postcode: "74950"
+city: Scionzier
+street: "Rue César Vuarchex"
+housenumber: 415
+phone: ""
+opening_hours: "Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/scionzier/decathlon.yml b/data/cities/scionzier/decathlon.yml
index 2e6fe44b2..641a61832 100644
--- a/data/cities/scionzier/decathlon.yml
+++ b/data/cities/scionzier/decathlon.yml
@@ -1,7 +1,7 @@
-id: 510682777
-type: way
-latitude: 46.06921
-longitude: 6.54889
+id: 11163891580
+type: node
+latitude: 46.06926
+longitude: 6.54951
 postcode: "74950"
 city: Scionzier
 street: "Rue Cesar Vuarchex"
diff --git a/data/cities/scionzier/so-bio-scionzier.yml b/data/cities/scionzier/so-bio-scionzier.yml
new file mode 100644
index 000000000..d2e39ab98
--- /dev/null
+++ b/data/cities/scionzier/so-bio-scionzier.yml
@@ -0,0 +1,11 @@
+id: 11163891582
+type: node
+latitude: 46.06947
+longitude: 6.54961
+postcode: "74950"
+city: Scionzier
+street: "Rue César Vuarchex"
+housenumber: 
+phone: "+33 4 72 19 96 44"
+opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-19:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/tarare/espace-auto-tarare.yml b/data/cities/tarare/espace-auto-tarare.yml
deleted file mode 100644
index 43c6b2dab..000000000
--- a/data/cities/tarare/espace-auto-tarare.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6168004487
-type: node
-latitude: 45.89403
-longitude: 4.43577
-postcode: "69170"
-city: Tarare
-street: "Boulevard Voltaire"
-housenumber: 34
-phone: "+33 4 74 05 04 82"
-opening_hours: ""
-website: "http://www.espace-auto-tarare.com/"
\ No newline at end of file
diff --git a/data/cities/tarare/les-marchands-dencre.yml b/data/cities/tarare/les-marchands-dencre.yml
deleted file mode 100644
index d06fe7673..000000000
--- a/data/cities/tarare/les-marchands-dencre.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6168001569
-type: node
-latitude: 45.89549
-longitude: 4.43186
-postcode: "69170"
-city: Tarare
-street: "Rue de la République"
-housenumber: 29
-phone: "+33 6 33 72 16 54"
-opening_hours: ""
-website: "https://fr-fr.facebook.com/marchandencre/"
\ No newline at end of file
diff --git a/data/cities/tarare/rendez-vous-nature.yml b/data/cities/tarare/rendez-vous-nature.yml
deleted file mode 100644
index 36f6fecd9..000000000
--- a/data/cities/tarare/rendez-vous-nature.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5981463765
-type: node
-latitude: 45.89651
-longitude: 4.43284
-postcode: "69170"
-city: Tarare
-street: "Rue Pêcherie"
-housenumber: 31
-phone: "+33 4 74 05 08 70"
-opening_hours: "Tu-Sa 09:00-12:30, 14:00-19:00"
-website: "https://fr-fr.facebook.com/pg/rendezvousnaturetarare/about/?ref=page_internal"
\ No newline at end of file
diff --git a/data/cities/vienne/marionnaud-parfumerie-place-francois-mitterrand.yml b/data/cities/vienne/marionnaud-parfumerie-place-francois-mitterrand.yml
deleted file mode 100644
index fa5c51aaf..000000000
--- a/data/cities/vienne/marionnaud-parfumerie-place-francois-mitterrand.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2717189551
-type: node
-latitude: 45.52557
-longitude: 4.87564
-postcode: "38200"
-city: Vienne
-street: "Place François Mitterrand"
-housenumber: 13
-phone: "+33 4 74 85 34 51"
-opening_hours: ""
-website: "https://www.marionnaud.fr/"
\ No newline at end of file
diff --git a/data/cities/vienne/marionnaud-parfumerie-rue-ponsard.yml b/data/cities/vienne/marionnaud-parfumerie-rue-ponsard.yml
new file mode 100644
index 000000000..5a401cc52
--- /dev/null
+++ b/data/cities/vienne/marionnaud-parfumerie-rue-ponsard.yml
@@ -0,0 +1,11 @@
+id: 2716296506
+type: node
+latitude: 45.52447
+longitude: 4.87544
+postcode: "38200"
+city: Vienne
+street: "Rue Ponsard"
+housenumber: 
+phone: ""
+opening_hours: ""
+website: "https://www.marionnaud.fr/"
\ No newline at end of file
diff --git a/data/cities/vienne/marionnaud-parfumerie.yml b/data/cities/vienne/marionnaud-parfumerie.yml
index 5a401cc52..fa5c51aaf 100644
--- a/data/cities/vienne/marionnaud-parfumerie.yml
+++ b/data/cities/vienne/marionnaud-parfumerie.yml
@@ -1,11 +1,11 @@
-id: 2716296506
+id: 2717189551
 type: node
-latitude: 45.52447
-longitude: 4.87544
+latitude: 45.52557
+longitude: 4.87564
 postcode: "38200"
 city: Vienne
-street: "Rue Ponsard"
-housenumber: 
-phone: ""
+street: "Place François Mitterrand"
+housenumber: 13
+phone: "+33 4 74 85 34 51"
 opening_hours: ""
 website: "https://www.marionnaud.fr/"
\ No newline at end of file