diff --git a/content/cities/annecy/carrefour-city-avenue-du-parc-des-sports.md b/content/cities/annecy/carrefour-city-avenue-du-parc-des-sports.md
new file mode 100644
index 000000000..7c3a54baa
--- /dev/null
+++ b/content/cities/annecy/carrefour-city-avenue-du-parc-des-sports.md
@@ -0,0 +1,5 @@
+---
+title: "Carrefour City"
+url: /annecy/carrefour-city-avenue-du-parc-des-sports/
+shop: commodité
+---
\ No newline at end of file
diff --git a/content/cities/annecy/carrefour-city-avenue-du-stade.md b/content/cities/annecy/carrefour-city-avenue-du-stade.md
deleted file mode 100644
index f03b08680..000000000
--- a/content/cities/annecy/carrefour-city-avenue-du-stade.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Carrefour City"
-url: /annecy/carrefour-city-avenue-du-stade/
-shop: commodité
----
\ No newline at end of file
diff --git a/content/cities/annecy/lockin-consigne-a-bagages.md b/content/cities/annecy/lockin-consigne-a-bagages.md
deleted file mode 100644
index 21b8fc6a7..000000000
--- a/content/cities/annecy/lockin-consigne-a-bagages.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "LOCKIN - Consigne à bagages"
-url: /annecy/lockin-consigne-a-bagages/
-shop: sac
----
\ No newline at end of file
diff --git a/content/cities/belley/_index.md b/content/cities/belley/_index.md
index 3080d31e9..8b6b55b36 100644
--- a/content/cities/belley/_index.md
+++ b/content/cities/belley/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Belley
 url: /belley/
-latitude: 45.759
-longitude: 5.706
+latitude: 45.761
+longitude: 5.682
 ---
\ No newline at end of file
diff --git a/content/cities/belley/bugey-cote-fermes.md b/content/cities/belley/bugey-cote-fermes.md
deleted file mode 100644
index 2fd75f73d..000000000
--- a/content/cities/belley/bugey-cote-fermes.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bugey Côté Fermes"
-url: /belley/bugey-cote-fermes/
-shop: ferme
----
\ No newline at end of file
diff --git a/content/cities/etrembieres/go-sport.md b/content/cities/etrembieres/go-sport.md
deleted file mode 100644
index 5be626795..000000000
--- a/content/cities/etrembieres/go-sport.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Go Sport"
-url: /etrembieres/go-sport/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/etrembieres/intersport.md b/content/cities/etrembieres/intersport.md
new file mode 100644
index 000000000..c6bc2d0c0
--- /dev/null
+++ b/content/cities/etrembieres/intersport.md
@@ -0,0 +1,5 @@
+---
+title: "Intersport"
+url: /etrembieres/intersport/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/la-tronche/_index.md b/content/cities/la-tronche/_index.md
index eb80459e6..beb603daf 100644
--- a/content/cities/la-tronche/_index.md
+++ b/content/cities/la-tronche/_index.md
@@ -1,6 +1,6 @@
 ---
 title: La Tronche
 url: /la-tronche/
-latitude: 45.203
-longitude: 5.736
+latitude: 45.202
+longitude: 5.754
 ---
\ No newline at end of file
diff --git a/content/cities/lentigny/_index.md b/content/cities/lentigny/_index.md
index 123ec92d9..1128c8d49 100644
--- a/content/cities/lentigny/_index.md
+++ b/content/cities/lentigny/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lentigny
 url: /lentigny/
-latitude: 45.993
-longitude: 3.984
+latitude: 45.992
+longitude: 3.974
 ---
\ No newline at end of file
diff --git a/content/cities/les-houches/eric-jacquier-route-des-trabets.md b/content/cities/les-houches/eric-jacquier-route-des-trabets.md
new file mode 100644
index 000000000..a1b2ec556
--- /dev/null
+++ b/content/cities/les-houches/eric-jacquier-route-des-trabets.md
@@ -0,0 +1,5 @@
+---
+title: "Éric Jacquier"
+url: /les-houches/eric-jacquier-route-des-trabets/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/les-houches/eric-jacquier-rue-du-mont-blanc.md b/content/cities/les-houches/eric-jacquier-rue-du-mont-blanc.md
deleted file mode 100644
index a30dc610b..000000000
--- a/content/cities/les-houches/eric-jacquier-rue-du-mont-blanc.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Éric Jacquier"
-url: /les-houches/eric-jacquier-rue-du-mont-blanc/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/content/cities/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/poisy/_index.md b/content/cities/poisy/_index.md
index 63505abd9..ec1d1a6da 100644
--- a/content/cities/poisy/_index.md
+++ b/content/cities/poisy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Poisy
 url: /poisy/
