diff --git a/content/cities/andancette/_index.md b/content/cities/andancette/_index.md
index f12ebeee4..75d2631ff 100644
--- a/content/cities/andancette/_index.md
+++ b/content/cities/andancette/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Andancette
 url: /andancette/
-latitude: 45.244
-longitude: 4.813
+latitude: 45.242
+longitude: 4.806
 ---
\ No newline at end of file
diff --git a/content/cities/annecy/_index.md b/content/cities/annecy/_index.md
index 50c992683..4dfcd067b 100644
--- a/content/cities/annecy/_index.md
+++ b/content/cities/annecy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Annecy
 url: /annecy/
-latitude: 45.91
-longitude: 6.118
+latitude: 45.919
+longitude: 6.129
 ---
\ 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
deleted file mode 100644
index 3a8076bb4..000000000
--- a/content/cities/annemasse/histoire-dor-allee-francois-truffaut.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 000000000..b794559f4
--- /dev/null
+++ b/content/cities/annemasse/histoire-dor-rue-de-la-resistance.md
@@ -0,0 +1,5 @@
+---
+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/bernin/_index.md b/content/cities/bernin/_index.md
index 717c93f81..ff836972f 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.869
+longitude: 5.868
 ---
\ 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/courchevel/_index.md b/content/cities/courchevel/_index.md
index e734ab4ef..9168bb242 100644
--- a/content/cities/courchevel/_index.md
+++ b/content/cities/courchevel/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Courchevel
 url: /courchevel/
-latitude: 45.418
-longitude: 6.652
+latitude: 45.416
+longitude: 6.631
 ---
\ No newline at end of file
diff --git a/content/cities/evian-les-bains/marionnaud.md b/content/cities/evian-les-bains/marionnaud.md
new file mode 100644
index 000000000..9ed9c3b5a
--- /dev/null
+++ b/content/cities/evian-les-bains/marionnaud.md
@@ -0,0 +1,5 @@
+---
+title: "Marionnaud"
+url: /evian-les-bains/marionnaud/
+shop: parfumerie
+---
\ No newline at end of file
diff --git a/content/cities/grenoble/aamset.md b/content/cities/grenoble/aamset.md
deleted file mode 100644
index b78444073..000000000
--- a/content/cities/grenoble/aamset.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "aamset"
-url: /grenoble/aamset/
-shop: ordinateur
----
\ No newline at end of file
diff --git a/content/cities/grenoble/paul-zac-de-bonne-centre-commercial-caserne-de-bonne.md b/content/cities/grenoble/paul-zac-de-bonne-centre-commercial-caserne-de-bonne.md
new file mode 100644
index 000000000..715e014ef
--- /dev/null
+++ b/content/cities/grenoble/paul-zac-de-bonne-centre-commercial-caserne-de-bonne.md
@@ -0,0 +1,5 @@
+---
+title: "Paul"
+url: /grenoble/paul-zac-de-bonne-centre-commercial-caserne-de-bonne/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/grenoble/vival.md b/content/cities/grenoble/vival.md
deleted file mode 100644
index 5d949ad35..000000000
--- a/content/cities/grenoble/vival.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Vival"
-url: /grenoble/vival/
-shop: commodité
----
\ No newline at end of file
diff --git a/content/cities/la-clusaz/_index.md b/content/cities/la-clusaz/_index.md
index 46a572cf3..d4e34e56e 100644
--- a/content/cities/la-clusaz/_index.md
+++ b/content/cities/la-clusaz/_index.md
@@ -1,6 +1,6 @@
 ---
 title: La Clusaz
 url: /la-clusaz/
-latitude: 45.905
-longitude: 6.425
+latitude: 45.907
+longitude: 6.429
 ---
\ No newline at end of file
diff --git a/content/cities/la-terrasse/easy-riders-cafe-velo.md b/content/cities/la-terrasse/easy-riders-cafe-velo.md
new file mode 100644
index 000000000..6a207a3d1
--- /dev/null
+++ b/content/cities/la-terrasse/easy-riders-cafe-velo.md
@@ -0,0 +1,5 @@
+---
+title: "Easy Riders Café Vélo"
+url: /la-terrasse/easy-riders-cafe-velo/
+shop: vélo
+---
\ No newline at end of file
diff --git a/content/cities/la-terrasse/les-fees-maison.md b/content/cities/la-terrasse/les-fees-maison.md
index 67aa641ed..0bb8d1272 100644
--- a/content/cities/la-terrasse/les-fees-maison.md
+++ b/content/cities/la-terrasse/les-fees-maison.md
@@ -1,5 +1,5 @@
 ---
-title: "Les fées maison"
+title: "Les Fées Maison"
 url: /la-terrasse/les-fees-maison/
 shop: boulangerie
 ---
\ No newline at end of file
diff --git a/content/cities/la-tronche/_index.md b/content/cities/la-tronche/_index.md
index beb603daf..eb80459e6 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.202
-longitude: 5.754
+latitude: 45.203
+longitude: 5.736
 ---
\ 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/letra/_index.md b/content/cities/letra/_index.md
index 708feb422..0cd7e590f 100644
--- a/content/cities/letra/_index.md
+++ b/content/cities/letra/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Létra
 url: /letra/
-latitude: 45.957
-longitude: 4.524
+latitude: 45.962
+longitude: 4.525
 ---
