diff --git a/content/cities/ambilly/_index.md b/content/cities/ambilly/_index.md
index b2ccd83fc..7e33e10d0 100644
--- a/content/cities/ambilly/_index.md
+++ b/content/cities/ambilly/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Ambilly
 url: /ambilly/
-latitude: 46.196
+latitude: 46.194
 longitude: 6.228
 ---
\ No newline at end of file
diff --git a/content/cities/annecy/intimissimi.md b/content/cities/annecy/intimissimi.md
new file mode 100644
index 000000000..bd1d0d96d
--- /dev/null
+++ b/content/cities/annecy/intimissimi.md
@@ -0,0 +1,5 @@
+---
+title: "Intimissimi"
+url: /annecy/intimissimi/
+shop: vêtements
+---
\ No newline at end of file
diff --git a/content/cities/annecy/la-compagnie-des-petits.md b/content/cities/annecy/la-compagnie-des-petits.md
deleted file mode 100644
index 745269db4..000000000
--- a/content/cities/annecy/la-compagnie-des-petits.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "La Compagnie des Petits"
-url: /annecy/la-compagnie-des-petits/
-shop: vêtements
----
\ No newline at end of file
diff --git a/content/cities/belleville-en-beaujolais/_index.md b/content/cities/belleville-en-beaujolais/_index.md
deleted file mode 100644
index bd76c76c1..000000000
--- a/content/cities/belleville-en-beaujolais/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Belleville en beaujolais
-url: /belleville-en-beaujolais/
-latitude: 46.102
-longitude: 4.748
----
\ No newline at end of file
diff --git a/content/cities/belleville-en-beaujolais/la-vie-claire.md b/content/cities/belleville-en-beaujolais/la-vie-claire.md
deleted file mode 100644
index 1b3febbf2..000000000
--- a/content/cities/belleville-en-beaujolais/la-vie-claire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "La Vie Claire"
-url: /belleville-en-beaujolais/la-vie-claire/
-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/bourg-saint-maurice/intermarche-drive.md b/content/cities/bourg-saint-maurice/intermarche-drive.md
new file mode 100644
index 000000000..6b6d8f3b9
--- /dev/null
+++ b/content/cities/bourg-saint-maurice/intermarche-drive.md
@@ -0,0 +1,5 @@
+---
+title: "Intermarché Drive"
+url: /bourg-saint-maurice/intermarche-drive/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/chatillon-sur-chalaronne/_index.md b/content/cities/chatillon-sur-chalaronne/_index.md
index 392d32363..86faea5e2 100644
--- a/content/cities/chatillon-sur-chalaronne/_index.md
+++ b/content/cities/chatillon-sur-chalaronne/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Châtillon-sur-Chalaronne
 url: /chatillon-sur-chalaronne/
-latitude: 46.122
-longitude: 4.953
+latitude: 46.116
+longitude: 4.964
 ---
\ No newline at end of file
diff --git a/content/cities/chazelles-sur-lyon/cycles-vaudier.md b/content/cities/chazelles-sur-lyon/cycles-vaudier.md
new file mode 100644
index 000000000..bfb7379ef
--- /dev/null
+++ b/content/cities/chazelles-sur-lyon/cycles-vaudier.md
@@ -0,0 +1,5 @@
+---
+title: "Cycles Vaudier"
+url: /chazelles-sur-lyon/cycles-vaudier/
+shop: vélo
+---
\ No newline at end of file
diff --git a/content/cities/chazelles-sur-lyon/passion-et-mangue-primeurs.md b/content/cities/chazelles-sur-lyon/passion-et-mangue-primeurs.md
new file mode 100644
index 000000000..39aa7fe88
--- /dev/null
+++ b/content/cities/chazelles-sur-lyon/passion-et-mangue-primeurs.md
@@ -0,0 +1,5 @@
+---
+title: "Passion & Mangue Primeurs"
+url: /chazelles-sur-lyon/passion-et-mangue-primeurs/
+shop: légumes
+---
\ No newline at end of file
diff --git a/content/cities/chazelles-sur-lyon/pompes-funebres-miozzo.md b/content/cities/chazelles-sur-lyon/pompes-funebres-miozzo.md
new file mode 100644
index 000000000..f1a56d09c
--- /dev/null
+++ b/content/cities/chazelles-sur-lyon/pompes-funebres-miozzo.md
@@ -0,0 +1,5 @@
+---
+title: "Pompes Funèbres Miozzo"
+url: /chazelles-sur-lyon/pompes-funebres-miozzo/
+shop: directeurs de funérailles
+---
\ No newline at end of file
diff --git a/content/cities/corenc/_index.md b/content/cities/corenc/_index.md
index c613f7af6..fb7eaa33a 100644
--- a/content/cities/corenc/_index.md
+++ b/content/cities/corenc/_index.md
@@ -2,5 +2,5 @@
 title: Corenc
 url: /corenc/
 latitude: 45.212
-longitude: 5.758
+longitude: 5.765
 ---
\ No newline at end of file
diff --git a/content/cities/corenc/epicuria.md b/content/cities/corenc/epicuria.md
new file mode 100644
index 000000000..0731e631a
--- /dev/null
+++ b/content/cities/corenc/epicuria.md
@@ -0,0 +1,5 @@
+---
+title: "Epicuria"
+url: /corenc/epicuria/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/courchevel/_index.md b/content/cities/courchevel/_index.md
index 9168bb242..e734ab4ef 100644
--- a/content/cities/courchevel/_index.md
+++ b/content/cities/courchevel/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Courchevel
 url: /courchevel/
