diff --git a/content/cities/aigueblanche/_index.md b/content/cities/aigueblanche/_index.md
index dc81220ed..ebe52bd82 100644
--- a/content/cities/aigueblanche/_index.md
+++ b/content/cities/aigueblanche/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Aigueblanche
 url: /aigueblanche/
-latitude: 45.503
-longitude: 6.502
+latitude: 45.502
+longitude: 6.503
 ---
\ No newline at end of file
diff --git a/content/cities/andancette/_index.md b/content/cities/andancette/_index.md
index f12ebeee4..75d2631ff 100644
--- a/content/cities/andancette/_index.md
+++ b/content/cities/andancette/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Andancette
 url: /andancette/
-latitude: 45.244
-longitude: 4.813
+latitude: 45.242
+longitude: 4.806
 ---
\ 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/histoire-dor-allee-francois-truffaut.md b/content/cities/annemasse/histoire-dor-allee-francois-truffaut.md
new file mode 100644
index 000000000..3a8076bb4
--- /dev/null
+++ b/content/cities/annemasse/histoire-dor-allee-francois-truffaut.md
@@ -0,0 +1,5 @@
+---
+title: "Histoire d'Or"
+url: /annemasse/histoire-dor-allee-francois-truffaut/
+shop: bijoux
+---
\ No newline at end of file
diff --git a/content/cities/annemasse/histoire-dor-rue-de-la-resistance.md b/content/cities/annemasse/histoire-dor-rue-de-la-resistance.md
deleted file mode 100644
index b794559f4..000000000
--- a/content/cities/annemasse/histoire-dor-rue-de-la-resistance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Histoire d'Or"
-url: /annemasse/histoire-dor-rue-de-la-resistance/
-shop: bijoux
----
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/yesss-electrique.md b/content/cities/anthy-sur-leman/yesss-electrique.md
new file mode 100644
index 000000000..e3321e395
--- /dev/null
+++ b/content/cities/anthy-sur-leman/yesss-electrique.md
@@ -0,0 +1,5 @@
+---
+title: "Yesss électrique"
+url: /anthy-sur-leman/yesss-electrique/
+shop: électrique
+---
\ No newline at end of file
diff --git a/content/cities/aubenas/_index.md b/content/cities/aubenas/_index.md
index 1ebe4ed8e..57e4dbdcb 100644
--- a/content/cities/aubenas/_index.md
+++ b/content/cities/aubenas/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Aubenas
 url: /aubenas/
-latitude: 44.618
-longitude: 4.389
+latitude: 44.614
+longitude: 4.406
 ---
\ No newline at end of file
diff --git a/content/cities/aubenas/station-avia.md b/content/cities/aubenas/station-avia.md
new file mode 100644
index 000000000..1200b0603
--- /dev/null
+++ b/content/cities/aubenas/station-avia.md
@@ -0,0 +1,5 @@
+---
+title: "Station Avia"
+url: /aubenas/station-avia/
+shop: commodité
+---
\ No newline at end of file
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/bons-en-chablais/classique-autowerks.md b/content/cities/bons-en-chablais/classique-autowerks.md
new file mode 100644
index 000000000..c4d962fa1
--- /dev/null
+++ b/content/cities/bons-en-chablais/classique-autowerks.md
@@ -0,0 +1,5 @@
+---
+title: "Classique Autowerks"
+url: /bons-en-chablais/classique-autowerks/
+shop: pièces de voitures
+---
\ No newline at end of file
diff --git a/content/cities/chambery/euromaster-milliand-pneus.md b/content/cities/chambery/euromaster-milliand-pneus.md
new file mode 100644
index 000000000..001878d8e
--- /dev/null
+++ b/content/cities/chambery/euromaster-milliand-pneus.md
@@ -0,0 +1,5 @@
+---
+title: "Euromaster -Milliand Pneus"
+url: /chambery/euromaster-milliand-pneus/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/chambery/foussier-chambery.md b/content/cities/chambery/foussier-chambery.md
new file mode 100644
index 000000000..7b252a3ad
--- /dev/null
+++ b/content/cities/chambery/foussier-chambery.md
@@ -0,0 +1,5 @@
+---
+title: "Foussier Chambéry"
+url: /chambery/foussier-chambery/
+shop: matériel informatique
+---
\ No newline at end of file
diff --git a/content/cities/chambery/la-chaise-longue.md b/content/cities/chambery/la-chaise-longue.md
new file mode 100644
index 000000000..5621e6a33
--- /dev/null
+++ b/content/cities/chambery/la-chaise-longue.md
@@ -0,0 +1,5 @@
+---
+title: "La Chaise Longue"
+url: /chambery/la-chaise-longue/
+shop: cadeau
+---
\ No newline at end of file
diff --git a/content/cities/chambery/yesss-electrique-chambery.md b/content/cities/chambery/yesss-electrique-chambery.md
new file mode 100644
index 000000000..e62b7f698
--- /dev/null
+++ b/content/cities/chambery/yesss-electrique-chambery.md
@@ -0,0 +1,5 @@
+---
+title: "YESSS Electrique Chambéry"
+url: /chambery/yesss-electrique-chambery/
+shop: électrique
+---
\ 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/les-houches/eric-jacquier-route-des-trabets.md b/content/cities/les-houches/eric-jacquier-route-des-trabets.md
deleted file mode 100644
index a1b2ec556..000000000
--- a/content/cities/les-houches/eric-jacquier-route-des-trabets.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 000000000..a30dc610b
--- /dev/null
+++ b/content/cities/les-houches/eric-jacquier-rue-du-mont-blanc.md
@@ -0,0 +1,5 @@
+---
+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/lully/_index.md b/content/cities/lully/_index.md
new file mode 100644
index 000000000..a28261bb6
--- /dev/null
+++ b/content/cities/lully/_index.md
@@ -0,0 +1,6 @@
+---
+title: Lully
+url: /lully/
+latitude: 46.291
+longitude: 6.408
+---
\ No newline at end of file
diff --git a/content/cities/lully/royal-viandes.md b/content/cities/lully/royal-viandes.md
new file mode 100644
index 000000000..e330653f2
--- /dev/null
+++ b/content/cities/lully/royal-viandes.md
@@ -0,0 +1,5 @@
+---
+title: "Royal Viandes"
+url: /lully/royal-viandes/
+shop: commerce
+---
\ No newline at end of file
diff --git a/content/cities/lyon/centre-funeraire-riviere.md b/content/cities/lyon/centre-funeraire-riviere.md
new file mode 100644
index 000000000..9bd5360d4
--- /dev/null
+++ b/content/cities/lyon/centre-funeraire-riviere.md
@@ -0,0 +1,5 @@
+---
+title: "Centre Funéraire Rivière"
+url: /lyon/centre-funeraire-riviere/
+shop: directeurs de funérailles
+---
\ No newline at end of file
diff --git a/content/cities/lyon/elistyl.md b/content/cities/lyon/elistyl.md
new file mode 100644
index 000000000..a63c971a8
--- /dev/null
+++ b/content/cities/lyon/elistyl.md
@@ -0,0 +1,5 @@
+---
+title: "Elistyl'"
+url: /lyon/elistyl/
+shop: coiffeur
+---
\ No newline at end of file
diff --git a/content/cities/lyon/galaxy-solutions.md b/content/cities/lyon/galaxy-solutions.md
new file mode 100644
index 000000000..3ead3b697
--- /dev/null
+++ b/content/cities/lyon/galaxy-solutions.md
@@ -0,0 +1,5 @@
+---
+title: "Galaxy Solutions"
+url: /lyon/galaxy-solutions/
+shop: téléphone portable
+---
\ No newline at end of file
diff --git a/content/cities/lyon/rhone-medical.md b/content/cities/lyon/rhone-medical.md
new file mode 100644
index 000000000..cd57ff5e3
--- /dev/null
+++ b/content/cities/lyon/rhone-medical.md
@@ -0,0 +1,5 @@
+---
+title: "Rhône médical"
+url: /lyon/rhone-medical/
+shop: approvisionnement médical
+---
\ No newline at end of file
diff --git a/content/cities/lyon/transakauto.md b/content/cities/lyon/transakauto.md
new file mode 100644
index 000000000..469695d8d
--- /dev/null
+++ b/content/cities/lyon/transakauto.md
@@ -0,0 +1,5 @@
+---
+title: "TransakAuto"
+url: /lyon/transakauto/
+shop: voiture
+---
\ No newline at end of file
diff --git a/content/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.md b/content/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.md
index f0ceede05..9d3de1bcc 100644
--- a/content/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.md
+++ b/content/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.md
@@ -1,5 +1,5 @@
 ---
 title: "Bar Tabac Presse du Soleil Levant"
 url: /monnetier-mornex/bar-tabac-presse-du-soleil-levant/
