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/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/aubenas/tabac-matimo.md b/content/cities/aubenas/tabac-matimo.md
new file mode 100644
index 000000000..de90bd30d
--- /dev/null
+++ b/content/cities/aubenas/tabac-matimo.md
@@ -0,0 +1,5 @@
+---
+title: "Tabac Matimo"
+url: /aubenas/tabac-matimo/
+shop: tabac
+---
\ 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/_index.md b/content/cities/bourg-saint-maurice/_index.md
index 56b939204..30736de1a 100644
--- a/content/cities/bourg-saint-maurice/_index.md
+++ b/content/cities/bourg-saint-maurice/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bourg-Saint-Maurice
 url: /bourg-saint-maurice/
-latitude: 45.619
-longitude: 6.77
+latitude: 45.595
+longitude: 6.792
 ---
\ No newline at end of file
diff --git a/content/cities/chambery/atelier-de-couture-de-fil.md b/content/cities/chambery/atelier-de-couture-de-fil.md
new file mode 100644
index 000000000..3473e9c26
--- /dev/null
+++ b/content/cities/chambery/atelier-de-couture-de-fil.md
@@ -0,0 +1,5 @@
+---
+title: "Atelier de Couture Dé-Fil"
+url: /chambery/atelier-de-couture-de-fil/
+shop: couture
+---
\ No newline at end of file
diff --git a/content/cities/chambery/cave-a-cigare.md b/content/cities/chambery/cave-a-cigare.md
deleted file mode 100644
index c0aea781c..000000000
--- a/content/cities/chambery/cave-a-cigare.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Cave à Cigare"
-url: /chambery/cave-a-cigare/
-shop: tabac
----
\ 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 86faea5e2..392d32363 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.116
-longitude: 4.964
+latitude: 46.122
+longitude: 4.953
 ---
\ No newline at end of file
diff --git a/content/cities/chatte/au-palais-fermier.md b/content/cities/chatte/au-palais-fermier.md
new file mode 100644
index 000000000..1bf02bdeb
--- /dev/null
+++ b/content/cities/chatte/au-palais-fermier.md
@@ -0,0 +1,5 @@
+---
+title: "Au Palais Fermier"
+url: /chatte/au-palais-fermier/
+shop: ferme
+---
\ 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 ab4f2ee24..1d80e55e6 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.186
+longitude: 5.732
 ---
\ No newline at end of file
diff --git a/content/cities/grenoble/boutique-du-baobab.md b/content/cities/grenoble/boutique-du-baobab.md
new file mode 100644
index 000000000..b7ce7de0b
--- /dev/null
+++ b/content/cities/grenoble/boutique-du-baobab.md
@@ -0,0 +1,5 @@
+---
+title: "Boutique du Baobab"
+url: /grenoble/boutique-du-baobab/
+shop: cadeau
+---
\ No newline at end of file
diff --git a/content/cities/grenoble/le-salon-rue-de-turenne.md b/content/cities/grenoble/le-salon-rue-de-turenne.md
deleted file mode 100644
index 96e4456eb..000000000
--- a/content/cities/grenoble/le-salon-rue-de-turenne.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Le salon"
-url: /grenoble/le-salon-rue-de-turenne/
-shop: opticien
----
\ No newline at end of file
diff --git a/content/cities/grenoble/le-salon-rue-thiers.md b/content/cities/grenoble/le-salon-rue-thiers.md
new file mode 100644
index 000000000..1070f4c8e
--- /dev/null
+++ b/content/cities/grenoble/le-salon-rue-thiers.md
@@ -0,0 +1,5 @@
+---
+title: "Le Salon"
+url: /grenoble/le-salon-rue-thiers/
+shop: coiffeur
+---
\ No newline at end of file
diff --git a/content/cities/grenoble/le-salon.md b/content/cities/grenoble/le-salon.md
index 9db82ad56..dbd9e540f 100644
--- a/content/cities/grenoble/le-salon.md
+++ b/content/cities/grenoble/le-salon.md
@@ -1,5 +1,5 @@
 ---
-title: "Le Salon"
+title: "Le salon"
 url: /grenoble/le-salon/