\ No newline at end of file
diff --git a/content/cities/lyon/anne-et-thierry.md b/content/cities/lyon/anne-et-thierry.md
deleted file mode 100644
index 85a41b2d2..000000000
--- a/content/cities/lyon/anne-et-thierry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Anne & Thierry"
-url: /lyon/anne-et-thierry/
-shop: antiquités
----
\ No newline at end of file
diff --git a/content/cities/lyon/archi-chouette.md b/content/cities/lyon/archi-chouette.md
new file mode 100644
index 000000000..a22e7ca9f
--- /dev/null
+++ b/content/cities/lyon/archi-chouette.md
@@ -0,0 +1,5 @@
+---
+title: "Archi Chouette"
+url: /lyon/archi-chouette/
+shop: jeux
+---
\ No newline at end of file
diff --git a/content/cities/lyon/le-dadashop.md b/content/cities/lyon/le-dadashop.md
new file mode 100644
index 000000000..93ad27fcb
--- /dev/null
+++ b/content/cities/lyon/le-dadashop.md
@@ -0,0 +1,5 @@
+---
+title: "Le Dadashop"
+url: /lyon/le-dadashop/
+shop: meubles
+---
\ No newline at end of file
diff --git a/content/cities/lyon/theraform.md b/content/cities/lyon/theraform.md
new file mode 100644
index 000000000..9f635c589
--- /dev/null
+++ b/content/cities/lyon/theraform.md
@@ -0,0 +1,5 @@
+---
+title: "Theraform"
+url: /lyon/theraform/
+shop: beauté
+---
\ No newline at end of file
diff --git a/content/cities/lyon/verlene.md b/content/cities/lyon/verlene.md
deleted file mode 100644
index a85c84edd..000000000
--- a/content/cities/lyon/verlene.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Verlène"
-url: /lyon/verlene/
-shop: coiffeur
----
\ No newline at end of file
diff --git a/content/cities/lyon/zoi.md b/content/cities/lyon/zoi.md
deleted file mode 100644
index b59e2cdd5..000000000
--- a/content/cities/lyon/zoi.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Zoï"
-url: /lyon/zoi/
-shop: pâtisserie
----
\ No newline at end of file
diff --git a/content/cities/meylan/paul-meylan.md b/content/cities/meylan/paul-meylan.md
deleted file mode 100644
index f53442261..000000000
--- a/content/cities/meylan/paul-meylan.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Paul Meylan"
-url: /meylan/paul-meylan/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/content/cities/meylan/paul.md b/content/cities/meylan/paul.md
new file mode 100644
index 000000000..7412d3e7a
--- /dev/null
+++ b/content/cities/meylan/paul.md
@@ -0,0 +1,5 @@
+---
+title: "Paul"
+url: /meylan/paul/
+shop: boulangerie
+---
\ 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/peisey-nancroix/chez-pierre-et-coline.md b/content/cities/peisey-nancroix/chez-pierre-et-coline.md
deleted file mode 100644
index 99fd04fdd..000000000
--- a/content/cities/peisey-nancroix/chez-pierre-et-coline.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Chez Pierre & Coline"
-url: /peisey-nancroix/chez-pierre-et-coline/
-shop: boucherie
----
\ No newline at end of file
diff --git a/content/cities/plateau-des-petites-roches/atv-cycles.md b/content/cities/plateau-des-petites-roches/atv-cycles.md
new file mode 100644
index 000000000..c9b8d253e
--- /dev/null
+++ b/content/cities/plateau-des-petites-roches/atv-cycles.md
@@ -0,0 +1,5 @@
+---
+title: "ATV Cycles"
+url: /plateau-des-petites-roches/atv-cycles/
+shop: vélo
+---
\ No newline at end of file
diff --git a/content/cities/reignier-esery/_index.md b/content/cities/reignier-esery/_index.md
index 7debe9423..db9436a11 100644
--- a/content/cities/reignier-esery/_index.md
+++ b/content/cities/reignier-esery/_index.md
@@ -1,6 +1,6 @@
 ---
-title: Reignier-Ésery
+title: Reignier-Esery
 url: /reignier-esery/
-latitude: 46.136
-longitude: 6.269
+latitude: 46.138
+longitude: 6.27
 ---
\ No newline at end of file
diff --git a/content/cities/saint-chamond/boucherie-blanc.md b/content/cities/saint-chamond/boucherie-blanc.md
deleted file mode 100644
index 608fd8807..000000000
--- a/content/cities/saint-chamond/boucherie-blanc.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Boucherie Blanc"
-url: /saint-chamond/boucherie-blanc/
-shop: boucherie
----
\ No newline at end of file
diff --git a/content/cities/saint-chamond/im-collection.md b/content/cities/saint-chamond/im-collection.md
new file mode 100644
index 000000000..1e8d4a6b1
--- /dev/null
+++ b/content/cities/saint-chamond/im-collection.md
@@ -0,0 +1,5 @@
+---
+title: "IM Collection"
+url: /saint-chamond/im-collection/
+shop: vêtements
+---
\ No newline at end of file
diff --git a/content/cities/saint-chamond/vectow.md b/content/cities/saint-chamond/vectow.md
deleted file mode 100644
index 986c99430..000000000
--- a/content/cities/saint-chamond/vectow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Vectow"
-url: /saint-chamond/vectow/
-shop: ordinateur
----
\ No newline at end of file
diff --git a/content/cities/saint-chamond/villeneuve-funeraire.md b/content/cities/saint-chamond/villeneuve-funeraire.md
deleted file mode 100644
index c403d4983..000000000
--- a/content/cities/saint-chamond/villeneuve-funeraire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Villeneuve Funéraire"
-url: /saint-chamond/villeneuve-funeraire/
-shop: directeurs de funérailles
----
\ 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-julien-en-genevois/centre-du-pneu-doccasion.md b/content/cities/saint-julien-en-genevois/centre-du-pneu-doccasion.md
new file mode 100644
index 000000000..02de146ae
--- /dev/null
+++ b/content/cities/saint-julien-en-genevois/centre-du-pneu-doccasion.md
@@ -0,0 +1,5 @@
+---
+title: "Centre du Pneu D’occasion"
+url: /saint-julien-en-genevois/centre-du-pneu-doccasion/
+shop: pneus
+---
\ No newline at end of file
diff --git a/content/cities/saint-julien-en-genevois/harmony-cuisines.md b/content/cities/saint-julien-en-genevois/harmony-cuisines.md
new file mode 100644
index 000000000..49e70d283
--- /dev/null
+++ b/content/cities/saint-julien-en-genevois/harmony-cuisines.md
@@ -0,0 +1,5 @@
+---
+title: "Harmony Cuisines"
+url: /saint-julien-en-genevois/harmony-cuisines/
+shop: cuisine
+---
\ No newline at end of file
diff --git a/content/cities/saint-julien-en-genevois/resa-box-74.md b/content/cities/saint-julien-en-genevois/resa-box-74.md
new file mode 100644
index 000000000..e30e2f22c
--- /dev/null
+++ b/content/cities/saint-julien-en-genevois/resa-box-74.md
@@ -0,0 +1,5 @@
+---
+title: "Resa Box 74"
+url: /saint-julien-en-genevois/resa-box-74/
+shop: location de stockage
+---
\ No newline at end of file
diff --git a/content/cities/saint-julien-en-genevois/s-o-s-piscines-haute-savoie-74.md b/content/cities/saint-julien-en-genevois/s-o-s-piscines-haute-savoie-74.md
new file mode 100644
index 000000000..374138c8f
--- /dev/null
+++ b/content/cities/saint-julien-en-genevois/s-o-s-piscines-haute-savoie-74.md
@@ -0,0 +1,5 @@
+---
+title: "S.O.S Piscines Haute-Savoie (74)"
+url: /saint-julien-en-genevois/s-o-s-piscines-haute-savoie-74/
+shop: piscine
+---
\ No newline at end of file
diff --git a/content/cities/saint-julien-en-genevois/samse.md b/content/cities/saint-julien-en-genevois/samse.md
new file mode 100644
index 000000000..fe7b9cc62
--- /dev/null
+++ b/content/cities/saint-julien-en-genevois/samse.md
@@ -0,0 +1,5 @@
+---
+title: "Samse"
+url: /saint-julien-en-genevois/samse/
+shop: à faire soi-même
+---
\ 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-martin-dheres/centrakor.md b/content/cities/saint-martin-dheres/centrakor.md
new file mode 100644
index 000000000..2d873ded3
--- /dev/null
+++ b/content/cities/saint-martin-dheres/centrakor.md
@@ -0,0 +1,5 @@
+---
+title: "Centrakor"
+url: /saint-martin-dheres/centrakor/
+shop: matériel informatique
+---
\ 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-thomas-en-royans/_index.md b/content/cities/saint-thomas-en-royans/_index.md
new file mode 100644
index 000000000..4e94fbd56
--- /dev/null
+++ b/content/cities/saint-thomas-en-royans/_index.md
@@ -0,0 +1,6 @@
+---
+title: Saint-Thomas-en-Royans
+url: /saint-thomas-en-royans/
+latitude: 45.048
+longitude: 5.295
+---
\ No newline at end of file
diff --git a/content/cities/saint-thomas-en-royans/jacopain.md b/content/cities/saint-thomas-en-royans/jacopain.md
new file mode 100644
index 000000000..383011a22
--- /dev/null
+++ b/content/cities/saint-thomas-en-royans/jacopain.md
@@ -0,0 +1,5 @@
+---
+title: "Jaco'Pain"
+url: /saint-thomas-en-royans/jacopain/
+shop: boulangerie
+---
\ 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/sassenage/_index.md b/content/cities/sassenage/_index.md
index 9e9c49675..30ca526d4 100644
--- a/content/cities/sassenage/_index.md
+++ b/content/cities/sassenage/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sassenage
 url: /sassenage/