-latitude: 45.922
-longitude: 6.063
+latitude: 45.917
+longitude: 6.083
 ---
\ No newline at end of file
diff --git a/content/cities/pringy/biocoop-aquarius-pringy.md b/content/cities/pringy/biocoop-aquarius-pringy.md
new file mode 100644
index 000000000..a5da0c069
--- /dev/null
+++ b/content/cities/pringy/biocoop-aquarius-pringy.md
@@ -0,0 +1,5 @@
+---
+title: "Biocoop Aquarius Pringy"
+url: /pringy/biocoop-aquarius-pringy/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/pringy/biocoop.md b/content/cities/pringy/biocoop.md
deleted file mode 100644
index d4b8a094e..000000000
--- a/content/cities/pringy/biocoop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Biocoop"
-url: /pringy/biocoop/
-shop: supermarché
----
\ No newline at end of file
diff --git a/content/cities/saint-cyr-de-valorges/_index.md b/content/cities/saint-cyr-de-valorges/_index.md
index 02b88cbd0..57640c4d7 100644
--- a/content/cities/saint-cyr-de-valorges/_index.md
+++ b/content/cities/saint-cyr-de-valorges/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Cyr-de-Valorges
 url: /saint-cyr-de-valorges/
-latitude: 45.881
-longitude: 4.327
+latitude: 45.895
+longitude: 4.293
 ---
\ No newline at end of file
diff --git a/content/cities/saint-etienne/centrauto-plaine.md b/content/cities/saint-etienne/centrauto-plaine.md
new file mode 100644
index 000000000..3a1f1bed8
--- /dev/null
+++ b/content/cities/saint-etienne/centrauto-plaine.md
@@ -0,0 +1,5 @@
+---
+title: "CentrAuto Plaine"
+url: /saint-etienne/centrauto-plaine/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/saint-etienne/creaphis-editions.md b/content/cities/saint-etienne/creaphis-editions.md
deleted file mode 100644
index 0ff2fad1e..000000000
--- a/content/cities/saint-etienne/creaphis-editions.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Créaphis Éditions"
-url: /saint-etienne/creaphis-editions/
-shop: livres
----
\ No newline at end of file
diff --git a/content/cities/saint-just-saint-rambert/_index.md b/content/cities/saint-just-saint-rambert/_index.md
index 3ae855ea2..d59a8c991 100644
--- a/content/cities/saint-just-saint-rambert/_index.md
+++ b/content/cities/saint-just-saint-rambert/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Just-Saint-Rambert
 url: /saint-just-saint-rambert/
-latitude: 45.5
-longitude: 4.241
+latitude: 45.495
+longitude: 4.245
 ---
\ No newline at end of file
diff --git a/content/cities/saint-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/saint-symphorien-sur-coise/_index.md b/content/cities/saint-symphorien-sur-coise/_index.md
index e93a52abb..cbc158f11 100644
--- a/content/cities/saint-symphorien-sur-coise/_index.md
+++ b/content/cities/saint-symphorien-sur-coise/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Symphorien-sur-Coise
 url: /saint-symphorien-sur-coise/
 latitude: 45.632
-longitude: 4.457
+longitude: 4.455
 ---
\ No newline at end of file
diff --git a/content/cities/sainte-foy-largentiere/_index.md b/content/cities/sainte-foy-largentiere/_index.md
index bea527ae9..395d43430 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.712
+latitude: 45.709
 longitude: 4.473
 ---
\ No newline at end of file
diff --git a/content/cities/valencin/_index.md b/content/cities/valencin/_index.md
index cd79a2a48..937172541 100644
--- a/content/cities/valencin/_index.md
+++ b/content/cities/valencin/_index.md
@@ -1,6 +1,6 @@
 ---
-title: Valencin
+title: valencin
 url: /valencin/
-latitude: 45.613
-longitude: 5.017
+latitude: 45.627
+longitude: 5.072
 ---
\ No newline at end of file
diff --git a/content/cities/viviers-du-lac/boulangerie-le-saint-honore.md b/content/cities/viviers-du-lac/boulangerie-le-saint-honore.md
deleted file mode 100644
index e4540cbe9..000000000
--- a/content/cities/viviers-du-lac/boulangerie-le-saint-honore.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Boulangerie le Saint-Honoré"
-url: /viviers-du-lac/boulangerie-le-saint-honore/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/data/cities/annecy/carrefour-city-avenue-du-stade.yml b/data/cities/annecy/carrefour-city-avenue-du-parc-des-sports.yml
similarity index 84%
rename from data/cities/annecy/carrefour-city-avenue-du-stade.yml
rename to data/cities/annecy/carrefour-city-avenue-du-parc-des-sports.yml
index f4ad2fd8a..ff6284a93 100644
--- a/data/cities/annecy/carrefour-city-avenue-du-stade.yml
+++ b/data/cities/annecy/carrefour-city-avenue-du-parc-des-sports.yml
@@ -4,7 +4,7 @@ latitude: 45.91181
 longitude: 6.12128
 postcode: "74000"
 city: Annecy