-shop: tabac
+shop: marchand de journaux
 ---
\ No newline at end of file
diff --git a/content/cities/nantua/clert.md b/content/cities/nantua/clert.md
deleted file mode 100644
index 1d5017cd5..000000000
--- a/content/cities/nantua/clert.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Clert"
-url: /nantua/clert/
-shop: boucherie
----
\ No newline at end of file
diff --git a/content/cities/saint-alban-leysse/decathlon-rue-du-marocaz.md b/content/cities/saint-alban-leysse/decathlon-rue-du-marocaz.md
new file mode 100644
index 000000000..3000a4fac
--- /dev/null
+++ b/content/cities/saint-alban-leysse/decathlon-rue-du-marocaz.md
@@ -0,0 +1,5 @@
+---
+title: "Decathlon"
+url: /saint-alban-leysse/decathlon-rue-du-marocaz/
+shop: vélo
+---
\ No newline at end of file
diff --git a/content/cities/saint-chamond/aldi.md b/content/cities/saint-chamond/aldi.md
new file mode 100644
index 000000000..97309a7f8
--- /dev/null
+++ b/content/cities/saint-chamond/aldi.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI"
+url: /saint-chamond/aldi/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/saint-genest-lerpt/boulangerie-patisserie-le-coin-des-gourmands.md b/content/cities/saint-genest-lerpt/boulangerie-patisserie-le-coin-des-gourmands.md
deleted file mode 100644
index 47805fcc7..000000000
--- a/content/cities/saint-genest-lerpt/boulangerie-patisserie-le-coin-des-gourmands.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Boulangerie Pâtisserie Le coin des Gourmands"
-url: /saint-genest-lerpt/boulangerie-patisserie-le-coin-des-gourmands/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/content/cities/saint-genix-les-villages/_index.md b/content/cities/saint-genix-les-villages/_index.md
index 2809f7c81..75acabc3e 100644
--- a/content/cities/saint-genix-les-villages/_index.md
+++ b/content/cities/saint-genix-les-villages/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Genix-les-Villages
 url: /saint-genix-les-villages/
 latitude: 45.6
-longitude: 5.632
+longitude: 5.633
 ---
\ No newline at end of file
diff --git a/content/cities/saint-gervais-les-bains/_index.md b/content/cities/saint-gervais-les-bains/_index.md
index b9e887f3e..87bcc6a03 100644
--- a/content/cities/saint-gervais-les-bains/_index.md
+++ b/content/cities/saint-gervais-les-bains/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Gervais-les-Bains
 url: /saint-gervais-les-bains/
-latitude: 45.892
-longitude: 6.712
+latitude: 45.854
+longitude: 6.724
 ---