-shop: coiffeur
+shop: opticien
 ---
\ No newline at end of file
diff --git a/content/cities/la-mure/garage-des-chevrons.md b/content/cities/la-mure/garage-des-chevrons.md
deleted file mode 100644
index c223023ad..000000000
--- a/content/cities/la-mure/garage-des-chevrons.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Garage Des Chevrons"
-url: /la-mure/garage-des-chevrons/
-shop: réparation de voitures
----
\ No newline at end of file
diff --git a/content/cities/la-mure/la-belle-verte.md b/content/cities/la-mure/la-belle-verte.md
new file mode 100644
index 000000000..58f5a85c2
--- /dev/null
+++ b/content/cities/la-mure/la-belle-verte.md
@@ -0,0 +1,5 @@
+---
+title: "La Belle Verte"
+url: /la-mure/la-belle-verte/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/la-mure/mon-epivrac.md b/content/cities/la-mure/mon-epivrac.md
new file mode 100644
index 000000000..fb500f82c
--- /dev/null
+++ b/content/cities/la-mure/mon-epivrac.md
@@ -0,0 +1,5 @@
+---
+title: "Mon Epi'vrac"
+url: /la-mure/mon-epivrac/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/lanarce/_index.md b/content/cities/lanarce/_index.md
index 4fb94bb00..0c6a1451c 100644
--- a/content/cities/lanarce/_index.md
+++ b/content/cities/lanarce/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lanarce
 url: /lanarce/
-latitude: 44.726
-longitude: 4.008
+latitude: 44.729
+longitude: 4.006
 ---
\ 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/moirans/_index.md b/content/cities/moirans/_index.md
index 3234d4711..0ebb0524a 100644
--- a/content/cities/moirans/_index.md
+++ b/content/cities/moirans/_index.md
@@ -2,5 +2,5 @@
 title: Moirans
 url: /moirans/
 latitude: 45.327
-longitude: 5.563
+longitude: 5.565
 ---
\ No newline at end of file
diff --git a/content/cities/moutiers/dietetique-promovert-biomonde.md b/content/cities/moutiers/dietetique-promovert-biomonde.md
new file mode 100644
index 000000000..b3e719060
--- /dev/null
+++ b/content/cities/moutiers/dietetique-promovert-biomonde.md
@@ -0,0 +1,5 @@
+---
+title: "Diététique Promovert Biomonde"
+url: /moutiers/dietetique-promovert-biomonde/
+shop: commodité
+---
\ No newline at end of file
diff --git a/content/cities/pomeys/garage-poyard-eurorepar.md b/content/cities/pomeys/garage-poyard-eurorepar.md
new file mode 100644
index 000000000..516e1afc8
--- /dev/null
+++ b/content/cities/pomeys/garage-poyard-eurorepar.md
@@ -0,0 +1,5 @@
+---
+title: "Garage Poyard (Eurorepar)"
+url: /pomeys/garage-poyard-eurorepar/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/pomeys/garage-poyard-peugeot.md b/content/cities/pomeys/garage-poyard-peugeot.md
deleted file mode 100644
index 70f7dda48..000000000
--- a/content/cities/pomeys/garage-poyard-peugeot.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Garage Poyard (Peugeot)"
-url: /pomeys/garage-poyard-peugeot/
-shop: réparation de voitures
----
\ No newline at end of file
diff --git a/content/cities/pontcharra/spa-institut-sophie-beaute.md b/content/cities/pontcharra/spa-institut-sophie-beaute.md
new file mode 100644
index 000000000..15295ece6
--- /dev/null
+++ b/content/cities/pontcharra/spa-institut-sophie-beaute.md
@@ -0,0 +1,5 @@
+---
+title: "SPA Institut Sophie Beauté"
+url: /pontcharra/spa-institut-sophie-beaute/
+shop: beauté
+---
\ 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/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-jean-darves/_index.md b/content/cities/saint-jean-darves/_index.md
index 442120d8c..113030e2c 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.264
+longitude: 6.263
 ---
