diff --git a/content/cities/ambilly/tabac-presse-des-eaux-vives.md b/content/cities/ambilly/tabac-presse-des-eaux-vives.md
new file mode 100644
index 000000000..06e83c6b1
--- /dev/null
+++ b/content/cities/ambilly/tabac-presse-des-eaux-vives.md
@@ -0,0 +1,5 @@
+---
+title: "Tabac Presse des Eaux Vives"
+url: /ambilly/tabac-presse-des-eaux-vives/
+shop: marchand de journaux
+---
\ No newline at end of file
diff --git a/content/cities/annecy/_index.md b/content/cities/annecy/_index.md
index 50c992683..ba40cee70 100644
--- a/content/cities/annecy/_index.md
+++ b/content/cities/annecy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Annecy
 url: /annecy/
-latitude: 45.91
-longitude: 6.118
+latitude: 45.917
+longitude: 6.134
 ---
\ No newline at end of file
diff --git a/content/cities/annecy/agip-buffard.md b/content/cities/annecy/agip-buffard.md
deleted file mode 100644
index 876bc73fa..000000000
--- a/content/cities/annecy/agip-buffard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Agip Buffard"
-url: /annecy/agip-buffard/
-shop: commodité
----
\ 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
deleted file mode 100644
index 6bd821652..000000000
--- a/content/cities/annecy/carrefour-city-place-annapurna.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 000000000..990010696
--- /dev/null
+++ b/content/cities/annecy/carrefour-city-place-des-rhododendrons.md
@@ -0,0 +1,5 @@
+---
+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 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/annemasse/casino-hyperfrais.md b/content/cities/annemasse/casino-hyperfrais.md
deleted file mode 100644
index 39f13c9a9..000000000
--- a/content/cities/annemasse/casino-hyperfrais.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Casino #HyperFrais"
-url: /annemasse/casino-hyperfrais/
-shop: supermarché
----
\ No newline at end of file
diff --git a/content/cities/annemasse/franprix.md b/content/cities/annemasse/franprix.md
deleted file mode 100644
index da570ea83..000000000
--- a/content/cities/annemasse/franprix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Franprix"
-url: /annemasse/franprix/
-shop: commodité
----
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/mg-motor-thonon.md b/content/cities/anthy-sur-leman/mg-motor-thonon.md
new file mode 100644
index 000000000..76c686e07
--- /dev/null
+++ b/content/cities/anthy-sur-leman/mg-motor-thonon.md
@@ -0,0 +1,5 @@
+---
+title: "Mg Motor Thonon"
+url: /anthy-sur-leman/mg-motor-thonon/
+shop: voiture
+---
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/mg-motors.md b/content/cities/anthy-sur-leman/mg-motors.md
deleted file mode 100644
index a32b78013..000000000
--- a/content/cities/anthy-sur-leman/mg-motors.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Mg Motors"
-url: /anthy-sur-leman/mg-motors/
-shop: voiture
----
\ No newline at end of file
diff --git a/content/cities/grenoble/_index.md b/content/cities/grenoble/_index.md
index 1d80e55e6..d03535a96 100644
--- a/content/cities/grenoble/_index.md
+++ b/content/cities/grenoble/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Grenoble
 url: /grenoble/
-latitude: 45.186
-longitude: 5.732
+latitude: 45.188
+longitude: 5.721
 ---