-latitude: 45.416
-longitude: 6.631
+latitude: 45.418
+longitude: 6.652
 ---
\ No newline at end of file
diff --git a/content/cities/couzon-au-mont-dor/_index.md b/content/cities/couzon-au-mont-dor/_index.md
index 27597d34f..5b29affbd 100644
--- a/content/cities/couzon-au-mont-dor/_index.md
+++ b/content/cities/couzon-au-mont-dor/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Couzon-au-Mont-d'Or
 url: /couzon-au-mont-dor/
-latitude: 45.845
-longitude: 4.831
+latitude: 45.846
+longitude: 4.832
 ---
\ No newline at end of file
diff --git a/content/cities/cublize/_index.md b/content/cities/cublize/_index.md
index 27eeeb29e..8cb69e7ef 100644
--- a/content/cities/cublize/_index.md
+++ b/content/cities/cublize/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Cublize
 url: /cublize/
-latitude: 46.016
-longitude: 4.377
+latitude: 46.019
+longitude: 4.378
 ---
\ No newline at end of file
diff --git a/content/cities/epagny-metz-tessy/central-parc-epagny.md b/content/cities/epagny-metz-tessy/central-parc-epagny.md
new file mode 100644
index 000000000..d16d3ff35
--- /dev/null
+++ b/content/cities/epagny-metz-tessy/central-parc-epagny.md
@@ -0,0 +1,5 @@
+---
+title: "Central Parc Epagny"
+url: /epagny-metz-tessy/central-parc-epagny/
+shop: centre commercial
+---
\ No newline at end of file
diff --git a/content/cities/fillinges/_index.md b/content/cities/fillinges/_index.md
index acd8e1e3f..d472776fb 100644
--- a/content/cities/fillinges/_index.md
+++ b/content/cities/fillinges/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Fillinges
 url: /fillinges/
-latitude: 46.151
-longitude: 6.32
+latitude: 46.154
+longitude: 6.321
 ---
\ No newline at end of file
diff --git a/content/cities/grenoble/_index.md b/content/cities/grenoble/_index.md
index 1d80e55e6..ab4f2ee24 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.729
 ---
\ No newline at end of file
diff --git a/content/cities/le-cheylard/station-u.md b/content/cities/le-cheylard/station-u.md
deleted file mode 100644
index c43f4809b..000000000
--- a/content/cities/le-cheylard/station-u.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Station U"
-url: /le-cheylard/station-u/
-shop: gaz
----
\ No newline at end of file
diff --git a/content/cities/le-cheylard/systeme-u.md b/content/cities/le-cheylard/systeme-u.md
new file mode 100644
index 000000000..5dbaccdef
--- /dev/null
+++ b/content/cities/le-cheylard/systeme-u.md
@@ -0,0 +1,5 @@
+---
+title: "Système U"
+url: /le-cheylard/systeme-u/
+shop: gaz
+---
\ 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/marin/_index.md b/content/cities/marin/_index.md
new file mode 100644
index 000000000..616fa946b
--- /dev/null
+++ b/content/cities/marin/_index.md
@@ -0,0 +1,6 @@
+---
+title: Marin
+url: /marin/
+latitude: 46.38
+longitude: 6.511
+---
\ No newline at end of file
diff --git a/content/cities/marin/dauphiblanc.md b/content/cities/marin/dauphiblanc.md
new file mode 100644
index 000000000..34b527d54
--- /dev/null
+++ b/content/cities/marin/dauphiblanc.md
@@ -0,0 +1,5 @@
+---
+title: "Dauphiblanc"
+url: /marin/dauphiblanc/
+shop: blanchisserie
+---
\ No newline at end of file
diff --git a/content/cities/megeve/meglavage.md b/content/cities/megeve/meglavage.md
new file mode 100644
index 000000000..54758fe92
--- /dev/null
+++ b/content/cities/megeve/meglavage.md
@@ -0,0 +1,5 @@
+---
+title: "Meg'lavage"
+url: /megeve/meglavage/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/meylan/_index.md b/content/cities/meylan/_index.md
index 7bb316f9d..93e5ed051 100644
--- a/content/cities/meylan/_index.md
+++ b/content/cities/meylan/_index.md
@@ -2,5 +2,5 @@
 title: Meylan
 url: /meylan/
 latitude: 45.203
-longitude: 5.761
+longitude: 5.76
 ---