\ No newline at end of file
diff --git a/content/cities/saint-haon-le-chatel/confiserie-lou-sucreu.md b/content/cities/saint-haon-le-chatel/confiserie-lou-sucreu.md
deleted file mode 100644
index 997c6de5c..000000000
--- a/content/cities/saint-haon-le-chatel/confiserie-lou-sucreu.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Confiserie Lou Sucrèu"
-url: /saint-haon-le-chatel/confiserie-lou-sucreu/
-shop: confiserie
----
\ 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-jean-de-bournay/bijouterie-benetti.md b/content/cities/saint-jean-de-bournay/bijouterie-benetti.md
new file mode 100644
index 000000000..40285df62
--- /dev/null
+++ b/content/cities/saint-jean-de-bournay/bijouterie-benetti.md
@@ -0,0 +1,5 @@
+---
+title: "Bijouterie Benetti"
+url: /saint-jean-de-bournay/bijouterie-benetti/
+shop: bijoux
+---
\ No newline at end of file
diff --git a/content/cities/saint-jean-de-bournay/bleu-indigo.md b/content/cities/saint-jean-de-bournay/bleu-indigo.md
new file mode 100644
index 000000000..9f71d32af
--- /dev/null
+++ b/content/cities/saint-jean-de-bournay/bleu-indigo.md
@@ -0,0 +1,5 @@
+---
+title: "Bleu Indigo"
+url: /saint-jean-de-bournay/bleu-indigo/
+shop: coiffeur
+---
\ No newline at end of file
diff --git a/content/cities/saint-jean-de-bournay/krys.md b/content/cities/saint-jean-de-bournay/krys.md
new file mode 100644
index 000000000..aab64573e
--- /dev/null
+++ b/content/cities/saint-jean-de-bournay/krys.md
@@ -0,0 +1,5 @@
+---
+title: "Krys"
+url: /saint-jean-de-bournay/krys/
+shop: opticien
+---
\ No newline at end of file
diff --git a/content/cities/saint-julien-en-genevois/le-fils-de-rene-comte.md b/content/cities/saint-julien-en-genevois/le-fils-de-rene-comte.md
new file mode 100644
index 000000000..1ebaba819
--- /dev/null
+++ b/content/cities/saint-julien-en-genevois/le-fils-de-rene-comte.md
@@ -0,0 +1,5 @@
+---
+title: "Le Fils de René Comte"
+url: /saint-julien-en-genevois/le-fils-de-rene-comte/
+shop: boucherie
+---
\ No newline at end of file
diff --git a/content/cities/saint-martin-dheres/le-moulin-blanc.md b/content/cities/saint-martin-dheres/le-moulin-blanc.md
deleted file mode 100644
index 55f197cd7..000000000
--- a/content/cities/saint-martin-dheres/le-moulin-blanc.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Le Moulin Blanc"
-url: /saint-martin-dheres/le-moulin-blanc/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/content/cities/saint-martin-dheres/o-tentation.md b/content/cities/saint-martin-dheres/o-tentation.md
new file mode 100644
index 000000000..769030a07
--- /dev/null
+++ b/content/cities/saint-martin-dheres/o-tentation.md
@@ -0,0 +1,5 @@
+---
+title: "Ô tentation"
+url: /saint-martin-dheres/o-tentation/
+shop: boulangerie
+---
\ 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 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/sainte-helene-sur-isere/_index.md b/content/cities/sainte-helene-sur-isere/_index.md
new file mode 100644
index 000000000..484f24f63
--- /dev/null
+++ b/content/cities/sainte-helene-sur-isere/_index.md
@@ -0,0 +1,6 @@
+---
+title: Sainte-Hélène-sur-Isère
+url: /sainte-helene-sur-isere/
+latitude: 45.608
+longitude: 6.326
+---
\ No newline at end of file
diff --git a/content/cities/sainte-helene-sur-isere/les-sens-des-alpes.md b/content/cities/sainte-helene-sur-isere/les-sens-des-alpes.md
new file mode 100644
index 000000000..32e1d3ee7
--- /dev/null
+++ b/content/cities/sainte-helene-sur-isere/les-sens-des-alpes.md
@@ -0,0 +1,5 @@
+---
+title: "Les sens des Alpes"
+url: /sainte-helene-sur-isere/les-sens-des-alpes/
+shop: herboriste
+---
\ No newline at end of file
diff --git a/content/cities/sciez-sur-leman/_index.md b/content/cities/sciez-sur-leman/_index.md
index debe57c5a..b70e8bb06 100644
--- a/content/cities/sciez-sur-leman/_index.md
+++ b/content/cities/sciez-sur-leman/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sciez-sur-Léman
 url: /sciez-sur-leman/
-latitude: 46.329
-longitude: 6.38
+latitude: 46.331
+longitude: 6.375
 ---
\ No newline at end of file
diff --git a/content/cities/sciez-sur-leman/diagonale-7.md b/content/cities/sciez-sur-leman/diagonale-7.md
new file mode 100644
index 000000000..1326a17db
--- /dev/null
+++ b/content/cities/sciez-sur-leman/diagonale-7.md
@@ -0,0 +1,5 @@
+---
+title: "Diagonale 7"
+url: /sciez-sur-leman/diagonale-7/
+shop: coiffeur
+---
\ No newline at end of file
diff --git a/content/cities/sciez/graines-de-curieux.md b/content/cities/sciez-sur-leman/graines-de-curieux.md
similarity index 54%
rename from content/cities/sciez/graines-de-curieux.md
rename to content/cities/sciez-sur-leman/graines-de-curieux.md
index a48f0bb74..d55f4fd1f 100644
--- a/content/cities/sciez/graines-de-curieux.md
+++ b/content/cities/sciez-sur-leman/graines-de-curieux.md
@@ -1,5 +1,5 @@
 ---
 title: "Graines de Curieux"
-url: /sciez/graines-de-curieux/
+url: /sciez-sur-leman/graines-de-curieux/
 shop: fleuriste
 ---
\ No newline at end of file
diff --git a/content/cities/sciez-sur-leman/le-crayon-bleu.md b/content/cities/sciez-sur-leman/le-crayon-bleu.md
new file mode 100644
index 000000000..6505f7c68
--- /dev/null
+++ b/content/cities/sciez-sur-leman/le-crayon-bleu.md
@@ -0,0 +1,5 @@
+---
+title: "le Crayon Bleu"
+url: /sciez-sur-leman/le-crayon-bleu/
+shop: art
+---
\ No newline at end of file
diff --git a/content/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.md b/content/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.md
new file mode 100644
index 000000000..80e26214d
--- /dev/null
+++ b/content/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.md
@@ -0,0 +1,5 @@
+---
+title: "Vestiaire Intercommunal Saint-Maurice"
+url: /sciez-sur-leman/vestiaire-intercommunal-saint-maurice/
+shop: vêtements
+---
\ 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/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/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/venissieux/grand-marche-istanbul.md b/content/cities/venissieux/grand-marche-istanbul.md
new file mode 100644
index 000000000..54471ada2
--- /dev/null
+++ b/content/cities/venissieux/grand-marche-istanbul.md
@@ -0,0 +1,5 @@
+---
+title: "Grand Marché Istanbul"
+url: /venissieux/grand-marche-istanbul/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/data/cities/andancette/le-marche-dodile.yml b/data/cities/andancette/le-marche-dodile.yml
index dec155adb..8f9ea9d30 100644
--- a/data/cities/andancette/le-marche-dodile.yml
+++ b/data/cities/andancette/le-marche-dodile.yml
@@ -7,5 +7,5 @@ city: Andancette
 street: "Rue du Radier"
 housenumber: 2
 phone: ""