\ No newline at end of file
diff --git a/content/cities/grenoble/le-chardon-bleu.md b/content/cities/grenoble/le-chardon-bleu.md
new file mode 100644
index 000000000..c36ef3ede
--- /dev/null
+++ b/content/cities/grenoble/le-chardon-bleu.md
@@ -0,0 +1,5 @@
+---
+title: "Le Chardon Bleu"
+url: /grenoble/le-chardon-bleu/
+shop: pâtisserie
+---
\ No newline at end of file
diff --git a/content/cities/grenoble/le-gourmet.md b/content/cities/grenoble/le-gourmet.md
new file mode 100644
index 000000000..8f6f7bd07
--- /dev/null
+++ b/content/cities/grenoble/le-gourmet.md
@@ -0,0 +1,5 @@
+---
+title: "Le Gourmet"
+url: /grenoble/le-gourmet/
+shop: charcuterie
+---
\ No newline at end of file
diff --git a/content/cities/grenoble/raphael-philatelie.md b/content/cities/grenoble/raphael-philatelie.md
new file mode 100644
index 000000000..41f3b110d
--- /dev/null
+++ b/content/cities/grenoble/raphael-philatelie.md
@@ -0,0 +1,5 @@
+---
+title: "Raphael Philatélie"
+url: /grenoble/raphael-philatelie/
+shop: collecteur
+---
\ 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/les-houches/eric-jacquier-route-des-trabets.md b/content/cities/les-houches/eric-jacquier-route-des-trabets.md
new file mode 100644
index 000000000..a1b2ec556
--- /dev/null
+++ b/content/cities/les-houches/eric-jacquier-route-des-trabets.md
@@ -0,0 +1,5 @@
+---
+title: "Éric Jacquier"
+url: /les-houches/eric-jacquier-route-des-trabets/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/les-houches/eric-jacquier-rue-du-mont-blanc.md b/content/cities/les-houches/eric-jacquier-rue-du-mont-blanc.md
deleted file mode 100644
index a30dc610b..000000000
--- a/content/cities/les-houches/eric-jacquier-rue-du-mont-blanc.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Éric Jacquier"
-url: /les-houches/eric-jacquier-rue-du-mont-blanc/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/content/cities/lyon/bouldingue.md b/content/cities/lyon/bouldingue.md
new file mode 100644
index 000000000..43f0278a9
--- /dev/null
+++ b/content/cities/lyon/bouldingue.md
@@ -0,0 +1,5 @@
+---
+title: "Boul'Dingue"
+url: /lyon/bouldingue/
+shop: musique
+---
\ No newline at end of file
diff --git a/content/cities/rives/hobby-dou.md b/content/cities/rives/hobby-dou.md
new file mode 100644
index 000000000..a51861ac3
--- /dev/null
+++ b/content/cities/rives/hobby-dou.md
@@ -0,0 +1,5 @@
+---
+title: "Hobby Dou'"
+url: /rives/hobby-dou/
+shop: jeux vidéo
+---
\ No newline at end of file
diff --git a/content/cities/saint-etienne/blackstore.md b/content/cities/saint-etienne/blackstore.md
new file mode 100644
index 000000000..9f403be4a
--- /dev/null
+++ b/content/cities/saint-etienne/blackstore.md
@@ -0,0 +1,5 @@
+---
+title: "Blackstore"
+url: /saint-etienne/blackstore/
+shop: vêtements
+---
\ No newline at end of file
diff --git a/content/cities/saint-rambert-dalbon/2000-chaussures.md b/content/cities/saint-rambert-dalbon/2000-chaussures.md
new file mode 100644
index 000000000..b3f4657e7
--- /dev/null
+++ b/content/cities/saint-rambert-dalbon/2000-chaussures.md
@@ -0,0 +1,5 @@
+---
+title: "2000 Chaussures"
+url: /saint-rambert-dalbon/2000-chaussures/
+shop: chaussures
+---
\ No newline at end of file
diff --git a/content/cities/saint-rambert-dalbon/aux-delices-rambertoises.md b/content/cities/saint-rambert-dalbon/aux-delices-rambertoises.md
new file mode 100644
index 000000000..641ffdeeb
--- /dev/null
+++ b/content/cities/saint-rambert-dalbon/aux-delices-rambertoises.md
@@ -0,0 +1,5 @@
+---
+title: "Aux Délices Rambertoises"
+url: /saint-rambert-dalbon/aux-delices-rambertoises/
+shop: pâtisserie
+---
\ No newline at end of file
diff --git a/content/cities/saint-rambert-dalbon/berthet.md b/content/cities/saint-rambert-dalbon/berthet.md
new file mode 100644
index 000000000..b1bcf81bf
--- /dev/null
+++ b/content/cities/saint-rambert-dalbon/berthet.md
@@ -0,0 +1,5 @@
+---
+title: "Berthet"
+url: /saint-rambert-dalbon/berthet/
+shop: vêtements
+---
\ No newline at end of file
diff --git a/content/cities/saint-rambert-dalbon/laverie-libre-service.md b/content/cities/saint-rambert-dalbon/laverie-libre-service.md
new file mode 100644
index 000000000..064e38caa
--- /dev/null
+++ b/content/cities/saint-rambert-dalbon/laverie-libre-service.md
@@ -0,0 +1,5 @@
+---
+title: "Laverie libre-service"
+url: /saint-rambert-dalbon/laverie-libre-service/
+shop: blanchisserie
+---
\ No newline at end of file
diff --git a/content/cities/saint-rambert-dalbon/mursol.md b/content/cities/saint-rambert-dalbon/mursol.md
new file mode 100644
index 000000000..3de7f91b7
--- /dev/null
+++ b/content/cities/saint-rambert-dalbon/mursol.md
@@ -0,0 +1,5 @@
+---
+title: "Mursol"
+url: /saint-rambert-dalbon/mursol/
+shop: peinture
+---
\ No newline at end of file
diff --git a/content/cities/saint-sauveur/_index.md b/content/cities/saint-sauveur/_index.md
index c7d8a3d9d..14b73944f 100644
--- a/content/cities/saint-sauveur/_index.md
+++ b/content/cities/saint-sauveur/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Sauveur
 url: /saint-sauveur/
 latitude: 45.158