\ No newline at end of file
diff --git a/content/cities/meylan/garage-pelletier.md b/content/cities/meylan/garage-pelletier.md
deleted file mode 100644
index b40b4fa99..000000000
--- a/content/cities/meylan/garage-pelletier.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Garage Pelletier"
-url: /meylan/garage-pelletier/
-shop: réparation de voitures
----
\ No newline at end of file
diff --git a/content/cities/meylan/justin-femme.md b/content/cities/meylan/justin-femme.md
new file mode 100644
index 000000000..bbe0857fe
--- /dev/null
+++ b/content/cities/meylan/justin-femme.md
@@ -0,0 +1,5 @@
+---
+title: "Just'in Femme"
+url: /meylan/justin-femme/
+shop: vêtements
+---
\ No newline at end of file
diff --git a/content/cities/meylan/la-foret-noire.md b/content/cities/meylan/la-foret-noire.md
new file mode 100644
index 000000000..5bb76e0c1
--- /dev/null
+++ b/content/cities/meylan/la-foret-noire.md
@@ -0,0 +1,5 @@
+---
+title: "La Forêt Noire"
+url: /meylan/la-foret-noire/
+shop: pâtisserie
+---
\ No newline at end of file
diff --git a/content/cities/meylan/le-pressing-des-buclos.md b/content/cities/meylan/le-pressing-des-buclos.md
new file mode 100644
index 000000000..72da6d426
--- /dev/null
+++ b/content/cities/meylan/le-pressing-des-buclos.md
@@ -0,0 +1,5 @@
+---
+title: "Le Pressing des Buclos"
+url: /meylan/le-pressing-des-buclos/
+shop: blanchisserie
+---
\ No newline at end of file
diff --git a/content/cities/meylan/meylan-fruits.md b/content/cities/meylan/meylan-fruits.md
new file mode 100644
index 000000000..b9b5a176e
--- /dev/null
+++ b/content/cities/meylan/meylan-fruits.md
@@ -0,0 +1,5 @@
+---
+title: "Meylan Fruits"
+url: /meylan/meylan-fruits/
+shop: légumes
+---
\ No newline at end of file
diff --git a/content/cities/meylan/peugeot-garage-pelletier.md b/content/cities/meylan/peugeot-garage-pelletier.md
new file mode 100644
index 000000000..288a72aa3
--- /dev/null
+++ b/content/cities/meylan/peugeot-garage-pelletier.md
@@ -0,0 +1,5 @@
+---
+title: "Peugeot Garage Pelletier"
+url: /meylan/peugeot-garage-pelletier/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/meylan/poissonerie-moroni.md b/content/cities/meylan/poissonerie-moroni.md
new file mode 100644
index 000000000..81c315042
--- /dev/null
+++ b/content/cities/meylan/poissonerie-moroni.md
@@ -0,0 +1,5 @@
+---
+title: "Poissonerie Moroni"
+url: /meylan/poissonerie-moroni/
+shop: fruits de mer
+---
\ No newline at end of file
diff --git a/content/cities/meylan/pressing-bulle-do.md b/content/cities/meylan/pressing-bulle-do.md
new file mode 100644
index 000000000..859d3ac8c
--- /dev/null
+++ b/content/cities/meylan/pressing-bulle-do.md
@@ -0,0 +1,5 @@
+---
+title: "Pressing Bulle d'O"
+url: /meylan/pressing-bulle-do/
+shop: blanchisserie
+---
\ No newline at end of file
diff --git a/content/cities/meylan/renault-meylan.md b/content/cities/meylan/renault-meylan.md
new file mode 100644
index 000000000..1bf73bfba
--- /dev/null
+++ b/content/cities/meylan/renault-meylan.md
@@ -0,0 +1,5 @@
+---
+title: "Renault Meylan"
+url: /meylan/renault-meylan/
+shop: voiture
+---
\ No newline at end of file
diff --git a/content/cities/meylan/triperie-boucherie-buchs.md b/content/cities/meylan/triperie-boucherie-buchs.md
new file mode 100644
index 000000000..78ec537f4
--- /dev/null
+++ b/content/cities/meylan/triperie-boucherie-buchs.md
@@ -0,0 +1,5 @@
+---
+title: "Triperie Boucherie Buchs"
+url: /meylan/triperie-boucherie-buchs/
+shop: boucherie
+---
\ No newline at end of file
diff --git a/content/cities/montbonnot-saint-martin/edelweiss-pressing.md b/content/cities/montbonnot-saint-martin/edelweiss-pressing.md
deleted file mode 100644
index 040d85dbf..000000000
--- a/content/cities/montbonnot-saint-martin/edelweiss-pressing.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Edelweiss Pressing"
-url: /montbonnot-saint-martin/edelweiss-pressing/
-shop: blanchisserie
----
\ No newline at end of file
diff --git a/content/cities/montbonnot-saint-martin/krys.md b/content/cities/montbonnot-saint-martin/krys.md
new file mode 100644
index 000000000..4db117da2
--- /dev/null
+++ b/content/cities/montbonnot-saint-martin/krys.md
@@ -0,0 +1,5 @@
+---
+title: "Krys"
+url: /montbonnot-saint-martin/krys/
+shop: opticien
+---
\ No newline at end of file
diff --git a/content/cities/moutiers/_index.md b/content/cities/moutiers/_index.md
index 453bc739d..880abddd9 100644
--- a/content/cities/moutiers/_index.md
+++ b/content/cities/moutiers/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Moûtiers
 url: /moutiers/
-latitude: 45.485
+latitude: 45.484
 longitude: 6.532
 ---
\ No newline at end of file
diff --git a/content/cities/passy/_index.md b/content/cities/passy/_index.md
index 63de64b5e..42aabc799 100644
--- a/content/cities/passy/_index.md
+++ b/content/cities/passy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Passy
 url: /passy/
-latitude: 45.936
-longitude: 6.709
+latitude: 45.939
+longitude: 6.71
 ---