-latitude: 45.208
-longitude: 5.658
+latitude: 45.204
+longitude: 5.664
 ---
\ No newline at end of file
diff --git a/content/cities/soleymieu/_index.md b/content/cities/soleymieu/_index.md
index 6755caa74..1dee47eb9 100644
--- a/content/cities/soleymieu/_index.md
+++ b/content/cities/soleymieu/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Soleymieu
 url: /soleymieu/
-latitude: 45.688
-longitude: 5.369
+latitude: 45.69
+longitude: 5.375
 ---
\ No newline at end of file
diff --git a/content/cities/tignieu-jameyzieu/pause-beaute.md b/content/cities/tignieu-jameyzieu/pause-beaute.md
new file mode 100644
index 000000000..ca13c1a16
--- /dev/null
+++ b/content/cities/tignieu-jameyzieu/pause-beaute.md
@@ -0,0 +1,5 @@
+---
+title: "Pause Beauté"
+url: /tignieu-jameyzieu/pause-beaute/
+shop: beauté
+---
\ No newline at end of file
diff --git a/content/cities/tulette/domaine-la-bignande-des-clos.md b/content/cities/tulette/domaine-la-bignande-des-clos.md
deleted file mode 100644
index 64f789759..000000000
--- a/content/cities/tulette/domaine-la-bignande-des-clos.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Domaine la Bignande des Clos"
-url: /tulette/domaine-la-bignande-des-clos/
-shop: vin
----
\ 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/content/cities/valencin/_index.md b/content/cities/valencin/_index.md
index 937172541..cd79a2a48 100644
--- a/content/cities/valencin/_index.md
+++ b/content/cities/valencin/_index.md
@@ -1,6 +1,6 @@
 ---
-title: valencin
+title: Valencin
 url: /valencin/
-latitude: 45.627
-longitude: 5.072
+latitude: 45.613
+longitude: 5.017
 ---
\ No newline at end of file
diff --git a/content/cities/villard-bonnot/allbikes-38.md b/content/cities/villard-bonnot/allbikes-38.md
new file mode 100644
index 000000000..be7e5bccd
--- /dev/null
+++ b/content/cities/villard-bonnot/allbikes-38.md
@@ -0,0 +1,5 @@
+---
+title: "ALLBIKES 38"
+url: /villard-bonnot/allbikes-38/
+shop: vélo
+---
\ No newline at end of file
diff --git a/content/cities/villard-bonnot/cycleohm.md b/content/cities/villard-bonnot/cycleohm.md
deleted file mode 100644
index 69c254ef0..000000000
--- a/content/cities/villard-bonnot/cycleohm.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Cycleohm"
-url: /villard-bonnot/cycleohm/
-shop: vélo
----
\ No newline at end of file
diff --git a/content/cities/villars/decathlon-saint-etienne-villars.md b/content/cities/villars/decathlon-saint-etienne-villars.md
deleted file mode 100644
index a93a9ea71..000000000
--- a/content/cities/villars/decathlon-saint-etienne-villars.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Decathlon Saint-Étienne Villars"
-url: /villars/decathlon-saint-etienne-villars/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/ville-la-grand/shop-airsoft-74.md b/content/cities/ville-la-grand/shop-airsoft-74.md
index 9e393a107..b4908c623 100644
--- a/content/cities/ville-la-grand/shop-airsoft-74.md
+++ b/content/cities/ville-la-grand/shop-airsoft-74.md
@@ -1,5 +1,5 @@
 ---
 title: "Shop Airsoft 74"
 url: /ville-la-grand/shop-airsoft-74/
-shop: shop
+shop: sports
 ---
\ No newline at end of file
diff --git a/content/cities/villeurbanne/boulangerie-alexandre.md b/content/cities/villeurbanne/boulangerie-alexandre.md
deleted file mode 100644
index 0dea8ef6e..000000000
--- a/content/cities/villeurbanne/boulangerie-alexandre.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Boulangerie Alexandre"
-url: /villeurbanne/boulangerie-alexandre/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/content/cities/villeurbanne/concessionnaire-f-bouvet-piaggio-vespa.md b/content/cities/villeurbanne/concessionnaire-f-bouvet-piaggio-vespa.md
deleted file mode 100644
index e53d5d47e..000000000
--- a/content/cities/villeurbanne/concessionnaire-f-bouvet-piaggio-vespa.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Concessionnaire F. Bouvet - Piaggio, Vespa"
-url: /villeurbanne/concessionnaire-f-bouvet-piaggio-vespa/
-shop: moto
----
\ 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
deleted file mode 100644
index b0b0263d1..000000000
--- a/data/cities/annemasse/histoire-dor-allee-francois-truffaut.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 000000000..6d56fe95b
--- /dev/null
+++ b/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml
@@ -0,0 +1,11 @@
+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 6d56fe95b..b0b0263d1 100644
--- a/data/cities/annemasse/histoire-dor.yml
+++ b/data/cities/annemasse/histoire-dor.yml
@@ -1,11 +1,11 @@
-id: 4565378166
+id: 4579827772
 type: node