-longitude: 5.334
+longitude: 5.336
 ---
\ 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/sainte-foy-largentiere/garage-des-rossandes.md b/content/cities/sainte-foy-largentiere/garage-des-rossandes.md
new file mode 100644
index 000000000..14461f762
--- /dev/null
+++ b/content/cities/sainte-foy-largentiere/garage-des-rossandes.md
@@ -0,0 +1,5 @@
+---
+title: "Garage des Rossandes"
+url: /sainte-foy-largentiere/garage-des-rossandes/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/thones/_index.md b/content/cities/thones/_index.md
index 904b7deed..fc6924ccc 100644
--- a/content/cities/thones/_index.md
+++ b/content/cities/thones/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Thônes
 url: /thones/
-latitude: 45.881
-longitude: 6.325
+latitude: 45.882
+longitude: 6.326
 ---
\ No newline at end of file
diff --git a/content/cities/valencin/_index.md b/content/cities/valencin/_index.md
index 937172541..cd79a2a48 100644
--- a/content/cities/valencin/_index.md
+++ b/content/cities/valencin/_index.md
@@ -1,6 +1,6 @@
 ---
-title: valencin
+title: Valencin
 url: /valencin/
-latitude: 45.627
-longitude: 5.072
+latitude: 45.613
+longitude: 5.017
 ---
\ No newline at end of file
diff --git a/content/cities/valleiry/_index.md b/content/cities/valleiry/_index.md
index aaec12c47..ce6378db5 100644
--- a/content/cities/valleiry/_index.md
+++ b/content/cities/valleiry/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Valleiry
 url: /valleiry/
-latitude: 46.109
-longitude: 5.976
+latitude: 46.108
+longitude: 5.968
 ---