-opening_hours: ""
+opening_hours: "Tu-Sa 15:00-19:00, We-Fr 08:00-12:00, Sa,Su 09:00-12:00"
 website: ""
\ 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 3a7806e36..fdd21050e 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: ""
\ No newline at end of file
diff --git a/data/cities/annecy/carrefour-city.yml b/data/cities/annecy/carrefour-city.yml
index fdd21050e..3a7806e36 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: ""
\ 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
new file mode 100644
index 000000000..b0b0263d1
--- /dev/null
+++ b/data/cities/annemasse/histoire-dor-allee-francois-truffaut.yml
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index 6d56fe95b..000000000
--- a/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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 b0b0263d1..6d56fe95b 100644
--- a/data/cities/annemasse/histoire-dor.yml
+++ b/data/cities/annemasse/histoire-dor.yml
@@ -1,11 +1,11 @@
-id: 4579827772
+id: 4565378166
 type: node
-latitude: 46.1966
-longitude: 6.2368
+latitude: 46.19592
+longitude: 6.25349
 postcode: "74100"
 city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 2
+street: "Rue de la Résistance"
+housenumber: 14
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
+opening_hours: "Mo-Sa 09:00-20:00; Su off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/anthy-sur-leman/lidl.yml b/data/cities/anthy-sur-leman/lidl.yml
index 2d47dd2c1..5bb2db546 100644
--- a/data/cities/anthy-sur-leman/lidl.yml
+++ b/data/cities/anthy-sur-leman/lidl.yml
@@ -1,7 +1,7 @@
 id: 977084210
 type: way
 latitude: 46.34961
-longitude: 6.43293
+longitude: 6.43294
 postcode: "74200"
 city: Anthy-sur-Léman
 street: "Avenue du Pré Robert Sud"
diff --git a/data/cities/anthy-sur-leman/yesss-electrique.yml b/data/cities/anthy-sur-leman/yesss-electrique.yml
new file mode 100644
index 000000000..7ae2fa2f4
--- /dev/null
+++ b/data/cities/anthy-sur-leman/yesss-electrique.yml
@@ -0,0 +1,11 @@
+id: 69004789
+type: way
+latitude: 46.35307
+longitude: 6.44039
+postcode: "74200"
+city: Anthy-sur-Léman
+street: "Route du Champ du Puits"
+housenumber: 3
+phone: ""
+opening_hours: "Mo-Th 07:30-12:00,13:30-17:30; Fr 07:30-12:00,13:30-17:00; Sa-Su off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/aubenas/station-avia.yml b/data/cities/aubenas/station-avia.yml
new file mode 100644
index 000000000..65df658b2
--- /dev/null
+++ b/data/cities/aubenas/station-avia.yml
@@ -0,0 +1,11 @@
+id: 25214314
+type: node
+latitude: 44.61436
+longitude: 4.40634
+postcode: "07200"
+city: Aubenas
+street: ""
+housenumber: 
+phone: ""
+opening_hours: "24/7"
+website: ""
\ No newline at end of file
diff --git a/data/cities/bons-en-chablais/classique-autowerks.yml b/data/cities/bons-en-chablais/classique-autowerks.yml
new file mode 100644
index 000000000..f84e7c7d5
--- /dev/null
+++ b/data/cities/bons-en-chablais/classique-autowerks.yml
@@ -0,0 +1,11 @@
+id: 208379682
+type: way
+latitude: 46.26076
+longitude: 6.3514
+postcode: "74890"
+city: Bons-en-Chablais
+street: "Rue de la Golliasse"
+housenumber: 11
+phone: ""
+opening_hours: "Tu-Fr 17:00-21:00; Mo,Sa-Su off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/chambery/eko-systm.yml b/data/cities/chambery/eko-systm.yml
index d31395f1a..12a260e9e 100644
--- a/data/cities/chambery/eko-systm.yml
+++ b/data/cities/chambery/eko-systm.yml
@@ -4,8 +4,8 @@ latitude: 45.56864
 longitude: 5.903
 postcode: "73000"
 city: Chambéry
-street: "Boulevard Henry Bordeaux"
+street: "boulevard Henry Bordeaux"
 housenumber: 572