\ No newline at end of file
diff --git a/content/cities/passy/decathlon-mountain-store.md b/content/cities/passy/decathlon-mountain-store.md
deleted file mode 100644
index c2addf229..000000000
--- a/content/cities/passy/decathlon-mountain-store.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Decathlon Mountain Store"
-url: /passy/decathlon-mountain-store/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/passy/decathlon.md b/content/cities/passy/decathlon.md
new file mode 100644
index 000000000..7f966a31a
--- /dev/null
+++ b/content/cities/passy/decathlon.md
@@ -0,0 +1,5 @@
+---
+title: "Decathlon"
+url: /passy/decathlon/
+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 db9436a11..7debe9423 100644
--- a/content/cities/reignier-esery/_index.md
+++ b/content/cities/reignier-esery/_index.md
@@ -1,6 +1,6 @@
 ---
-title: Reignier-Esery
+title: Reignier-Ésery
 url: /reignier-esery/
-latitude: 46.138
-longitude: 6.27
+latitude: 46.136
+longitude: 6.269
 ---
\ No newline at end of file
diff --git a/content/cities/sain-bel/_index.md b/content/cities/sain-bel/_index.md
index 812552b77..381f56801 100644
--- a/content/cities/sain-bel/_index.md
+++ b/content/cities/sain-bel/_index.md
@@ -2,5 +2,5 @@
 title: Sain-Bel
 url: /sain-bel/
 latitude: 45.811
-longitude: 4.599
+longitude: 4.6
 ---
\ No newline at end of file
diff --git a/content/cities/saint-etienne/midas.md b/content/cities/saint-etienne/midas.md
deleted file mode 100644
index 3f9762d36..000000000
--- a/content/cities/saint-etienne/midas.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Midas"
-url: /saint-etienne/midas/
-shop: réparation de voitures
----
\ 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 d59a8c991..3ae855ea2 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.495
-longitude: 4.245
+latitude: 45.5
+longitude: 4.241
 ---
\ 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 cdf1baafe..4ed0b659f 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.012
+longitude: 5.011
 ---
\ 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-helene-sur-isere/reda.md b/content/cities/sainte-helene-sur-isere/reda.md
deleted file mode 100644
index 1b866f63f..000000000
--- a/content/cities/sainte-helene-sur-isere/reda.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "REDA"
-url: /sainte-helene-sur-isere/reda/
-shop: réparation de voitures
----
\ No newline at end of file
diff --git a/content/cities/sallanches/le-talon-dachille.md b/content/cities/sallanches/le-talon-dachille.md
deleted file mode 100644
index 4d7926410..000000000
--- a/content/cities/sallanches/le-talon-dachille.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Le Talon d'Achille"
-url: /sallanches/le-talon-dachille/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/sallanches/terre-de-running.md b/content/cities/sallanches/terre-de-running.md
new file mode 100644
index 000000000..425914960
--- /dev/null
+++ b/content/cities/sallanches/terre-de-running.md
@@ -0,0 +1,5 @@
+---
+title: "Terre de Running"
+url: /sallanches/terre-de-running/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/seez/garage-metral.md b/content/cities/seez/garage-metral.md
new file mode 100644
index 000000000..eb41ac43d
--- /dev/null
+++ b/content/cities/seez/garage-metral.md
@@ -0,0 +1,5 @@
+---
+title: "Garage Metral"
+url: /seez/garage-metral/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/seez/weldom.md b/content/cities/seez/weldom.md
new file mode 100644
index 000000000..41a51a9f9
--- /dev/null
+++ b/content/cities/seez/weldom.md
@@ -0,0 +1,5 @@
+---
+title: "Weldom"
+url: /seez/weldom/
+shop: à faire soi-même
+---
\ No newline at end of file
diff --git a/content/cities/valaurie/_index.md b/content/cities/valaurie/_index.md
index f6e6e15a6..b3da23093 100644
--- a/content/cities/valaurie/_index.md
+++ b/content/cities/valaurie/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Valaurie
 url: /valaurie/
-latitude: 44.417
-longitude: 4.806
+latitude: 44.418
+longitude: 4.802
 ---
\ No newline at end of file
diff --git a/data/cities/alby-sur-cheran/vival.yml b/data/cities/alby-sur-cheran/vival.yml
index c4a764ffd..af53075e6 100644
--- a/data/cities/alby-sur-cheran/vival.yml
+++ b/data/cities/alby-sur-cheran/vival.yml
@@ -7,5 +7,5 @@ city: Alby-sur-Chéran
 street: Place du Pont Neuf
 housenumber: "2"
 phone: "0450681051"
-opening_hours: Mo-Sa 07:30-13:00, 15:00-19:30; Su 08:00-12:30
+opening_hours: Mo-Sa 07:30-13:00,15:00-19:30; Su 08:00-12:30
 website: ""
diff --git a/data/cities/annecy/boucherie-deruaz.yml b/data/cities/annecy/boucherie-deruaz.yml
index a1c42283a..599d71566 100644
--- a/data/cities/annecy/boucherie-deruaz.yml
+++ b/data/cities/annecy/boucherie-deruaz.yml
@@ -1,7 +1,7 @@
 id: 3124432701
 type: node