\ No newline at end of file
diff --git a/content/cities/vienne/emmaus-vienne.md b/content/cities/vienne/emmaus-vienne.md
deleted file mode 100644
index d983342b8..000000000
--- a/content/cities/vienne/emmaus-vienne.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Emmaüs Vienne"
-url: /vienne/emmaus-vienne/
-shop: charité
----
\ No newline at end of file
diff --git a/data/cities/ambilly/tabac-presse-des-eaux-vives.yml b/data/cities/ambilly/tabac-presse-des-eaux-vives.yml
new file mode 100644
index 000000000..18f9ce9b0
--- /dev/null
+++ b/data/cities/ambilly/tabac-presse-des-eaux-vives.yml
@@ -0,0 +1,11 @@
+id: 3912185753
+type: node
+latitude: 46.19555
+longitude: 6.2277
+postcode: "74100"
+city: Ambilly
+street: "Rue du Jura"
+housenumber: 41
+phone: ""
+opening_hours: "Mo-Fr 07:00-20:00; Sa 08:00-20:00; Su 08:00-14:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/annecy/agip-buffard.yml b/data/cities/annecy/agip-buffard.yml
deleted file mode 100644
index a8e34e7ef..000000000
--- a/data/cities/annecy/agip-buffard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 25179237
-type: node
-latitude: 45.91007
-longitude: 6.1181
-postcode: "74000"
-city: Annecy
-street: "Chemin des Alluèges"
-housenumber: 4 bis
-phone: ""
-opening_hours: "24/7"
-website: ""
\ 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/casino-hyperfrais.yml b/data/cities/annemasse/casino-hyperfrais.yml
deleted file mode 100644
index a53f63824..000000000
--- a/data/cities/annemasse/casino-hyperfrais.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4008119339
-type: node
-latitude: 46.19568
-longitude: 6.25385
-postcode: "74100"
-city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
-phone: ""
-opening_hours: "Oct 01-Mar 31 Mo-Sa 07:30-21:00; Su 09:00-21:00; Apr 01-Sep 30 Mo-Sa 07:30-21:30; Su 09:00-21:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/annemasse/franprix.yml b/data/cities/annemasse/franprix.yml
deleted file mode 100644
index 500a6b525..000000000
--- a/data/cities/annemasse/franprix.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 10300303146
-type: node
-latitude: 46.1984
-longitude: 6.23661
-postcode: "74100"
-city: Annemasse
-street: "Avenue de la Gare"
-housenumber: 66
-phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/anthy-sur-leman/mg-motors.yml b/data/cities/anthy-sur-leman/mg-motor-thonon.yml
similarity index 68%
rename from data/cities/anthy-sur-leman/mg-motors.yml
rename to data/cities/anthy-sur-leman/mg-motor-thonon.yml
index 382e830af..8d92deb1c 100644
--- a/data/cities/anthy-sur-leman/mg-motors.yml
+++ b/data/cities/anthy-sur-leman/mg-motor-thonon.yml
@@ -7,5 +7,5 @@ city: Anthy-sur-Léman
 street: "Route de Margencel"
 housenumber: 
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Fr 08:30-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/brides-les-bains/intersport.yml b/data/cities/brides-les-bains/intersport.yml
index e7e3315ee..baf77e064 100644
--- a/data/cities/brides-les-bains/intersport.yml
+++ b/data/cities/brides-les-bains/intersport.yml
@@ -4,7 +4,7 @@ latitude: 45.45382
 longitude: 6.56148
 postcode: "73570"
 city: Brides-les-Bains
-street: "Rue Aristide Briand"
+street: ""
 housenumber: 65
 phone: ""
 opening_hours: ""
diff --git a/data/cities/fontaine/cycles-saveuil.yml b/data/cities/fontaine/cycles-saveuil.yml
index 4789f1aab..6d315268d 100644
--- a/data/cities/fontaine/cycles-saveuil.yml
+++ b/data/cities/fontaine/cycles-saveuil.yml
@@ -7,5 +7,5 @@ city: Fontaine
 street: "Avenue du Vercors"
 housenumber: 13
 phone: ""