-latitude: 46.19592
-longitude: 6.25349
+latitude: 46.1966
+longitude: 6.2368
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: "Allée François Truffaut"
+housenumber: 2
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00; Su off"
+opening_hours: "Mo-Sa 10:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/courchevel/serge-sport-skiset.yml b/data/cities/courchevel/serge-sport-skiset.yml
index d67a76427..a4ce77fc4 100644
--- a/data/cities/courchevel/serge-sport-skiset.yml
+++ b/data/cities/courchevel/serge-sport-skiset.yml
@@ -1,7 +1,7 @@
 id: 3183018976
 type: node
-latitude: 45.41548
-longitude: 6.65077
+latitude: 45.41556
+longitude: 6.65086
 postcode: "73120"
 city: Courchevel
 street: ""
diff --git a/data/cities/crolles/routens-electric-bike.yml b/data/cities/crolles/routens-electric-bike.yml
index 40f05b077..2b1747a47 100644
--- a/data/cities/crolles/routens-electric-bike.yml
+++ b/data/cities/crolles/routens-electric-bike.yml
@@ -4,7 +4,7 @@ latitude: 45.27341
 longitude: 5.88564
 postcode: "38920"
 city: Crolles
-street: "Avenue Amboise Croizat"
+street: "Avenue Ambroise Croizat"
 housenumber: 431
 phone: ""
 opening_hours: "Tu-Sa 09:45-12:30,14:00-19:00"
diff --git a/data/cities/etrembieres/go-sport.yml b/data/cities/etrembieres/go-sport.yml
index 1bb984c81..45a6a353e 100644
--- a/data/cities/etrembieres/go-sport.yml
+++ b/data/cities/etrembieres/go-sport.yml
@@ -8,4 +8,4 @@ street: "Chemin de l'Industrie"
 housenumber: 21
 phone: ""
 opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.go-sport.com/stores?lang=default#/stores/1030"
\ No newline at end of file
+website: ""
\ No newline at end of file
diff --git a/data/cities/evian-les-bains/marionnaud.yml b/data/cities/evian-les-bains/marionnaud.yml
new file mode 100644
index 000000000..8da38d939
--- /dev/null
+++ b/data/cities/evian-les-bains/marionnaud.yml
@@ -0,0 +1,11 @@
+id: 11267873200
+type: node
+latitude: 46.40047
+longitude: 6.59093
+postcode: "74500"
+city: Évian-les-Bains
+street: "Rue Nationale"
+housenumber: 42
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/gaillard/monsieur-store.yml b/data/cities/gaillard/monsieur-store.yml
index 62985fc8f..eecd8ed65 100644
--- a/data/cities/gaillard/monsieur-store.yml
+++ b/data/cities/gaillard/monsieur-store.yml
@@ -8,4 +8,4 @@ street: "Rue de Genève"
 housenumber: 84
 phone: ""
 opening_hours: "Tu-Fr 14:00-18:30; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: "https://monsieurstore.com/magasin/annemasse-74240/"
\ No newline at end of file
+website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/aamset.yml b/data/cities/grenoble/aamset.yml
deleted file mode 100644
index 36913f383..000000000
--- a/data/cities/grenoble/aamset.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4456804643
-type: node
-latitude: 45.17775
-longitude: 5.73654
-postcode: "38100"
-city: Grenoble
-street: "Avenue Jean Perrot"
-housenumber: 53
-phone: "+334 76 01 03 76"
-opening_hours: ""
-website: "https://www.aamset.com/"
\ No newline at end of file
diff --git a/data/cities/grenoble/fit-et-gourmande.yml b/data/cities/grenoble/fit-et-gourmande.yml
index 50f9f8f12..92d7382e6 100644
--- a/data/cities/grenoble/fit-et-gourmande.yml
+++ b/data/cities/grenoble/fit-et-gourmande.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Boulevard Maréchal Foch"
 housenumber: 22
 phone: "+33 6 13 86 78 24"
-opening_hours: "Mo 10:00-16:00; Tu-Fr 09:00-19:00; Sa 09:00-13:00"
+opening_hours: "Mo 10:00-15:00; Tu-Fr 09:00-18:00; Sa[1] 09:00-13:00"
 website: "https://fit-et-gourmande.com"
\ No newline at end of file
diff --git a/data/cities/grenoble/gourmand-et-mignon.yml b/data/cities/grenoble/gourmand-et-mignon.yml
index 3c0fad992..63f96af5d 100644
--- a/data/cities/grenoble/gourmand-et-mignon.yml
+++ b/data/cities/grenoble/gourmand-et-mignon.yml
@@ -7,5 +7,5 @@ city: Grenoble
 street: "Boulevard Maréchal Foch"
 housenumber: 20
 phone: ""
-opening_hours: "Mo-Fr,Su 09:00-18:00"
+opening_hours: "Mo-Th,Su 07:30-20:00; Fr 07:30-16:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/la-roue-libre.yml b/data/cities/grenoble/la-roue-libre.yml
index f47e33458..4132546f6 100644
--- a/data/cities/grenoble/la-roue-libre.yml
+++ b/data/cities/grenoble/la-roue-libre.yml
@@ -6,6 +6,6 @@ postcode: "38100"
 city: Grenoble
 street: "Rue des Eaux Claires"
 housenumber: 24
-phone: "+33 6 76 28 50 30"
+phone: ""
 opening_hours: "Mo-Fr 11:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/grenoble/paul-zac-de-bonne-centre-commercial-caserne-de-bonne.yml b/data/cities/grenoble/paul-zac-de-bonne-centre-commercial-caserne-de-bonne.yml