-latitude: 45.90104
-longitude: 6.12568
+latitude: 45.90102
+longitude: 6.12569
 postcode: ""
 city: Annecy
 street: Rue Carnot
diff --git a/data/cities/annecy/etam.yml b/data/cities/annecy/etam.yml
index cfe888c3c..8ba3e4131 100644
--- a/data/cities/annecy/etam.yml
+++ b/data/cities/annecy/etam.yml
@@ -1,7 +1,7 @@
 id: 3124432705
 type: node
-latitude: 45.9011
-longitude: 6.12564
+latitude: 45.90107
+longitude: 6.12565
 postcode: ""
 city: Annecy
 street: Rue Carnot
diff --git a/data/cities/annecy/la-compagnie-des-petits.yml b/data/cities/annecy/intimissimi.yml
similarity index 100%
rename from data/cities/annecy/la-compagnie-des-petits.yml
rename to data/cities/annecy/intimissimi.yml
diff --git a/data/cities/belleville-en-beaujolais/la-vie-claire.yml b/data/cities/belleville-en-beaujolais/la-vie-claire.yml
deleted file mode 100644
index 8bdbba641..000000000
--- a/data/cities/belleville-en-beaujolais/la-vie-claire.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 784089315
-type: node
-latitude: 46.10231
-longitude: 4.74834
-postcode: "69200"
-city: Belleville en beaujolais
-street: Rue des Prés de la Cloche
-housenumber: ""
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/bourg-en-bresse/karactere.yml b/data/cities/bourg-en-bresse/karactere.yml
index 1a953e91b..d3b8609c9 100644
--- a/data/cities/bourg-en-bresse/karactere.yml
+++ b/data/cities/bourg-en-bresse/karactere.yml
@@ -6,6 +6,6 @@ postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
 housenumber: 14B
-phone: ""
+phone: +33 4 74 23 43 13
 opening_hours: Tu-Fr 09:00-19:00; Sa 08:00-16:00
 website: ""
diff --git a/data/cities/bourg-saint-maurice/intermarche-drive.yml b/data/cities/bourg-saint-maurice/intermarche-drive.yml
new file mode 100644
index 000000000..7ebc7dbe5
--- /dev/null
+++ b/data/cities/bourg-saint-maurice/intermarche-drive.yml
@@ -0,0 +1,11 @@
+id: 1318343304
+type: node
+latitude: 45.6238
+longitude: 6.77996
+postcode: "73700"
+city: Bourg-Saint-Maurice
+street: ""
+housenumber: ""
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/cycles-vaudier.yml b/data/cities/chazelles-sur-lyon/cycles-vaudier.yml
new file mode 100644
index 000000000..950f80e9a
--- /dev/null
+++ b/data/cities/chazelles-sur-lyon/cycles-vaudier.yml
@@ -0,0 +1,11 @@
+id: 12289924484
+type: node
+latitude: 45.63756
+longitude: 4.38998
+postcode: "42140"
+city: Chazelles-sur-Lyon
+street: Rue Max Fléchet
+housenumber: "9"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/passion-et-mangue-primeurs.yml b/data/cities/chazelles-sur-lyon/passion-et-mangue-primeurs.yml
new file mode 100644
index 000000000..18ce26623
--- /dev/null
+++ b/data/cities/chazelles-sur-lyon/passion-et-mangue-primeurs.yml
@@ -0,0 +1,12 @@
+id: 12289924475
+type: node
+latitude: 45.63777
+longitude: 4.39107
+postcode: "42140"
+city: Chazelles-sur-Lyon
+street: Place J.B. Galland
+housenumber: "9"
+phone: ""
+opening_hours: Tu,Fr 07:30-12:30,14:30-19:00; We,Th 08:00-12:30,14:30-19:00; Sa 08:00-12:30,14:30-18:00;
+    Su 08:30-12:00
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/pompes-funebres-miozzo.yml b/data/cities/chazelles-sur-lyon/pompes-funebres-miozzo.yml
new file mode 100644
index 000000000..55012ba6a
--- /dev/null
+++ b/data/cities/chazelles-sur-lyon/pompes-funebres-miozzo.yml
@@ -0,0 +1,11 @@
+id: 12289853049
+type: node
+latitude: 45.63682
+longitude: 4.38866
+postcode: "42140"
+city: Chazelles-sur-Lyon
+street: Rue Max Fléchet
+housenumber: "31"
+phone: ""
+opening_hours: ""
+website: https://www.pompesfunebresmiozzo.com/
diff --git a/data/cities/corenc/epicuria.yml b/data/cities/corenc/epicuria.yml
new file mode 100644
index 000000000..f327b5d30
--- /dev/null
+++ b/data/cities/corenc/epicuria.yml
@@ -0,0 +1,11 @@
+id: 5046404621
+type: node
+latitude: 45.21195
+longitude: 5.76504
+postcode: "38700"
+city: Corenc
+street: Avenue du Grésivaudan
+housenumber: "9"
+phone: +33 9 72 52 13 13
+opening_hours: Mo-Su 06:30-20:00
+website: http://www.epicuriasucresale.com/
diff --git a/data/cities/courchevel/intersport-2.yml b/data/cities/courchevel/intersport-2.yml
index 41c7102a0..f6bb10649 100644
--- a/data/cities/courchevel/intersport-2.yml
+++ b/data/cities/courchevel/intersport-2.yml
@@ -1,7 +1,7 @@
-id: 3169003061
+id: 3170101773
 type: node