-street: "Avenue du Stade"
+street: "Avenue du Parc des Sports"
 housenumber: 27
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00; Su 09:00-13:00, 16:00-20:00"
diff --git a/data/cities/annecy/lockin-consigne-a-bagages.yml b/data/cities/annecy/lockin-consigne-a-bagages.yml
deleted file mode 100644
index b68f0e33e..000000000
--- a/data/cities/annecy/lockin-consigne-a-bagages.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9349028608
-type: node
-latitude: 45.89789
-longitude: 6.12361
-postcode: "74000"
-city: Annecy
-street: "1 Passage Nemours"
-housenumber: 1
-phone: ""
-opening_hours: "Mo-Su 07:00-23:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/belley/bugey-cote-fermes.yml b/data/cities/belley/bugey-cote-fermes.yml
deleted file mode 100644
index b08d7cc69..000000000
--- a/data/cities/belley/bugey-cote-fermes.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6837149431
-type: node
-latitude: 45.75876
-longitude: 5.70647
-postcode: "01300"
-city: Belley
-street: "Rond-Point Jean Monnet"
-housenumber: 
-phone: "+33 4 79 81 33 85"
-opening_hours: "Tu 14:30-19:00; We-Fr 09:00-12:30,14:00-19:00; Sa 09:00-18:00"
-website: "https://www.bugeycotefermes.fr/"
\ No newline at end of file
diff --git a/data/cities/etrembieres/go-sport.yml b/data/cities/etrembieres/intersport.yml
similarity index 65%
rename from data/cities/etrembieres/go-sport.yml
rename to data/cities/etrembieres/intersport.yml
index 45a6a353e..60f211705 100644
--- a/data/cities/etrembieres/go-sport.yml
+++ b/data/cities/etrembieres/intersport.yml
@@ -4,8 +4,8 @@ latitude: 46.18129
 longitude: 6.23135
 postcode: "74100"
 city: Étrembières
-street: "Chemin de l'Industrie"
+street: "Rue de l'Industrie"
 housenumber: 21
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00"
+opening_hours: "Mo-Sa 09:30-20:00; Su off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/fontaine/geant-casino.yml b/data/cities/fontaine/geant-casino.yml
index 6adadbf64..ee5177df0 100644
--- a/data/cities/fontaine/geant-casino.yml
+++ b/data/cities/fontaine/geant-casino.yml
@@ -7,5 +7,5 @@ city: Fontaine
 street: "Boulevard Paul Langevin"
 housenumber: 120
 phone: ""
-opening_hours: "Mo-Sa 08:30-21:00; Su 09:00-12:30"
+opening_hours: "Mo-Sa 07:30-21:00; Su 09:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/fontaine/gifi.yml b/data/cities/fontaine/gifi.yml
index 88cd10ae9..5b8b530c2 100644
--- a/data/cities/fontaine/gifi.yml
+++ b/data/cities/fontaine/gifi.yml
@@ -7,5 +7,5 @@ city: Fontaine
 street: "Avenue Ambroise Croizat"
 housenumber: 46
 phone: "+33 4 76 43 49 72"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-12:30,14:00-18:30"
+opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-12:00,14:00-18:00"
 website: "https://magasins.gifi.fr/fr/gifi-grenoble-29658"
\ No newline at end of file
diff --git a/data/cities/grenoble/epicerie-arax.yml b/data/cities/grenoble/epicerie-arax.yml
index b09a91819..bec865608 100644
--- a/data/cities/grenoble/epicerie-arax.yml
+++ b/data/cities/grenoble/epicerie-arax.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Rue de Turenne"
 housenumber: 3
 phone: "+33 4 76 87 23 37"
-opening_hours: "Tu-Sa 09:00-12:00, 15:00-19:00; 2018 week 31-34 off"
-website: "https://www.epicerie-arax.com/"
\ No newline at end of file
+opening_hours: "Tu-Sa 09:00-12:00, 15:00-19:00"
+website: "https://epicerie-arax.com/"
\ No newline at end of file
diff --git a/data/cities/les-cotes-darey/melanine.yml b/data/cities/les-cotes-darey/melanine.yml
index 0cf888532..9bb6abfb8 100644
--- a/data/cities/les-cotes-darey/melanine.yml
+++ b/data/cities/les-cotes-darey/melanine.yml
@@ -1,6 +1,6 @@
-id: 158446134
-type: way
-latitude: 45.45622
+id: 11954223739
+type: node
+latitude: 45.45635
 longitude: 4.86868
 postcode: "38138"
 city: Les Côtes-d'Arey