new file mode 100644
index 000000000..d7acaa7c3
--- /dev/null
+++ b/data/cities/grenoble/paul-zac-de-bonne-centre-commercial-caserne-de-bonne.yml
@@ -0,0 +1,11 @@
+id: 398056960
+type: way
+latitude: 45.18421
+longitude: 5.72393
+postcode: "38000"
+city: Grenoble
+street: "Zac De Bonne, Centre Commercial Caserne De Bonne"
+housenumber: 
+phone: "+33 4 76 27 83 26"
+opening_hours: "Mo-Sa 07:30-20:00;Su 07:30-13:30"
+website: "https://www.paul.fr/stores/grenoble"
\ No newline at end of file
diff --git a/data/cities/grenoble/paul.yml b/data/cities/grenoble/paul.yml
index b5ca55586..9dafb13a7 100644
--- a/data/cities/grenoble/paul.yml
+++ b/data/cities/grenoble/paul.yml
@@ -6,6 +6,6 @@ postcode: "38000"
 city: Grenoble
 street: "Avenue des Martyrs"
 housenumber: 78
-phone: ""
+phone: "+33 4 82 29 98 92"
 opening_hours: "Mo-Fr 07:00-19:00; Sa 09:00-13:00"
-website: ""
\ No newline at end of file
+website: "https://www.paul.fr/stores/grenoble_presqu_ile"
\ No newline at end of file
diff --git a/data/cities/grenoble/vival.yml b/data/cities/grenoble/vival.yml
deleted file mode 100644
index b489d4f9c..000000000
--- a/data/cities/grenoble/vival.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3874502283
-type: node
-latitude: 45.19096
-longitude: 5.70871
-postcode: "38000"
-city: Grenoble
-street: "Rue du Vercors"
-housenumber: 35-37
-phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:00-12:30,16:00-20:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/la-terrasse/easy-riders-cafe-velo.yml b/data/cities/la-terrasse/easy-riders-cafe-velo.yml
new file mode 100644
index 000000000..750ac1e54
--- /dev/null
+++ b/data/cities/la-terrasse/easy-riders-cafe-velo.yml
@@ -0,0 +1,11 @@
+id: 1803154489
+type: node
+latitude: 45.31489
+longitude: 5.92427
+postcode: "38660"
+city: La Terrasse
+street: "Rue des Vergers"
+housenumber: 15
+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/lyon/anne-et-thierry.yml b/data/cities/lyon/anne-et-thierry.yml
deleted file mode 100644
index ef9c7945e..000000000
--- a/data/cities/lyon/anne-et-thierry.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5469805141
-type: node
-latitude: 45.7507
-longitude: 4.84893
-postcode: "69007"
-city: Lyon
-street: "Grande Rue de la Guillotière"
-housenumber: 110
-phone: "+33 6 09 36 75 09;+33 4 72 73 02 28"
-opening_hours: "Horaires irréguliers. Prendre rendez-vous."
-website: "https://www.anne-et-thierry.com/"
\ No newline at end of file
diff --git a/data/cities/lyon/archi-chouette.yml b/data/cities/lyon/archi-chouette.yml
new file mode 100644
index 000000000..4c44ae9c7
--- /dev/null
+++ b/data/cities/lyon/archi-chouette.yml
@@ -0,0 +1,11 @@
+id: 2295743614
+type: node
+latitude: 45.76921
+longitude: 4.8362
+postcode: ""
+city: Lyon
+street: "Place du Griffon"
+housenumber: 3
+phone: "+33 4 72 27 84 51"
+opening_hours: "Mo-Su 10:00-13:30; 14:30-19:30"
+website: "https://www.archi-chouette.fr/"
\ No newline at end of file
diff --git a/data/cities/lyon/le-dadashop.yml b/data/cities/lyon/le-dadashop.yml
new file mode 100644
index 000000000..3d31cade1
--- /dev/null
+++ b/data/cities/lyon/le-dadashop.yml
@@ -0,0 +1,11 @@
+id: 4701119195
+type: node
+latitude: 45.7686
+longitude: 4.83634
+postcode: ""
+city: Lyon
+street: "Rue du Griffon"
+housenumber: 13
+phone: "+33 4 27 11 25 02"
+opening_hours: "Tu-Sa 11:00-19:00"
+website: "https://ledadashop.com"
\ No newline at end of file
diff --git a/data/cities/lyon/theraform.yml b/data/cities/lyon/theraform.yml
new file mode 100644
index 000000000..2b873ea70
--- /dev/null
+++ b/data/cities/lyon/theraform.yml
@@ -0,0 +1,11 @@
+id: 8366698217
+type: node
+latitude: 45.766
+longitude: 4.84358
+postcode: "69006"
+city: Lyon
+street: "Rue Bugeaud"
+housenumber: 19
+phone: "+33 04 72 15 01 10"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/lyon/verlene.yml b/data/cities/lyon/verlene.yml
deleted file mode 100644
index 8ccd391e1..000000000
--- a/data/cities/lyon/verlene.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2217052947
-type: node
-latitude: 45.7516
-longitude: 4.84544
-postcode: "69007"
-city: Lyon
-street: "Avenue Jean Jaurès"
-housenumber: 
-phone: "0472718986"
-opening_hours: "Tu-Sa 9:00-19:00; Sa 8:00-18:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/lyon/zoi.yml b/data/cities/lyon/zoi.yml
deleted file mode 100644
index 4f410e13e..000000000
--- a/data/cities/lyon/zoi.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3375289054
-type: node
-latitude: 45.76416
-longitude: 4.82834
-postcode: ""
-city: Lyon
-street: "Rue Saint-Jean"
-housenumber: 3
-phone: "+33 6 02167601"
-opening_hours: "Mo-Fr 09:00-19:00; Sa 10:00-19:00; Su 10:00-18:00"
-website: "https://www.zoi-kitchen.com"
\ No newline at end of file
diff --git a/data/cities/meylan/paul-meylan.yml b/data/cities/meylan/paul-meylan.yml
deleted file mode 100644
index 16d747530..000000000
--- a/data/cities/meylan/paul-meylan.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 62092178
-type: way
-latitude: 45.20765
-longitude: 5.75678
-postcode: "38700"
-city: Meylan
-street: "Avenue du Grésivaudan"
-housenumber: 73
-phone: ""
-opening_hours: "Mo-Sa 07:00-19:30"
-website: ""
\ No newline at end of file
diff --git a/data/cities/meylan/paul.yml b/data/cities/meylan/paul.yml
new file mode 100644
index 000000000..4a5bec128
--- /dev/null
+++ b/data/cities/meylan/paul.yml
@@ -0,0 +1,11 @@
+id: 62092178
+type: way
+latitude: 45.20759
+longitude: 5.75665
+postcode: "38240"
+city: Meylan
+street: "Avenue du Grésivaudan"
+housenumber: 73
+phone: "+33 4 76 52 47 19"
+opening_hours: "Mo-Sa 07:00-19:30"
+website: "https://www.paul.fr/stores/meylan"
\ No newline at end of file
diff --git a/data/cities/montelimar/chant-libre.yml b/data/cities/montelimar/chant-libre.yml
index ede060401..2bdd489c1 100644
--- a/data/cities/montelimar/chant-libre.yml
+++ b/data/cities/montelimar/chant-libre.yml
@@ -7,5 +7,5 @@ city: Montélimar
 street: "Place des Clercs"
 housenumber: 22
 phone: "+33 4 75 01 92 22"