-phone: ""
-opening_hours: "Mo,Tu,Th 15:30-19:30, Tu,Th 10:00-12:00, We,Fr 09:00-19:30, Sa 10:00-18:00"
-website: "https://www.ekosystm.com/"
\ No newline at end of file
+phone: "+33982235323"
+opening_hours: "Mo 16:00-19:30; Tu-Fr 09:00-13:00, 15:30-19:30; Sa 09:00-13:00, 16:00-18:00"
+website: "ekosystm.com"
\ No newline at end of file
diff --git a/data/cities/chambery/euromaster-milliand-pneus.yml b/data/cities/chambery/euromaster-milliand-pneus.yml
new file mode 100644
index 000000000..ac1ba9983
--- /dev/null
+++ b/data/cities/chambery/euromaster-milliand-pneus.yml
@@ -0,0 +1,11 @@
+id: 3299338569
+type: node
+latitude: 45.60742
+longitude: 5.89115
+postcode: "73000"
+city: Chambéry
+street: "Rue Belle-Eau"
+housenumber: 67
+phone: "+33 4 79 44 00 55"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/chambery/foussier-chambery.yml b/data/cities/chambery/foussier-chambery.yml
new file mode 100644
index 000000000..c7d13d170
--- /dev/null
+++ b/data/cities/chambery/foussier-chambery.yml
@@ -0,0 +1,11 @@
+id: 3299338570
+type: node
+latitude: 45.60764
+longitude: 5.89105
+postcode: "73000"
+city: Chambéry
+street: "Rue Belle-Eau"
+housenumber: 84
+phone: "+33 4 78 49 49 49"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/chambery/la-chaise-longue.yml b/data/cities/chambery/la-chaise-longue.yml
new file mode 100644
index 000000000..f5f2087c7
--- /dev/null
+++ b/data/cities/chambery/la-chaise-longue.yml
@@ -0,0 +1,11 @@
+id: 11204192106
+type: node
+latitude: 45.59245
+longitude: 5.90117
+postcode: "73000"
+city: Chambéry
+street: "Avenue des Landiers"
+housenumber: 1097
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/chambery/yesss-electrique-chambery.yml b/data/cities/chambery/yesss-electrique-chambery.yml
new file mode 100644
index 000000000..0e4773a89
--- /dev/null
+++ b/data/cities/chambery/yesss-electrique-chambery.yml
@@ -0,0 +1,11 @@
+id: 3299338568
+type: node
+latitude: 45.60698
+longitude: 5.89125
+postcode: "73000"
+city: Chambéry
+street: "Rue du Pré Pagnon"
+housenumber: 159
+phone: "+33 4 79 75 32 69"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/recyclerie-sportive-grenoble.yml b/data/cities/grenoble/recyclerie-sportive-grenoble.yml
index 36e81f72a..521a6559e 100644
--- a/data/cities/grenoble/recyclerie-sportive-grenoble.yml
+++ b/data/cities/grenoble/recyclerie-sportive-grenoble.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Rue Raoul Blanchard"
 housenumber: 3
 phone: "07 68 53 23 35"
-opening_hours: ""
+opening_hours: "We-Fr 13:00-19:00; Sa 11:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/youbadit.yml b/data/cities/grenoble/youbadit.yml
index c0c8c4707..1ba5983c7 100644
--- a/data/cities/grenoble/youbadit.yml
+++ b/data/cities/grenoble/youbadit.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Rue Nicolas Chorier"
 housenumber: 13;15
 phone: "+33 6 42 69 38 19"
-opening_hours: "Mo 13:30-18:00; Tu,We,Fr 09:00-18:00; Th 09:30-12:30,13:30-18:30"
+opening_hours: "Mo 13:30-18:30; Tu-We,Fr 09:00-18:00; Th 09:30-12:30,13:30-18:30; Sa-Su off"
 website: "https://www.youbadit.fr/"
\ No newline at end of file
diff --git a/data/cities/grenoble/youbikeit.yml b/data/cities/grenoble/youbikeit.yml
index e5f49695e..e069b906e 100644
--- a/data/cities/grenoble/youbikeit.yml
+++ b/data/cities/grenoble/youbikeit.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Rue Nicolas Chorier"
 housenumber: 15
 phone: ""
-opening_hours: "Mo-Fr 09:30-18:30"
+opening_hours: "Mo-Fr 09:30-18:30; Sa-Su off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/lentigny/boulangerie-patisserie.yml b/data/cities/lentigny/boulangerie-patisserie.yml
index 931042a74..cae8c853b 100644
--- a/data/cities/lentigny/boulangerie-patisserie.yml
+++ b/data/cities/lentigny/boulangerie-patisserie.yml
@@ -7,5 +7,5 @@ city: Lentigny
 street: "Rue de la Bruyère"
 housenumber: 595
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Sa 06:00-20:00; Su 06:00-13:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/les-gets/carrefour-montagne-les-gets.yml b/data/cities/les-gets/carrefour-montagne-les-gets.yml
index c87577c4f..206bd7a42 100644
--- a/data/cities/les-gets/carrefour-montagne-les-gets.yml
+++ b/data/cities/les-gets/carrefour-montagne-les-gets.yml
@@ -7,5 +7,5 @@ city: Les Gets
 street: "Rue du Centre"
 housenumber: 548
 phone: ""
-opening_hours: "Mo-Su 08:00-20:00"
+opening_hours: "Dec-Apr Mo-Su 08:00-20:00; Jul-Aug Mo-Su 8:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/les-gets/sherpa.yml b/data/cities/les-gets/sherpa.yml
index ea943b3e9..8b899e38e 100644
--- a/data/cities/les-gets/sherpa.yml
+++ b/data/cities/les-gets/sherpa.yml
@@ -7,5 +7,5 @@ city: Les Gets
 street: "Route des Grandes Alpes"
 housenumber: 927
 phone: ""
-opening_hours: "Mo-Tu,Th-Sa 07:30-12:30, 15:00-19:30; We,Su 07:30-12:30"
+opening_hours: "07:00-12:30, 15:00-19:30; Apr-Jun,Sep-Nov Mo-Tu,Fr-Sa 07:30-12:30, 15:00-19:30; We,Su 07:30-12:30"
 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
deleted file mode 100644
index 9b445c7bf..000000000
--- a/data/cities/les-houches/eric-jacquier-route-des-trabets.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 000000000..cb7f45fc0
--- /dev/null
+++ b/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml
@@ -0,0 +1,11 @@
+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 cb7f45fc0..9b445c7bf 100644
--- a/data/cities/les-houches/eric-jacquier.yml
+++ b/data/cities/les-houches/eric-jacquier.yml
@@ -1,11 +1,11 @@
-id: 9527735194
+id: 9525402299
 type: node
-latitude: 45.89033
-longitude: 6.79811
+latitude: 45.89004
+longitude: 6.78902
 postcode: "74310"
 city: Les Houches
-street: "Rue du Mont Blanc"
-housenumber: 106
+street: "Route des Trabets"
+housenumber: 94
 phone: ""