-latitude: 45.41781
-longitude: 6.65177
+latitude: 45.41561
+longitude: 6.63108
 postcode: "73120"
 city: Courchevel
 street: ""
diff --git a/data/cities/courchevel/intersport.yml b/data/cities/courchevel/intersport.yml
index f6bb10649..41c7102a0 100644
--- a/data/cities/courchevel/intersport.yml
+++ b/data/cities/courchevel/intersport.yml
@@ -1,7 +1,7 @@
-id: 3170101773
+id: 3169003061
 type: node
-latitude: 45.41561
-longitude: 6.63108
+latitude: 45.41781
+longitude: 6.65177
 postcode: "73120"
 city: Courchevel
 street: ""
diff --git a/data/cities/epagny-metz-tessy/central-parc-epagny.yml b/data/cities/epagny-metz-tessy/central-parc-epagny.yml
new file mode 100644
index 000000000..ebb38a9b9
--- /dev/null
+++ b/data/cities/epagny-metz-tessy/central-parc-epagny.yml
@@ -0,0 +1,11 @@
+id: 413038472
+type: node
+latitude: 45.93566
+longitude: 6.07947
+postcode: "74330"
+city: Épagny Metz-Tessy
+street: Avenue des Alpes
+housenumber: "482"
+phone: ""
+opening_hours: Mo-Th 10:00-19:00, Fr-Sa 10:00-20:00
+website: https://centralparcgrandepagny.com/
diff --git a/data/cities/grenoble/edouard-b.yml b/data/cities/grenoble/edouard-b.yml
index d63161f1f..d7890e2b0 100644
--- a/data/cities/grenoble/edouard-b.yml
+++ b/data/cities/grenoble/edouard-b.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: Rue Lesdiguières
 housenumber: "16"
 phone: +33 4 76 46 00 46
-opening_hours: Tu 10:00-20:00; We-Th 10:00-21:00; Fr 10:00-19:00; Sa 08:00-12:00
+opening_hours: Tu,Fr 10:00-20:00; We-Th 10:00-21:00; Sa 08:00-12:00
 website: https://www.planity.com/edouard-b-38000-grenoble