-opening_hours: ""
+opening_hours: "Mo,Su off; Tu-Sa 09:00-12:00,14:30-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/peisey-nancroix/chez-pierre-et-coline.yml b/data/cities/peisey-nancroix/chez-pierre-et-coline.yml
deleted file mode 100644
index cd1a7e80e..000000000
--- a/data/cities/peisey-nancroix/chez-pierre-et-coline.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7179361218
-type: node
-latitude: 45.54658
-longitude: 6.75578
-postcode: "73210"
-city: Peisey-Nancroix
-street: "Rue des Monts d'Argent"
-housenumber: 
-phone: "+33 4 79 41 68 40"
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/plateau-des-petites-roches/atv-cycles.yml b/data/cities/plateau-des-petites-roches/atv-cycles.yml
new file mode 100644
index 000000000..d30b3110f
--- /dev/null
+++ b/data/cities/plateau-des-petites-roches/atv-cycles.yml
@@ -0,0 +1,11 @@
+id: 11263555337
+type: node
+latitude: 45.31226
+longitude: 5.88724
+postcode: "38660"
+city: Plateau des Petites Roches
+street: "Route des Trois Villages"
+housenumber: 5171
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/rumilly/le-petit-casino.yml b/data/cities/rumilly/le-petit-casino.yml
index 4034c62ba..4cf2cadc1 100644
--- a/data/cities/rumilly/le-petit-casino.yml
+++ b/data/cities/rumilly/le-petit-casino.yml
@@ -4,7 +4,7 @@ latitude: 45.86417
 longitude: 5.94469
 postcode: "74150"
 city: Rumilly
-street: "Rue Montpellaz"
+street: ""
 housenumber: 50
 phone: ""
 opening_hours: "Mo-Sa 07:30-12:30, 15:30-19:30; Su 08:00-12:00"
diff --git a/data/cities/rumilly/marche-filaterie-ganesh.yml b/data/cities/rumilly/marche-filaterie-ganesh.yml
index 410ee5e5e..a48919b46 100644
--- a/data/cities/rumilly/marche-filaterie-ganesh.yml
+++ b/data/cities/rumilly/marche-filaterie-ganesh.yml
@@ -4,7 +4,7 @@ latitude: 45.86659
 longitude: 5.9437
 postcode: "74150"
 city: Rumilly
-street: "Rue Filaterie"
+street: ""
 housenumber: 5
 phone: "+33981808735"
 opening_hours: "Mo 14:00-00:00; Tu-Fr 11:00-13:00,14:00-00:00; Sa-Su 09:30-00:00"
diff --git a/data/cities/rumilly/supeco.yml b/data/cities/rumilly/supeco.yml
index 60700b62f..3a11f98ee 100644
--- a/data/cities/rumilly/supeco.yml
+++ b/data/cities/rumilly/supeco.yml
@@ -4,7 +4,7 @@ latitude: 45.85854
 longitude: 5.94393
 postcode: "74150"
 city: Rumilly
-street: "Rue de Robesson"
+street: ""
 housenumber: 9
 phone: ""
 opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-12:30"
diff --git a/data/cities/saint-chamond/boucherie-blanc.yml b/data/cities/saint-chamond/boucherie-blanc.yml
deleted file mode 100644
index 820126046..000000000
--- a/data/cities/saint-chamond/boucherie-blanc.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5875711859
-type: node
-latitude: 45.47774
-longitude: 4.51266
-postcode: "42400"
-city: Saint-Chamond
-street: "Rue de la Caure"
-housenumber: 12
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/saint-chamond/vectow.yml b/data/cities/saint-chamond/im-collection.yml
similarity index 63%
rename from data/cities/saint-chamond/vectow.yml
rename to data/cities/saint-chamond/im-collection.yml
index b7d28fe68..b67d75c89 100644
--- a/data/cities/saint-chamond/vectow.yml
+++ b/data/cities/saint-chamond/im-collection.yml
@@ -1,11 +1,11 @@
-id: 5716163693
+id: 5870546545
 type: node
-latitude: 45.47801
-longitude: 4.51275
+latitude: 45.47795
+longitude: 4.51349
 postcode: "42400"
 city: Saint-Chamond
 street: "Place Saint-Pierre"