-opening_hours: "Mo-Su 06:00-12:30, 15:00-19:00"
+opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/lully/royal-viandes.yml b/data/cities/lully/royal-viandes.yml
new file mode 100644
index 000000000..cca5e9f5f
--- /dev/null
+++ b/data/cities/lully/royal-viandes.yml
@@ -0,0 +1,11 @@
+id: 1209330609
+type: way
+latitude: 46.29118
+longitude: 6.40791
+postcode: "74890"
+city: Lully
+street: "Route des Esserts"
+housenumber: 95
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/lyon/centre-funeraire-riviere.yml b/data/cities/lyon/centre-funeraire-riviere.yml
new file mode 100644
index 000000000..dd93ae981
--- /dev/null
+++ b/data/cities/lyon/centre-funeraire-riviere.yml
@@ -0,0 +1,11 @@
+id: 5775388753
+type: node
+latitude: 45.74368
+longitude: 4.87713
+postcode: "69003"
+city: Lyon
+street: "Cours Albert Thomas"
+housenumber: 153
+phone: ""
+opening_hours: "Mo-Fr 08:30-12:30,14:00-18:00; Sa 08:30-12:30,14:00-17:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/lyon/elistyl.yml b/data/cities/lyon/elistyl.yml
new file mode 100644
index 000000000..e6d375314
--- /dev/null
+++ b/data/cities/lyon/elistyl.yml
@@ -0,0 +1,11 @@
+id: 11225239980
+type: node
+latitude: 45.7325
+longitude: 4.8732
+postcode: "69008"
+city: Lyon
+street: "Avenue Paul Santy"
+housenumber: 47
+phone: "+33 4 78 76 38 34"
+opening_hours: "Tu-We 09:00-12:00,14:00-18:30; Th-Fr 09:00-18:00; Sa 08:30-16:00"
+website: "http://www.elistyl-lyon8.fr/"
\ No newline at end of file
diff --git a/data/cities/lyon/galaxy-solutions.yml b/data/cities/lyon/galaxy-solutions.yml
new file mode 100644
index 000000000..150e6e4b6
--- /dev/null
+++ b/data/cities/lyon/galaxy-solutions.yml
@@ -0,0 +1,11 @@
+id: 11215613305
+type: node
+latitude: 45.73535
+longitude: 4.86404
+postcode: "69008"
+city: Lyon
+street: "Rue Paul Cazeneuve"
+housenumber: 35
+phone: "+33 9 80 52 31 03"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/lyon/rhone-medical.yml b/data/cities/lyon/rhone-medical.yml
new file mode 100644
index 000000000..32ef17933
--- /dev/null
+++ b/data/cities/lyon/rhone-medical.yml
@@ -0,0 +1,11 @@
+id: 10201962482
+type: node
+latitude: 45.73397
+longitude: 4.85813
+postcode: "69008"
+city: Lyon
+street: "Rue Pierre Delore"
+housenumber: 45
+phone: "+33 4 78 58 34 15"
+opening_hours: "Mo-Fr 08:30-12:30,13:30-18:30; Sa 08:30-12:30"
+website: "https://rhone-medical.com/"
\ No newline at end of file
diff --git a/data/cities/lyon/transakauto.yml b/data/cities/lyon/transakauto.yml
new file mode 100644
index 000000000..dff2cf80b
--- /dev/null
+++ b/data/cities/lyon/transakauto.yml
@@ -0,0 +1,11 @@
+id: 11225239978
+type: node
+latitude: 45.73265
+longitude: 4.87302
+postcode: "69008"
+city: Lyon
+street: "Avenue Paul Santy"
+housenumber: 45
+phone: "+33 9 86 26 62 41"
+opening_hours: ""
+website: "https://transakautolyon8.auto-gestion.net/"
\ No newline at end of file
diff --git a/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml b/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml
index c8b46d6e8..747887e53 100644
--- a/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml
+++ b/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml
@@ -1,11 +1,11 @@
 id: 10006361717
 type: node
-latitude: 46.16141
-longitude: 6.22945
-postcode: ""
+latitude: 46.16144
+longitude: 6.22944
+postcode: "74560"
 city: Monnetier-Mornex
 street: "Route du Salève"
 housenumber: 1482
 phone: ""
-opening_hours: "Mo-Sa 06:30-20:00"
+opening_hours: "Mo-Fr 06:30-20:00; Sa 08:00-20:00; Su off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/nantua/clert.yml b/data/cities/nantua/clert.yml
deleted file mode 100644
index d6ec75f4c..000000000
--- a/data/cities/nantua/clert.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2730492612
-type: node
-latitude: 46.15328
-longitude: 5.60658
-postcode: "01130"
-city: Nantua
-street: "Rue du Collège"
-housenumber: 22
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/rumilly/intertrade.yml b/data/cities/rumilly/intertrade.yml
index 3938b0f11..5b7eb5029 100644
--- a/data/cities/rumilly/intertrade.yml
+++ b/data/cities/rumilly/intertrade.yml
@@ -4,7 +4,7 @@ latitude: 45.84518
 longitude: 5.95412
 postcode: "74150"
 city: Rumilly
-street: "Avenue de l'Arcalod"
+street: ""
 housenumber: 20
 phone: ""
 opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:00"
diff --git a/data/cities/saint-alban-leysse/decathlon-rue-du-marocaz.yml b/data/cities/saint-alban-leysse/decathlon-rue-du-marocaz.yml
new file mode 100644
index 000000000..f2914d6f0
--- /dev/null
+++ b/data/cities/saint-alban-leysse/decathlon-rue-du-marocaz.yml
@@ -0,0 +1,11 @@
+id: 11207370182
+type: node
+latitude: 45.57378
+longitude: 5.94929
+postcode: "73230"
+city: Saint-Alban-Leysse
+street: "Rue du Marocaz"
+housenumber: 43
+phone: "+33 4 79 85 37 85"
+opening_hours: "Mo-Sa 09:30-19:30; Su, PH closed"
+website: "https://www.decathlon.fr/store-view/magasin-de-sports-saint-alban-leysse-0070007600076"
\ No newline at end of file
diff --git a/data/cities/saint-alban-leysse/decathlon.yml b/data/cities/saint-alban-leysse/decathlon.yml
index fda458d98..c59d5d273 100644
--- a/data/cities/saint-alban-leysse/decathlon.yml
+++ b/data/cities/saint-alban-leysse/decathlon.yml
@@ -1,7 +1,7 @@
 id: 8558278046
 type: node