\ No newline at end of file
diff --git a/content/cities/saint-jean-darves/skiset-le-cret-de-la-grange.md b/content/cities/saint-jean-darves/skiset-le-cret-de-la-grange.md
deleted file mode 100644
index f69cc0616..000000000
--- a/content/cities/saint-jean-darves/skiset-le-cret-de-la-grange.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Skiset Le Crêt de la Grange"
-url: /saint-jean-darves/skiset-le-cret-de-la-grange/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/saint-jeoire/garage-grillet.md b/content/cities/saint-jeoire/garage-grillet.md
new file mode 100644
index 000000000..826fdc447
--- /dev/null
+++ b/content/cities/saint-jeoire/garage-grillet.md
@@ -0,0 +1,5 @@
+---
+title: "Garage Grillet"
+url: /saint-jeoire/garage-grillet/
+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 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-sauveur/_index.md b/content/cities/saint-sauveur/_index.md
index 14b73944f..c7d8a3d9d 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.336
+longitude: 5.334
 ---
\ No newline at end of file
diff --git a/content/cities/sainte-foy-largentiere/_index.md b/content/cities/sainte-foy-largentiere/_index.md
index 395d43430..bea527ae9 100644
--- a/content/cities/sainte-foy-largentiere/_index.md
+++ b/content/cities/sainte-foy-largentiere/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sainte-Foy-l'Argentière
 url: /sainte-foy-largentiere/
-latitude: 45.709
+latitude: 45.712
 longitude: 4.473
 ---
\ 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/tignes-val-claret/_index.md b/content/cities/tignes-val-claret/_index.md
index 1b47d11df..8c7758c8e 100644
--- a/content/cities/tignes-val-claret/_index.md
+++ b/content/cities/tignes-val-claret/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Tignes Val-Claret
 url: /tignes-val-claret/
-latitude: 45.454
+latitude: 45.455
 longitude: 6.898
 ---
\ No newline at end of file
diff --git a/content/cities/val-disere/boraso-sport.md b/content/cities/val-disere/boraso-sport.md
deleted file mode 100644
index 35a28154a..000000000
--- a/content/cities/val-disere/boraso-sport.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Boraso Sport"
-url: /val-disere/boraso-sport/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/val-disere/intersport-rue-des-telepheriques.md b/content/cities/val-disere/intersport-rue-des-telepheriques.md
new file mode 100644
index 000000000..3e5ca0f59
--- /dev/null
+++ b/content/cities/val-disere/intersport-rue-des-telepheriques.md
@@ -0,0 +1,5 @@
+---
+title: "Intersport"
+url: /val-disere/intersport-rue-des-telepheriques/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/val-disere/sport-2000-avenue-olympique.md b/content/cities/val-disere/sport-2000-avenue-olympique.md
new file mode 100644
index 000000000..1c5179cb2
--- /dev/null
+++ b/content/cities/val-disere/sport-2000-avenue-olympique.md
@@ -0,0 +1,5 @@
+---
+title: "Sport 2000"
+url: /val-disere/sport-2000-avenue-olympique/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/val-disere/sport-shop-intersport-mattis-location.md b/content/cities/val-disere/sport-shop-intersport-mattis-location.md
deleted file mode 100644
index ea4db7fce..000000000
--- a/content/cities/val-disere/sport-shop-intersport-mattis-location.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Sport Shop Intersport Mattis Location"
-url: /val-disere/sport-shop-intersport-mattis-location/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/valaurie/_index.md b/content/cities/valaurie/_index.md
index 485279214..b3da23093 100644
--- a/content/cities/valaurie/_index.md
+++ b/content/cities/valaurie/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Valaurie
 url: /valaurie/
-latitude: 44.419
-longitude: 4.803
+latitude: 44.418
+longitude: 4.802
 ---
\ 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/besson-chaussures.yml b/data/cities/annemasse/besson-chaussures.yml
index 6c7c57b42..531709128 100644
--- a/data/cities/annemasse/besson-chaussures.yml
+++ b/data/cities/annemasse/besson-chaussures.yml
@@ -7,5 +7,5 @@ city: Annemasse
 street: "Rue de la Résistance"
 housenumber: 32
 phone: ""