-housenumber: 3
+housenumber: 9
 phone: ""
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/saint-chamond/villeneuve-funeraire.yml b/data/cities/saint-chamond/villeneuve-funeraire.yml
deleted file mode 100644
index 728c866f8..000000000
--- a/data/cities/saint-chamond/villeneuve-funeraire.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5867793987
-type: node
-latitude: 45.47846
-longitude: 4.51288
-postcode: "42400"
-city: Saint-Chamond
-street: "Place Saint-Pierre"
-housenumber: 13
-phone: ""
-opening_hours: "Mo-Fr 08:30-12:00,14:00-17:30"
-website: ""
\ No newline at end of file
diff --git a/data/cities/saint-julien-en-genevois/centre-du-pneu-doccasion.yml b/data/cities/saint-julien-en-genevois/centre-du-pneu-doccasion.yml
new file mode 100644
index 000000000..1deca5692
--- /dev/null
+++ b/data/cities/saint-julien-en-genevois/centre-du-pneu-doccasion.yml
@@ -0,0 +1,11 @@
+id: 11264421516
+type: node
+latitude: 46.14297
+longitude: 6.09368
+postcode: "74160"
+city: Saint-Julien-en-Genevois
+street: "Route d'Annemasse"
+housenumber: 
+phone: ""
+opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-16:00;Su off"
+website: "https://pneuoccasion-74.com"
\ No newline at end of file
diff --git a/data/cities/saint-julien-en-genevois/harmony-cuisines.yml b/data/cities/saint-julien-en-genevois/harmony-cuisines.yml
new file mode 100644
index 000000000..32c83c63f
--- /dev/null
+++ b/data/cities/saint-julien-en-genevois/harmony-cuisines.yml
@@ -0,0 +1,11 @@
+id: 11264414652
+type: node
+latitude: 46.1426
+longitude: 6.09298
+postcode: "74160"
+city: Saint-Julien-en-Genevois
+street: "Route d'Annemasse"
+housenumber: 9
+phone: "+33 04 50 35 12 72"
+opening_hours: "Mo-Fr 10:00-12:00,14:00-18:00; Sa-Su off"
+website: "https://harmonycuisines.com"
\ No newline at end of file
diff --git a/data/cities/saint-julien-en-genevois/resa-box-74.yml b/data/cities/saint-julien-en-genevois/resa-box-74.yml
new file mode 100644
index 000000000..750f57abf
--- /dev/null
+++ b/data/cities/saint-julien-en-genevois/resa-box-74.yml
@@ -0,0 +1,11 @@
+id: 11265027151
+type: node
+latitude: 46.14341
+longitude: 6.10112
+postcode: "74160"
+city: Saint-Julien-en-Genevois
+street: "Route d'Annemasse"
+housenumber: 27
+phone: "+33 04 50 80 71 79"
+opening_hours: "Mo 09:30-12:00,13:30-17:30;Tu off; Fr 09:30-12:00,13:30-18:00"
+website: "https://resabox74.com"
\ No newline at end of file
diff --git a/data/cities/saint-julien-en-genevois/s-o-s-piscines-haute-savoie-74.yml b/data/cities/saint-julien-en-genevois/s-o-s-piscines-haute-savoie-74.yml
new file mode 100644
index 000000000..264fe95ec
--- /dev/null
+++ b/data/cities/saint-julien-en-genevois/s-o-s-piscines-haute-savoie-74.yml
@@ -0,0 +1,11 @@
+id: 8963914836
+type: node
+latitude: 46.14239
+longitude: 6.09209
+postcode: "74160"
+city: Saint-Julien-en-Genevois
+street: "Route d'Annemasse"
+housenumber: 
+phone: "+33 4 50 49 43 44"
+opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00; Sa 09:00-16:00;Su off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-julien-en-genevois/samse.yml b/data/cities/saint-julien-en-genevois/samse.yml
new file mode 100644
index 000000000..8f9a76338
--- /dev/null
+++ b/data/cities/saint-julien-en-genevois/samse.yml
@@ -0,0 +1,11 @@
+id: 11264414651
+type: node
+latitude: 46.14284
+longitude: 6.09431
+postcode: "74160"
+city: Saint-Julien-en-Genevois
+street: "Route d'Annemasse"
+housenumber: 
+phone: "+33 4 50 49 23 33"
+opening_hours: "Mo-Fr 07:30-11:45,13:30-18:00; Sa 08:15-13:30; Su off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-martin-dheres/centrakor.yml b/data/cities/saint-martin-dheres/centrakor.yml
new file mode 100644
index 000000000..54d282f69
--- /dev/null
+++ b/data/cities/saint-martin-dheres/centrakor.yml
@@ -0,0 +1,11 @@
+id: 160165244
+type: way
+latitude: 45.18519
+longitude: 5.76556
+postcode: "38400"
+city: Saint-Martin-d'Hères
+street: "Avenue Gabriel Péri"
+housenumber: 125
+phone: ""
+opening_hours: "Mo-Sa 09:30-19:00; Su 14:00-19:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-martin-dheres/paul.yml b/data/cities/saint-martin-dheres/paul.yml
index 93a0b5318..d5f7675d1 100644
--- a/data/cities/saint-martin-dheres/paul.yml
+++ b/data/cities/saint-martin-dheres/paul.yml
@@ -6,6 +6,6 @@ postcode: "38400"
 city: Saint-Martin-d'Hères
 street: "Avenue Gabriel Péri"
 housenumber: 117
-phone: "+33476428403"
-opening_hours: "Mo-Sa 06:30-19:00, Su 06:30-13:00"
-website: ""
\ No newline at end of file
+phone: "+33 4 76 42 84 03"
+opening_hours: "Mo-Sa 06:30-19:00; Su 06:30-13:00"
+website: "https://www.paul.fr/stores/saint_martin_d_heres"
\ No newline at end of file
diff --git a/data/cities/saint-martin-le-vinoux/velos-papillon.yml b/data/cities/saint-martin-le-vinoux/velos-papillon.yml
index 4bdfb3d45..01e2e13e6 100644
--- a/data/cities/saint-martin-le-vinoux/velos-papillon.yml
+++ b/data/cities/saint-martin-le-vinoux/velos-papillon.yml
@@ -6,6 +6,6 @@ postcode: "38950"
 city: Saint-Martin-le-Vinoux
 street: "Avenue du Général Leclerc"
 housenumber: 105
-phone: "+33 6 13 07 21 24"
+phone: ""
 opening_hours: "Tu-Sa 10:00-12:00,14:00-18:00"