-opening_hours: "Tu-Th 07:00-12:30, 13:30-19:00"
+opening_hours: "Tu-Th 07:00-12:30,13:30-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/le-chardon-bleu.yml b/data/cities/grenoble/le-chardon-bleu.yml
new file mode 100644
index 000000000..5d5ea64ee
--- /dev/null
+++ b/data/cities/grenoble/le-chardon-bleu.yml
@@ -0,0 +1,11 @@
+id: 1764741303
+type: node
+latitude: 45.1892
+longitude: 5.72067
+postcode: "38000"
+city: Grenoble
+street: "Avenue Alsace Lorraine"
+housenumber: 23
+phone: "+33 4 76 12 05 93"
+opening_hours: "Mo-Sa 06:45-19:45"
+website: "https://www.auchardonbleu.com/boutiques/alsace-lorraine/"
\ No newline at end of file
diff --git a/data/cities/grenoble/le-gourmet.yml b/data/cities/grenoble/le-gourmet.yml
new file mode 100644
index 000000000..2a46f361a
--- /dev/null
+++ b/data/cities/grenoble/le-gourmet.yml
@@ -0,0 +1,11 @@
+id: 11016345908
+type: node
+latitude: 45.18917
+longitude: 5.72086
+postcode: "38000"
+city: Grenoble
+street: "Avenue Alsace Lorraine"
+housenumber: 21
+phone: "+33 4 38 86 90 00"
+opening_hours: "Mo-Sa 10:00-19:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/raphael-philatelie.yml b/data/cities/grenoble/raphael-philatelie.yml
new file mode 100644
index 000000000..c8fb8a0fb
--- /dev/null
+++ b/data/cities/grenoble/raphael-philatelie.yml
@@ -0,0 +1,11 @@
+id: 2341895506
+type: node
+latitude: 45.18926
+longitude: 5.72022
+postcode: "38000"
+city: Grenoble
+street: "Avenue Alsace Lorraine"
+housenumber: 33
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/les-houches/eric-jacquier-route-des-trabets.yml b/data/cities/les-houches/eric-jacquier-route-des-trabets.yml
new file mode 100644
index 000000000..9b445c7bf
--- /dev/null
+++ b/data/cities/les-houches/eric-jacquier-route-des-trabets.yml
@@ -0,0 +1,11 @@
+id: 9525402299
+type: node
+latitude: 45.89004
+longitude: 6.78902
+postcode: "74310"
+city: Les Houches
+street: "Route des Trabets"
+housenumber: 94
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml b/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml
deleted file mode 100644
index cb7f45fc0..000000000
--- a/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9527735194
-type: node
-latitude: 45.89033
-longitude: 6.79811
-postcode: "74310"
-city: Les Houches
-street: "Rue du Mont Blanc"
-housenumber: 106
-phone: ""
-opening_hours: "Mo-Su 06:00-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/les-houches/eric-jacquier.yml b/data/cities/les-houches/eric-jacquier.yml
index 9b445c7bf..cb7f45fc0 100644
--- a/data/cities/les-houches/eric-jacquier.yml
+++ b/data/cities/les-houches/eric-jacquier.yml
@@ -1,11 +1,11 @@
-id: 9525402299
+id: 9527735194
 type: node
-latitude: 45.89004
-longitude: 6.78902
+latitude: 45.89033
+longitude: 6.79811
 postcode: "74310"
 city: Les Houches