diff --git a/data/cities/le-cheylard/station-u.yml b/data/cities/le-cheylard/systeme-u.yml
similarity index 100%
rename from data/cities/le-cheylard/station-u.yml
rename to data/cities/le-cheylard/systeme-u.yml
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 27916248f..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: ""
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..8ff536f0f
--- /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: ""
diff --git a/data/cities/les-houches/eric-jacquier.yml b/data/cities/les-houches/eric-jacquier.yml
index 8ff536f0f..27916248f 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: ""
diff --git a/data/cities/marin/dauphiblanc.yml b/data/cities/marin/dauphiblanc.yml
new file mode 100644
index 000000000..137d097f9
--- /dev/null
+++ b/data/cities/marin/dauphiblanc.yml
@@ -0,0 +1,11 @@
+id: 1328522903
+type: node
+latitude: 46.38007
+longitude: 6.51094
+postcode: "74200"
+city: Marin
+street: Allée du Larry
+housenumber: "174"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/megeve/meglavage.yml b/data/cities/megeve/meglavage.yml
new file mode 100644
index 000000000..e9ff6e064
--- /dev/null
+++ b/data/cities/megeve/meglavage.yml
@@ -0,0 +1,11 @@
+id: 1328527596
+type: node
+latitude: 45.86872
+longitude: 6.62767
+postcode: "74120"
+city: Megève
+street: Chemin d'Arbon
+housenumber: ""
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/meylan/justin-femme.yml b/data/cities/meylan/justin-femme.yml
new file mode 100644
index 000000000..0a8012370
--- /dev/null
+++ b/data/cities/meylan/justin-femme.yml
@@ -0,0 +1,11 @@
+id: 1786367760
+type: node
+latitude: 45.20959
+longitude: 5.76259
+postcode: "38240"
+city: Meylan
+street: Rue des Aiguinards
+housenumber: "6"
+phone: +33 6 08 01 40 04
+opening_hours: ""
+website: ""
diff --git a/data/cities/meylan/la-foret-noire.yml b/data/cities/meylan/la-foret-noire.yml
new file mode 100644
index 000000000..6c0565fb0
--- /dev/null
+++ b/data/cities/meylan/la-foret-noire.yml
@@ -0,0 +1,11 @@
+id: 925155398
+type: node
+latitude: 45.20348
+longitude: 5.76026
+postcode: "38240"
+city: Meylan
+street: Avenue de la Plaine Fleurie
+housenumber: "42"
+phone: +33 4 76 90 74 04
+opening_hours: Tu-Th 09:30-12:30,14:30-19:00; Fr-Sa 09:00-19:00; Su 09:00-13:00
+website: https://patisserielaforetnoire.fr/
diff --git a/data/cities/meylan/le-pressing-des-buclos.yml b/data/cities/meylan/le-pressing-des-buclos.yml
new file mode 100644
index 000000000..2c2ffffdb
--- /dev/null
+++ b/data/cities/meylan/le-pressing-des-buclos.yml
@@ -0,0 +1,11 @@
+id: 1934298809
+type: node
+latitude: 45.2064
+longitude: 5.77356
+postcode: "38240"
+city: Meylan
+street: Avenue du Vercors
+housenumber: "27"
+phone: +33 4 76 41 10 16
+opening_hours: ""
+website: ""
diff --git a/data/cities/meylan/meylan-fruits.yml b/data/cities/meylan/meylan-fruits.yml
new file mode 100644
index 000000000..64bd007a3
--- /dev/null
+++ b/data/cities/meylan/meylan-fruits.yml
@@ -0,0 +1,11 @@
+id: 1313234164
+type: node
+latitude: 45.20955
+longitude: 5.76263
+postcode: "38240"
+city: Meylan
+street: Rue des Aiguinards
+housenumber: "6"
+phone: +33 4 76 90 27 72
+opening_hours: Tu-Sa 07:30-12:30,15:30-19:00; Su 07:30-12:30
+website: ""
diff --git a/data/cities/meylan/garage-pelletier.yml b/data/cities/meylan/peugeot-garage-pelletier.yml
similarity index 100%
rename from data/cities/meylan/garage-pelletier.yml
rename to data/cities/meylan/peugeot-garage-pelletier.yml
diff --git a/data/cities/meylan/poissonerie-moroni.yml b/data/cities/meylan/poissonerie-moroni.yml
new file mode 100644
index 000000000..9897e3b52
--- /dev/null
+++ b/data/cities/meylan/poissonerie-moroni.yml
@@ -0,0 +1,11 @@
+id: 1313234602
+type: node
+latitude: 45.20837
+longitude: 5.7634
+postcode: "38240"
+city: Meylan
+street: Rue des Aiguinards
+housenumber: "41"
+phone: +33 4 76 90 00 00
+opening_hours: Tu-Sa 07:30-12:30,16:00-19:30; Su 08:00-12:30
+website: http://poissonnerie.free.fr/
diff --git a/data/cities/meylan/pressing-bulle-do.yml b/data/cities/meylan/pressing-bulle-do.yml
new file mode 100644
index 000000000..d38afe296
--- /dev/null
+++ b/data/cities/meylan/pressing-bulle-do.yml
@@ -0,0 +1,11 @@
+id: 12293484138
+type: node
+latitude: 45.2061
+longitude: 5.75799
+postcode: "38240"
+city: Meylan
+street: Avenue de la Plaine Fleurie
+housenumber: "21"
+phone: +33 4 56 00 32 82
+opening_hours: Mo-Fr 08:00-19:00; Sa 08:00-12:00
+website: ""
diff --git a/data/cities/meylan/renault-meylan.yml b/data/cities/meylan/renault-meylan.yml
new file mode 100644
index 000000000..ea208c580
--- /dev/null
+++ b/data/cities/meylan/renault-meylan.yml
@@ -0,0 +1,11 @@
+id: 1610933048
+type: node
+latitude: 45.20184
+longitude: 5.7606
+postcode: "38240"
+city: Meylan
+street: Boulevard des Alpes
+housenumber: "18"
+phone: +33 4 76 90 36 48
+opening_hours: ""
+website: https://concessionnaire.renault.fr/meylan.html
diff --git a/data/cities/meylan/romain-rey.yml b/data/cities/meylan/romain-rey.yml
index 2ebb4dfbe..7f5b2e0c3 100644
--- a/data/cities/meylan/romain-rey.yml
+++ b/data/cities/meylan/romain-rey.yml
@@ -6,6 +6,6 @@ postcode: "38240"
 city: Meylan
 street: Avenue de Chartreuse
 housenumber: "46"
-phone: "+33476900982"
+phone: +33 4 76 90 09 82
 opening_hours: ""
 website: https://www.facebook.com/people/P%C3%A2tisserie-Chocolaterie-Rey/100063766321923/
diff --git a/data/cities/meylan/triperie-boucherie-buchs.yml b/data/cities/meylan/triperie-boucherie-buchs.yml
new file mode 100644
index 000000000..a5bd66d66
--- /dev/null
+++ b/data/cities/meylan/triperie-boucherie-buchs.yml
@@ -0,0 +1,11 @@
+id: 1786367230
+type: node
+latitude: 45.20944
+longitude: 5.7627
+postcode: "38240"
+city: Meylan
+street: Rue des Aiguinards
+housenumber: "6"
+phone: +33 4 76 41 14 48.
+opening_hours: ""
+website: ""
diff --git a/data/cities/montbonnot-saint-martin/edelweiss-pressing.yml b/data/cities/montbonnot-saint-martin/krys.yml
similarity index 50%
rename from data/cities/montbonnot-saint-martin/edelweiss-pressing.yml
rename to data/cities/montbonnot-saint-martin/krys.yml
index 2f33f461a..5dcdb9daa 100644
--- a/data/cities/montbonnot-saint-martin/edelweiss-pressing.yml
+++ b/data/cities/montbonnot-saint-martin/krys.yml
@@ -6,6 +6,6 @@ postcode: "38330"
 city: Montbonnot-Saint-Martin
 street: Avenue de l'Europe
 housenumber: "1365"