-latitude: 45.5739
-longitude: 5.94922
+latitude: 45.57414
+longitude: 5.9491
 postcode: "73230"
 city: Saint-Alban-Leysse
 street: "Rue du Marocaz"
diff --git a/data/cities/saint-baldoph/label-energie.yml b/data/cities/saint-baldoph/label-energie.yml
index 7a67c6756..05f0f48b5 100644
--- a/data/cities/saint-baldoph/label-energie.yml
+++ b/data/cities/saint-baldoph/label-energie.yml
@@ -4,8 +4,8 @@ latitude: 45.53162
 longitude: 5.96078
 postcode: "73190"
 city: Saint-Baldoph
-street: "Impasse de la Roselière"
+street: "impasse de la roselière"
 housenumber: 94
 phone: "+33 4 79 28 74 99"
-opening_hours: ""
-website: "http://www.labelenergie.com"
\ No newline at end of file
+opening_hours: "Mo 08:00-12:30; Tu-Fr 08:00-12:30, 14:00-18:30; Sa 09:00-12:00"
+website: "www.labelenergie.com"
\ No newline at end of file
diff --git a/data/cities/saint-chamond/aldi.yml b/data/cities/saint-chamond/aldi.yml
new file mode 100644
index 000000000..3f7ac599f
--- /dev/null
+++ b/data/cities/saint-chamond/aldi.yml
@@ -0,0 +1,11 @@
+id: 11222087600
+type: node
+latitude: 45.47184
+longitude: 4.50773
+postcode: "42400"
+city: Saint-Chamond
+street: "Rue Maurice Bonnevialle"
+housenumber: 2
+phone: "+33 1 81 09 78 25"
+opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-chamond/gamm-vert.yml b/data/cities/saint-chamond/gamm-vert.yml
index 44ebdce3b..914e58f65 100644
--- a/data/cities/saint-chamond/gamm-vert.yml
+++ b/data/cities/saint-chamond/gamm-vert.yml
@@ -5,7 +5,7 @@ longitude: 4.48942
 postcode: "42400"
 city: Saint-Chamond
 street: "Rue du 17 Octobre 1961"
-housenumber: 
+housenumber: 4
 phone: "+33 4 77 29 26 00"
 opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00"
 website: "http://www.gammvert.fr"
\ No newline at end of file
diff --git a/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml b/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml
index 5ecc35985..fff740700 100644
--- a/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml
+++ b/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml
@@ -5,7 +5,7 @@ longitude: 4.49781
 postcode: "42400"
 city: Saint-Chamond
 street: "Route du Cantonnement"
-housenumber: 
+housenumber: 2
 phone: "+33 4 77 29 69 44"
 opening_hours: "Mo 14:00-19:00; Tu-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/saint-genest-lerpt/boulangerie-patisserie-le-coin-des-gourmands.yml b/data/cities/saint-genest-lerpt/boulangerie-patisserie-le-coin-des-gourmands.yml
deleted file mode 100644
index 39c77f0fa..000000000
--- a/data/cities/saint-genest-lerpt/boulangerie-patisserie-le-coin-des-gourmands.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 11013684472
-type: node
-latitude: 45.44598
-longitude: 4.33439
-postcode: "42530"
-city: Saint-Genest-Lerpt
-street: "Rue Eugène Bonnardel"
-housenumber: 1
-phone: "+33 6 11 94 05 23"
-opening_hours: "Tu-Fr 07:00–13:00; Tu-Fr 15:00–19:00; Sa 07:00–18:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/saint-haon-le-chatel/confiserie-lou-sucreu.yml b/data/cities/saint-haon-le-chatel/confiserie-lou-sucreu.yml
deleted file mode 100644
index df06cd86a..000000000
--- a/data/cities/saint-haon-le-chatel/confiserie-lou-sucreu.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 362962178
-type: way
-latitude: 46.06615
-longitude: 3.91433
-postcode: "42370"
-city: Saint-Haon-le-Châtel
-street: "Place de la Bouverie"
-housenumber: 
-phone: "+33 6 27 66 05 53"
-opening_hours: ""
-website: "https://confiserielousucreu.fr/"
\ No newline at end of file
diff --git a/data/cities/saint-jean-de-bournay/bijouterie-benetti.yml b/data/cities/saint-jean-de-bournay/bijouterie-benetti.yml
new file mode 100644
index 000000000..606efa769
--- /dev/null
+++ b/data/cities/saint-jean-de-bournay/bijouterie-benetti.yml
@@ -0,0 +1,11 @@
+id: 11219512832
+type: node
+latitude: 45.50246
+longitude: 5.13891
+postcode: "38440"
+city: Saint-Jean-de-Bournay
+street: "Rue de la République"
+housenumber: 84
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-jean-de-bournay/bleu-indigo.yml b/data/cities/saint-jean-de-bournay/bleu-indigo.yml
new file mode 100644
index 000000000..30fef166e
--- /dev/null
+++ b/data/cities/saint-jean-de-bournay/bleu-indigo.yml
@@ -0,0 +1,11 @@
+id: 11219435278
+type: node
+latitude: 45.50232
+longitude: 5.14153
+postcode: "38440"
+city: Saint-Jean-de-Bournay
+street: "Rue de la République"
+housenumber: 
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-jean-de-bournay/krys.yml b/data/cities/saint-jean-de-bournay/krys.yml
new file mode 100644
index 000000000..8bc91ef27
--- /dev/null
+++ b/data/cities/saint-jean-de-bournay/krys.yml
@@ -0,0 +1,11 @@
+id: 11219518596
+type: node
+latitude: 45.50234
+longitude: 5.14012
+postcode: "38440"
+city: Saint-Jean-de-Bournay
+street: "Rue de la République"
+housenumber: 72
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-julien-en-genevois/le-fils-de-rene-comte.yml b/data/cities/saint-julien-en-genevois/le-fils-de-rene-comte.yml
new file mode 100644
index 000000000..738ea0cd3
--- /dev/null
+++ b/data/cities/saint-julien-en-genevois/le-fils-de-rene-comte.yml
@@ -0,0 +1,11 @@
+id: 2995721088
+type: node
+latitude: 46.14418
+longitude: 6.08091
+postcode: "74160"
+city: Saint-Julien-en-Genevois
+street: "Pl. du Maquis des Glières"
+housenumber: 1
+phone: "+33 4 50 49 01 57"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-martin-dheres/le-moulin-blanc.yml b/data/cities/saint-martin-dheres/o-tentation.yml
similarity index 100%
rename from data/cities/saint-martin-dheres/le-moulin-blanc.yml
rename to data/cities/saint-martin-dheres/o-tentation.yml
diff --git a/data/cities/sainte-helene-sur-isere/les-sens-des-alpes.yml b/data/cities/sainte-helene-sur-isere/les-sens-des-alpes.yml
new file mode 100644
index 000000000..1ba63b57b
--- /dev/null
+++ b/data/cities/sainte-helene-sur-isere/les-sens-des-alpes.yml
@@ -0,0 +1,11 @@
+id: 10239881299
+type: node
+latitude: 45.60779
+longitude: 6.32611
+postcode: "73460"
+city: Sainte-Hélène-sur-Isère
+street: "Route de Plan Violet"
+housenumber: 325
+phone: "+33(0)650015775"
+opening_hours: ""
+website: "https://lessensdesalpes.fr"
\ No newline at end of file
diff --git a/data/cities/sciez-sur-leman/diagonale-7.yml b/data/cities/sciez-sur-leman/diagonale-7.yml
new file mode 100644
index 000000000..8e40d1bbc
--- /dev/null
+++ b/data/cities/sciez-sur-leman/diagonale-7.yml
@@ -0,0 +1,11 @@
+id: 4628438895
+type: node
+latitude: 46.33084
+longitude: 6.37527
+postcode: "74140"
+city: Sciez-sur-Léman
+street: "Avenue des Charmes"
+housenumber: 118
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/sciez/graines-de-curieux.yml b/data/cities/sciez-sur-leman/graines-de-curieux.yml
similarity index 62%
rename from data/cities/sciez/graines-de-curieux.yml
rename to data/cities/sciez-sur-leman/graines-de-curieux.yml
index c16a1cb36..6949e3602 100644
--- a/data/cities/sciez/graines-de-curieux.yml
+++ b/data/cities/sciez-sur-leman/graines-de-curieux.yml
@@ -1,11 +1,11 @@
 id: 8238280778
 type: node