-street: "Route des Trabets"
-housenumber: 94
+street: "Rue du Mont Blanc"
+housenumber: 106
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Su 06:00-12:30, 15:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/lyon/bouldingue.yml b/data/cities/lyon/bouldingue.yml
new file mode 100644
index 000000000..9a87d9907
--- /dev/null
+++ b/data/cities/lyon/bouldingue.yml
@@ -0,0 +1,11 @@
+id: 8483834496
+type: node
+latitude: 45.76244
+longitude: 4.82781
+postcode: "69005"
+city: Lyon
+street: "Rue du Palais de Justice"
+housenumber: 8
+phone: ""
+opening_hours: "We-Su 11:00-12:30,14:30-19:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/lyon/le-marche-lyonnais.yml b/data/cities/lyon/le-marche-lyonnais.yml
index 13f2fb473..c512a807a 100644
--- a/data/cities/lyon/le-marche-lyonnais.yml
+++ b/data/cities/lyon/le-marche-lyonnais.yml
@@ -6,6 +6,6 @@ postcode: "69003"
 city: Lyon
 street: "Rue Paul Bert"
 housenumber: 252
-phone: ""
+phone: "+33 6 23 79 28 70"
 opening_hours: "Tu-Fr 10:00-13:00,15:30-19:00; Sa 09:00-13:00,15:30-19:00"
-website: ""
\ No newline at end of file
+website: "https://www.lemarchelyonnais.fr"
\ No newline at end of file
diff --git a/data/cities/rives/hobby-dou.yml b/data/cities/rives/hobby-dou.yml
new file mode 100644
index 000000000..309ad41f6
--- /dev/null
+++ b/data/cities/rives/hobby-dou.yml
@@ -0,0 +1,11 @@
+id: 11871246994
+type: node
+latitude: 45.34919
+longitude: 5.50354
+postcode: "38140"
+city: Rives
+street: "Rue de la République"
+housenumber: 56
+phone: "+33982627720"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-alban-des-villards/garage-tardy-serge.yml b/data/cities/saint-alban-des-villards/garage-tardy-serge.yml
index a1c4035ee..e8ca13729 100644
--- a/data/cities/saint-alban-des-villards/garage-tardy-serge.yml
+++ b/data/cities/saint-alban-des-villards/garage-tardy-serge.yml
@@ -4,7 +4,7 @@ latitude: 45.30287
 longitude: 6.24883
 postcode: "73130"
 city: Saint-Alban-des-Villards
-street: "Route du Planchamp"
+street: ""
 housenumber: 240
 phone: ""
 opening_hours: ""
diff --git a/data/cities/saint-etienne/blackstore.yml b/data/cities/saint-etienne/blackstore.yml
new file mode 100644
index 000000000..b590b2878
--- /dev/null
+++ b/data/cities/saint-etienne/blackstore.yml
@@ -0,0 +1,11 @@
+id: 9762802029
+type: node
+latitude: 45.44664
+longitude: 4.42356
+postcode: "42000"
+city: Saint-Étienne
+street: "Rue Ferrer"
+housenumber: 2
+phone: ""
+opening_hours: "Mo-Sa 09:30-19:30; Su 09:30-19:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-etienne/reparpc-sim-radio.yml b/data/cities/saint-etienne/reparpc-sim-radio.yml
index f8d2ec72b..61e711199 100644
--- a/data/cities/saint-etienne/reparpc-sim-radio.yml
+++ b/data/cities/saint-etienne/reparpc-sim-radio.yml
@@ -1,7 +1,7 @@
 id: 2270794483
 type: node
-latitude: 45.4423
-longitude: 4.38217
+latitude: 45.44231
+longitude: 4.38218
 postcode: "42000"
 city: Saint-Étienne
 street: "Place Jacquard"