-opening_hours: ""
-website: "https://www.besson-chaussures.com/nos-boutiques.php"
\ No newline at end of file
+opening_hours: "Mo-Sa 09:30-19: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/aubenas/tabac-matimo.yml b/data/cities/aubenas/tabac-matimo.yml
new file mode 100644
index 000000000..f34c631c4
--- /dev/null
+++ b/data/cities/aubenas/tabac-matimo.yml
@@ -0,0 +1,11 @@
+id: 11756909794
+type: node
+latitude: 44.62011
+longitude: 4.39161
+postcode: "07200"
+city: Aubenas
+street: "Boulevard Gambetta"
+housenumber: 10
+phone: "+33 4 75 89 93 04"
+opening_hours: "Mo-Sa 07:30-19:00"
+website: "https://matimo07.com"
\ No newline at end of file
diff --git a/data/cities/chambery/atelier-de-couture-de-fil.yml b/data/cities/chambery/atelier-de-couture-de-fil.yml
new file mode 100644
index 000000000..f2650be5b
--- /dev/null
+++ b/data/cities/chambery/atelier-de-couture-de-fil.yml
@@ -0,0 +1,11 @@
+id: 693156722
+type: node
+latitude: 45.5649
+longitude: 5.92397
+postcode: "73000"
+city: Chambéry
+street: "Rue Croix-d'Or"
+housenumber: 16
+phone: ""
+opening_hours: ""
+website: "https://atelier-de-couture-de-fil-chambery.business.site"
\ No newline at end of file
diff --git a/data/cities/chambery/cave-a-cigare.yml b/data/cities/chambery/cave-a-cigare.yml
deleted file mode 100644
index 99b6f9bbc..000000000
--- a/data/cities/chambery/cave-a-cigare.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2597410353
-type: node
-latitude: 45.56493
-longitude: 5.92452
-postcode: "73000"
-city: Chambéry
-street: "Rue Denfert Rochereau"
-housenumber: 
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/chambery/la-boucherie-du-senat.yml b/data/cities/chambery/la-boucherie-du-senat.yml
index dfdc520d8..c28b34967 100644
--- a/data/cities/chambery/la-boucherie-du-senat.yml
+++ b/data/cities/chambery/la-boucherie-du-senat.yml
@@ -1,7 +1,7 @@
 id: 1522685107
 type: node
-latitude: 45.56601
-longitude: 5.91975
+latitude: 45.56597
+longitude: 5.91979
 postcode: "73000"
 city: Chambéry
 street: "Rue du Sénat de Savoie"
diff --git a/data/cities/chambery/la-brulerie-du-senat.yml b/data/cities/chambery/la-brulerie-du-senat.yml
index dbff10f2a..7b682a4f8 100644
--- a/data/cities/chambery/la-brulerie-du-senat.yml
+++ b/data/cities/chambery/la-brulerie-du-senat.yml
@@ -1,7 +1,7 @@
 id: 7425449837
 type: node
 latitude: 45.56612
-longitude: 5.91974
+longitude: 5.91975
 postcode: "73000"
 city: Chambéry
 street: "Rue du Sénat de Savoie"
diff --git a/data/cities/chambery/le-fidele-berger.yml b/data/cities/chambery/le-fidele-berger.yml
index b1255572d..c09c09e24 100644
--- a/data/cities/chambery/le-fidele-berger.yml
+++ b/data/cities/chambery/le-fidele-berger.yml
@@ -1,7 +1,7 @@
 id: 2585264886
 type: node
-latitude: 45.56543
-longitude: 5.92082
+latitude: 45.56541
+longitude: 5.92086
 postcode: "73000"
 city: Chambéry
 street: "Rue de Boigne"
diff --git a/data/cities/chambery/united-colors-of-benetton.yml b/data/cities/chambery/united-colors-of-benetton.yml
index 797ccc740..365c7a4f3 100644
--- a/data/cities/chambery/united-colors-of-benetton.yml
+++ b/data/cities/chambery/united-colors-of-benetton.yml
@@ -1,7 +1,7 @@
 id: 1254524576
 type: node
-latitude: 45.56515
-longitude: 5.92051
+latitude: 45.56516
+longitude: 5.92055
 postcode: "73000"
 city: Chambéry
 street: "Place Saint-Léger"