diff --git a/data/cities/les-houches/eric-jacquier-route-des-trabets.yml b/data/cities/les-houches/eric-jacquier-route-des-trabets.yml
new file mode 100644
index 000000000..9b445c7bf
--- /dev/null
+++ b/data/cities/les-houches/eric-jacquier-route-des-trabets.yml
@@ -0,0 +1,11 @@
+id: 9525402299
+type: node
+latitude: 45.89004
+longitude: 6.78902
+postcode: "74310"
+city: Les Houches
+street: "Route des Trabets"
+housenumber: 94
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml b/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml
deleted file mode 100644
index cb7f45fc0..000000000
--- a/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9527735194
-type: node
-latitude: 45.89033
-longitude: 6.79811
-postcode: "74310"
-city: Les Houches
-street: "Rue du Mont Blanc"
-housenumber: 106
-phone: ""
-opening_hours: "Mo-Su 06:00-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/les-houches/eric-jacquier.yml b/data/cities/les-houches/eric-jacquier.yml
index 9b445c7bf..cb7f45fc0 100644
--- a/data/cities/les-houches/eric-jacquier.yml
+++ b/data/cities/les-houches/eric-jacquier.yml
@@ -1,11 +1,11 @@
-id: 9525402299
+id: 9527735194
 type: node
-latitude: 45.89004
-longitude: 6.78902
+latitude: 45.89033
+longitude: 6.79811
 postcode: "74310"
 city: Les Houches
-street: "Route des Trabets"
-housenumber: 94
+street: "Rue du Mont Blanc"
+housenumber: 106
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Su 06:00-12:30, 15:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/pringy/biocoop.yml b/data/cities/pringy/biocoop-aquarius-pringy.yml
similarity index 100%
rename from data/cities/pringy/biocoop.yml
rename to data/cities/pringy/biocoop-aquarius-pringy.yml
diff --git a/data/cities/quincieux/le-verger-de-nadine.yml b/data/cities/quincieux/le-verger-de-nadine.yml
index 1eb2625ce..99a9bc0c8 100644
--- a/data/cities/quincieux/le-verger-de-nadine.yml
+++ b/data/cities/quincieux/le-verger-de-nadine.yml
@@ -8,4 +8,4 @@ street: "Rue des Verchères"
 housenumber: 14
 phone: "+33478313158"
 opening_hours: "Mo 15:00-19:00; Tu-Fr 09:30-12:30,15:00-19:00; Sa 09:00-13:00"
-website: ""
\ No newline at end of file
+website: "https://www.facebook.com/profile.php?id=100064335288878"
\ No newline at end of file
diff --git a/data/cities/saint-etienne/centrauto-plaine.yml b/data/cities/saint-etienne/centrauto-plaine.yml
new file mode 100644
index 000000000..7e705e61f
--- /dev/null
+++ b/data/cities/saint-etienne/centrauto-plaine.yml
@@ -0,0 +1,11 @@
+id: 11949617880
+type: node
+latitude: 45.41427
+longitude: 4.40281
+postcode: "42100"
+city: Saint-Etienne
+street: "Avenue De Rochetaillé"
+housenumber: 77
+phone: "+33 4 77 57 25 13"
+opening_hours: "Mo 14:00-18:00, Tu-Fr 09:00-12:00,14:00-18:00, Sa 08:00-12:00"
+website: "https://www.centrautoplaine.fr"
\ No newline at end of file
diff --git a/data/cities/saint-etienne/creaphis-editions.yml b/data/cities/saint-etienne/creaphis-editions.yml
deleted file mode 100644
index e82ed0288..000000000
--- a/data/cities/saint-etienne/creaphis-editions.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3965807817
-type: node
-latitude: 45.43784
-longitude: 4.39107
-postcode: "42000"
-city: Saint-Étienne
-street: "Rue Pierre Bérard"
-housenumber: 16
-phone: "+33966819203"
-opening_hours: ""
-website: "www.editions-creaphis.com"
\ No newline at end of file
diff --git a/data/cities/viviers-du-lac/boulangerie-le-saint-honore.yml b/data/cities/viviers-du-lac/boulangerie-le-saint-honore.yml
deleted file mode 100644
index 7309987d9..000000000
--- a/data/cities/viviers-du-lac/boulangerie-le-saint-honore.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3092565685
-type: node
-latitude: 45.64833
-longitude: 5.90712
-postcode: "73420"
-city: Viviers-du-Lac
-street: "Rue Antoine Montagnole"
-housenumber: 154
-phone: "+33 4 79 61 04 18"
-opening_hours: ""
-website: "https://www.boulangerie-lesainthonore.fr/"
\ No newline at end of file