diff --git a/data/cities/saint-rambert-dalbon/2000-chaussures.yml b/data/cities/saint-rambert-dalbon/2000-chaussures.yml
new file mode 100644
index 000000000..bd2b801b9
--- /dev/null
+++ b/data/cities/saint-rambert-dalbon/2000-chaussures.yml
@@ -0,0 +1,11 @@
+id: 11869548781
+type: node
+latitude: 45.2934
+longitude: 4.81314
+postcode: "26140"
+city: Saint-Rambert-d'Albon
+street: "Avenue du Docteur Lucien Steinberg"
+housenumber: 22
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-rambert-dalbon/aux-delices-rambertoises.yml b/data/cities/saint-rambert-dalbon/aux-delices-rambertoises.yml
new file mode 100644
index 000000000..0b16306fa
--- /dev/null
+++ b/data/cities/saint-rambert-dalbon/aux-delices-rambertoises.yml
@@ -0,0 +1,11 @@
+id: 11869514852
+type: node
+latitude: 45.29259
+longitude: 4.81369
+postcode: "26140"
+city: Saint-Rambert-d'Albon
+street: "Avenue du Docteur Lucien Steinberg"
+housenumber: 47
+phone: "+33 4 75 31 02 08"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-rambert-dalbon/berthet.yml b/data/cities/saint-rambert-dalbon/berthet.yml
new file mode 100644
index 000000000..c247b343d
--- /dev/null
+++ b/data/cities/saint-rambert-dalbon/berthet.yml
@@ -0,0 +1,11 @@
+id: 11872360916
+type: node
+latitude: 45.29213
+longitude: 4.81447
+postcode: "26140"
+city: Saint-Rambert-d'Albon
+street: "Place Gaston Oriol"
+housenumber: 
+phone: "+33 4 75 31 22 12"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-rambert-dalbon/laverie-libre-service.yml b/data/cities/saint-rambert-dalbon/laverie-libre-service.yml
new file mode 100644
index 000000000..077fa1fa7
--- /dev/null
+++ b/data/cities/saint-rambert-dalbon/laverie-libre-service.yml
@@ -0,0 +1,11 @@
+id: 11872376628
+type: node
+latitude: 45.29194
+longitude: 4.81366
+postcode: "26140"
+city: Saint-Rambert-d'Albon
+street: "Avenue du Docteur Lucien Steinberg"
+housenumber: 54
+phone: ""
+opening_hours: "Mo-Su 06:30-20:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-rambert-dalbon/mursol.yml b/data/cities/saint-rambert-dalbon/mursol.yml
new file mode 100644
index 000000000..3a7375132
--- /dev/null
+++ b/data/cities/saint-rambert-dalbon/mursol.yml
@@ -0,0 +1,11 @@
+id: 11872363687
+type: node
+latitude: 45.29165
+longitude: 4.81377
+postcode: "26140"
+city: Saint-Rambert-d'Albon
+street: "Avenue du Docteur Lucien Steinberg"
+housenumber: 60
+phone: "+33 4 75 31 05 22"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/sainte-foy-largentiere/garage-des-rossandes.yml b/data/cities/sainte-foy-largentiere/garage-des-rossandes.yml
new file mode 100644
index 000000000..0b6b7cf32
--- /dev/null
+++ b/data/cities/sainte-foy-largentiere/garage-des-rossandes.yml
@@ -0,0 +1,11 @@
+id: 148891362
+type: way
+latitude: 45.7127
+longitude: 4.47484
+postcode: "69610"
+city: Sainte-Foy-l'Argentière
+street: "Route de Lyon"
+housenumber: 774
+phone: "+33 4 74 26 10 00"
+opening_hours: "Mo-Fr 07:30-12:30,13:30-19:00; Sa 08:30-12:00"
+website: "https://garagerossandes.fr/"
\ No newline at end of file
diff --git a/data/cities/vienne/emmaus-vienne.yml b/data/cities/vienne/emmaus-vienne.yml
deleted file mode 100644
index aa471671f..000000000
--- a/data/cities/vienne/emmaus-vienne.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 30600328
-type: way
-latitude: 45.54021
-longitude: 4.87294
-postcode: "38200"
-city: Vienne
-street: "5 Avenue Marcellin Berthelot"
-housenumber: 5
-phone: "+33474574477"
-opening_hours: "Tu-Th 14:05-17:30; Sa 09:00-12:00,14:05-17:30"
-website: "https://emmausvienne.fr/"
\ No newline at end of file