diff --git a/data/cities/chatte/au-palais-fermier.yml b/data/cities/chatte/au-palais-fermier.yml
new file mode 100644
index 000000000..7d1063e9c
--- /dev/null
+++ b/data/cities/chatte/au-palais-fermier.yml
@@ -0,0 +1,11 @@
+id: 11339256869
+type: node
+latitude: 45.14266
+longitude: 5.30234
+postcode: "38160"
+city: Chatte
+street: "ZI la Gloriette"
+housenumber: 1005
+phone: "+33964473844"
+opening_hours: "Mo-Fr 09:00-12:30,14:30-19:00; Sa 09:00-12:30,14:30-18:30"
+website: "https://www.aupalaisfermier.fr/"
\ No newline at end of file
diff --git a/data/cities/grenoble/boutique-du-baobab.yml b/data/cities/grenoble/boutique-du-baobab.yml
new file mode 100644
index 000000000..1e566dffb
--- /dev/null
+++ b/data/cities/grenoble/boutique-du-baobab.yml
@@ -0,0 +1,11 @@
+id: 398056948
+type: way
+latitude: 45.18431
+longitude: 5.72415
+postcode: "38000"
+city: Grenoble
+street: ""
+housenumber: 
+phone: ""
+opening_hours: "Mo-Sa 10:00-19:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/chez-niwa.yml b/data/cities/grenoble/chez-niwa.yml
index 26b6d05fe..926d4ab47 100644
--- a/data/cities/grenoble/chez-niwa.yml
+++ b/data/cities/grenoble/chez-niwa.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Rue Paul Janet"
 housenumber: 8
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Su 12:00-02:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/le-salon-rue-de-turenne.yml b/data/cities/grenoble/le-salon-rue-de-turenne.yml
deleted file mode 100644
index 8b12258bf..000000000
--- a/data/cities/grenoble/le-salon-rue-de-turenne.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3069779930
-type: node
-latitude: 45.18525
-longitude: 5.72188
-postcode: "38000"
-city: Grenoble
-street: "Rue de Turenne"
-housenumber: 2
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/le-salon-rue-thiers.yml b/data/cities/grenoble/le-salon-rue-thiers.yml
new file mode 100644
index 000000000..b642b77e7
--- /dev/null
+++ b/data/cities/grenoble/le-salon-rue-thiers.yml
@@ -0,0 +1,11 @@
+id: 3101784109
+type: node
+latitude: 45.18343
+longitude: 5.71848
+postcode: "38000"
+city: Grenoble
+street: "Rue Thiers"
+housenumber: 70
+phone: ""
+opening_hours: "Mo,Tu,Th,Fr 09:00-19:00; We 14:00-19:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/le-salon.yml b/data/cities/grenoble/le-salon.yml
index b642b77e7..8b12258bf 100644
--- a/data/cities/grenoble/le-salon.yml
+++ b/data/cities/grenoble/le-salon.yml
@@ -1,11 +1,11 @@
-id: 3101784109
+id: 3069779930
 type: node
-latitude: 45.18343
-longitude: 5.71848
+latitude: 45.18525
+longitude: 5.72188
 postcode: "38000"
 city: Grenoble
-street: "Rue Thiers"
-housenumber: 70
+street: "Rue de Turenne"
+housenumber: 2
 phone: ""
-opening_hours: "Mo,Tu,Th,Fr 09:00-19:00; We 14:00-19:00"
+opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/mvelo-agence-et-atelier-grenoble-gare.yml b/data/cities/grenoble/mvelo-agence-et-atelier-grenoble-gare.yml
index e683657d5..796e3dbdf 100644
--- a/data/cities/grenoble/mvelo-agence-et-atelier-grenoble-gare.yml
+++ b/data/cities/grenoble/mvelo-agence-et-atelier-grenoble-gare.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Parvis Madeleine-Pauliac/Escadron Bleu"
 housenumber: 11
 phone: ""