-latitude: 46.33075
-longitude: 6.37538
+latitude: 46.33133
+longitude: 6.37467
 postcode: "74140"
-city: Sciez
+city: Sciez-sur-Léman
 street: "Avenue des Charmes"
-housenumber: 118
+housenumber: 16
 phone: "+33 4 50 72 94 04"
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/sciez-sur-leman/le-crayon-bleu.yml b/data/cities/sciez-sur-leman/le-crayon-bleu.yml
new file mode 100644
index 000000000..7380b8d21
--- /dev/null
+++ b/data/cities/sciez-sur-leman/le-crayon-bleu.yml
@@ -0,0 +1,11 @@
+id: 11215165491
+type: node
+latitude: 46.33079
+longitude: 6.37533
+postcode: "74140"
+city: Sciez-sur-Léman
+street: "Avenue des Charmes"
+housenumber: 118
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.yml b/data/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.yml
new file mode 100644
index 000000000..2e8cbdf78
--- /dev/null
+++ b/data/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.yml
@@ -0,0 +1,11 @@
+id: 11217499088
+type: node
+latitude: 46.33098
+longitude: 6.37839
+postcode: "74140"
+city: Sciez-sur-Léman
+street: "Route du Crêt Beule"
+housenumber: 1
+phone: ""
+opening_hours: "Tu 13:30-16:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/tassin-la-demi-lune/lideal.yml b/data/cities/tassin-la-demi-lune/lideal.yml
index 88c8dab1a..f77502873 100644
--- a/data/cities/tassin-la-demi-lune/lideal.yml
+++ b/data/cities/tassin-la-demi-lune/lideal.yml
@@ -7,5 +7,5 @@ city: Tassin-la-Demi-Lune
 street: "Rue Georges Perret"
 housenumber: 17
 phone: "+33472529492"
-opening_hours: "Mo 14:30-19:00; Tu-Th 10:00-12:30,14:30-19:00; Fr,Sa 10:00-19:00"
+opening_hours: "Mo-Fr 14:30-19:00, We,Fr,Sa 10:00-12:30, Sa 14:00-19:00, Tu,Th 10:00-12:00"
 website: "http://lidealboutique.fr/"
\ No newline at end of file
diff --git a/data/cities/thurins/un-dimanche-a-la-campagne.yml b/data/cities/thurins/un-dimanche-a-la-campagne.yml
index 056e0de13..be5336028 100644
--- a/data/cities/thurins/un-dimanche-a-la-campagne.yml
+++ b/data/cities/thurins/un-dimanche-a-la-campagne.yml
@@ -8,4 +8,4 @@ street: "La Durantière"
 housenumber: 
 phone: "+33478819438"
 opening_hours: "We-Fr 09:00-12:30,15:00-19:00; Sa,Su 09:00-12:30,15:00-18:00"
-website: "http://udalc.pagesperso-orange.fr"
\ No newline at end of file
+website: ""
\ No newline at end of file
diff --git a/data/cities/venissieux/grand-marche-istanbul.yml b/data/cities/venissieux/grand-marche-istanbul.yml
new file mode 100644
index 000000000..cb66c37da
--- /dev/null
+++ b/data/cities/venissieux/grand-marche-istanbul.yml
@@ -0,0 +1,11 @@
+id: 11218007308
+type: node
+latitude: 45.7271
+longitude: 4.85448
+postcode: "69200"
+city: Vénissieux
+street: "Route de Vienne"
+housenumber: 277
+phone: "+33 4 78 00 38 77"
+opening_hours: ""
+website: "https://grandmarcheistanbul.fr/"
\ No newline at end of file