-website: "https://velos-papillon.fr/"
\ No newline at end of file
+website: ""
\ No newline at end of file
diff --git a/data/cities/saint-thomas-en-royans/jacopain.yml b/data/cities/saint-thomas-en-royans/jacopain.yml
new file mode 100644
index 000000000..cc1fcdb6f
--- /dev/null
+++ b/data/cities/saint-thomas-en-royans/jacopain.yml
@@ -0,0 +1,11 @@
+id: 2405870487
+type: node
+latitude: 45.04835
+longitude: 5.29499
+postcode: "26190"
+city: Saint-Thomas-en-Royans
+street: "Route du Vercors"
+housenumber: 140
+phone: ""
+opening_hours: ""
+website: "https://www.jacopain.fr/"
\ No newline at end of file
diff --git a/data/cities/sassenage/lesprit-des-velos.yml b/data/cities/sassenage/lesprit-des-velos.yml
index e1ae6a871..82a03e450 100644
--- a/data/cities/sassenage/lesprit-des-velos.yml
+++ b/data/cities/sassenage/lesprit-des-velos.yml
@@ -7,5 +7,5 @@ city: Sassenage
 street: "Rue de la République"
 housenumber: 42
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Tu,Th-Fr 09:00-12:00,14:00-19:00; We,Sa 09:00-12:00,14:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/seyssinet-pariset/carrefour-city.yml b/data/cities/seyssinet-pariset/carrefour-city.yml
index 1f8ee21f8..e714ce836 100644
--- a/data/cities/seyssinet-pariset/carrefour-city.yml
+++ b/data/cities/seyssinet-pariset/carrefour-city.yml
@@ -7,5 +7,5 @@ city: Seyssinet-Pariset
 street: "Boulevard de l'Europe"
 housenumber: 29
 phone: ""
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-19:00"
+opening_hours: "Mo-Sa 07:00-21:00; Su 09:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/tignieu-jameyzieu/pause-beaute.yml b/data/cities/tignieu-jameyzieu/pause-beaute.yml
new file mode 100644
index 000000000..5e45f71ae
--- /dev/null
+++ b/data/cities/tignieu-jameyzieu/pause-beaute.yml
@@ -0,0 +1,11 @@
+id: 11257527793
+type: node
+latitude: 45.71553
+longitude: 5.16159
+postcode: "38230"
+city: Tignieu-Jameyzieu
+street: "Route de Lyon"
+housenumber: 57
+phone: "+33 09 70 21 15 11"
+opening_hours: ""
+website: "https://www.planity.com/pause-beaute-38230-tignieu-jameyzieu"
\ No newline at end of file
diff --git a/data/cities/tulette/domaine-la-bignande-des-clos.yml b/data/cities/tulette/domaine-la-bignande-des-clos.yml
deleted file mode 100644
index dbebc37a0..000000000
--- a/data/cities/tulette/domaine-la-bignande-des-clos.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 10187858481
-type: node
-latitude: 44.27236
-longitude: 4.91447
-postcode: ""
-city: Tulette
-street: "Chemin de la Bignande"
-housenumber: 1195
-phone: "0475983247"
-opening_hours: "Mo-Fr 10:00-12:00; Mo-Fr 14:30-17:30; Sa 10:00 12:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/villard-bonnot/cycleohm.yml b/data/cities/villard-bonnot/allbikes-38.yml
similarity index 66%
rename from data/cities/villard-bonnot/cycleohm.yml
rename to data/cities/villard-bonnot/allbikes-38.yml
index 6396db884..4da4277dd 100644
--- a/data/cities/villard-bonnot/cycleohm.yml
+++ b/data/cities/villard-bonnot/allbikes-38.yml
@@ -1,11 +1,11 @@
 id: 8837915337
 type: node
-latitude: 45.257
-longitude: 5.90697
+latitude: 45.25692
+longitude: 5.90688
 postcode: "38190"
 city: Villard-Bonnot
 street: "Boulevard de la Libération"
 housenumber: 23 b
 phone: ""
-opening_hours: "Tu-Fr 10:00-19:00"
+opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/villard-de-lans/la-boule-dantan.yml b/data/cities/villard-de-lans/la-boule-dantan.yml
index 700bf7047..1f557bc7e 100644
--- a/data/cities/villard-de-lans/la-boule-dantan.yml
+++ b/data/cities/villard-de-lans/la-boule-dantan.yml
@@ -7,5 +7,5 @@ city: Villard-de-Lans
 street: "Rue Vaucanson"
 housenumber: 50
 phone: "+33 4 76 94 02 58"
-opening_hours: "Mo-Su 07:30-12:30, 15:30-19:00"
+opening_hours: "Mo-Su 07:30-12:30,15:30-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/villard-de-lans/ma-tonka.yml b/data/cities/villard-de-lans/ma-tonka.yml
index c9f72b947..2f145eacf 100644
--- a/data/cities/villard-de-lans/ma-tonka.yml
+++ b/data/cities/villard-de-lans/ma-tonka.yml
@@ -7,5 +7,5 @@ city: Villard-de-Lans
 street: "Place de la Libération"
 housenumber: 75
 phone: "04 76 50 83 86"
-opening_hours: ""
+opening_hours: "Tu-Sa 08:00-18:30; Su 08:00-12:30"
 website: "http://www.matonka.fr/"
\ No newline at end of file
diff --git a/data/cities/villard-de-lans/poissonnerie-du-vercors.yml b/data/cities/villard-de-lans/poissonnerie-du-vercors.yml
index e59e86b48..f6dc1e783 100644
--- a/data/cities/villard-de-lans/poissonnerie-du-vercors.yml
+++ b/data/cities/villard-de-lans/poissonnerie-du-vercors.yml
@@ -7,5 +7,5 @@ city: Villard-de-Lans
 street: "Rue de la République"
 housenumber: 88
 phone: "04 76 43 31 38"
-opening_hours: ""
+opening_hours: "PH,Tu-Su 08:30-12:30, Fr,Sa 16:00-19:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/villars/decathlon-saint-etienne-villars.yml b/data/cities/villars/decathlon-saint-etienne-villars.yml
deleted file mode 100644
index ac14ca222..000000000
--- a/data/cities/villars/decathlon-saint-etienne-villars.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 866937675
-type: way
-latitude: 45.46862
-longitude: 4.34331
-postcode: "42390"
-city: Villars
-street: "Zone d activite Commerciale de Montravel"
-housenumber: 
-phone: "+33 4 77 93 00 21"
-opening_hours: "Mo-Sa 09:00-20:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/villeurbanne/boulangerie-alexandre.yml b/data/cities/villeurbanne/boulangerie-alexandre.yml
deleted file mode 100644
index 531f71213..000000000
--- a/data/cities/villeurbanne/boulangerie-alexandre.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9529556871
-type: node
-latitude: 45.77108
-longitude: 4.86433
-postcode: "69100"
-city: Villeurbanne
-street: "Rue Gabriel Péri"
-housenumber: 20
-phone: "04 72 84 98 43"
-opening_hours: "Mo-Fr 06:30-19:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/villeurbanne/concessionnaire-f-bouvet-piaggio-vespa.yml b/data/cities/villeurbanne/concessionnaire-f-bouvet-piaggio-vespa.yml
deleted file mode 100644
index b63c06d39..000000000
--- a/data/cities/villeurbanne/concessionnaire-f-bouvet-piaggio-vespa.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1904331005
-type: node
-latitude: 45.77241
-longitude: 4.86827
-postcode: "69100"
-city: Villeurbanne
-street: "Rue Francis de Pressensé"
-housenumber: 21
-phone: ""
-opening_hours: "Tu-Fr 09:00-12:30,14:00-18:30, Sa 09:00-12:30,14:00-17:30"
-website: ""
\ No newline at end of file
diff --git a/data/cities/voiron/veligood.yml b/data/cities/voiron/veligood.yml
index 9b0957d7d..dc1ea94b2 100644
--- a/data/cities/voiron/veligood.yml
+++ b/data/cities/voiron/veligood.yml
@@ -7,5 +7,5 @@ city: Voiron
 street: "Rue Hector Blanchet"
 housenumber: 33
 phone: ""
-opening_hours: "13:30-17:00"
+opening_hours: "Tu-Fr 08:30-18:00; Sa 09:00-12:00"
 website: ""
\ No newline at end of file