-opening_hours: "Apr-Oct: Mo-Su 09:00-19:00; Nov-Mar: Mo-Su 10:00-17:00"
+opening_hours: "Mo-Fr 07:30-19:30; Sa,Su 09:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/la-mure/la-belle-verte.yml b/data/cities/la-mure/la-belle-verte.yml
new file mode 100644
index 000000000..8d5f901da
--- /dev/null
+++ b/data/cities/la-mure/la-belle-verte.yml
@@ -0,0 +1,11 @@
+id: 913664266
+type: way
+latitude: 44.92844
+longitude: 5.77975
+postcode: "38350"
+city: La Mure
+street: "Zone Industrielle les Marais"
+housenumber: 
+phone: "+33 4 76 83 03 57"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/la-mure/garage-des-chevrons.yml b/data/cities/la-mure/mon-epivrac.yml
similarity index 86%
rename from data/cities/la-mure/garage-des-chevrons.yml
rename to data/cities/la-mure/mon-epivrac.yml
index 79215e0fe..09ce49ae2 100644
--- a/data/cities/la-mure/garage-des-chevrons.yml
+++ b/data/cities/la-mure/mon-epivrac.yml
@@ -6,6 +6,6 @@ postcode: "38350"
 city: La Mure
 street: "Avenue Docteur Tagnard"
 housenumber: 18
-phone: ""
+phone: "+33 4 76 30 49 35"
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/les-deux-alpes/intersport-2.yml b/data/cities/les-deux-alpes/intersport-2.yml
index 59803dc5b..d6a6e1ea7 100644
--- a/data/cities/les-deux-alpes/intersport-2.yml
+++ b/data/cities/les-deux-alpes/intersport-2.yml
@@ -1,11 +1,11 @@
-id: 3170487564
+id: 3170427561
 type: node
-latitude: 45.01198
-longitude: 6.1249
+latitude: 45.01962
+longitude: 6.12982
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 72
+housenumber: 
 phone: ""
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/les-deux-alpes/intersport.yml b/data/cities/les-deux-alpes/intersport.yml
index d6a6e1ea7..59803dc5b 100644
--- a/data/cities/les-deux-alpes/intersport.yml
+++ b/data/cities/les-deux-alpes/intersport.yml
@@ -1,11 +1,11 @@
-id: 3170427561
+id: 3170487564
 type: node