-phone: "+33438388651"
-opening_hours: Mo-Fr 08:00-19:00; Sa 09:00-13:00, 14:00-18:00
-website: http://www.edelweiss-pressing.fr/
+phone: +33 4 28 07 01 02
+opening_hours: Tu-Sa 10:00-12:00,14:00-19:00
+website: https://www.krys.com/opticien/france/isere/opticien-montbonnot-saint-martin
diff --git a/data/cities/passy/decathlon-mountain-store.yml b/data/cities/passy/decathlon.yml
similarity index 100%
rename from data/cities/passy/decathlon-mountain-store.yml
rename to data/cities/passy/decathlon.yml
diff --git a/data/cities/saint-etienne/midas.yml b/data/cities/saint-etienne/midas.yml
deleted file mode 100644
index 27cdd41fb..000000000
--- a/data/cities/saint-etienne/midas.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 63268328
-type: node
-latitude: 45.44409
-longitude: 4.41694
-postcode: "42100"
-city: Saint-Étienne
-street: Rue de la Montat
-housenumber: "135"
-phone: +33 4 77 95 34 00
-opening_hours: ""
-website: https://www.midas.fr/
diff --git a/data/cities/saint-laurent-dagny/terres-lyonnaises.yml b/data/cities/saint-laurent-dagny/terres-lyonnaises.yml
index 958d353ef..4bda7e485 100644
--- a/data/cities/saint-laurent-dagny/terres-lyonnaises.yml
+++ b/data/cities/saint-laurent-dagny/terres-lyonnaises.yml
@@ -5,7 +5,7 @@ longitude: 4.6837
 postcode: "69440"
 city: Saint Laurent d'Agny
 street: Route de Mornant
-housenumber: "475"
+housenumber: ""
 phone: +33 4 78 48 30 67
 opening_hours: Tu-Fr 09:00-12:30,14:00-19:30; Sa 09:00-12:30
 website: ""
diff --git a/data/cities/sainte-helene-sur-isere/reda.yml b/data/cities/sainte-helene-sur-isere/reda.yml
deleted file mode 100644
index d7cb0cbe8..000000000
--- a/data/cities/sainte-helene-sur-isere/reda.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 160822806
-type: node
-latitude: 45.61387
-longitude: 6.30574
-postcode: "73460"
-city: Sainte-Hélène-sur-Isère
-street: Chemin de la Liberté
-housenumber: "240"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/sallanches/cone-mobile.yml b/data/cities/sallanches/cone-mobile.yml
index 62425d789..99e92801f 100644
--- a/data/cities/sallanches/cone-mobile.yml
+++ b/data/cities/sallanches/cone-mobile.yml
@@ -1,7 +1,7 @@
 id: 6306158327
 type: node
-latitude: 45.93486
-longitude: 6.63121
+latitude: 45.93488
+longitude: 6.63131
 postcode: "74700"
 city: Sallanches
 street: Rue de la République
diff --git a/data/cities/sallanches/mondial-tissus.yml b/data/cities/sallanches/mondial-tissus.yml
index ed40cc3fe..4404aecd2 100644
--- a/data/cities/sallanches/mondial-tissus.yml
+++ b/data/cities/sallanches/mondial-tissus.yml
@@ -7,5 +7,5 @@ city: Sallanches
 street: Avenue de Genève
 housenumber: "2018"
 phone: +331 70 18 16 00
-opening_hours: ""
+opening_hours: Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-12:30
 website: https://magasins.mondialtissus.fr/tissu-mercerie/sallanches/M015
diff --git a/data/cities/sallanches/le-talon-dachille.yml b/data/cities/sallanches/terre-de-running.yml
similarity index 100%
rename from data/cities/sallanches/le-talon-dachille.yml
rename to data/cities/sallanches/terre-de-running.yml
diff --git a/data/cities/seez/garage-metral.yml b/data/cities/seez/garage-metral.yml
new file mode 100644
index 000000000..1041e0689
--- /dev/null
+++ b/data/cities/seez/garage-metral.yml
@@ -0,0 +1,11 @@
+id: 196699483
+type: node
+latitude: 45.61951
+longitude: 6.78776
+postcode: "73700"
+city: Séez
+street: ""
+housenumber: ""
+phone: "+33479410965"
+opening_hours: ""
+website: ""
diff --git a/data/cities/seez/weldom.yml b/data/cities/seez/weldom.yml
new file mode 100644
index 000000000..d3506c383
--- /dev/null
+++ b/data/cities/seez/weldom.yml
@@ -0,0 +1,11 @@
+id: 1317396154
+type: node
+latitude: 45.62107
+longitude: 6.78933
+postcode: "73700"
+city: Séez
+street: ""
+housenumber: "1038"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/vienne/ldlc.yml b/data/cities/vienne/ldlc.yml
index 438e37da5..c4a078eb8 100644
--- a/data/cities/vienne/ldlc.yml
+++ b/data/cities/vienne/ldlc.yml
@@ -7,6 +7,5 @@ city: Vienne
 street: ""
 housenumber: 10-14
 phone: +33 4 81 43 11 11
-opening_hours: Tu-We 10:00-19:00; Th 10:00-12:30, 13:30-19:00; Fr 10:00-19:00; Sa
-    10:00-12:00, 14:00-19:00
+opening_hours: Tu-Fr 10:00-19:00; Sa 10:00-12:00, 14:00-19:00
 website: https://www.ldlc.com/magasins-ldlc/magasin-470055/38-ldlc-vienne/