-latitude: 45.01962
-longitude: 6.12982
+latitude: 45.01198
+longitude: 6.1249
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 
+housenumber: 72
 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
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/moutiers/dietetique-promovert-biomonde.yml b/data/cities/moutiers/dietetique-promovert-biomonde.yml
new file mode 100644
index 000000000..6734d0a76
--- /dev/null
+++ b/data/cities/moutiers/dietetique-promovert-biomonde.yml
@@ -0,0 +1,11 @@
+id: 5077025009
+type: node
+latitude: 45.48388
+longitude: 6.53204
+postcode: "73600"
+city: Moûtiers
+street: "Grande Rue"
+housenumber: 132
+phone: "+33479229499"
+opening_hours: "Mo 09:00-12:30,14:30-19:15; Tu,Fr 08:00-19:15; We,Th,Sa 09:00-19:15"
+website: "https://www.dietetique-bio-promovert.fr/"
\ No newline at end of file
diff --git a/data/cities/pomeys/garage-poyard-peugeot.yml b/data/cities/pomeys/garage-poyard-eurorepar.yml
similarity index 100%
rename from data/cities/pomeys/garage-poyard-peugeot.yml
rename to data/cities/pomeys/garage-poyard-eurorepar.yml
diff --git a/data/cities/pontcharra/spa-institut-sophie-beaute.yml b/data/cities/pontcharra/spa-institut-sophie-beaute.yml
new file mode 100644
index 000000000..5ad5022cf
--- /dev/null
+++ b/data/cities/pontcharra/spa-institut-sophie-beaute.yml
@@ -0,0 +1,11 @@
+id: 64763684
+type: way
+latitude: 45.43099
+longitude: 6.02085
+postcode: "38530"
+city: Pontcharra
+street: "Avenue du Dauphiné"
+housenumber: 111
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-jean-darves/skiset-le-cret-de-la-grange.yml b/data/cities/saint-jean-darves/skiset-le-cret-de-la-grange.yml
deleted file mode 100644
index b736174fd..000000000
--- a/data/cities/saint-jean-darves/skiset-le-cret-de-la-grange.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2984884972
-type: node
-latitude: 45.2141
-longitude: 6.26433
-postcode: "73530"
-city: Saint-Jean-d'Arves
-street: ""
-housenumber: 
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/saint-jeoire/garage-grillet.yml b/data/cities/saint-jeoire/garage-grillet.yml
new file mode 100644
index 000000000..88f70f089
--- /dev/null
+++ b/data/cities/saint-jeoire/garage-grillet.yml
@@ -0,0 +1,11 @@
+id: 11761206069
+type: node
+latitude: 46.14654
+longitude: 6.46726
+postcode: "74490"
+city: Saint-Jeoire
+street: "Rue des Tovets"
+housenumber: 129
+phone: "+33 4 50 35 82 25"
+opening_hours: "Mo-Fr 08:00-19:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/val-disere/boraso-sport.yml b/data/cities/val-disere/boraso-sport.yml
deleted file mode 100644
index 188d32ecc..000000000
--- a/data/cities/val-disere/boraso-sport.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5316700604
-type: node
-latitude: 45.44801
-longitude: 6.97943
-postcode: "73150"
-city: Val-d'Isère
-street: "Résidence Grand Cocor"
-housenumber: 
-phone: ""
-opening_hours: ""
-website: "https://boraso.sport2000.fr/fr/?utm_source=google&utm_medium=gmb&utm_content=local"
\ No newline at end of file
diff --git a/data/cities/val-disere/sport-shop-intersport-mattis-location.yml b/data/cities/val-disere/intersport-rue-des-telepheriques.yml
similarity index 100%
rename from data/cities/val-disere/sport-shop-intersport-mattis-location.yml
rename to data/cities/val-disere/intersport-rue-des-telepheriques.yml
diff --git a/data/cities/val-disere/sport-2000-avenue-olympique.yml b/data/cities/val-disere/sport-2000-avenue-olympique.yml
new file mode 100644
index 000000000..c4795dbd5
--- /dev/null
+++ b/data/cities/val-disere/sport-2000-avenue-olympique.yml
@@ -0,0 +1,11 @@
+id: 6758710374
+type: node
+latitude: 45.45282
+longitude: 6.97378
+postcode: "73150"
+city: Val-d'Isère
+street: "Avenue Olympique"
+housenumber: 
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/val-disere/sport-2000.yml b/data/cities/val-disere/sport-2000.yml
index c4795dbd5..188d32ecc 100644
--- a/data/cities/val-disere/sport-2000.yml
+++ b/data/cities/val-disere/sport-2000.yml
@@ -1,11 +1,11 @@
-id: 6758710374
+id: 5316700604
 type: node
-latitude: 45.45282
-longitude: 6.97378
+latitude: 45.44801
+longitude: 6.97943
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
+street: "Résidence Grand Cocor"
 housenumber: 
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: "https://boraso.sport2000.fr/fr/?utm_source=google&utm_medium=gmb&utm_content=local"
\ No newline at end of file
diff --git a/data/cities/valmeinier/intersport-2.yml b/data/cities/valmeinier/intersport-2.yml
index a5ebd5666..62548441e 100644
--- a/data/cities/valmeinier/intersport-2.yml
+++ b/data/cities/valmeinier/intersport-2.yml
@@ -1,7 +1,7 @@
-id: 3170514204
+id: 3213779131
 type: node
-latitude: 45.17573
-longitude: 6.49398
+latitude: 45.17455
+longitude: 6.49336
 postcode: "73450"
 city: Valmeinier
 street: ""
diff --git a/data/cities/valmeinier/intersport.yml b/data/cities/valmeinier/intersport.yml
index 62548441e..a5ebd5666 100644
--- a/data/cities/valmeinier/intersport.yml
+++ b/data/cities/valmeinier/intersport.yml
@@ -1,7 +1,7 @@
-id: 3213779131
+id: 3170514204
 type: node
-latitude: 45.17455
-longitude: 6.49336
+latitude: 45.17573
+longitude: 6.49398
 postcode: "73450"
 city: Valmeinier
 street: ""