diff --git a/content/cities/annecy/_index.md b/content/cities/annecy/_index.md
index 4dfcd067b..ba40cee70 100644
--- a/content/cities/annecy/_index.md
+++ b/content/cities/annecy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Annecy
 url: /annecy/
-latitude: 45.919
-longitude: 6.129
+latitude: 45.917
+longitude: 6.134
 ---
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/boulangerie-marie-blachere.md b/content/cities/anthy-sur-leman/boulangerie-marie-blachere.md
deleted file mode 100644
index a00ea9da0..000000000
--- a/content/cities/anthy-sur-leman/boulangerie-marie-blachere.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Boulangerie Marie Blachère"
-url: /anthy-sur-leman/boulangerie-marie-blachere/
-shop: boulangerie
----
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/marie-blachere.md b/content/cities/anthy-sur-leman/marie-blachere.md
new file mode 100644
index 000000000..0097d9eba
--- /dev/null
+++ b/content/cities/anthy-sur-leman/marie-blachere.md
@@ -0,0 +1,5 @@
+---
+title: "Marie Blachère"
+url: /anthy-sur-leman/marie-blachere/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/norauto.md b/content/cities/anthy-sur-leman/norauto.md
index d4c9440b3..b32169998 100644
--- a/content/cities/anthy-sur-leman/norauto.md
+++ b/content/cities/anthy-sur-leman/norauto.md
@@ -1,5 +1,5 @@
 ---
 title: "Norauto"
 url: /anthy-sur-leman/norauto/
-shop: pièces de voitures
+shop: réparation de voitures
 ---
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/satoriz-thonon-anthy.md b/content/cities/anthy-sur-leman/satoriz-thonon-anthy.md
deleted file mode 100644
index 85c735479..000000000
--- a/content/cities/anthy-sur-leman/satoriz-thonon-anthy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Satoriz Thonon Anthy"
-url: /anthy-sur-leman/satoriz-thonon-anthy/
-shop: supermarché
----
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/satoriz.md b/content/cities/anthy-sur-leman/satoriz.md
new file mode 100644
index 000000000..9d99ca5da
--- /dev/null
+++ b/content/cities/anthy-sur-leman/satoriz.md
@@ -0,0 +1,5 @@
+---
+title: "Satoriz"
+url: /anthy-sur-leman/satoriz/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/v-and-b.md b/content/cities/anthy-sur-leman/v-and-b.md
new file mode 100644
index 000000000..2ec8b5dfd
--- /dev/null
+++ b/content/cities/anthy-sur-leman/v-and-b.md
@@ -0,0 +1,5 @@
+---
+title: "V and B"
+url: /anthy-sur-leman/v-and-b/
+shop: alcool
+---
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/vetb.md b/content/cities/anthy-sur-leman/vetb.md
deleted file mode 100644
index 841fc9489..000000000
--- a/content/cities/anthy-sur-leman/vetb.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "V&B"
-url: /anthy-sur-leman/vetb/
-shop: boissons
----
\ No newline at end of file
diff --git a/content/cities/anthy-sur-leman/yesss-electrique.md b/content/cities/anthy-sur-leman/yesss-electrique.md
index e3321e395..c66fa2640 100644
--- a/content/cities/anthy-sur-leman/yesss-electrique.md
+++ b/content/cities/anthy-sur-leman/yesss-electrique.md
@@ -1,5 +1,5 @@
 ---
-title: "Yesss électrique"
+title: "Yesss Électrique"
 url: /anthy-sur-leman/yesss-electrique/
 shop: électrique
 ---
\ No newline at end of file
diff --git a/content/cities/aoste/_index.md b/content/cities/aoste/_index.md
index c7a084281..2dfcfe0fb 100644
--- a/content/cities/aoste/_index.md
+++ b/content/cities/aoste/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Aoste
 url: /aoste/
-latitude: 45.597
-longitude: 5.629
+latitude: 45.587
+longitude: 5.607
 ---
\ No newline at end of file
diff --git a/content/cities/chatel/intersport-chemin-de-sous-le-cret.md b/content/cities/chatel/intersport-chemin-de-sous-le-cret.md
new file mode 100644
index 000000000..9c126af51
--- /dev/null
+++ b/content/cities/chatel/intersport-chemin-de-sous-le-cret.md
@@ -0,0 +1,5 @@
+---
+title: "Intersport"
+url: /chatel/intersport-chemin-de-sous-le-cret/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/chatel/intersport-route-du-petit-chatel.md b/content/cities/chatel/intersport-route-du-petit-chatel.md
deleted file mode 100644
index 2b977bce9..000000000
--- a/content/cities/chatel/intersport-route-du-petit-chatel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Intersport"
-url: /chatel/intersport-route-du-petit-chatel/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/courchevel/_index.md b/content/cities/courchevel/_index.md
index 9168bb242..57406e6e7 100644
--- a/content/cities/courchevel/_index.md
+++ b/content/cities/courchevel/_index.md
@@ -2,5 +2,5 @@
 title: Courchevel
 url: /courchevel/
 latitude: 45.416
-longitude: 6.631
+longitude: 6.651
 ---
\ No newline at end of file
diff --git a/content/cities/courchevel/intersport-rue-des-tovets.md b/content/cities/courchevel/intersport-rue-des-tovets.md
deleted file mode 100644
index edd8a96d9..000000000
--- a/content/cities/courchevel/intersport-rue-des-tovets.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Intersport"
-url: /courchevel/intersport-rue-des-tovets/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/courchevel/sport-2000-place-du-marquis.md b/content/cities/courchevel/sport-2000-place-du-marquis.md
deleted file mode 100644
index 549891ef0..000000000
--- a/content/cities/courchevel/sport-2000-place-du-marquis.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Sport 2000"
-url: /courchevel/sport-2000-place-du-marquis/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/grenoble/soupcon-de-magie.md b/content/cities/grenoble/soupcon-de-magie.md
new file mode 100644
index 000000000..3612431bc
--- /dev/null
+++ b/content/cities/grenoble/soupcon-de-magie.md
@@ -0,0 +1,5 @@
+---
+title: "Soupçon de Magie"
+url: /grenoble/soupcon-de-magie/
+shop: bijoux
+---
\ No newline at end of file
diff --git a/content/cities/la-clusaz/_index.md b/content/cities/la-clusaz/_index.md
index d4e34e56e..46a572cf3 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.907
-longitude: 6.429
+latitude: 45.905
+longitude: 6.425
 ---
\ No newline at end of file
diff --git a/content/cities/la-roche-sur-foron/alextrem-cycles.md b/content/cities/la-roche-sur-foron/alextrem-cycles.md
deleted file mode 100644
index e30ca1f59..000000000
--- a/content/cities/la-roche-sur-foron/alextrem-cycles.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Alex'trem Cycles"
-url: /la-roche-sur-foron/alextrem-cycles/
-shop: vélo
----
\ 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/larbresle/_index.md b/content/cities/larbresle/_index.md
index 67042cf66..5935836fd 100644
--- a/content/cities/larbresle/_index.md
+++ b/content/cities/larbresle/_index.md
@@ -1,6 +1,6 @@
 ---
 title: L'Arbresle
 url: /larbresle/
-latitude: 45.835
-longitude: 4.618
+latitude: 45.826
+longitude: 4.607
 ---
\ 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
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/montriond/carrosserie-des-plagnettes.md b/content/cities/montriond/carrosserie-des-plagnettes.md
new file mode 100644
index 000000000..c8b44652c
--- /dev/null
+++ b/content/cities/montriond/carrosserie-des-plagnettes.md
@@ -0,0 +1,5 @@
+---
+title: "Carrosserie des Plagnettes"
+url: /montriond/carrosserie-des-plagnettes/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/prades/_index.md b/content/cities/prades/_index.md
index 313cdff38..7f8bbfd73 100644
--- a/content/cities/prades/_index.md
+++ b/content/cities/prades/_index.md
@@ -2,5 +2,5 @@
 title: Prades
 url: /prades/
 latitude: 44.644
-longitude: 4.327
+longitude: 4.326
 ---
\ No newline at end of file
diff --git a/content/cities/sain-bel/_index.md b/content/cities/sain-bel/_index.md
index 812552b77..381f56801 100644
--- a/content/cities/sain-bel/_index.md
+++ b/content/cities/sain-bel/_index.md
@@ -2,5 +2,5 @@
 title: Sain-Bel
 url: /sain-bel/
 latitude: 45.811
-longitude: 4.599
+longitude: 4.6
 ---
\ No newline at end of file
diff --git a/content/cities/saint-bon-tarentaise/_index.md b/content/cities/saint-bon-tarentaise/_index.md
deleted file mode 100644
index 7b1885103..000000000
--- a/content/cities/saint-bon-tarentaise/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: SAINT BON TARENTAISE
-url: /saint-bon-tarentaise/
-latitude: 45.418
-longitude: 6.653
----
\ No newline at end of file
diff --git a/content/cities/saint-bon-tarentaise/sport-2000.md b/content/cities/saint-bon-tarentaise/sport-2000.md
deleted file mode 100644
index fbdfa7c67..000000000
--- a/content/cities/saint-bon-tarentaise/sport-2000.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Sport 2000"
-url: /saint-bon-tarentaise/sport-2000/
-shop: sports
----
\ No newline at end of file
diff --git a/content/cities/saint-gervais-les-bains/_index.md b/content/cities/saint-gervais-les-bains/_index.md
index 87bcc6a03..b9e887f3e 100644
--- a/content/cities/saint-gervais-les-bains/_index.md
+++ b/content/cities/saint-gervais-les-bains/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Gervais-les-Bains
 url: /saint-gervais-les-bains/
-latitude: 45.854
-longitude: 6.724
+latitude: 45.892
+longitude: 6.712
 ---
\ No newline at end of file
diff --git a/content/cities/saint-jeoire/_index.md b/content/cities/saint-jeoire/_index.md
index 35430a93f..e64459e04 100644
--- a/content/cities/saint-jeoire/_index.md
+++ b/content/cities/saint-jeoire/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Saint-Jeoire
 url: /saint-jeoire/
-latitude: 46.138
-longitude: 6.458
+latitude: 46.12
+longitude: 6.489
 ---
\ No newline at end of file
diff --git a/content/cities/saint-jeoire/vival.md b/content/cities/saint-jeoire/vival.md
deleted file mode 100644
index 48ae953f4..000000000
--- a/content/cities/saint-jeoire/vival.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Vival"
-url: /saint-jeoire/vival/
-shop: commodité
----
\ No newline at end of file
diff --git a/content/cities/saint-martin-dheres/generale-doptique.md b/content/cities/saint-martin-dheres/generale-doptique.md
new file mode 100644
index 000000000..5bf410b68
--- /dev/null
+++ b/content/cities/saint-martin-dheres/generale-doptique.md
@@ -0,0 +1,5 @@
+---
+title: "Générale d'Optique"
+url: /saint-martin-dheres/generale-doptique/
+shop: opticien
+---
\ No newline at end of file
diff --git a/content/cities/saint-martin-dheres/hello-laundry.md b/content/cities/saint-martin-dheres/hello-laundry.md
new file mode 100644
index 000000000..b48fa6abf
--- /dev/null
+++ b/content/cities/saint-martin-dheres/hello-laundry.md
@@ -0,0 +1,5 @@
+---
+title: "Hello Laundry"
+url: /saint-martin-dheres/hello-laundry/
+shop: blanchisserie
+---
\ No newline at end of file
diff --git a/content/cities/saint-martin-dheres/self-laverie.md b/content/cities/saint-martin-dheres/self-laverie.md
deleted file mode 100644
index 1997cdeba..000000000
--- a/content/cities/saint-martin-dheres/self-laverie.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Self Laverie"
-url: /saint-martin-dheres/self-laverie/
-shop: blanchisserie
----
\ No newline at end of file
diff --git a/content/cities/saint-pierre-de-chandieu/_index.md b/content/cities/saint-pierre-de-chandieu/_index.md
index 4ed0b659f..cdf1baafe 100644
--- a/content/cities/saint-pierre-de-chandieu/_index.md
+++ b/content/cities/saint-pierre-de-chandieu/_index.md
@@ -2,5 +2,5 @@
 title: Saint-Pierre-de-Chandieu
 url: /saint-pierre-de-chandieu/
 latitude: 45.645
-longitude: 5.011
+longitude: 5.012
 ---
\ No newline at end of file
diff --git a/content/cities/saint-symphorien-sur-coise/_index.md b/content/cities/saint-symphorien-sur-coise/_index.md
index 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/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/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/val-disere/intersport-2.md b/content/cities/val-disere/intersport-2.md
new file mode 100644
index 000000000..b49349a94
--- /dev/null
+++ b/content/cities/val-disere/intersport-2.md
@@ -0,0 +1,5 @@
+---
+title: "Intersport"
+url: /val-disere/intersport-2/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/val-disere/intersport-avenue-olympique-3.md b/content/cities/val-disere/intersport-avenue-olympique-3.md
deleted file mode 100644
index 4ec25cb8e..000000000
--- a/content/cities/val-disere/intersport-avenue-olympique-3.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Intersport"
-url: /val-disere/intersport-avenue-olympique-3/
-shop: sports
----
\ No newline at end of file
diff --git a/data/cities/38190/la-boulange-cafe.yml b/data/cities/38190/la-boulange-cafe.yml
index 618951900..5b0bc63c6 100644
--- a/data/cities/38190/la-boulange-cafe.yml
+++ b/data/cities/38190/la-boulange-cafe.yml
@@ -3,9 +3,9 @@ type: node
 latitude: 45.27202
 longitude: 5.86884
 postcode: ""
-city: 38190
+city: "38190"
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/abondance/sherpa.yml b/data/cities/abondance/sherpa.yml
index 30a71a58a..e104ccacf 100644
--- a/data/cities/abondance/sherpa.yml
+++ b/data/cities/abondance/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 46.27974
 longitude: 6.72029
 postcode: "74360"
 city: Abondance
-street: "Place du Champ de Foire"
-housenumber: 
+street: Place du Champ de Foire
+housenumber: ""
 phone: ""
-opening_hours: "Nov 01-May 11 Tu-Sa 07:30-12:15; May 02-Nov 01 Mo-Su 07:30-12:15, 15:00-19:15"
-website: ""
\ No newline at end of file
+opening_hours: Nov 01-May 11 Tu-Sa 07:30-12:15; May 02-Nov 01 Mo-Su 07:30-12:15, 15:00-19:15
+website: ""
diff --git a/data/cities/abondance/vival.yml b/data/cities/abondance/vival.yml
index cf30208da..06eee7d04 100644
--- a/data/cities/abondance/vival.yml
+++ b/data/cities/abondance/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.28072
 longitude: 6.71907
 postcode: "74360"
 city: Abondance
-street: "Grande Rue"
-housenumber: 
+street: Grande Rue
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:30-20:00; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-20:00; Su 07:30-12:30
+website: ""
diff --git a/data/cities/aigubelle/bk-auto.yml b/data/cities/aigubelle/bk-auto.yml
index 25a3a01ac..eb7ddfe51 100644
--- a/data/cities/aigubelle/bk-auto.yml
+++ b/data/cities/aigubelle/bk-auto.yml
@@ -5,7 +5,7 @@ longitude: 6.30902
 postcode: "73220"
 city: Aigubelle
 street: ""
-housenumber: 5
-phone: "+334 79 36 20 56"
+housenumber: "5"
+phone: +334 79 36 20 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aiguebelle/de-meches-avec-vous.yml b/data/cities/aiguebelle/de-meches-avec-vous.yml
index 095deb72f..2eceedb30 100644
--- a/data/cities/aiguebelle/de-meches-avec-vous.yml
+++ b/data/cities/aiguebelle/de-meches-avec-vous.yml
@@ -5,7 +5,7 @@ longitude: 6.30496
 postcode: "73220"
 city: Aiguebelle
 street: ""
-housenumber: 42
+housenumber: "42"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aiguebelle/la-lunetterie-de-marion.yml b/data/cities/aiguebelle/la-lunetterie-de-marion.yml
index 46d2503d9..8eab0127e 100644
--- a/data/cities/aiguebelle/la-lunetterie-de-marion.yml
+++ b/data/cities/aiguebelle/la-lunetterie-de-marion.yml
@@ -5,7 +5,7 @@ longitude: 6.30567
 postcode: "73220"
 city: Aiguebelle
 street: ""
-housenumber: 26
+housenumber: "26"
 phone: "+33479852464"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aiguebelle/le-carre-53.yml b/data/cities/aiguebelle/le-carre-53.yml
index 1e1a4d037..5526f604b 100644
--- a/data/cities/aiguebelle/le-carre-53.yml
+++ b/data/cities/aiguebelle/le-carre-53.yml
@@ -5,7 +5,7 @@ longitude: 6.30459
 postcode: "73220"
 city: Aiguebelle
 street: ""
-housenumber: 53
+housenumber: "53"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aiguebelle/le-coffee-press.yml b/data/cities/aiguebelle/le-coffee-press.yml
index f35f68327..190f6282a 100644
--- a/data/cities/aiguebelle/le-coffee-press.yml
+++ b/data/cities/aiguebelle/le-coffee-press.yml
@@ -5,7 +5,7 @@ longitude: 6.30354
 postcode: "73220"
 city: Aiguebelle
 street: ""
-housenumber: 68
-phone: "+334 79 36 20 39"
-opening_hours: "Mo-We, Fr 07:30-18:30; Th, Su 08:00-12:00; Sa 07:30-12:30"
-website: ""
\ No newline at end of file
+housenumber: "68"
+phone: +334 79 36 20 39
+opening_hours: Mo-We, Fr 07:30-18:30; Th, Su 08:00-12:00; Sa 07:30-12:30
+website: ""
diff --git a/data/cities/aiguebelle/rosette-fleurs.yml b/data/cities/aiguebelle/rosette-fleurs.yml
index a896a16f9..fd769ea3e 100644
--- a/data/cities/aiguebelle/rosette-fleurs.yml
+++ b/data/cities/aiguebelle/rosette-fleurs.yml
@@ -5,7 +5,7 @@ longitude: 6.30511
 postcode: "73220"
 city: Aiguebelle
 street: ""
-housenumber: 39
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aigueblanche/sport-2000-mottet-sports.yml b/data/cities/aigueblanche/sport-2000-mottet-sports.yml
index b25a64ca1..82326fcca 100644
--- a/data/cities/aigueblanche/sport-2000-mottet-sports.yml
+++ b/data/cities/aigueblanche/sport-2000-mottet-sports.yml
@@ -1,11 +1,11 @@
 id: 190120405
-type: way
+type: node
 latitude: 45.50275
 longitude: 6.50182
 postcode: "73260"
 city: Aigueblanche
-street: "Rue de la Petite Prairie"
-housenumber: 333
+street: Rue de la Petite Prairie
+housenumber: "333"
 phone: ""
-opening_hours: "Tu-Sa 9:00-12:00,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 9:00-12:00,15:00-19:00
+website: ""
diff --git a/data/cities/aigueblanche/super-u.yml b/data/cities/aigueblanche/super-u.yml
index fb0cdaa04..2681017bf 100644
--- a/data/cities/aigueblanche/super-u.yml
+++ b/data/cities/aigueblanche/super-u.yml
@@ -1,11 +1,11 @@
 id: 190119947
-type: way
+type: node
 latitude: 45.50249
 longitude: 6.50291
 postcode: ""
 city: Aigueblanche
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.magasins-u.com/magasin/superu-aigueblanche.m66073"
\ No newline at end of file
+website: https://www.magasins-u.com/magasin/superu-aigueblanche.m66073
diff --git a/data/cities/aillon-le-jeune/aillon-sport.yml b/data/cities/aillon-le-jeune/aillon-sport.yml
index 71117521b..4fae47956 100644
--- a/data/cities/aillon-le-jeune/aillon-sport.yml
+++ b/data/cities/aillon-le-jeune/aillon-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.60878
 longitude: 6.10606
 postcode: "73340"
 city: Aillon-le-Jeune
-street: "Immeuble LE Saint-ANNE"
-housenumber: 
-phone: "+33 6 86 72 12 68"
+street: Immeuble LE Saint-ANNE
+housenumber: ""
+phone: +33 6 86 72 12 68
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aillon-le-jeune/intersport.yml b/data/cities/aillon-le-jeune/intersport.yml
index 01f5d463a..31b3f0622 100644
--- a/data/cities/aillon-le-jeune/intersport.yml
+++ b/data/cities/aillon-le-jeune/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.1035
 postcode: "73340"
 city: Aillon-le-Jeune
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aillon-le-vieux/cedric-legon.yml b/data/cities/aillon-le-vieux/cedric-legon.yml
index a1dcd9d77..aba19261b 100644
--- a/data/cities/aillon-le-vieux/cedric-legon.yml
+++ b/data/cities/aillon-le-vieux/cedric-legon.yml
@@ -1,11 +1,11 @@
 id: 761493134
-type: way
+type: node
 latitude: 45.65494
 longitude: 6.0943
 postcode: "73340"
 city: Aillon-le-Vieux
-street: "en Savouet"
-housenumber: 
+street: en Savouet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aillon-le-vieux/nathalie-en-montagne.yml b/data/cities/aillon-le-vieux/nathalie-en-montagne.yml
index 482b06be1..0d29f2880 100644
--- a/data/cities/aillon-le-vieux/nathalie-en-montagne.yml
+++ b/data/cities/aillon-le-vieux/nathalie-en-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.65461
 longitude: 6.09434
 postcode: "73340"
 city: Aillon-le-Vieux
-street: "en Savouet"
-housenumber: 
+street: en Savouet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aime-2000/intersport.yml b/data/cities/aime-2000/intersport.yml
index 2243b5278..50f179018 100644
--- a/data/cities/aime-2000/intersport.yml
+++ b/data/cities/aime-2000/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.66497
 postcode: "73210"
 city: Aime 2000
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aime-la-plagne/ambiance-m.yml b/data/cities/aime-la-plagne/ambiance-m.yml
index 9ecdcaeeb..0e2b5fac8 100644
--- a/data/cities/aime-la-plagne/ambiance-m.yml
+++ b/data/cities/aime-la-plagne/ambiance-m.yml
@@ -4,8 +4,8 @@ latitude: 45.55277
 longitude: 6.64482
 postcode: "73210"
 city: Aime-la-Plagne
-street: "Route des Îles"
-housenumber: 
-phone: "+33 4 79 09 80 17"
-opening_hours: "Mo-Sa 09:30-12:00, 14:00-19:00"
-website: "https://www.ambiance-m.fr/"
\ No newline at end of file
+street: Route des Îles
+housenumber: ""
+phone: +33 4 79 09 80 17
+opening_hours: Mo-Sa 09:30-12:00, 14:00-19:00
+website: https://www.ambiance-m.fr/
diff --git a/data/cities/aime-la-plagne/decathlon-aime-la-plagne.yml b/data/cities/aime-la-plagne/decathlon-aime-la-plagne.yml
index a0de60498..1a2117531 100644
--- a/data/cities/aime-la-plagne/decathlon-aime-la-plagne.yml
+++ b/data/cities/aime-la-plagne/decathlon-aime-la-plagne.yml
@@ -4,8 +4,8 @@ latitude: 45.55271
 longitude: 6.64421
 postcode: "73210"
 city: Aime-la-Plagne
-street: "Route Nationale 90 ZA des Îles"
-housenumber: 
-phone: "+33 4 79 22 28 59"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-aime-0070180001800"
\ No newline at end of file
+street: Route Nationale 90 ZA des Îles
+housenumber: ""
+phone: +33 4 79 22 28 59
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.decathlon.fr/store-view/magasin-de-sports-aime-0070180001800
diff --git a/data/cities/aime-la-plagne/e-leclerc.yml b/data/cities/aime-la-plagne/e-leclerc.yml
index 47952d377..68343ff06 100644
--- a/data/cities/aime-la-plagne/e-leclerc.yml
+++ b/data/cities/aime-la-plagne/e-leclerc.yml
@@ -4,8 +4,8 @@ latitude: 45.55292
 longitude: 6.64738
 postcode: "73210"
 city: Aime-la-Plagne
-street: "Route des Îles"
-housenumber: 
-phone: "+33 4 79 01 30 30"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: "https://www.e-leclerc.com/aime-distribution"
\ No newline at end of file
+street: Route des Îles
+housenumber: ""
+phone: +33 4 79 01 30 30
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: https://www.e-leclerc.com/aime-distribution
diff --git a/data/cities/aime-la-plagne/garage-mc-motors.yml b/data/cities/aime-la-plagne/garage-mc-motors.yml
index fbfc3d02b..b9802b031 100644
--- a/data/cities/aime-la-plagne/garage-mc-motors.yml
+++ b/data/cities/aime-la-plagne/garage-mc-motors.yml
@@ -5,7 +5,7 @@ longitude: 6.64556
 postcode: "73210"
 city: Aime-la-Plagne
 street: ""
-housenumber: 790
-phone: "+33 4 79 2265 45"
+housenumber: "790"
+phone: +33 4 79 2265 45
 opening_hours: ""
-website: "http://www.garage-courtois-automobiles-savoie.com/"
\ No newline at end of file
+website: http://www.garage-courtois-automobiles-savoie.com/
diff --git a/data/cities/aime-la-plagne/recyclerie.yml b/data/cities/aime-la-plagne/recyclerie.yml
index ce109c8f7..ab593ca9b 100644
--- a/data/cities/aime-la-plagne/recyclerie.yml
+++ b/data/cities/aime-la-plagne/recyclerie.yml
@@ -5,7 +5,7 @@ longitude: 6.64591
 postcode: "73210"
 city: Aime-la-Plagne
 street: ""
-housenumber: 620
-phone: "+33 6 51 83 86 75"
-opening_hours: "Tu-Fr 12:00-18:30; Sa 09:00-18:30"
-website: "https://www.antropia-coop.fr/recyclerie/"
\ No newline at end of file
+housenumber: "620"
+phone: +33 6 51 83 86 75
+opening_hours: Tu-Fr 12:00-18:30; Sa 09:00-18:30
+website: https://www.antropia-coop.fr/recyclerie/
diff --git a/data/cities/aime-la-plagne/skiset-aime-2000.yml b/data/cities/aime-la-plagne/skiset-aime-2000.yml
index 18d0e1b7f..d5e6a948e 100644
--- a/data/cities/aime-la-plagne/skiset-aime-2000.yml
+++ b/data/cities/aime-la-plagne/skiset-aime-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.51048
 longitude: 6.66591
 postcode: "73210"
 city: Aime-la-Plagne
-street: "Galerie commerciale aime 2000"
-housenumber: 
+street: Galerie commerciale aime 2000
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aime-la-plagne/weldom.yml b/data/cities/aime-la-plagne/weldom.yml
index 775ded569..e00b4e1d4 100644
--- a/data/cities/aime-la-plagne/weldom.yml
+++ b/data/cities/aime-la-plagne/weldom.yml
@@ -4,8 +4,8 @@ latitude: 45.55266
 longitude: 6.64323
 postcode: "73210"
 city: Aime-la-Plagne
-street: "Route des Îles"
-housenumber: 
-phone: "+33 4 79 55 67 11"
+street: Route des Îles
+housenumber: ""
+phone: +33 4 79 55 67 11
 opening_hours: ""
-website: "https://www.weldom.fr/weldom/"
\ No newline at end of file
+website: https://www.weldom.fr/weldom/
diff --git a/data/cities/aime/dodie-dods.yml b/data/cities/aime/dodie-dods.yml
index 1cf19f2fe..3ddd2dcb6 100644
--- a/data/cities/aime/dodie-dods.yml
+++ b/data/cities/aime/dodie-dods.yml
@@ -4,8 +4,8 @@ latitude: 45.55695
 longitude: 6.65134
 postcode: "73210"
 city: Aime
-street: "Grande Rue"
-housenumber: 156
-phone: "+33 4 79 22 62 54"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.dodiedods.fr"
\ No newline at end of file
+street: Grande Rue
+housenumber: "156"
+phone: +33 4 79 22 62 54
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: https://www.dodiedods.fr
diff --git a/data/cities/aime/la-boucherie-gourmande.yml b/data/cities/aime/la-boucherie-gourmande.yml
index 982f93ec7..ed79c0b58 100644
--- a/data/cities/aime/la-boucherie-gourmande.yml
+++ b/data/cities/aime/la-boucherie-gourmande.yml
@@ -4,8 +4,8 @@ latitude: 45.55702
 longitude: 6.65194
 postcode: "73210"
 city: Aime
-street: "Grande Rue"
-housenumber: 198
-phone: "+33 4 79 55 67 35"
-opening_hours: "Tu-Sa 07:30-12:30,15:30-19:00"
-website: "https://www.laboucheriegourmande.fr"
\ No newline at end of file
+street: Grande Rue
+housenumber: "198"
+phone: +33 4 79 55 67 35
+opening_hours: Tu-Sa 07:30-12:30,15:30-19:00
+website: https://www.laboucheriegourmande.fr
diff --git a/data/cities/aime/mfleurs.yml b/data/cities/aime/mfleurs.yml
index e420eed7e..e68553f18 100644
--- a/data/cities/aime/mfleurs.yml
+++ b/data/cities/aime/mfleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.5569
 longitude: 6.65109
 postcode: "73210"
 city: Aime
-street: "Grande Rue"
-housenumber: 130
-phone: "+33 4 79 09 82 74"
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00; Su 09:00-12:30"
-website: "https://www.mfleurs.com/"
\ No newline at end of file
+street: Grande Rue
+housenumber: "130"
+phone: +33 4 79 09 82 74
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00; Su 09:00-12:30
+website: https://www.mfleurs.com/
diff --git a/data/cities/aime/montagne-experience.yml b/data/cities/aime/montagne-experience.yml
index c11219d24..b39c685f3 100644
--- a/data/cities/aime/montagne-experience.yml
+++ b/data/cities/aime/montagne-experience.yml
@@ -4,8 +4,8 @@ latitude: 45.55707
 longitude: 6.65142
 postcode: "73210"
 city: Aime
-street: "Grande Rue"
-housenumber: 157
-phone: "+33 9 53 41 63 95"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.montagne-experience.fr"
\ No newline at end of file
+street: Grande Rue
+housenumber: "157"
+phone: +33 9 53 41 63 95
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: https://www.montagne-experience.fr
diff --git a/data/cities/aix-les-bains/bien-etre-et-conscience.yml b/data/cities/aix-les-bains/bien-etre-et-conscience.yml
index b694d51ea..733544c4f 100644
--- a/data/cities/aix-les-bains/bien-etre-et-conscience.yml
+++ b/data/cities/aix-les-bains/bien-etre-et-conscience.yml
@@ -4,8 +4,8 @@ latitude: 45.69413
 longitude: 5.90278
 postcode: "73100"
 city: Aix-les-Bains
-street: "Rue Alice Eynard"
-housenumber: 6
+street: Rue Alice Eynard
+housenumber: "6"
 phone: ""
-opening_hours: "Sur RDV"
-website: "https://www.bien-etre-et-conscience.fr"
\ No newline at end of file
+opening_hours: '"Sur RDV"'
+website: https://www.bien-etre-et-conscience.fr
diff --git a/data/cities/aix-les-bains/centre-commercial-intermarche-hyper.yml b/data/cities/aix-les-bains/centre-commercial-intermarche-hyper.yml
index 47d184ae7..7075caca2 100644
--- a/data/cities/aix-les-bains/centre-commercial-intermarche-hyper.yml
+++ b/data/cities/aix-les-bains/centre-commercial-intermarche-hyper.yml
@@ -1,11 +1,11 @@
 id: 81651437
-type: way
+type: node
 latitude: 45.67489
 longitude: 5.90527
 postcode: "73100"
 city: Aix-les-Bains
-street: "Rue Clément Ader"
-housenumber: 33
+street: Rue Clément Ader
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aix-les-bains/didier-pijolet-coiffure.yml b/data/cities/aix-les-bains/didier-pijolet-coiffure.yml
index d73ba2ef8..932b3bf82 100644
--- a/data/cities/aix-les-bains/didier-pijolet-coiffure.yml
+++ b/data/cities/aix-les-bains/didier-pijolet-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.6892
 longitude: 5.91494
 postcode: "73100"
 city: Aix-les-Bains
-street: "Square du Temple de Diane"
-housenumber: 10
+street: Square du Temple de Diane
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aix-les-bains/e-leclerc-drive.yml b/data/cities/aix-les-bains/e-leclerc-drive.yml
index f47bfc62e..e713d61a4 100644
--- a/data/cities/aix-les-bains/e-leclerc-drive.yml
+++ b/data/cities/aix-les-bains/e-leclerc-drive.yml
@@ -4,8 +4,8 @@ latitude: 45.69337
 longitude: 5.91195
 postcode: "73100"
 city: Aix-les-Bains
-street: "Square Alfred Boucher"
-housenumber: 4
+street: Square Alfred Boucher
+housenumber: "4"
 phone: "+33479545903"
-opening_hours: "Mo-Sa 08:30-20:00"
-website: "https://www.leclercdrive.fr/region-auvergne-rhone-alpes/aix-les-bains/drive-relais-aix-les-bains.aspx"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00
+website: https://www.leclercdrive.fr/region-auvergne-rhone-alpes/aix-les-bains/drive-relais-aix-les-bains.aspx
diff --git a/data/cities/aix-les-bains/kokum-spa-et-beaute.yml b/data/cities/aix-les-bains/kokum-spa-et-beaute.yml
index 5c2b95ec9..48cb6a8c5 100644
--- a/data/cities/aix-les-bains/kokum-spa-et-beaute.yml
+++ b/data/cities/aix-les-bains/kokum-spa-et-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.68795
 longitude: 5.91111
 postcode: "73100"
 city: Aix-les-Bains
-street: "Avenue Charles de Gaulle"
-housenumber: 27
-phone: "+33 4 79 61 47 74"
-opening_hours: "09:00-20:00"
-website: "http://www.kokum.fr"
\ No newline at end of file
+street: Avenue Charles de Gaulle
+housenumber: "27"
+phone: +33 4 79 61 47 74
+opening_hours: 09:00-20:00
+website: http://www.kokum.fr
diff --git a/data/cities/aix-les-bains/maison-delplanque.yml b/data/cities/aix-les-bains/maison-delplanque.yml
index cc3e62c48..88954db06 100644
--- a/data/cities/aix-les-bains/maison-delplanque.yml
+++ b/data/cities/aix-les-bains/maison-delplanque.yml
@@ -4,8 +4,8 @@ latitude: 45.69198
 longitude: 5.89624
 postcode: "73100"
 city: Aix-les-Bains
-street: "Boulevard Jean Charcot"
-housenumber: 15
-phone: "+33 4 79 54 73 60"
+street: Boulevard Jean Charcot
+housenumber: "15"
+phone: +33 4 79 54 73 60
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aix-les-bains/maison-georges-larnicol.yml b/data/cities/aix-les-bains/maison-georges-larnicol.yml
index 0383053b2..a2639048b 100644
--- a/data/cities/aix-les-bains/maison-georges-larnicol.yml
+++ b/data/cities/aix-les-bains/maison-georges-larnicol.yml
@@ -4,8 +4,8 @@ latitude: 45.69189
 longitude: 5.91221
 postcode: "73100"
 city: Aix-les-Bains
-street: "Rue de Genève"
-housenumber: 289
+street: Rue de Genève
+housenumber: "289"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aix-les-bains/midas.yml b/data/cities/aix-les-bains/midas.yml
index c0f6bb971..31f29cca4 100644
--- a/data/cities/aix-les-bains/midas.yml
+++ b/data/cities/aix-les-bains/midas.yml
@@ -4,8 +4,8 @@ latitude: 45.68443
 longitude: 5.91046
 postcode: "73100"
 city: Aix-les-Bains
-street: "Boulevard de Russie"
-housenumber: 7
-phone: "+33 4 79 34 00 00"
+street: Boulevard de Russie
+housenumber: "7"
+phone: +33 4 79 34 00 00
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/aix-les-bains/pharmacie-de-marlioz.yml b/data/cities/aix-les-bains/pharmacie-de-marlioz.yml
index 514c975f3..7418d160b 100644
--- a/data/cities/aix-les-bains/pharmacie-de-marlioz.yml
+++ b/data/cities/aix-les-bains/pharmacie-de-marlioz.yml
@@ -4,8 +4,8 @@ latitude: 45.67591
 longitude: 5.90547
 postcode: "73100"
 city: Aix-les-Bains
-street: "Rue Clément Ader"
-housenumber: 33
+street: Rue Clément Ader
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: "https://pharmaciedemarlioz.pharminfo.fr/"
\ No newline at end of file
+website: https://pharmaciedemarlioz.pharminfo.fr/
diff --git a/data/cities/aix-les-bains/sofaly-olyreve.yml b/data/cities/aix-les-bains/sofaly-olyreve.yml
index ebfc8eb73..d95556357 100644
--- a/data/cities/aix-les-bains/sofaly-olyreve.yml
+++ b/data/cities/aix-les-bains/sofaly-olyreve.yml
@@ -4,8 +4,8 @@ latitude: 45.69554
 longitude: 5.90676
 postcode: "73100"
 city: Aix-les-Bains
-street: "Boulevard Maréchal de Lattre de Tassigny"
-housenumber: 12
+street: Boulevard Maréchal de Lattre de Tassigny
+housenumber: "12"
 phone: "+33479611520"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00"
-website: "https://www.olyreve.fr/nos-magasins-olyreve-literie/aix-les-bains"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00
+website: https://www.olyreve.fr/nos-magasins-olyreve-literie/aix-les-bains
diff --git a/data/cities/aix-les-bains/spar.yml b/data/cities/aix-les-bains/spar.yml
index addef2b1d..dee5cc7b5 100644
--- a/data/cities/aix-les-bains/spar.yml
+++ b/data/cities/aix-les-bains/spar.yml
@@ -1,11 +1,11 @@
 id: 81757876
-type: way
+type: node
 latitude: 45.7034
 longitude: 5.89961
 postcode: "73100"
 city: Aix-les-Bains
-street: "Avenue du Grand Port"
-housenumber: 146
-phone: "+33 4 79 34 63 57"
-opening_hours: "Mo-Sa 07:00-19:30, Su 08:00-19:30"
-website: "https://magasins.spar.fr/fr/s/spar-aix-les-bains"
\ No newline at end of file
+street: Avenue du Grand Port
+housenumber: "146"
+phone: +33 4 79 34 63 57
+opening_hours: Mo-Sa 07:00-19:30, Su 08:00-19:30
+website: https://magasins.spar.fr/fr/s/spar-aix-les-bains
diff --git a/data/cities/aix-les-bains/sport-aix-trem.yml b/data/cities/aix-les-bains/sport-aix-trem.yml
index f1e52b252..b3113fa09 100644
--- a/data/cities/aix-les-bains/sport-aix-trem.yml
+++ b/data/cities/aix-les-bains/sport-aix-trem.yml
@@ -4,8 +4,8 @@ latitude: 45.70644
 longitude: 5.91142
 postcode: "73100"
 city: Aix-les-Bains
-street: "Avenue Franklin Roosevelt"
-housenumber: 60
+street: Avenue Franklin Roosevelt
+housenumber: "60"
 phone: ""
 opening_hours: ""
-website: "https://www.sportaixtrem.com/"
\ No newline at end of file
+website: https://www.sportaixtrem.com/
diff --git a/data/cities/aix-les-bains/yves-rocher.yml b/data/cities/aix-les-bains/yves-rocher.yml
index d90c4f22d..80a898221 100644
--- a/data/cities/aix-les-bains/yves-rocher.yml
+++ b/data/cities/aix-les-bains/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.68988
 longitude: 5.91322
 postcode: "73100"
 city: Aix-les-Bains
-street: "Rue du Casino"
-housenumber: 84
+street: Rue du Casino
+housenumber: "84"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:00, 14:00-19:00"
-website: "http://yves-rocher.fr/aix-les-bains"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00, 14:00-19:00
+website: http://yves-rocher.fr/aix-les-bains
diff --git a/data/cities/albertville/albertville-medical.yml b/data/cities/albertville/albertville-medical.yml
index 817f04eeb..4e47a2229 100644
--- a/data/cities/albertville/albertville-medical.yml
+++ b/data/cities/albertville/albertville-medical.yml
@@ -4,8 +4,8 @@ latitude: 45.67442
 longitude: 6.38701
 postcode: "73200"
 city: Albertville
-street: "Avenue Victor Hugo"
-housenumber: 6
-phone: "04 79 37 00 18"
+street: Avenue Victor Hugo
+housenumber: "6"
+phone: 04 79 37 00 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/alpinessences.yml b/data/cities/albertville/alpinessences.yml
index 72296d2d6..500ffc1ce 100644
--- a/data/cities/albertville/alpinessences.yml
+++ b/data/cities/albertville/alpinessences.yml
@@ -1,11 +1,11 @@
 id: 152254507
-type: way
+type: node
 latitude: 45.6595
 longitude: 6.36865
 postcode: "73209"
 city: Albertville
-street: "Chemin de la Charrette"
-housenumber: 627
-phone: "+33 4 79 37 02 14"
+street: Chemin de la Charrette
+housenumber: "627"
+phone: +33 4 79 37 02 14
 opening_hours: ""
-website: "https://www.alpinessences.com"
\ No newline at end of file
+website: https://www.alpinessences.com
diff --git a/data/cities/albertville/au-vieux-campeur.yml b/data/cities/albertville/au-vieux-campeur.yml
index 8f65bf2c3..11dd71a5b 100644
--- a/data/cities/albertville/au-vieux-campeur.yml
+++ b/data/cities/albertville/au-vieux-campeur.yml
@@ -1,11 +1,11 @@
 id: 152123491
-type: way
+type: node
 latitude: 45.6579
 longitude: 6.36925
 postcode: "73200"
 city: Albertville
-street: "Rue Ambroise Croizat"
-housenumber: 10
+street: Rue Ambroise Croizat
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: "https://www.auvieuxcampeur.fr/"
\ No newline at end of file
+website: https://www.auvieuxcampeur.fr/
diff --git a/data/cities/albertville/bijouterie-vibert.yml b/data/cities/albertville/bijouterie-vibert.yml
index 6fa621d58..f3fe8bd7a 100644
--- a/data/cities/albertville/bijouterie-vibert.yml
+++ b/data/cities/albertville/bijouterie-vibert.yml
@@ -4,8 +4,8 @@ latitude: 45.67758
 longitude: 6.39151
 postcode: "73200"
 city: Albertville
-street: "Rue de la République"
-housenumber: 38
+street: Rue de la République
+housenumber: "38"
 phone: ""
-opening_hours: "Mo 14:00-18:45; Tu-Sa 09:15-12:00, 14:00-19:00"
-website: "https://guildedesorfevres.fr/bijouterie/albertville-1197M"
\ No newline at end of file
+opening_hours: Mo 14:00-18:45; Tu-Sa 09:15-12:00, 14:00-19:00
+website: https://guildedesorfevres.fr/bijouterie/albertville-1197M
diff --git a/data/cities/albertville/biocoop.yml b/data/cities/albertville/biocoop.yml
index c07e35d56..14ec6a9ea 100644
--- a/data/cities/albertville/biocoop.yml
+++ b/data/cities/albertville/biocoop.yml
@@ -1,11 +1,11 @@
 id: 152122804
-type: way
+type: node
 latitude: 45.66073
 longitude: 6.37322
 postcode: "73200"
 city: Albertville
-street: "Rue Louis Armand"
-housenumber: 616
+street: Rue Louis Armand
+housenumber: "616"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.biocoop-albertville.com"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.biocoop-albertville.com
diff --git a/data/cities/albertville/blackstore.yml b/data/cities/albertville/blackstore.yml
index e96866668..09e64d729 100644
--- a/data/cities/albertville/blackstore.yml
+++ b/data/cities/albertville/blackstore.yml
@@ -1,11 +1,11 @@
 id: 152254843
-type: way
+type: node
 latitude: 45.65648
 longitude: 6.37017
 postcode: "73200"
 city: Albertville
-street: "Chemin De La Cassine"
-housenumber: 
+street: Chemin De La Cassine
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/albertville/boucherie-fraix.yml b/data/cities/albertville/boucherie-fraix.yml
index 72bd98df1..20e1fde64 100644
--- a/data/cities/albertville/boucherie-fraix.yml
+++ b/data/cities/albertville/boucherie-fraix.yml
@@ -4,8 +4,8 @@ latitude: 45.67383
 longitude: 6.37894
 postcode: "73200"
 city: Albertville
-street: "Rue Joseph Suarez"
-housenumber: 145
+street: Rue Joseph Suarez
+housenumber: "145"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/boulangerie-laurent.yml b/data/cities/albertville/boulangerie-laurent.yml
index 986f61e9d..53c2da4d3 100644
--- a/data/cities/albertville/boulangerie-laurent.yml
+++ b/data/cities/albertville/boulangerie-laurent.yml
@@ -4,8 +4,8 @@ latitude: 45.67367
 longitude: 6.37875
 postcode: "73200"
 city: Albertville
-street: "Rue Joseph Suarez"
-housenumber: 151
+street: Rue Joseph Suarez
+housenumber: "151"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/boutique-victoria.yml b/data/cities/albertville/boutique-victoria.yml
index 1b120aba2..4c269813d 100644
--- a/data/cities/albertville/boutique-victoria.yml
+++ b/data/cities/albertville/boutique-victoria.yml
@@ -4,8 +4,8 @@ latitude: 45.67658
 longitude: 6.39029
 postcode: "73200"
 city: Albertville
-street: "Rue de la République"
-housenumber: 78
+street: Rue de la République
+housenumber: "78"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/carrefour-city.yml b/data/cities/albertville/carrefour-city.yml
index b71869bea..38f71144c 100644
--- a/data/cities/albertville/carrefour-city.yml
+++ b/data/cities/albertville/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.67662
 longitude: 6.3906
 postcode: "73200"
 city: Albertville
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/chocolathe.yml b/data/cities/albertville/chocolathe.yml
index 64282b0ca..e29f2999c 100644
--- a/data/cities/albertville/chocolathe.yml
+++ b/data/cities/albertville/chocolathe.yml
@@ -4,8 +4,8 @@ latitude: 45.67799
 longitude: 6.39213
 postcode: "73200"
 city: Albertville
-street: "rue de"
-housenumber: 20
-phone: "04 79 32 31 51"
+street: rue de
+housenumber: "20"
+phone: 04 79 32 31 51
 opening_hours: ""
-website: "https://www.chocola-the.fr/"
\ No newline at end of file
+website: https://www.chocola-the.fr/
diff --git a/data/cities/albertville/cooperative-laitiere-de-beaufort.yml b/data/cities/albertville/cooperative-laitiere-de-beaufort.yml
index cfd1ca652..b25a7a9c0 100644
--- a/data/cities/albertville/cooperative-laitiere-de-beaufort.yml
+++ b/data/cities/albertville/cooperative-laitiere-de-beaufort.yml
@@ -4,8 +4,8 @@ latitude: 45.6771
 longitude: 6.39331
 postcode: "73200"
 city: Albertville
-street: "Quai des Allobroges"
-housenumber: 
+street: Quai des Allobroges
+housenumber: ""
 phone: "+33967065381"
-opening_hours: "Mo-Sa 09:00-12:30,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:30,14:30-19:00
+website: ""
diff --git a/data/cities/albertville/decathlon.yml b/data/cities/albertville/decathlon.yml
index ba45a69ce..8b2291ed1 100644
--- a/data/cities/albertville/decathlon.yml
+++ b/data/cities/albertville/decathlon.yml
@@ -4,8 +4,8 @@ latitude: 45.65603
 longitude: 6.36915
 postcode: "73200"
 city: Albertville
-street: "Chemin de la Cassine"
-housenumber: 1227
-phone: "+33 4 79 37 47 32"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.decathlon.fr/"
\ No newline at end of file
+street: Chemin de la Cassine
+housenumber: "1227"
+phone: +33 4 79 37 47 32
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.decathlon.fr/
diff --git a/data/cities/albertville/des-des-en-bois.yml b/data/cities/albertville/des-des-en-bois.yml
index ecbac0b24..865f110b6 100644
--- a/data/cities/albertville/des-des-en-bois.yml
+++ b/data/cities/albertville/des-des-en-bois.yml
@@ -4,8 +4,8 @@ latitude: 45.67734
 longitude: 6.39191
 postcode: "73200"
 city: Albertville
-street: "Rue Gambetta"
-housenumber: 29
+street: Rue Gambetta
+housenumber: "29"
 phone: "+33457354742"
 opening_hours: ""
-website: "https://www.desdes.fr/fr"
\ No newline at end of file
+website: https://www.desdes.fr/fr
diff --git a/data/cities/albertville/eau-vive-albertville.yml b/data/cities/albertville/eau-vive-albertville.yml
index c06c1f68c..540725dba 100644
--- a/data/cities/albertville/eau-vive-albertville.yml
+++ b/data/cities/albertville/eau-vive-albertville.yml
@@ -4,8 +4,8 @@ latitude: 45.66034
 longitude: 6.36738
 postcode: ""
 city: Albertville
-street: "Chemin de la Charrette"
-housenumber: 412
+street: Chemin de la Charrette
+housenumber: "412"
 phone: "+33428701850"
 opening_hours: ""
-website: "https://www.eau-vive.com/magasin-bio/content/93-magasin-bio-albertville"
\ No newline at end of file
+website: https://www.eau-vive.com/magasin-bio/content/93-magasin-bio-albertville
diff --git a/data/cities/albertville/eureka-droguerie-chaboud.yml b/data/cities/albertville/eureka-droguerie-chaboud.yml
index f746fa105..df169ba15 100644
--- a/data/cities/albertville/eureka-droguerie-chaboud.yml
+++ b/data/cities/albertville/eureka-droguerie-chaboud.yml
@@ -4,8 +4,8 @@ latitude: 45.67343
 longitude: 6.38534
 postcode: "73200"
 city: Albertville
-street: "Avenue Victor Hugo"
-housenumber: 21
+street: Avenue Victor Hugo
+housenumber: "21"
 phone: "+33479320216"
-opening_hours: "Tu-Sa 08:30-12:00,14:00-19:00"
-website: "https://albertville.eurekamamaison.fr"
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-12:00,14:00-19:00
+website: https://albertville.eurekamamaison.fr
diff --git a/data/cities/albertville/gonthier-horticulture.yml b/data/cities/albertville/gonthier-horticulture.yml
index 4dc68e27e..aa95a5b00 100644
--- a/data/cities/albertville/gonthier-horticulture.yml
+++ b/data/cities/albertville/gonthier-horticulture.yml
@@ -4,8 +4,8 @@ latitude: 45.66496
 longitude: 6.39627
 postcode: "73200"
 city: Albertville
-street: "Chemin des Maraîchers"
-housenumber: 70
+street: Chemin des Maraîchers
+housenumber: "70"
 phone: "+33479104200"
-opening_hours: "Mo-Sa 08:00-18:00"
-website: "https://www.gonthier-horticulture.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-18:00
+website: https://www.gonthier-horticulture.fr/
diff --git a/data/cities/albertville/intermarche-hyper.yml b/data/cities/albertville/intermarche-hyper.yml
index 2a9d139c0..fcb98b6e7 100644
--- a/data/cities/albertville/intermarche-hyper.yml
+++ b/data/cities/albertville/intermarche-hyper.yml
@@ -4,8 +4,8 @@ latitude: 45.65645
 longitude: 6.36721
 postcode: "73200"
 city: Albertville
-street: "Chemin de la Cassine"
-housenumber: 
+street: Chemin de la Cassine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/julien-dorcel.yml b/data/cities/albertville/julien-dorcel.yml
index f82d46bac..4f4b4843b 100644
--- a/data/cities/albertville/julien-dorcel.yml
+++ b/data/cities/albertville/julien-dorcel.yml
@@ -4,8 +4,8 @@ latitude: 45.65608
 longitude: 6.36603
 postcode: "73200"
 city: Albertville
-street: "Chemin de la Cassine"
-housenumber: 1300
+street: Chemin de la Cassine
+housenumber: "1300"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/albertville/la-cordonnerie-alpine.yml b/data/cities/albertville/la-cordonnerie-alpine.yml
index b88ffa62a..c2147e654 100644
--- a/data/cities/albertville/la-cordonnerie-alpine.yml
+++ b/data/cities/albertville/la-cordonnerie-alpine.yml
@@ -4,8 +4,8 @@ latitude: 45.6734
 longitude: 6.38526
 postcode: "73200"
 city: Albertville
-street: "Avenue Victor Hugo"
-housenumber: 21
+street: Avenue Victor Hugo
+housenumber: "21"
 phone: "+33762384203"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:00"
-website: "https://www.lacordonneriealpine.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:00
+website: https://www.lacordonneriealpine.fr/
diff --git a/data/cities/albertville/la-galerie-albertville.yml b/data/cities/albertville/la-galerie-albertville.yml
index 180e95360..807f7c86d 100644
--- a/data/cities/albertville/la-galerie-albertville.yml
+++ b/data/cities/albertville/la-galerie-albertville.yml
@@ -1,11 +1,11 @@
 id: 226291218
-type: way
+type: node
 latitude: 45.65614
 longitude: 6.36543
 postcode: "73200"
 city: Albertville
-street: "Chemin de la Cassine"
-housenumber: 1300
+street: Chemin de la Cassine
+housenumber: "1300"
 phone: ""
 opening_hours: ""
-website: "https://www.la-galerie.com/albertville"
\ No newline at end of file
+website: https://www.la-galerie.com/albertville
diff --git a/data/cities/albertville/la-grignotte-albertville.yml b/data/cities/albertville/la-grignotte-albertville.yml
index efeeedcfd..dc5af1833 100644
--- a/data/cities/albertville/la-grignotte-albertville.yml
+++ b/data/cities/albertville/la-grignotte-albertville.yml
@@ -1,11 +1,11 @@
 id: 633877324
-type: way
+type: node
 latitude: 45.66585
 longitude: 6.38994
 postcode: "73200"
 city: Albertville
-street: "Avenue des Chasseurs Alpins"
-housenumber: 21
+street: Avenue des Chasseurs Alpins
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/latelier-du-boucher-boucher-charcutier-traiteur.yml b/data/cities/albertville/latelier-du-boucher-boucher-charcutier-traiteur.yml
index 0205874cf..188cf0c2b 100644
--- a/data/cities/albertville/latelier-du-boucher-boucher-charcutier-traiteur.yml
+++ b/data/cities/albertville/latelier-du-boucher-boucher-charcutier-traiteur.yml
@@ -1,11 +1,11 @@
 id: 152323146
-type: way
+type: node
 latitude: 45.66424
 longitude: 6.36441
 postcode: "73200"
 city: Albertville
-street: "Avenue Général de Gaulle"
-housenumber: 146
-phone: "+33 4 79320830"
+street: Avenue Général de Gaulle
+housenumber: "146"
+phone: +33 4 79320830
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/librairie-des-bauges.yml b/data/cities/albertville/librairie-des-bauges.yml
index dbd02e25c..0a033fab0 100644
--- a/data/cities/albertville/librairie-des-bauges.yml
+++ b/data/cities/albertville/librairie-des-bauges.yml
@@ -4,8 +4,8 @@ latitude: 45.67519
 longitude: 6.38857
 postcode: "73200"
 city: Albertville
-street: "Rue de la République"
-housenumber: 104
+street: Rue de la République
+housenumber: "104"
 phone: "+33479320091"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: "https://www.librairiedesbauges.fr"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: https://www.librairiedesbauges.fr
diff --git a/data/cities/albertville/mamens-barber-shop.yml b/data/cities/albertville/mamens-barber-shop.yml
index 482eded69..78b358ad6 100644
--- a/data/cities/albertville/mamens-barber-shop.yml
+++ b/data/cities/albertville/mamens-barber-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.67664
 longitude: 6.39316
 postcode: "73200"
 city: Albertville
-street: "Rue Gambetta"
-housenumber: 2
+street: Rue Gambetta
+housenumber: "2"
 phone: "+33660532355"
 opening_hours: ""
-website: "https://www.mamensbarbershop.fr/"
\ No newline at end of file
+website: https://www.mamensbarbershop.fr/
diff --git a/data/cities/albertville/matryochka.yml b/data/cities/albertville/matryochka.yml
index 4398b6d20..b0d2dba8e 100644
--- a/data/cities/albertville/matryochka.yml
+++ b/data/cities/albertville/matryochka.yml
@@ -4,8 +4,8 @@ latitude: 45.67596
 longitude: 6.39231
 postcode: "73200"
 city: Albertville
-street: "Place de l'Europe"
-housenumber: 39
+street: Place de l'Europe
+housenumber: "39"
 phone: "+33983474800"
-opening_hours: "Mo-Su 09:00-01:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-01:00
+website: ""
diff --git a/data/cities/albertville/meubles-revillet.yml b/data/cities/albertville/meubles-revillet.yml
index d8fbdce45..0f8057f7b 100644
--- a/data/cities/albertville/meubles-revillet.yml
+++ b/data/cities/albertville/meubles-revillet.yml
@@ -1,11 +1,11 @@
 id: 152122741
-type: way
+type: node
 latitude: 45.67208
 longitude: 6.37766
 postcode: "73200"
 city: Albertville
-street: "Rue de Longeray"
-housenumber: 11
+street: Rue de Longeray
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/noz.yml b/data/cities/albertville/noz.yml
index 3107d24b9..4c8107e2a 100644
--- a/data/cities/albertville/noz.yml
+++ b/data/cities/albertville/noz.yml
@@ -4,8 +4,8 @@ latitude: 45.67453
 longitude: 6.38728
 postcode: "73200"
 city: Albertville
-street: "Avenue Victor Hugo"
-housenumber: 4
+street: Avenue Victor Hugo
+housenumber: "4"
 phone: "+33479898340"
-opening_hours: "mo-sa 09:30-19:00"
-website: "https://nozarrivages.com/magasin/albertville/"
\ No newline at end of file
+opening_hours: mo-sa 09:30-19:00
+website: https://nozarrivages.com/magasin/albertville/
diff --git a/data/cities/albertville/paysarts.yml b/data/cities/albertville/paysarts.yml
index 67d4864e5..d7e9d4ed1 100644
--- a/data/cities/albertville/paysarts.yml
+++ b/data/cities/albertville/paysarts.yml
@@ -4,8 +4,8 @@ latitude: 45.67563
 longitude: 6.39136
 postcode: "73200"
 city: Albertville
-street: "Rue Pargoud"
-housenumber: 4
+street: Rue Pargoud
+housenumber: "4"
 phone: "+33953542419"
-opening_hours: "Tu-Sa 09:00-19:00"
-website: "http://www.paysarts.fr"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00
+website: http://www.paysarts.fr
diff --git a/data/cities/albertville/samse-albertville.yml b/data/cities/albertville/samse-albertville.yml
index b91c2b461..8b6d7c7cc 100644
--- a/data/cities/albertville/samse-albertville.yml
+++ b/data/cities/albertville/samse-albertville.yml
@@ -4,8 +4,8 @@ latitude: 45.66198
 longitude: 6.37527
 postcode: "73200"
 city: Albertville
-street: "Avenue des XVIe Jeux Olympiques d'Hiver"
-housenumber: 153
-phone: "+33 4 79 37 10 88"
+street: Avenue des XVIe Jeux Olympiques d'Hiver
+housenumber: "153"
+phone: +33 4 79 37 10 88
 opening_hours: ""
-website: "https://www.samse.fr/agence/samse/albertville/56"
\ No newline at end of file
+website: https://www.samse.fr/agence/samse/albertville/56
diff --git a/data/cities/albertville/terre-de-running.yml b/data/cities/albertville/terre-de-running.yml
index 3934fef56..7cf9eacd9 100644
--- a/data/cities/albertville/terre-de-running.yml
+++ b/data/cities/albertville/terre-de-running.yml
@@ -4,8 +4,8 @@ latitude: 45.65975
 longitude: 6.37194
 postcode: "73200"
 city: Albertville
-street: "Rue Louis Armand"
-housenumber: 518
+street: Rue Louis Armand
+housenumber: "518"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/version-originale.yml b/data/cities/albertville/version-originale.yml
index be9bf9d26..cd3f399a6 100644
--- a/data/cities/albertville/version-originale.yml
+++ b/data/cities/albertville/version-originale.yml
@@ -4,8 +4,8 @@ latitude: 45.67729
 longitude: 6.39224
 postcode: "73200"
 city: Albertville
-street: "Rue Gambetta"
-housenumber: 18
+street: Rue Gambetta
+housenumber: "18"
 phone: "+33479320238"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albertville/yves-rocher.yml b/data/cities/albertville/yves-rocher.yml
index 9eea81223..1f68a0a00 100644
--- a/data/cities/albertville/yves-rocher.yml
+++ b/data/cities/albertville/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.67727
 longitude: 6.39111
 postcode: "73200"
 city: Albertville
-street: "Rue de la République"
-housenumber: 50
+street: Rue de la République
+housenumber: "50"
 phone: ""
-opening_hours: "Tu-Sa 09:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/albertville/albertville/S-FRYROC590"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/albertville/albertville/S-FRYROC590
diff --git a/data/cities/albiez-montrond/intersport.yml b/data/cities/albiez-montrond/intersport.yml
index 74304a85e..0a3c1fada 100644
--- a/data/cities/albiez-montrond/intersport.yml
+++ b/data/cities/albiez-montrond/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.33716
 postcode: "73300"
 city: Albiez-Montrond
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/albigny-sur-saone/vival.yml b/data/cities/albigny-sur-saone/vival.yml
index a380b1a06..19a28f9a0 100644
--- a/data/cities/albigny-sur-saone/vival.yml
+++ b/data/cities/albigny-sur-saone/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.86544
 longitude: 4.83196
 postcode: "69250"
 city: Albigny-sur-Saône
-street: "Rue Jean Chirat"
-housenumber: 4
-phone: "06 51 58 33 36"
-opening_hours: "Mo-Sa 08:00-19:30; Su 08:00-13:00"
-website: "https://magasins.vival.fr/fr/vival-albigny-sur-saone"
\ No newline at end of file
+street: Rue Jean Chirat
+housenumber: "4"
+phone: 06 51 58 33 36
+opening_hours: Mo-Sa 08:00-19:30; Su 08:00-13:00
+website: https://magasins.vival.fr/fr/vival-albigny-sur-saone
diff --git a/data/cities/alby-sur-cheran/vival.yml b/data/cities/alby-sur-cheran/vival.yml
index cd173bf17..c4a764ffd 100644
--- a/data/cities/alby-sur-cheran/vival.yml
+++ b/data/cities/alby-sur-cheran/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.81876
 longitude: 6.02405
 postcode: "74540"
 city: Alby-sur-Chéran
-street: "Place du Pont Neuf"
-housenumber: 2
+street: Place du Pont Neuf
+housenumber: "2"
 phone: "0450681051"
-opening_hours: "Mo-Sa 07:30-13:00, 15:00-19:30; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-13:00, 15:00-19:30; Su 08:00-12:30
+website: ""
diff --git a/data/cities/alex/garage-dalex.yml b/data/cities/alex/garage-dalex.yml
index 4bd593fcf..5e71cfc74 100644
--- a/data/cities/alex/garage-dalex.yml
+++ b/data/cities/alex/garage-dalex.yml
@@ -1,11 +1,11 @@
 id: 74073580
-type: way
+type: node
 latitude: 45.89084
 longitude: 6.23916
 postcode: "74290"
 city: alex
-street: "Rue du Tilleul"
-housenumber: 207
+street: Rue du Tilleul
+housenumber: "207"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/alex/recyclerie-de-la-tournette.yml b/data/cities/alex/recyclerie-de-la-tournette.yml
index 842712c98..97440fee3 100644
--- a/data/cities/alex/recyclerie-de-la-tournette.yml
+++ b/data/cities/alex/recyclerie-de-la-tournette.yml
@@ -4,8 +4,8 @@ latitude: 45.89251
 longitude: 6.24712
 postcode: "74290"
 city: Alex
-street: "ZA de la Verrerie"
-housenumber: 
+street: ZA de la Verrerie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/allemond/spar.yml b/data/cities/allemond/spar.yml
index 784f74e7b..89d6287a3 100644
--- a/data/cities/allemond/spar.yml
+++ b/data/cities/allemond/spar.yml
@@ -5,7 +5,7 @@ longitude: 6.03192
 postcode: "38114"
 city: Allemond
 street: ""
-housenumber: 225
+housenumber: "225"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/allevard/ecox.yml b/data/cities/allevard/ecox.yml
index c1554119b..0876e5eaf 100644
--- a/data/cities/allevard/ecox.yml
+++ b/data/cities/allevard/ecox.yml
@@ -4,8 +4,8 @@ latitude: 45.39338
 longitude: 6.0757
 postcode: "38580"
 city: Allevard
-street: "Rue du Grand Pont"
-housenumber: 8
+street: Rue du Grand Pont
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Sa 9:30-12:00,14:00-18:30; We 13:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 9:30-12:00,14:00-18:30; We 13:30-18:30
+website: ""
diff --git a/data/cities/allevard/gresy.yml b/data/cities/allevard/gresy.yml
index cfcb19dd5..da7fbb396 100644
--- a/data/cities/allevard/gresy.yml
+++ b/data/cities/allevard/gresy.yml
@@ -4,8 +4,8 @@ latitude: 45.40288
 longitude: 6.08159
 postcode: "38580"
 city: Allevard
-street: "Route de la Mirande"
-housenumber: 3
-phone: "+33 6 76 00 18 88"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: "https://www.gresy.fr/"
\ No newline at end of file
+street: Route de la Mirande
+housenumber: "3"
+phone: +33 6 76 00 18 88
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: https://www.gresy.fr/
diff --git a/data/cities/allinges/a-l-kreations.yml b/data/cities/allinges/a-l-kreations.yml
index 943f09970..72cfc9cdb 100644
--- a/data/cities/allinges/a-l-kreations.yml
+++ b/data/cities/allinges/a-l-kreations.yml
@@ -4,8 +4,8 @@ latitude: 46.34263
 longitude: 6.4777
 postcode: "74200"
 city: Allinges
-street: "Avenue de Thonon"
-housenumber: 930
+street: Avenue de Thonon
+housenumber: "930"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/allinges/atelier-des-pains.yml b/data/cities/allinges/atelier-des-pains.yml
index 3bb7cb044..7a2010c3f 100644
--- a/data/cities/allinges/atelier-des-pains.yml
+++ b/data/cities/allinges/atelier-des-pains.yml
@@ -4,8 +4,8 @@ latitude: 46.32793
 longitude: 6.44568
 postcode: "74200"
 city: Allinges
-street: "Rue du Cercle Betemps"
-housenumber: 20
+street: Rue du Cercle Betemps
+housenumber: "20"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 06:00-19:30; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 06:00-19:30; Su 07:00-13:00
+website: ""
diff --git a/data/cities/allinges/boucherie-grassy.yml b/data/cities/allinges/boucherie-grassy.yml
index 77f5883af..dbe56e5d3 100644
--- a/data/cities/allinges/boucherie-grassy.yml
+++ b/data/cities/allinges/boucherie-grassy.yml
@@ -4,8 +4,8 @@ latitude: 46.3278
 longitude: 6.44558
 postcode: "74200"
 city: Allinges
-street: "Rue du Cercle Betemps"
-housenumber: 20
+street: Rue du Cercle Betemps
+housenumber: "20"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 08:00-12:30, 15:00-19:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 08:00-12:30, 15:00-19:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/allinges/carrosserie-des-bougeries.yml b/data/cities/allinges/carrosserie-des-bougeries.yml
index e0e2a542c..b321c6aa8 100644
--- a/data/cities/allinges/carrosserie-des-bougeries.yml
+++ b/data/cities/allinges/carrosserie-des-bougeries.yml
@@ -1,11 +1,11 @@
 id: 1196803978
-type: way
+type: node
 latitude: 46.34248
 longitude: 6.47757
 postcode: "74200"
 city: Allinges
-street: "Rue du Stade"
+street: Rue du Stade
 housenumber: 13 C
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa,Su off
+website: ""
diff --git a/data/cities/allinges/carrosserie-deville.yml b/data/cities/allinges/carrosserie-deville.yml
index a5660a2e3..2e11b914a 100644
--- a/data/cities/allinges/carrosserie-deville.yml
+++ b/data/cities/allinges/carrosserie-deville.yml
@@ -1,11 +1,11 @@
 id: 69098460
-type: way
+type: node
 latitude: 46.34114
 longitude: 6.48129
 postcode: "74200"
 city: Allinges
-street: "Avenue de Lonnaz"
-housenumber: 511
-phone: "+33 4 50 70 56 09"
+street: Avenue de Lonnaz
+housenumber: "511"
+phone: +33 4 50 70 56 09
 opening_hours: ""
-website: "https://www.carrosserie-deville.fr"
\ No newline at end of file
+website: https://www.carrosserie-deville.fr
diff --git a/data/cities/allinges/equi-agri.yml b/data/cities/allinges/equi-agri.yml
index 3a627451f..6deca7d36 100644
--- a/data/cities/allinges/equi-agri.yml
+++ b/data/cities/allinges/equi-agri.yml
@@ -4,8 +4,8 @@ latitude: 46.3348
 longitude: 6.4893
 postcode: "74200"
 city: Allinges
-street: "Route des Blaves"
-housenumber: 670
-phone: "+33 4 50 16 72 08"
-opening_hours: "Mo-Su 09:00-12:30,14:00-19:00"
-website: "https://equi-agri.fr"
\ No newline at end of file
+street: Route des Blaves
+housenumber: "670"
+phone: +33 4 50 16 72 08
+opening_hours: Mo-Su 09:00-12:30,14:00-19:00
+website: https://equi-agri.fr
diff --git a/data/cities/allinges/intermarche.yml b/data/cities/allinges/intermarche.yml
index e0083d44f..a7aff40f8 100644
--- a/data/cities/allinges/intermarche.yml
+++ b/data/cities/allinges/intermarche.yml
@@ -1,11 +1,11 @@
 id: 173581443
-type: way
+type: node
 latitude: 46.33564
 longitude: 6.48213
 postcode: "74200"
 city: Allinges
-street: "Route des Blaves"
-housenumber: 157
+street: Route des Blaves
+housenumber: "157"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/allinges/mgarage.yml b/data/cities/allinges/mgarage.yml
index 1bfcb4c29..7386b9cd7 100644
--- a/data/cities/allinges/mgarage.yml
+++ b/data/cities/allinges/mgarage.yml
@@ -1,11 +1,11 @@
 id: 69098564
-type: way
+type: node
 latitude: 46.33601
 longitude: 6.48289
 postcode: "74200"
 city: Allinges
-street: "Route des Blaves"
-housenumber: 289
+street: Route des Blaves
+housenumber: "289"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/allinges/moto-concept.yml b/data/cities/allinges/moto-concept.yml
index b15b9f57e..08a8e94e3 100644
--- a/data/cities/allinges/moto-concept.yml
+++ b/data/cities/allinges/moto-concept.yml
@@ -4,8 +4,8 @@ latitude: 46.3427
 longitude: 6.47767
 postcode: "74200"
 city: Allinges
-street: "Avenue de Thonon"
-housenumber: 930
+street: Avenue de Thonon
+housenumber: "930"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00; Mo,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00; Mo,Su off
+website: ""
diff --git a/data/cities/allonzier-la-caille/goodman-cycles.yml b/data/cities/allonzier-la-caille/goodman-cycles.yml
index aedf54ba2..314123a8e 100644
--- a/data/cities/allonzier-la-caille/goodman-cycles.yml
+++ b/data/cities/allonzier-la-caille/goodman-cycles.yml
@@ -4,8 +4,8 @@ latitude: 45.99934
 longitude: 6.12291
 postcode: "74350"
 city: Allonzier-la-Caille
-street: "Route d'Annecy"
-housenumber: 671
+street: Route d'Annecy
+housenumber: "671"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/allonzier-la-caille/maison-hofer.yml b/data/cities/allonzier-la-caille/maison-hofer.yml
index 66ee36a34..6bd80184c 100644
--- a/data/cities/allonzier-la-caille/maison-hofer.yml
+++ b/data/cities/allonzier-la-caille/maison-hofer.yml
@@ -1,11 +1,11 @@
 id: 785413575
-type: way
+type: node
 latitude: 46.00477
 longitude: 6.11919
 postcode: "74350"
 city: Allonzier-la-Caille
-street: "Route d'Annecy"
-housenumber: 287
+street: Route d'Annecy
+housenumber: "287"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/alpe-du-grand-serre/sport-2000.yml b/data/cities/alpe-du-grand-serre/sport-2000.yml
index f2d9df1c9..3b4f8de05 100644
--- a/data/cities/alpe-du-grand-serre/sport-2000.yml
+++ b/data/cities/alpe-du-grand-serre/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.02331
 longitude: 5.8631
 postcode: "38350"
 city: Alpe du Grand Serre
-street: "Allée de la Blache"
-housenumber: 9
-phone: "+33 4 76 78 36 86"
-opening_hours: "Mo-Fr 09:00-13:00,14:00-18:00; Sa,Su 09:00-18:00"
-website: "https://location-ski.sport2000.fr/magasins/365-sport-2000-loulou-sports"
\ No newline at end of file
+street: Allée de la Blache
+housenumber: "9"
+phone: +33 4 76 78 36 86
+opening_hours: Mo-Fr 09:00-13:00,14:00-18:00; Sa,Su 09:00-18:00
+website: https://location-ski.sport2000.fr/magasins/365-sport-2000-loulou-sports
diff --git a/data/cities/amancy/anc-74.yml b/data/cities/amancy/anc-74.yml
index bcbc2389e..81120c3e9 100644
--- a/data/cities/amancy/anc-74.yml
+++ b/data/cities/amancy/anc-74.yml
@@ -4,8 +4,8 @@ latitude: 46.07388
 longitude: 6.32986
 postcode: "74800"
 city: Amancy
-street: "Rue de la Fontaine"
-housenumber: 57
-phone: "+33 6 76 72 25 61"
+street: Rue de la Fontaine
+housenumber: "57"
+phone: +33 6 76 72 25 61
 opening_hours: ""
-website: "cibnico@hotmail.com"
\ No newline at end of file
+website: cibnico@hotmail.com
diff --git a/data/cities/amancy/carrefour-market.yml b/data/cities/amancy/carrefour-market.yml
index 37a0106e6..4f1d48e01 100644
--- a/data/cities/amancy/carrefour-market.yml
+++ b/data/cities/amancy/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 814871075
-type: way
+type: node
 latitude: 46.0702
 longitude: 6.3193
 postcode: "74800"
 city: Amancy
-street: "Route de la Roche"
-housenumber: 80
+street: Route de la Roche
+housenumber: "80"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/amancy/intermarche.yml b/data/cities/amancy/intermarche.yml
index bf0915710..a4a7c2f0c 100644
--- a/data/cities/amancy/intermarche.yml
+++ b/data/cities/amancy/intermarche.yml
@@ -1,11 +1,11 @@
 id: 107807986
-type: way
+type: node
 latitude: 46.07158
 longitude: 6.32451
 postcode: "74800"
 city: Amancy
-street: "Impasse des Champs"
-housenumber: 65
+street: Impasse des Champs
+housenumber: "65"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/amancy/la-vie-claire.yml b/data/cities/amancy/la-vie-claire.yml
index 35fc87ffa..a9be06b10 100644
--- a/data/cities/amancy/la-vie-claire.yml
+++ b/data/cities/amancy/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 46.07476
 longitude: 6.31437
 postcode: "74800"
 city: Amancy
-street: "Rue du Quarré"
-housenumber: 596
-phone: "+33 4 50 97 72 99"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: "https://magasins.lavieclaire.com/lavieclaire/fr/store/france/auvergne-rhone-alpes/haute-savoie/amancy/amancy/17411"
\ No newline at end of file
+street: Rue du Quarré
+housenumber: "596"
+phone: +33 4 50 97 72 99
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: https://magasins.lavieclaire.com/lavieclaire/fr/store/france/auvergne-rhone-alpes/haute-savoie/amancy/amancy/17411
diff --git a/data/cities/amancy/maison-janin.yml b/data/cities/amancy/maison-janin.yml
index 3c76060e2..2d017e81f 100644
--- a/data/cities/amancy/maison-janin.yml
+++ b/data/cities/amancy/maison-janin.yml
@@ -1,11 +1,11 @@
 id: 1244220783
-type: way
+type: node
 latitude: 46.07431
 longitude: 6.3145
 postcode: "74800"
 city: Amancy
-street: "Rue du Quarré"
-housenumber: 521
+street: Rue du Quarré
+housenumber: "521"
 phone: ""
-opening_hours: "Mo-Su 05:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:00-20:00
+website: ""
diff --git a/data/cities/amancy/optique-chatin.yml b/data/cities/amancy/optique-chatin.yml
index bc64b0975..677fdbe5b 100644
--- a/data/cities/amancy/optique-chatin.yml
+++ b/data/cities/amancy/optique-chatin.yml
@@ -4,8 +4,8 @@ latitude: 46.06995
 longitude: 6.31882
 postcode: "74800"
 city: Amancy
-street: "Route de la Roche"
-housenumber: 130
+street: Route de la Roche
+housenumber: "130"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:00-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:00-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/amberieu-en-bugey/biocoop.yml b/data/cities/amberieu-en-bugey/biocoop.yml
index f888e3e8c..84901a122 100644
--- a/data/cities/amberieu-en-bugey/biocoop.yml
+++ b/data/cities/amberieu-en-bugey/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 45.97295
 longitude: 5.35228
 postcode: "01500"
 city: Ambérieu-en-Bugey
-street: "Rue Alexandre Bérard"
-housenumber: 186
-phone: "+33 4 74 34 63 51"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.biocoop-levertdeterre.fr"
\ No newline at end of file
+street: Rue Alexandre Bérard
+housenumber: "186"
+phone: +33 4 74 34 63 51
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.biocoop-levertdeterre.fr
diff --git a/data/cities/amberieu-en-bugey/brico-cash.yml b/data/cities/amberieu-en-bugey/brico-cash.yml
index 3c3644c7b..1e972aeae 100644
--- a/data/cities/amberieu-en-bugey/brico-cash.yml
+++ b/data/cities/amberieu-en-bugey/brico-cash.yml
@@ -4,8 +4,8 @@ latitude: 45.97118
 longitude: 5.33871
 postcode: "01500"
 city: Ambérieu-en-Bugey
-street: "ZA le Terreau le Marais"
-housenumber: 
+street: ZA le Terreau le Marais
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/amberieu-en-bugey/fresh.yml b/data/cities/amberieu-en-bugey/fresh.yml
index fec2512fa..4b6784cab 100644
--- a/data/cities/amberieu-en-bugey/fresh.yml
+++ b/data/cities/amberieu-en-bugey/fresh.yml
@@ -4,8 +4,8 @@ latitude: 45.98057
 longitude: 5.34741
 postcode: "01500"
 city: Ambérieu-en-Bugey
-street: "Zac Point Boeuf"
-housenumber: 
+street: Zac Point Boeuf
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/amberieu-en-bugey/lprr.yml b/data/cities/amberieu-en-bugey/lprr.yml
index e4086cd41..b3cb3de91 100644
--- a/data/cities/amberieu-en-bugey/lprr.yml
+++ b/data/cities/amberieu-en-bugey/lprr.yml
@@ -4,8 +4,8 @@ latitude: 45.969
 longitude: 5.34108
 postcode: "01500"
 city: Ambérieu-en-Bugey
-street: "Rue Marius Berliet"
-housenumber: 4
-phone: "+33 4 74 38 36 25"
-opening_hours: "Tu-Fr 10:00-12:00,13:30-19:00; Sa 10:00-19:00; PH off"
-website: "https://lprr.fr"
\ No newline at end of file
+street: Rue Marius Berliet
+housenumber: "4"
+phone: +33 4 74 38 36 25
+opening_hours: Tu-Fr 10:00-12:00,13:30-19:00; Sa 10:00-19:00; PH off
+website: https://lprr.fr
diff --git a/data/cities/amberieu-en-bugey/noz.yml b/data/cities/amberieu-en-bugey/noz.yml
index ab8757ec0..e69e54a38 100644
--- a/data/cities/amberieu-en-bugey/noz.yml
+++ b/data/cities/amberieu-en-bugey/noz.yml
@@ -1,11 +1,11 @@
 id: 67078420
-type: way
+type: node
 latitude: 45.96655
 longitude: 5.34025
 postcode: "01500"
 city: Ambérieu-en-Bugey
-street: "Rue Victor Vermorel"
-housenumber: 19
+street: Rue Victor Vermorel
+housenumber: "19"
 phone: "0486800039"
-opening_hours: "Mo-Sa 08:00-19:30"
-website: "https://www.nozarrivages.com/magasin/amberieu-en-bugey/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30
+website: https://www.nozarrivages.com/magasin/amberieu-en-bugey/
diff --git a/data/cities/amberieu-en-bugey/pompes-funebres-ain-bugey.yml b/data/cities/amberieu-en-bugey/pompes-funebres-ain-bugey.yml
index 1818590c1..49c398542 100644
--- a/data/cities/amberieu-en-bugey/pompes-funebres-ain-bugey.yml
+++ b/data/cities/amberieu-en-bugey/pompes-funebres-ain-bugey.yml
@@ -1,11 +1,11 @@
 id: 273146717
-type: way
+type: node
 latitude: 45.9823
 longitude: 5.35295
 postcode: "01500"
 city: Ambérieu-en-Bugey
-street: "Rue du Professeur Christian Cabrol"
-housenumber: 
-phone: "+33 4 74 38 37 22"
+street: Rue du Professeur Christian Cabrol
+housenumber: ""
+phone: +33 4 74 38 37 22
 opening_hours: ""
-website: "https://www.pompesfunebres-marbrerie-ainbugey.fr/"
\ No newline at end of file
+website: https://www.pompesfunebres-marbrerie-ainbugey.fr/
diff --git a/data/cities/amberieu-en-bugey/renault.yml b/data/cities/amberieu-en-bugey/renault.yml
index 493c0298d..4e1dc981e 100644
--- a/data/cities/amberieu-en-bugey/renault.yml
+++ b/data/cities/amberieu-en-bugey/renault.yml
@@ -5,7 +5,7 @@ longitude: 5.35753
 postcode: ""
 city: Ambérieu-en-Bugey
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/amberieu-en-bugey/sport-2000.yml b/data/cities/amberieu-en-bugey/sport-2000.yml
index 3c58e022f..901c3405b 100644
--- a/data/cities/amberieu-en-bugey/sport-2000.yml
+++ b/data/cities/amberieu-en-bugey/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.97241
 longitude: 5.33638
 postcode: "01500"
 city: Ambérieu-en-Bugey
-street: "Zone Commerciale de l'Aviation"
-housenumber: 
-phone: "+33 4 74 38 94 50"
+street: Zone Commerciale de l'Aviation
+housenumber: ""
+phone: +33 4 74 38 94 50
 opening_hours: ""
-website: "https://www.sport2000.fr/magasin/sport-2000/sport-2000-amberieu-en-bugey.html"
\ No newline at end of file
+website: https://www.sport2000.fr/magasin/sport-2000/sport-2000-amberieu-en-bugey.html
diff --git a/data/cities/amberieux/boulangerie-du-marche.yml b/data/cities/amberieux/boulangerie-du-marche.yml
index 05421b145..fe1b74d5a 100644
--- a/data/cities/amberieux/boulangerie-du-marche.yml
+++ b/data/cities/amberieux/boulangerie-du-marche.yml
@@ -4,8 +4,8 @@ latitude: 45.93235
 longitude: 4.72522
 postcode: "69480"
 city: Ambérieux
-street: "Route de Lyon"
-housenumber: 375
+street: Route de Lyon
+housenumber: "375"
 phone: "+33427802059"
-opening_hours: "Mo-Sa 06:30-20:00; Su 06:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-20:00; Su 06:30-12:30
+website: ""
diff --git a/data/cities/amberieux/fresh.yml b/data/cities/amberieux/fresh.yml
index 465373cad..d546d0760 100644
--- a/data/cities/amberieux/fresh.yml
+++ b/data/cities/amberieux/fresh.yml
@@ -4,8 +4,8 @@ latitude: 45.93221
 longitude: 4.72544
 postcode: "69480"
 city: Ambérieux
-street: "Route de Lyon"
-housenumber: 375
-phone: "+33 4 27 80 20 15"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: "https://www.fresh.fr/magasin/amberieux-azergues/"
\ No newline at end of file
+street: Route de Lyon
+housenumber: "375"
+phone: +33 4 27 80 20 15
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: https://www.fresh.fr/magasin/amberieux-azergues/
diff --git a/data/cities/ambierle/noelle-coiffure.yml b/data/cities/ambierle/noelle-coiffure.yml
index 61efb2ee9..bd61d16be 100644
--- a/data/cities/ambierle/noelle-coiffure.yml
+++ b/data/cities/ambierle/noelle-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 3.89677
 postcode: "42820"
 city: Ambierle
 street: ""
-housenumber: 
-phone: "+33 4 77 65 62 64"
-opening_hours: "Fr 08:45-19:00; Sa 08:00-17:00; Tu-Th 08:45-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 77 65 62 64
+opening_hours: Fr 08:45-19:00; Sa 08:00-17:00; Tu-Th 08:45-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/ambilly/au-cristabel.yml b/data/cities/ambilly/au-cristabel.yml
index d767e99e0..da5fbe183 100644
--- a/data/cities/ambilly/au-cristabel.yml
+++ b/data/cities/ambilly/au-cristabel.yml
@@ -4,8 +4,8 @@ latitude: 46.19448
 longitude: 6.22806
 postcode: "74100"
 city: Ambilly
-street: "Rue des Négociants"
-housenumber: 3
+street: Rue des Négociants
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Tu,Th-Sa 06:00-13:00, 15:30-19:00; We off; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Sa 06:00-13:00, 15:30-19:00; We off; Su 07:00-13:00
+website: ""
diff --git a/data/cities/ambilly/carrefour-express.yml b/data/cities/ambilly/carrefour-express.yml
index 90972300f..dcc7759ee 100644
--- a/data/cities/ambilly/carrefour-express.yml
+++ b/data/cities/ambilly/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 46.19338
 longitude: 6.22399
 postcode: "74100"
 city: Ambilly
-street: "Rue de l'Helvétie"
-housenumber: 14
+street: Rue de l'Helvétie
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 07:30-21:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-21:00; Su 08:00-13:00
+website: ""
diff --git a/data/cities/ambilly/kim-duong-epicerie-asiatique.yml b/data/cities/ambilly/kim-duong-epicerie-asiatique.yml
index 0d017d6eb..db0505c29 100644
--- a/data/cities/ambilly/kim-duong-epicerie-asiatique.yml
+++ b/data/cities/ambilly/kim-duong-epicerie-asiatique.yml
@@ -4,8 +4,8 @@ latitude: 46.19564
 longitude: 6.22769
 postcode: "74100"
 city: Ambilly
-street: "Rue du Jura"
-housenumber: 41
+street: Rue du Jura
+housenumber: "41"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/ambilly/la-marquise.yml b/data/cities/ambilly/la-marquise.yml
index 0e21cf36f..109aa8e9d 100644
--- a/data/cities/ambilly/la-marquise.yml
+++ b/data/cities/ambilly/la-marquise.yml
@@ -4,8 +4,8 @@ latitude: 46.19311
 longitude: 6.22512
 postcode: "74100"
 city: Ambilly
-street: "Rue de Genève"
-housenumber: 6
+street: Rue de Genève
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Su 05:30-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:30-21:00
+website: ""
diff --git a/data/cities/ambilly/latelier-des-gourmandises.yml b/data/cities/ambilly/latelier-des-gourmandises.yml
index 039801beb..e009861e4 100644
--- a/data/cities/ambilly/latelier-des-gourmandises.yml
+++ b/data/cities/ambilly/latelier-des-gourmandises.yml
@@ -4,8 +4,8 @@ latitude: 46.19968
 longitude: 6.22712
 postcode: "74100"
 city: Ambilly
-street: "Rue Ravier"
-housenumber: 19
+street: Rue Ravier
+housenumber: "19"
 phone: ""
-opening_hours: "Mo off; Tu-Fr 06:00-13:00, 15:30-19:30; Sa 06:00-18:00; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Fr 06:00-13:00, 15:30-19:30; Sa 06:00-18:00; Su 07:00-13:00
+website: ""
diff --git a/data/cities/ambilly/pauscoif.yml b/data/cities/ambilly/pauscoif.yml
index ebe59f6b4..448f3f7e3 100644
--- a/data/cities/ambilly/pauscoif.yml
+++ b/data/cities/ambilly/pauscoif.yml
@@ -4,8 +4,8 @@ latitude: 46.19966
 longitude: 6.22703
 postcode: "74100"
 city: Ambilly
-street: "Rue Ravier"
-housenumber: 19
+street: Rue Ravier
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-19:00; Sa 08:00-16:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-19:00; Sa 08:00-16:00; Su off
+website: ""
diff --git a/data/cities/ambilly/tabac-presse-des-eaux-vives.yml b/data/cities/ambilly/tabac-presse-des-eaux-vives.yml
index 18f9ce9b0..c12b557e2 100644
--- a/data/cities/ambilly/tabac-presse-des-eaux-vives.yml
+++ b/data/cities/ambilly/tabac-presse-des-eaux-vives.yml
@@ -4,8 +4,8 @@ latitude: 46.19555
 longitude: 6.2277
 postcode: "74100"
 city: Ambilly
-street: "Rue du Jura"
-housenumber: 41
+street: Rue du Jura
+housenumber: "41"
 phone: ""
-opening_hours: "Mo-Fr 07:00-20:00; Sa 08:00-20:00; Su 08:00-14:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-20:00; Sa 08:00-20:00; Su 08:00-14:00
+website: ""
diff --git a/data/cities/ampuis/latelier-de-caroline-coiffure.yml b/data/cities/ampuis/latelier-de-caroline-coiffure.yml
index b0d101801..bd2edb7d1 100644
--- a/data/cities/ampuis/latelier-de-caroline-coiffure.yml
+++ b/data/cities/ampuis/latelier-de-caroline-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.80797
 postcode: "69420"
 city: Ampuis
 street: ""
-housenumber: 
-phone: "+33 4 74 56 10 83"
+housenumber: ""
+phone: +33 4 74 56 10 83
 opening_hours: ""
-website: "https://www.atelierdecaroline.fr/"
\ No newline at end of file
+website: https://www.atelierdecaroline.fr/
diff --git a/data/cities/andancette/carrosserie-dalbon.yml b/data/cities/andancette/carrosserie-dalbon.yml
index 2aad9c922..e743ecd2e 100644
--- a/data/cities/andancette/carrosserie-dalbon.yml
+++ b/data/cities/andancette/carrosserie-dalbon.yml
@@ -1,11 +1,11 @@
 id: 67646165
-type: way
+type: node
 latitude: 45.24405
 longitude: 4.81268
 postcode: "26140"
 city: Andancette
 street: ""
-housenumber: 
-phone: "+33 4 75 03 05 31"
-opening_hours: "Mo-Fr 08:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 75 03 05 31
+opening_hours: Mo-Fr 08:00-19:00
+website: ""
diff --git a/data/cities/andancette/le-marche-dodile.yml b/data/cities/andancette/le-marche-dodile.yml
index 8f9ea9d30..471c5b724 100644
--- a/data/cities/andancette/le-marche-dodile.yml
+++ b/data/cities/andancette/le-marche-dodile.yml
@@ -1,11 +1,11 @@
 id: 67647106
-type: way
+type: node
 latitude: 45.24195
 longitude: 4.8055
 postcode: "26140"
 city: Andancette
-street: "Rue du Radier"
-housenumber: 2
+street: Rue du Radier
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Sa 15:00-19:00, We-Fr 08:00-12:00, Sa,Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 15:00-19:00, We-Fr 08:00-12:00, Sa,Su 09:00-12:00
+website: ""
diff --git a/data/cities/andrezieux-boutheon/krys.yml b/data/cities/andrezieux-boutheon/krys.yml
index e187d7d0d..cc0f59557 100644
--- a/data/cities/andrezieux-boutheon/krys.yml
+++ b/data/cities/andrezieux-boutheon/krys.yml
@@ -4,8 +4,8 @@ latitude: 45.52477
 longitude: 4.25648
 postcode: "42160"
 city: Andrézieux-Bouthéon
-street: "Place du Forez"
-housenumber: 2
+street: Place du Forez
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: "https://www.krys.com/opticien/france/loire/opticien-andrezieux-boutheon/andrezieux-forez"
\ No newline at end of file
+website: https://www.krys.com/opticien/france/loire/opticien-andrezieux-boutheon/andrezieux-forez
diff --git a/data/cities/andrezieux-boutheon/optical-center.yml b/data/cities/andrezieux-boutheon/optical-center.yml
index a0b825b33..8af2fb754 100644
--- a/data/cities/andrezieux-boutheon/optical-center.yml
+++ b/data/cities/andrezieux-boutheon/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.5356
 longitude: 4.28721
 postcode: "42160"
 city: Andrézieux-Bouthéon
-street: "Avenue Jean Mermoz"
-housenumber: 40
+street: Avenue Jean Mermoz
+housenumber: "40"
 phone: "+33477100111"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://opticien.optical-center.fr/183-opticien-andrezieux-boutheon-optical-center"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://opticien.optical-center.fr/183-opticien-andrezieux-boutheon-optical-center
diff --git a/data/cities/andrezieux-boutheon/picard.yml b/data/cities/andrezieux-boutheon/picard.yml
index 7d5576c00..70ad4867b 100644
--- a/data/cities/andrezieux-boutheon/picard.yml
+++ b/data/cities/andrezieux-boutheon/picard.yml
@@ -1,11 +1,11 @@
 id: 154273554
-type: way
+type: node
 latitude: 45.52323
 longitude: 4.29358
 postcode: "42160"
 city: Andrézieux-Bouthéon
-street: "La Gouyonniere"
-housenumber: 
-phone: "+33 4 77 54 40 01"
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: "https://magasins.picard.fr/27-picard-andrezieux-boutheon"
\ No newline at end of file
+street: La Gouyonniere
+housenumber: ""
+phone: +33 4 77 54 40 01
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: https://magasins.picard.fr/27-picard-andrezieux-boutheon
diff --git a/data/cities/andrezieux-boutheon/station-service-e-leclerc.yml b/data/cities/andrezieux-boutheon/station-service-e-leclerc.yml
index 2430420c4..62062f3f2 100644
--- a/data/cities/andrezieux-boutheon/station-service-e-leclerc.yml
+++ b/data/cities/andrezieux-boutheon/station-service-e-leclerc.yml
@@ -1,11 +1,11 @@
 id: 154274977
-type: way
+type: node
 latitude: 45.53663
 longitude: 4.28642
 postcode: "42160"
 city: Andrézieux-Bouthéon
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/andrezieux-boutheon/vival.yml b/data/cities/andrezieux-boutheon/vival.yml
index c432d74ba..601f7c3eb 100644
--- a/data/cities/andrezieux-boutheon/vival.yml
+++ b/data/cities/andrezieux-boutheon/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.52457
 longitude: 4.25733
 postcode: "42160"
 city: Andrézieux-Bouthéon
-street: "Place du Forez"
-housenumber: 17
-phone: "+33 4 77 35 12 84"
-opening_hours: "Mo-Sa 08:00-13:00,14:30-20:00; Su 08:00-13:00"
-website: "https://magasins.vival.fr/fr/s/vival-andrezieux-boutheon"
\ No newline at end of file
+street: Place du Forez
+housenumber: "17"
+phone: +33 4 77 35 12 84
+opening_hours: Mo-Sa 08:00-13:00,14:30-20:00; Su 08:00-13:00
+website: https://magasins.vival.fr/fr/s/vival-andrezieux-boutheon
diff --git a/data/cities/annecy-le-vieux/botanic.yml b/data/cities/annecy-le-vieux/botanic.yml
index 0c93bc368..c3cfb19d3 100644
--- a/data/cities/annecy-le-vieux/botanic.yml
+++ b/data/cities/annecy-le-vieux/botanic.yml
@@ -1,11 +1,11 @@
 id: 62499251
-type: way
+type: node
 latitude: 45.91961
 longitude: 6.1444
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue du Pré de la Danse"
-housenumber: 
+street: Rue du Pré de la Danse
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy-le-vieux/coiffure-relax.yml b/data/cities/annecy-le-vieux/coiffure-relax.yml
index 665f44c87..d660bf0ac 100644
--- a/data/cities/annecy-le-vieux/coiffure-relax.yml
+++ b/data/cities/annecy-le-vieux/coiffure-relax.yml
@@ -4,8 +4,8 @@ latitude: 45.9118
 longitude: 6.14398
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue des Écoles"
-housenumber: 9
+street: Rue des Écoles
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy-le-vieux/concept-cuisine.yml b/data/cities/annecy-le-vieux/concept-cuisine.yml
index d2cb4a8a6..9a38e47fe 100644
--- a/data/cities/annecy-le-vieux/concept-cuisine.yml
+++ b/data/cities/annecy-le-vieux/concept-cuisine.yml
@@ -4,8 +4,8 @@ latitude: 45.91533
 longitude: 6.14774
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Avenue des Carrés"
+street: Avenue des Carrés
 housenumber: 34 A
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy-le-vieux/eminza.yml b/data/cities/annecy-le-vieux/eminza.yml
index 3dcbd1daa..98f403e09 100644
--- a/data/cities/annecy-le-vieux/eminza.yml
+++ b/data/cities/annecy-le-vieux/eminza.yml
@@ -4,8 +4,8 @@ latitude: 45.92812
 longitude: 6.1687
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue des Bouvières"
-housenumber: 3
+street: Rue des Bouvières
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: "https://www.eminza.com/"
\ No newline at end of file
+website: https://www.eminza.com/
diff --git a/data/cities/annecy-le-vieux/hair-mod.yml b/data/cities/annecy-le-vieux/hair-mod.yml
index cd1bb6a04..2aacd38e8 100644
--- a/data/cities/annecy-le-vieux/hair-mod.yml
+++ b/data/cities/annecy-le-vieux/hair-mod.yml
@@ -5,7 +5,7 @@ longitude: 6.14466
 postcode: "74940"
 city: Annecy-le-Vieux
 street: ""
-housenumber: 6
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy-le-vieux/intermarche.yml b/data/cities/annecy-le-vieux/intermarche.yml
index 9bb703376..ab56577f2 100644
--- a/data/cities/annecy-le-vieux/intermarche.yml
+++ b/data/cities/annecy-le-vieux/intermarche.yml
@@ -1,11 +1,11 @@
 id: 807465716
-type: way
+type: node
 latitude: 45.91539
 longitude: 6.14493
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Place du 18 juin 1940"
-housenumber: 7
+street: Place du 18 juin 1940
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:30-12:30"
-website: "https://www.intermarche.com/magasins/11793/Annecy-74940/infos-pratiques"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 09:30-12:30
+website: https://www.intermarche.com/magasins/11793/Annecy-74940/infos-pratiques
diff --git a/data/cities/annecy-le-vieux/le-fournil-des-pommaries.yml b/data/cities/annecy-le-vieux/le-fournil-des-pommaries.yml
index e405d16c3..7dbc14f53 100644
--- a/data/cities/annecy-le-vieux/le-fournil-des-pommaries.yml
+++ b/data/cities/annecy-le-vieux/le-fournil-des-pommaries.yml
@@ -4,8 +4,8 @@ latitude: 45.91032
 longitude: 6.14435
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue des Pommaries"
-housenumber: 11
+street: Rue des Pommaries
+housenumber: "11"
 phone: "+33450236375"
 opening_hours: ""
-website: "https://www.aupaindantan.fr/"
\ No newline at end of file
+website: https://www.aupaindantan.fr/
diff --git a/data/cities/annecy-le-vieux/le-jardin-de-marie.yml b/data/cities/annecy-le-vieux/le-jardin-de-marie.yml
index f23080972..5087a254c 100644
--- a/data/cities/annecy-le-vieux/le-jardin-de-marie.yml
+++ b/data/cities/annecy-le-vieux/le-jardin-de-marie.yml
@@ -4,8 +4,8 @@ latitude: 45.91028
 longitude: 6.14418
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue des Pommaries"
-housenumber: 11
+street: Rue des Pommaries
+housenumber: "11"
 phone: ""
-opening_hours: "Tu-Sa 08:30-19:00; Su 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-19:00; Su 08:30-12:00
+website: ""
diff --git a/data/cities/annecy-le-vieux/le-petit-casino.yml b/data/cities/annecy-le-vieux/le-petit-casino.yml
index de6129dbd..20d6811b5 100644
--- a/data/cities/annecy-le-vieux/le-petit-casino.yml
+++ b/data/cities/annecy-le-vieux/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.92183
 longitude: 6.14538
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue du Lachat"
-housenumber: 11
+street: Rue du Lachat
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy-le-vieux/metabikes.yml b/data/cities/annecy-le-vieux/metabikes.yml
index ae4c31ccf..cac467acb 100644
--- a/data/cities/annecy-le-vieux/metabikes.yml
+++ b/data/cities/annecy-le-vieux/metabikes.yml
@@ -4,8 +4,8 @@ latitude: 45.91512
 longitude: 6.14742
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Avenue des Carrés"
-housenumber: 34
-phone: "+33 9 83 51 71 43"
+street: Avenue des Carrés
+housenumber: "34"
+phone: +33 9 83 51 71 43
 opening_hours: ""
-website: "https://www.metabikes.fr/"
\ No newline at end of file
+website: https://www.metabikes.fr/
diff --git a/data/cities/annecy-le-vieux/petits-zestes.yml b/data/cities/annecy-le-vieux/petits-zestes.yml
index 2c990d16c..e3ddab900 100644
--- a/data/cities/annecy-le-vieux/petits-zestes.yml
+++ b/data/cities/annecy-le-vieux/petits-zestes.yml
@@ -4,8 +4,8 @@ latitude: 45.92906
 longitude: 6.16558
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue du Pré Paillard"
+street: Rue du Pré Paillard
 housenumber: 7 bis
-phone: "+33 6 51 37 34 69"
-opening_hours: "Tu-Fr 11:30-14:30 16:00-18:30"
-website: "https://www.petitszestes.fr/"
\ No newline at end of file
+phone: +33 6 51 37 34 69
+opening_hours: Tu-Fr 11:30-14:30 16:00-18:30
+website: https://www.petitszestes.fr/
diff --git a/data/cities/annecy-le-vieux/poissonnerie-de-locean.yml b/data/cities/annecy-le-vieux/poissonnerie-de-locean.yml
index aeda13a6b..338aca423 100644
--- a/data/cities/annecy-le-vieux/poissonnerie-de-locean.yml
+++ b/data/cities/annecy-le-vieux/poissonnerie-de-locean.yml
@@ -4,8 +4,8 @@ latitude: 45.91005
 longitude: 6.14385
 postcode: "74940"
 city: Annecy-le-Vieux
-street: "Rue des Pommaries"
-housenumber: 9
+street: Rue des Pommaries
+housenumber: "9"
 phone: "+33450325664"
-opening_hours: "Tu-Th 07:45-13:00,15:00-19:00; Fr,Sa 07:45-19:00; Su 08:30-12:00"
-website: "https://annecy-poissonnerie.fr/"
\ No newline at end of file
+opening_hours: Tu-Th 07:45-13:00,15:00-19:00; Fr,Sa 07:45-19:00; Su 08:30-12:00
+website: https://annecy-poissonnerie.fr/
diff --git a/data/cities/annecy/911-garage.yml b/data/cities/annecy/911-garage.yml
index 6dc0f3aca..445c21f0a 100644
--- a/data/cities/annecy/911-garage.yml
+++ b/data/cities/annecy/911-garage.yml
@@ -1,11 +1,11 @@
 id: 1110338086
-type: way
+type: node
 latitude: 45.91639
 longitude: 6.10505
 postcode: "74960"
 city: ANNECY
-street: "Avenue du Pont de Tasset"
+street: Avenue du Pont de Tasset
 housenumber: 26 Bis
-phone: "+33 7 63 32 72 78"
+phone: +33 7 63 32 72 78
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/9e-quai-bd-comics-jeunesse.yml b/data/cities/annecy/9e-quai-bd-comics-jeunesse.yml
index 9042df48c..d1ed3826b 100644
--- a/data/cities/annecy/9e-quai-bd-comics-jeunesse.yml
+++ b/data/cities/annecy/9e-quai-bd-comics-jeunesse.yml
@@ -4,8 +4,8 @@ latitude: 45.90525
 longitude: 6.12378
 postcode: "74000"
 city: Annecy
-street: "Rue Carnot"
-housenumber: 75
+street: Rue Carnot
+housenumber: "75"
 phone: "+33450510904"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annecy/a-corps-des-sens.yml b/data/cities/annecy/a-corps-des-sens.yml
index afdf03eb5..6ce743f19 100644
--- a/data/cities/annecy/a-corps-des-sens.yml
+++ b/data/cities/annecy/a-corps-des-sens.yml
@@ -4,8 +4,8 @@ latitude: 45.91105
 longitude: 6.124
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
+street: Avenue de Genève
 housenumber: 16 bis
 phone: ""
 opening_hours: ""
-website: "https://institutbeauteannecy.fr/"
\ No newline at end of file
+website: https://institutbeauteannecy.fr/
diff --git a/data/cities/annecy/a-tavola.yml b/data/cities/annecy/a-tavola.yml
index 7de098806..1e6b47637 100644
--- a/data/cities/annecy/a-tavola.yml
+++ b/data/cities/annecy/a-tavola.yml
@@ -4,8 +4,8 @@ latitude: 45.9057
 longitude: 6.12446
 postcode: "74000"
 city: Annecy
-street: "Boulevard du Lycée"
-housenumber: 
+street: Boulevard du Lycée
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/adapt-hair-concept.yml b/data/cities/annecy/adapt-hair-concept.yml
index 35d0d9557..200aa3500 100644
--- a/data/cities/annecy/adapt-hair-concept.yml
+++ b/data/cities/annecy/adapt-hair-concept.yml
@@ -4,8 +4,8 @@ latitude: 45.90536
 longitude: 6.1237
 postcode: "74000"
 city: Annecy
-street: "Boulevard Decouz"
-housenumber: 18
-phone: "+33 450675953"
+street: Boulevard Decouz
+housenumber: "18"
+phone: +33 450675953
 opening_hours: ""
-website: "https://adapthairconcept.fr/"
\ No newline at end of file
+website: https://adapthairconcept.fr/
diff --git a/data/cities/annecy/adidas.yml b/data/cities/annecy/adidas.yml
index 25054b3e4..5bc410385 100644
--- a/data/cities/annecy/adidas.yml
+++ b/data/cities/annecy/adidas.yml
@@ -4,8 +4,8 @@ latitude: 45.9066
 longitude: 6.13236
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/ads-pneu.yml b/data/cities/annecy/ads-pneu.yml
index 67ea07561..15a116446 100644
--- a/data/cities/annecy/ads-pneu.yml
+++ b/data/cities/annecy/ads-pneu.yml
@@ -1,11 +1,11 @@
 id: 62517234
-type: way
+type: node
 latitude: 45.943
 longitude: 6.13024
 postcode: "74370"
 city: Annecy
-street: "Impasse de la Lechèrte"
-housenumber: 
+street: Impasse de la Lechèrte
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:00-19:00; Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-19:00; Sa 08:00-17:00
+website: ""
diff --git a/data/cities/annecy/afb-shop.yml b/data/cities/annecy/afb-shop.yml
index 4787665fc..a330616a9 100644
--- a/data/cities/annecy/afb-shop.yml
+++ b/data/cities/annecy/afb-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.89303
 longitude: 6.08924
 postcode: "74960"
 city: Annecy
-street: "Rue du Tanay"
-housenumber: 4
-phone: "+33 4 50 24 42 09"
-opening_hours: "Mo-Fr 09:30-12:30,13:30-19:00; Sa 09:30-12:30,14:00-18:00"
-website: "https://www.afbshop.fr/"
\ No newline at end of file
+street: Rue du Tanay
+housenumber: "4"
+phone: +33 4 50 24 42 09
+opening_hours: Mo-Fr 09:30-12:30,13:30-19:00; Sa 09:30-12:30,14:00-18:00
+website: https://www.afbshop.fr/
diff --git a/data/cities/annecy/alain-afflelou.yml b/data/cities/annecy/alain-afflelou.yml
index b6c7dedaf..fccd75e49 100644
--- a/data/cities/annecy/alain-afflelou.yml
+++ b/data/cities/annecy/alain-afflelou.yml
@@ -1,11 +1,11 @@
 id: 946952725
-type: way
+type: node
 latitude: 45.92502
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450469055"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/albigny-optic.yml b/data/cities/annecy/albigny-optic.yml
index a8ba59cdc..ec3800909 100644
--- a/data/cities/annecy/albigny-optic.yml
+++ b/data/cities/annecy/albigny-optic.yml
@@ -4,8 +4,8 @@ latitude: 45.90669
 longitude: 6.14668
 postcode: "74940"
 city: Annecy
-street: "Rue Centrale"
-housenumber: 19
+street: Rue Centrale
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/annecy-buro.yml b/data/cities/annecy/annecy-buro.yml
index f40587248..df0fa645e 100644
--- a/data/cities/annecy/annecy-buro.yml
+++ b/data/cities/annecy/annecy-buro.yml
@@ -4,8 +4,8 @@ latitude: 45.89976
 longitude: 6.12182
 postcode: "74000"
 city: Annecy
-street: "Rue Royale"
-housenumber: 28
+street: Rue Royale
+housenumber: "28"
 phone: ""
-opening_hours: "Mo 09:00-12:00,14:00-18:30; Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: "https://annecyburo-calipage.fournituredebureau.com/"
\ No newline at end of file
+opening_hours: Mo 09:00-12:00,14:00-18:30; Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: https://annecyburo-calipage.fournituredebureau.com/
diff --git a/data/cities/annecy/annecy-market.yml b/data/cities/annecy/annecy-market.yml
index 41854e900..df957f248 100644
--- a/data/cities/annecy/annecy-market.yml
+++ b/data/cities/annecy/annecy-market.yml
@@ -4,8 +4,8 @@ latitude: 45.9194
 longitude: 6.12203
 postcode: "74000"
 city: Annecy
-street: "Rue Lucie Aubrac"
-housenumber: 
+street: Rue Lucie Aubrac
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/antiquites-royale.yml b/data/cities/annecy/antiquites-royale.yml
index b290a7900..4f1c2c067 100644
--- a/data/cities/annecy/antiquites-royale.yml
+++ b/data/cities/annecy/antiquites-royale.yml
@@ -4,8 +4,8 @@ latitude: 45.90085
 longitude: 6.12472
 postcode: "74000"
 city: Annecy
-street: "Rue Royale"
+street: Rue Royale
 housenumber: 6 bis
-phone: "+33 4 85 46 37 07"
+phone: +33 4 85 46 37 07
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/aramisauto-annecy.yml b/data/cities/annecy/aramisauto-annecy.yml
index ce60c1745..a2727dde4 100644
--- a/data/cities/annecy/aramisauto-annecy.yml
+++ b/data/cities/annecy/aramisauto-annecy.yml
@@ -4,8 +4,8 @@ latitude: 45.92015
 longitude: 6.12368
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 109
+street: Avenue de Genève
+housenumber: "109"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/aristide.yml b/data/cities/annecy/aristide.yml
index a00eb64aa..fae475274 100644
--- a/data/cities/annecy/aristide.yml
+++ b/data/cities/annecy/aristide.yml
@@ -4,8 +4,8 @@ latitude: 45.89886
 longitude: 6.12191
 postcode: "74000"
 city: Annecy
-street: "Rue de la Gare"
-housenumber: 5
-phone: "+33 4 50 32 69 78"
-opening_hours: "Tu-Fr 10:00-19:00; Sa 09:00-18:00"
-website: "https://boulangeriearistide.com/"
\ No newline at end of file
+street: Rue de la Gare
+housenumber: "5"
+phone: +33 4 50 32 69 78
+opening_hours: Tu-Fr 10:00-19:00; Sa 09:00-18:00
+website: https://boulangeriearistide.com/
diff --git a/data/cities/annecy/armand-thiery-rue-carnot.yml b/data/cities/annecy/armand-thiery-rue-carnot.yml
index 4ec428415..96d188c5e 100644
--- a/data/cities/annecy/armand-thiery-rue-carnot.yml
+++ b/data/cities/annecy/armand-thiery-rue-carnot.yml
@@ -4,8 +4,8 @@ latitude: 45.90207
 longitude: 6.12528
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 36
+street: Rue Carnot
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/armand-thiery.yml b/data/cities/annecy/armand-thiery.yml
index 1668bfe46..232282852 100644
--- a/data/cities/annecy/armand-thiery.yml
+++ b/data/cities/annecy/armand-thiery.yml
@@ -4,8 +4,8 @@ latitude: 45.90233
 longitude: 6.12504
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 35
+street: Rue Carnot
+housenumber: "35"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/as-barber.yml b/data/cities/annecy/as-barber.yml
index f7396caed..26cad9122 100644
--- a/data/cities/annecy/as-barber.yml
+++ b/data/cities/annecy/as-barber.yml
@@ -4,8 +4,8 @@ latitude: 45.90526
 longitude: 6.1224
 postcode: "74000"
 city: Annecy
-street: "Boulevard Decouz"
-housenumber: 8
+street: Boulevard Decouz
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Th 10:00-20:00; Fr,Sa 10:00-19:00"
-website: "https://www.planity.com/as-barber-74000-annecy"
\ No newline at end of file
+opening_hours: Mo-Th 10:00-20:00; Fr,Sa 10:00-19:00
+website: https://www.planity.com/as-barber-74000-annecy
diff --git a/data/cities/annecy/au-fidele-berger.yml b/data/cities/annecy/au-fidele-berger.yml
index 32a8f8a15..ce3ec8821 100644
--- a/data/cities/annecy/au-fidele-berger.yml
+++ b/data/cities/annecy/au-fidele-berger.yml
@@ -4,8 +4,8 @@ latitude: 45.90081
 longitude: 6.12581
 postcode: ""
 city: Annecy
-street: "Rue Royale"
-housenumber: 2
+street: Rue Royale
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: "https://www.aufideleberger.fr/"
\ No newline at end of file
+website: https://www.aufideleberger.fr/
diff --git a/data/cities/annecy/au-pays-des-miniz.yml b/data/cities/annecy/au-pays-des-miniz.yml
index 1c4db04a9..d250eb4d1 100644
--- a/data/cities/annecy/au-pays-des-miniz.yml
+++ b/data/cities/annecy/au-pays-des-miniz.yml
@@ -4,8 +4,8 @@ latitude: 45.90366
 longitude: 6.12686
 postcode: "74000"
 city: Annecy
-street: "Rue de la Paix"
-housenumber: 11
-phone: "+334 50 32 44 14"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-19:00"
-website: "https://www.aupaysdesminiz.com/"
\ No newline at end of file
+street: Rue de la Paix
+housenumber: "11"
+phone: +334 50 32 44 14
+opening_hours: Mo 14:00-19:00; Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-19:00
+website: https://www.aupaysdesminiz.com/
diff --git a/data/cities/annecy/au-puits-savoyard.yml b/data/cities/annecy/au-puits-savoyard.yml
index 40a052849..36dd8e514 100644
--- a/data/cities/annecy/au-puits-savoyard.yml
+++ b/data/cities/annecy/au-puits-savoyard.yml
@@ -5,7 +5,7 @@ longitude: 6.13017
 postcode: ""
 city: Annecy
 street: ""
-housenumber: 24
-phone: "+33 4 50 45 54 39"
-opening_hours: "Mo-Sa 06:30-13:30, 14:00-19:00; Su 07:00-13:00"
-website: "https://aupuitssavoyard.fr/"
\ No newline at end of file
+housenumber: "24"
+phone: +33 4 50 45 54 39
+opening_hours: Mo-Sa 06:30-13:30, 14:00-19:00; Su 07:00-13:00
+website: https://aupuitssavoyard.fr/
diff --git a/data/cities/annecy/au-rendez-vous-du-terroir.yml b/data/cities/annecy/au-rendez-vous-du-terroir.yml
index e6c129e9f..6c6fa7abc 100644
--- a/data/cities/annecy/au-rendez-vous-du-terroir.yml
+++ b/data/cities/annecy/au-rendez-vous-du-terroir.yml
@@ -4,8 +4,8 @@ latitude: 45.90987
 longitude: 6.09661
 postcode: "74960"
 city: Annecy
-street: "Impasse du Viéran"
-housenumber: 6
-phone: "+33 4 50 57 54 43"
-opening_hours: "Tu-Fr 09:00-19:00; Sa 9:00-13:00"
-website: "https://aurendezvousduterroir.fr/"
\ No newline at end of file
+street: Impasse du Viéran
+housenumber: "6"
+phone: +33 4 50 57 54 43
+opening_hours: Tu-Fr 09:00-19:00; Sa 9:00-13:00
+website: https://aurendezvousduterroir.fr/
diff --git a/data/cities/annecy/aubade.yml b/data/cities/annecy/aubade.yml
index 0f7dc3c76..7c1d32bd5 100644
--- a/data/cities/annecy/aubade.yml
+++ b/data/cities/annecy/aubade.yml
@@ -4,8 +4,8 @@ latitude: 45.90638
 longitude: 6.13267
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/bd-fugue-cafe.yml b/data/cities/annecy/bd-fugue-cafe.yml
index 03987e584..93474e0bb 100644
--- a/data/cities/annecy/bd-fugue-cafe.yml
+++ b/data/cities/annecy/bd-fugue-cafe.yml
@@ -4,8 +4,8 @@ latitude: 45.90197
 longitude: 6.12797
 postcode: "74000"
 city: Annecy
-street: "Rue Jean Jaurès"
-housenumber: 1
+street: Rue Jean Jaurès
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://www.bdfugue.com/annecy"
\ No newline at end of file
+website: https://www.bdfugue.com/annecy
diff --git a/data/cities/annecy/besaces-et-accessoires.yml b/data/cities/annecy/besaces-et-accessoires.yml
index 44699e9fe..c3255a40c 100644
--- a/data/cities/annecy/besaces-et-accessoires.yml
+++ b/data/cities/annecy/besaces-et-accessoires.yml
@@ -4,8 +4,8 @@ latitude: 45.90252
 longitude: 6.12495
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 39
+street: Rue Carnot
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/bieronomy.yml b/data/cities/annecy/bieronomy.yml
index bab59db89..85b0b46fc 100644
--- a/data/cities/annecy/bieronomy.yml
+++ b/data/cities/annecy/bieronomy.yml
@@ -4,8 +4,8 @@ latitude: 45.84082
 longitude: 6.05822
 postcode: "74600"
 city: Annecy
-street: "Avenue d'Aix-les-Bains"
-housenumber: 1154
+street: Avenue d'Aix-les-Bains
+housenumber: "1154"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:30, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30, 14:00-19:00
+website: ""
diff --git a/data/cities/annecy/billabong-store.yml b/data/cities/annecy/billabong-store.yml
index a6c356c59..b13d31560 100644
--- a/data/cities/annecy/billabong-store.yml
+++ b/data/cities/annecy/billabong-store.yml
@@ -4,8 +4,8 @@ latitude: 45.90372
 longitude: 6.12533
 postcode: "74000"
 city: Annecy
-street: "Rue du Président Favre"
-housenumber: 25
+street: Rue du Président Favre
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annecy/biocoop-aquarius.yml b/data/cities/annecy/biocoop-aquarius.yml
index 023a6ec34..03dc4bc36 100644
--- a/data/cities/annecy/biocoop-aquarius.yml
+++ b/data/cities/annecy/biocoop-aquarius.yml
@@ -4,8 +4,8 @@ latitude: 45.90342
 longitude: 6.12686
 postcode: "74000"
 city: Annecy
-street: "Rue de la Paix"
-housenumber: 10
+street: Rue de la Paix
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.aquarius-biocoop.org/magasins/annecy-centre/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.aquarius-biocoop.org/magasins/annecy-centre/
diff --git a/data/cities/annecy/boucherie-bocquet.yml b/data/cities/annecy/boucherie-bocquet.yml
index d3651e4e0..a43d32a6d 100644
--- a/data/cities/annecy/boucherie-bocquet.yml
+++ b/data/cities/annecy/boucherie-bocquet.yml
@@ -4,8 +4,8 @@ latitude: 45.90875
 longitude: 6.12934
 postcode: "74000"
 city: Annecy
-street: "Rue Louis Boch"
-housenumber: 16
+street: Rue Louis Boch
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: "https://www.boucheriebocquet.fr/"
\ No newline at end of file
+website: https://www.boucheriebocquet.fr/
diff --git a/data/cities/annecy/boucherie-charcuterie-viret.yml b/data/cities/annecy/boucherie-charcuterie-viret.yml
index 48db3e222..a7702db9d 100644
--- a/data/cities/annecy/boucherie-charcuterie-viret.yml
+++ b/data/cities/annecy/boucherie-charcuterie-viret.yml
@@ -4,8 +4,8 @@ latitude: 45.90636
 longitude: 6.14473
 postcode: "74940"
 city: Annecy
-street: "Rue Centrale"
-housenumber: 1
+street: Rue Centrale
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://traiteur-viret.com/"
\ No newline at end of file
+website: https://traiteur-viret.com/
diff --git a/data/cities/annecy/boucherie-deruaz.yml b/data/cities/annecy/boucherie-deruaz.yml
index 0930530de..a1c42283a 100644
--- a/data/cities/annecy/boucherie-deruaz.yml
+++ b/data/cities/annecy/boucherie-deruaz.yml
@@ -4,8 +4,8 @@ latitude: 45.90104
 longitude: 6.12568
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/boucherie-veyrat-parmelan.yml b/data/cities/annecy/boucherie-veyrat-parmelan.yml
index 66a699f4f..27824a691 100644
--- a/data/cities/annecy/boucherie-veyrat-parmelan.yml
+++ b/data/cities/annecy/boucherie-veyrat-parmelan.yml
@@ -4,8 +4,8 @@ latitude: 45.90716
 longitude: 6.13463
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 39
+street: Avenue du Parmelan
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/boucherie.yml b/data/cities/annecy/boucherie.yml
index 7a5da0146..2d3e716e4 100644
--- a/data/cities/annecy/boucherie.yml
+++ b/data/cities/annecy/boucherie.yml
@@ -6,6 +6,6 @@ postcode: ""
 city: Annecy
 street: ""
 housenumber: 29ter
-phone: "+33 4 50 77 27 27"
-opening_hours: "Tu-Sa 08:00-13:00, 15:30-19:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+phone: +33 4 50 77 27 27
+opening_hours: Tu-Sa 08:00-13:00, 15:30-19:00; Su 08:00-13:00
+website: ""
diff --git a/data/cities/annecy/boulangerie-chevallier.yml b/data/cities/annecy/boulangerie-chevallier.yml
index 868e55dbe..317392f5f 100644
--- a/data/cities/annecy/boulangerie-chevallier.yml
+++ b/data/cities/annecy/boulangerie-chevallier.yml
@@ -4,8 +4,8 @@ latitude: 45.90695
 longitude: 6.10942
 postcode: "74960"
 city: Annecy
-street: "Avenue de la République"
+street: Avenue de la République
 housenumber: 9ter
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/boulangerie-des-haras.yml b/data/cities/annecy/boulangerie-des-haras.yml
index 5496363eb..810effaff 100644
--- a/data/cities/annecy/boulangerie-des-haras.yml
+++ b/data/cities/annecy/boulangerie-des-haras.yml
@@ -4,8 +4,8 @@ latitude: 45.90465
 longitude: 6.12858
 postcode: "74000"
 city: Annecy
-street: "Rue Guillaume Fichet"
-housenumber: 12
-phone: "+33 4 50 45 64 41"
-opening_hours: "Tu-Sa 07:00-19:00; Su 07:00-12:30 PH Off"
-website: ""
\ No newline at end of file
+street: Rue Guillaume Fichet
+housenumber: "12"
+phone: +33 4 50 45 64 41
+opening_hours: Tu-Sa 07:00-19:00; Su 07:00-12:30 PH Off
+website: ""
diff --git a/data/cities/annecy/boulangerie-patisserie-campagne.yml b/data/cities/annecy/boulangerie-patisserie-campagne.yml
index 919283af1..dcea4065c 100644
--- a/data/cities/annecy/boulangerie-patisserie-campagne.yml
+++ b/data/cities/annecy/boulangerie-patisserie-campagne.yml
@@ -4,8 +4,8 @@ latitude: 45.90256
 longitude: 6.12665
 postcode: "74000"
 city: Annecy
-street: "Rue du Président Favre"
-housenumber: 6
+street: Rue du Président Favre
+housenumber: "6"
 phone: "+33450454186"
 opening_hours: ""
-website: "https://www.campagne.com/"
\ No newline at end of file
+website: https://www.campagne.com/
diff --git a/data/cities/annecy/boulangerie-rouge.yml b/data/cities/annecy/boulangerie-rouge.yml
index 161af2176..b8a2f00e8 100644
--- a/data/cities/annecy/boulangerie-rouge.yml
+++ b/data/cities/annecy/boulangerie-rouge.yml
@@ -4,8 +4,8 @@ latitude: 45.90707
 longitude: 6.10844
 postcode: "74960"
 city: Annecy
-street: "Avenue de la République"
-housenumber: 11
+street: Avenue de la République
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:30; Su 07:00-19:00"
-website: "https://www.boulangerierouge.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:30; Su 07:00-19:00
+website: https://www.boulangerierouge.com/
diff --git a/data/cities/annecy/bouygues-telecom.yml b/data/cities/annecy/bouygues-telecom.yml
index 6081651c3..4c07fdbfb 100644
--- a/data/cities/annecy/bouygues-telecom.yml
+++ b/data/cities/annecy/bouygues-telecom.yml
@@ -4,8 +4,8 @@ latitude: 45.90124
 longitude: 6.12555
 postcode: "74000"
 city: Annecy
-street: "Rue Carnot"
-housenumber: 15
+street: Rue Carnot
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/cabaia.yml b/data/cities/annecy/cabaia.yml
index dbfe8b6ba..ef689bf24 100644
--- a/data/cities/annecy/cabaia.yml
+++ b/data/cities/annecy/cabaia.yml
@@ -4,8 +4,8 @@ latitude: 45.90166
 longitude: 6.12547
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 24
+street: Rue Carnot
+housenumber: "24"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.cabaia.fr"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.cabaia.fr
diff --git a/data/cities/annecy/calvin-klein.yml b/data/cities/annecy/calvin-klein.yml
index 1c4047e4a..3eff8b229 100644
--- a/data/cities/annecy/calvin-klein.yml
+++ b/data/cities/annecy/calvin-klein.yml
@@ -4,8 +4,8 @@ latitude: 45.90656
 longitude: 6.13229
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/calzedonia.yml b/data/cities/annecy/calzedonia.yml
index aebe2b98d..e7f414439 100644
--- a/data/cities/annecy/calzedonia.yml
+++ b/data/cities/annecy/calzedonia.yml
@@ -4,8 +4,8 @@ latitude: 45.90189
 longitude: 6.12519
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 29
+street: Rue Carnot
+housenumber: "29"
 phone: ""
 opening_hours: ""
-website: "https://it.calzedonia.com/custserv/locate_store.cmd"
\ No newline at end of file
+website: https://it.calzedonia.com/custserv/locate_store.cmd
diff --git a/data/cities/annecy/canada-goose.yml b/data/cities/annecy/canada-goose.yml
index a2a842c73..7f1f6d5f7 100644
--- a/data/cities/annecy/canada-goose.yml
+++ b/data/cities/annecy/canada-goose.yml
@@ -4,8 +4,8 @@ latitude: 45.90644
 longitude: 6.13247
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/carador.yml b/data/cities/annecy/carador.yml
index 88fdf096d..8f29a25d1 100644
--- a/data/cities/annecy/carador.yml
+++ b/data/cities/annecy/carador.yml
@@ -1,11 +1,11 @@
 id: 946952730
-type: way
+type: node
 latitude: 45.92521
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450635211"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/caroll.yml b/data/cities/annecy/caroll.yml
index 2b454c3a3..acfc4962e 100644
--- a/data/cities/annecy/caroll.yml
+++ b/data/cities/annecy/caroll.yml
@@ -4,8 +4,8 @@ latitude: 45.90643
 longitude: 6.13262
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/carosserie-maniglier.yml b/data/cities/annecy/carosserie-maniglier.yml
index 90411114d..ebffc6532 100644
--- a/data/cities/annecy/carosserie-maniglier.yml
+++ b/data/cities/annecy/carosserie-maniglier.yml
@@ -4,8 +4,8 @@ latitude: 45.90729
 longitude: 6.11579
 postcode: "74000"
 city: Annecy
-street: "Boulevard de la Rocade"
-housenumber: 26
+street: Boulevard de la Rocade
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: "https://www.carrosserie-fontana.com/"
\ No newline at end of file
+website: https://www.carrosserie-fontana.com/
diff --git a/data/cities/annecy/carrefour-city-avenue-de-chambery.yml b/data/cities/annecy/carrefour-city-avenue-de-chambery.yml
index 713a14a0c..dabe4e2f4 100644
--- a/data/cities/annecy/carrefour-city-avenue-de-chambery.yml
+++ b/data/cities/annecy/carrefour-city-avenue-de-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.89917
 longitude: 6.11949
 postcode: "74000"
 city: Annecy
-street: "Avenue de Chambéry"
-housenumber: 14
+street: Avenue de Chambéry
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-21:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/annecy/carrefour-city-avenue-du-parc-des-sports.yml b/data/cities/annecy/carrefour-city-avenue-du-parc-des-sports.yml
index ff6284a93..1763164f9 100644
--- a/data/cities/annecy/carrefour-city-avenue-du-parc-des-sports.yml
+++ b/data/cities/annecy/carrefour-city-avenue-du-parc-des-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.91181
 longitude: 6.12128
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parc des Sports"
-housenumber: 27
+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"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-21:00; Su 09:00-13:00, 16:00-20:00
+website: ""
diff --git a/data/cities/annecy/carrefour-city-place-annapurna.yml b/data/cities/annecy/carrefour-city-place-annapurna.yml
index fdd21050e..a2b46fa1e 100644
--- a/data/cities/annecy/carrefour-city-place-annapurna.yml
+++ b/data/cities/annecy/carrefour-city-place-annapurna.yml
@@ -4,8 +4,8 @@ latitude: 45.91736
 longitude: 6.13371
 postcode: "74000"
 city: Annecy
-street: "Place Annapurna"
-housenumber: 13
+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
+opening_hours: Mo-Sa 07:00-21:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/annecy/carrefour-city.yml b/data/cities/annecy/carrefour-city.yml
index 3a7806e36..bc6f29ce2 100644
--- a/data/cities/annecy/carrefour-city.yml
+++ b/data/cities/annecy/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.91878
 longitude: 6.1289
 postcode: "74000"
 city: Annecy
-street: "Place des Rhododendrons"
-housenumber: 5
+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
+opening_hours: Mo-Sa 07:00-21:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/annecy/carrefour-fleurs.yml b/data/cities/annecy/carrefour-fleurs.yml
index 8c56fc540..bb08d2efc 100644
--- a/data/cities/annecy/carrefour-fleurs.yml
+++ b/data/cities/annecy/carrefour-fleurs.yml
@@ -1,11 +1,11 @@
 id: 946952736
-type: way
+type: node
 latitude: 45.92537
 longitude: 6.12432
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450666666"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/carrefour-market.yml b/data/cities/annecy/carrefour-market.yml
index 6b9701634..00e033055 100644
--- a/data/cities/annecy/carrefour-market.yml
+++ b/data/cities/annecy/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 62502978
-type: way
+type: node
 latitude: 45.91022
 longitude: 6.14916
 postcode: "74940"
 city: Annecy
-street: "Rue des Mouettes"
-housenumber: 33
+street: Rue des Mouettes
+housenumber: "33"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/annecy/carrefour-voyages.yml b/data/cities/annecy/carrefour-voyages.yml
index aabb1df18..83fd2133a 100644
--- a/data/cities/annecy/carrefour-voyages.yml
+++ b/data/cities/annecy/carrefour-voyages.yml
@@ -1,11 +1,11 @@
 id: 946952737
-type: way
+type: node
 latitude: 45.92547
 longitude: 6.12432
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450107407"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/carrefour.yml b/data/cities/annecy/carrefour.yml
index 00ef92e5c..b2f89778e 100644
--- a/data/cities/annecy/carrefour.yml
+++ b/data/cities/annecy/carrefour.yml
@@ -1,11 +1,11 @@
 id: 31987380
-type: way
+type: node
 latitude: 45.9257
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: ""
-opening_hours: "Mo-Fr 08:30-21:30; Sa 08:30-21:00; Su 08:30-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-21:30; Sa 08:30-21:00; Su 08:30-12:15
+website: ""
diff --git a/data/cities/annecy/carroserie-choufani.yml b/data/cities/annecy/carroserie-choufani.yml
index 77bb102ea..dc87a9cd8 100644
--- a/data/cities/annecy/carroserie-choufani.yml
+++ b/data/cities/annecy/carroserie-choufani.yml
@@ -1,11 +1,11 @@
 id: 1110338087
-type: way
+type: node
 latitude: 45.91647
 longitude: 6.10516
 postcode: "74960"
 city: ANNECY
-street: "Avenue du Pont de Tasset"
-housenumber: 26
-phone: "+33 4 50 46 61 20"
+street: Avenue du Pont de Tasset
+housenumber: "26"
+phone: +33 4 50 46 61 20
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/casino-shop.yml b/data/cities/annecy/casino-shop.yml
index 2a4db498b..6c6302108 100644
--- a/data/cities/annecy/casino-shop.yml
+++ b/data/cities/annecy/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.90945
 longitude: 6.12399
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
+street: Avenue de Genève
 housenumber: 10 ter
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su off
+website: ""
diff --git a/data/cities/annecy/catimini.yml b/data/cities/annecy/catimini.yml
index 822ee7a52..e6a1f1ba1 100644
--- a/data/cities/annecy/catimini.yml
+++ b/data/cities/annecy/catimini.yml
@@ -4,8 +4,8 @@ latitude: 45.90258
 longitude: 6.12493
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/centre-commercial-courier.yml b/data/cities/annecy/centre-commercial-courier.yml
index 655a28c85..6c22a3e78 100644
--- a/data/cities/annecy/centre-commercial-courier.yml
+++ b/data/cities/annecy/centre-commercial-courier.yml
@@ -1,11 +1,11 @@
 id: 889285945
-type: way
+type: node
 latitude: 45.90485
 longitude: 6.12238
 postcode: "74000"
 city: Annecy
-street: "Rue Carnot"
-housenumber: 65
-phone: "+33 4 50 46 46 76"
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: "https://courier.klepierre.fr"
\ No newline at end of file
+street: Rue Carnot
+housenumber: "65"
+phone: +33 4 50 46 46 76
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: https://courier.klepierre.fr
diff --git a/data/cities/annecy/cerise-et-potiron-rue-centrale.yml b/data/cities/annecy/cerise-et-potiron-rue-centrale.yml
index 0a0354aba..c067bf9c4 100644
--- a/data/cities/annecy/cerise-et-potiron-rue-centrale.yml
+++ b/data/cities/annecy/cerise-et-potiron-rue-centrale.yml
@@ -4,8 +4,8 @@ latitude: 45.90611
 longitude: 6.14559
 postcode: "74940"
 city: Annecy
-street: "Rue Centrale"
+street: Rue Centrale
 housenumber: 8 bis
-phone: "+33 4 50 27 59 17"
-opening_hours: "Mo-Sa 08:00-19:30; Su 08:30-12:30"
-website: "https://www.cerise-et-potiron.fr/"
\ No newline at end of file
+phone: +33 4 50 27 59 17
+opening_hours: Mo-Sa 08:00-19:30; Su 08:30-12:30
+website: https://www.cerise-et-potiron.fr/
diff --git a/data/cities/annecy/cerise-et-potiron.yml b/data/cities/annecy/cerise-et-potiron.yml
index caeb05f82..67702c267 100644
--- a/data/cities/annecy/cerise-et-potiron.yml
+++ b/data/cities/annecy/cerise-et-potiron.yml
@@ -4,8 +4,8 @@ latitude: 45.9174
 longitude: 6.13432
 postcode: "74000"
 city: Annecy
-street: "Place Annapurna"
-housenumber: 29
+street: Place Annapurna
+housenumber: "29"
 phone: "0481062465"
-opening_hours: "Mo-Sa 08:00-19:30"
-website: "http://ceriseetpotiron.fr"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30
+website: http://ceriseetpotiron.fr
diff --git a/data/cities/annecy/champion.yml b/data/cities/annecy/champion.yml
index 39cb75c0c..32de1dc9d 100644
--- a/data/cities/annecy/champion.yml
+++ b/data/cities/annecy/champion.yml
@@ -4,8 +4,8 @@ latitude: 45.90668
 longitude: 6.13237
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/chantal-thomass.yml b/data/cities/annecy/chantal-thomass.yml
index f5727d09c..2b6e96395 100644
--- a/data/cities/annecy/chantal-thomass.yml
+++ b/data/cities/annecy/chantal-thomass.yml
@@ -4,8 +4,8 @@ latitude: 45.90638
 longitude: 6.13283
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/chantelle-avenue-du-parmelan.yml b/data/cities/annecy/chantelle-avenue-du-parmelan.yml
index 5b15d86ad..b566d4d8b 100644
--- a/data/cities/annecy/chantelle-avenue-du-parmelan.yml
+++ b/data/cities/annecy/chantelle-avenue-du-parmelan.yml
@@ -4,8 +4,8 @@ latitude: 45.90634
 longitude: 6.13273
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/chantelle.yml b/data/cities/annecy/chantelle.yml
index 9dbf38647..a7c5b37f7 100644
--- a/data/cities/annecy/chantelle.yml
+++ b/data/cities/annecy/chantelle.yml
@@ -4,8 +4,8 @@ latitude: 45.90166
 longitude: 6.1253
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 21
+street: Rue Carnot
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/christophe-borocco.yml b/data/cities/annecy/christophe-borocco.yml
index ad8354cf0..06f2aec69 100644
--- a/data/cities/annecy/christophe-borocco.yml
+++ b/data/cities/annecy/christophe-borocco.yml
@@ -4,8 +4,8 @@ latitude: 45.90566
 longitude: 6.12398
 postcode: "74000"
 city: Annecy
-street: "Boulevard du Lycée"
-housenumber: 1
+street: Boulevard du Lycée
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://www.borocco.fr/"
\ No newline at end of file
+website: https://www.borocco.fr/
diff --git a/data/cities/annecy/ciao-agip.yml b/data/cities/annecy/ciao-agip.yml
index a90484bef..70cb81244 100644
--- a/data/cities/annecy/ciao-agip.yml
+++ b/data/cities/annecy/ciao-agip.yml
@@ -4,8 +4,8 @@ latitude: 45.89809
 longitude: 6.11664
 postcode: "74000"
 city: Annecy
-street: "Avenue de Chambéry"
-housenumber: 17
+street: Avenue de Chambéry
+housenumber: "17"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/annecy/cigusto.yml b/data/cities/annecy/cigusto.yml
index a315c5bc6..91b8b6438 100644
--- a/data/cities/annecy/cigusto.yml
+++ b/data/cities/annecy/cigusto.yml
@@ -1,11 +1,11 @@
 id: 946952720
-type: way
+type: node
 latitude: 45.92453
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/citroen-sadal.yml b/data/cities/annecy/citroen-sadal.yml
index 2cd717dda..e728d01eb 100644
--- a/data/cities/annecy/citroen-sadal.yml
+++ b/data/cities/annecy/citroen-sadal.yml
@@ -1,11 +1,11 @@
 id: 62597758
-type: way
+type: node
 latitude: 45.88053
 longitude: 6.09497
 postcode: "74600"
 city: Annecy
-street: "Avenue d'Aix les Bains"
-housenumber: 209
+street: Avenue d'Aix les Bains
+housenumber: "209"
 phone: ""
-opening_hours: "Mo-Fr 07:30-12:00,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:00,13:30-19:00
+website: ""
diff --git a/data/cities/annecy/cnos-terroirs.yml b/data/cities/annecy/cnos-terroirs.yml
index 7ab7eee90..eb2ebbafc 100644
--- a/data/cities/annecy/cnos-terroirs.yml
+++ b/data/cities/annecy/cnos-terroirs.yml
@@ -4,8 +4,8 @@ latitude: 45.88287
 longitude: 6.08959
 postcode: "74600"
 city: Annecy
-street: "Avenue des Neigeos"
-housenumber: 67
+street: Avenue des Neigeos
+housenumber: "67"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/columbia-avenue-du-parmelan.yml b/data/cities/annecy/columbia-avenue-du-parmelan.yml
index 822fe24ff..be1edd98c 100644
--- a/data/cities/annecy/columbia-avenue-du-parmelan.yml
+++ b/data/cities/annecy/columbia-avenue-du-parmelan.yml
@@ -4,8 +4,8 @@ latitude: 45.90673
 longitude: 6.13231
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/columbia.yml b/data/cities/annecy/columbia.yml
index 7ada6df3d..c39e968a4 100644
--- a/data/cities/annecy/columbia.yml
+++ b/data/cities/annecy/columbia.yml
@@ -4,8 +4,8 @@ latitude: 45.90311
 longitude: 6.12596
 postcode: "74000"
 city: Annecy
-street: "Rue du Président Favre"
-housenumber: 19
+street: Rue du Président Favre
+housenumber: "19"
 phone: ""
-opening_hours: "Mo 14:00-19:00, We10:00-13:00,14:00-19:00, Tu 10:00-19:00, Th-Sa 10:00-19:00"
-website: "https://www.columbiasportswear.fr/FR/c/stores"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00, We10:00-13:00,14:00-19:00, Tu 10:00-19:00, Th-Sa 10:00-19:00
+website: https://www.columbiasportswear.fr/FR/c/stores
diff --git a/data/cities/annecy/creatif-coiffure.yml b/data/cities/annecy/creatif-coiffure.yml
index 611695364..a85b76f67 100644
--- a/data/cities/annecy/creatif-coiffure.yml
+++ b/data/cities/annecy/creatif-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.90859
 longitude: 6.12923
 postcode: "74000"
 city: Annecy
-street: "Rue Louis Boch"
-housenumber: 15
+street: Rue Louis Boch
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/crematorium.yml b/data/cities/annecy/crematorium.yml
index 854b11cdc..b45d3beca 100644
--- a/data/cities/annecy/crematorium.yml
+++ b/data/cities/annecy/crematorium.yml
@@ -1,11 +1,11 @@
 id: 35210129
-type: way
+type: node
 latitude: 45.91638
 longitude: 6.11575
 postcode: "74000"
 city: Annecy
-street: "Boulevard du Fier"
-housenumber: 25
+street: Boulevard du Fier
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/cremerie-du-thiou.yml b/data/cities/annecy/cremerie-du-thiou.yml
index d62e609d4..480d4110e 100644
--- a/data/cities/annecy/cremerie-du-thiou.yml
+++ b/data/cities/annecy/cremerie-du-thiou.yml
@@ -4,8 +4,8 @@ latitude: 45.90705
 longitude: 6.10853
 postcode: "74960"
 city: Annecy
-street: "Avenue de la République"
-housenumber: 11
+street: Avenue de la République
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: "https://alainmichel-fromager.com/"
\ No newline at end of file
+website: https://alainmichel-fromager.com/
diff --git a/data/cities/annecy/cuisine-plaisir.yml b/data/cities/annecy/cuisine-plaisir.yml
index 417f28f52..1fa9ec9f0 100644
--- a/data/cities/annecy/cuisine-plaisir.yml
+++ b/data/cities/annecy/cuisine-plaisir.yml
@@ -4,8 +4,8 @@ latitude: 45.89941
 longitude: 6.12736
 postcode: "74000"
 city: Annecy
-street: "Rue du Collège Chapuisien"
-housenumber: 6
+street: Rue du Collège Chapuisien
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/annecy/cyclable-annecy.yml b/data/cities/annecy/cyclable-annecy.yml
index 327778f82..b978af28d 100644
--- a/data/cities/annecy/cyclable-annecy.yml
+++ b/data/cities/annecy/cyclable-annecy.yml
@@ -4,8 +4,8 @@ latitude: 45.90334
 longitude: 6.12871
 postcode: "74000"
 city: Annecy
-street: "Rue de Bonlieu"
-housenumber: 6
-phone: "+33 456739771"
-opening_hours: ""
-website: "https://annecy-bonlieu.cyclable.com/"
\ No newline at end of file
+street: Rue de Bonlieu
+housenumber: "6"
+phone: +33 456739771
+opening_hours: Tu-Sa 10:00-12:30,14:30-19:00
+website: https://annecy-bonlieu.cyclable.com/
diff --git a/data/cities/annecy/d-bosstech-carrosserie.yml b/data/cities/annecy/d-bosstech-carrosserie.yml
index 3db3a1dd0..7c7fe0a5a 100644
--- a/data/cities/annecy/d-bosstech-carrosserie.yml
+++ b/data/cities/annecy/d-bosstech-carrosserie.yml
@@ -4,8 +4,8 @@ latitude: 45.91027
 longitude: 6.09645
 postcode: "74960"
 city: Annecy
-street: "Impasse du Viéran"
-housenumber: 
-phone: "+33 4 50 57 48 38"
+street: Impasse du Viéran
+housenumber: ""
+phone: +33 4 50 57 48 38
 opening_hours: ""
-website: "http://www.d-bosstech.com/"
\ No newline at end of file
+website: http://www.d-bosstech.com/
diff --git a/data/cities/annecy/dalery.yml b/data/cities/annecy/dalery.yml
index 7a0c6eeca..be916fe76 100644
--- a/data/cities/annecy/dalery.yml
+++ b/data/cities/annecy/dalery.yml
@@ -1,11 +1,11 @@
 id: 946952722
-type: way
+type: node
 latitude: 45.92462
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450670780"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/day-by-day.yml b/data/cities/annecy/day-by-day.yml
index b6bfa4f86..d18246994 100644
--- a/data/cities/annecy/day-by-day.yml
+++ b/data/cities/annecy/day-by-day.yml
@@ -4,8 +4,8 @@ latitude: 45.90619
 longitude: 6.12409
 postcode: "74000"
 city: Annecy
-street: "Rue Joseph Dessaix"
-housenumber: 4
+street: Rue Joseph Dessaix
+housenumber: "4"
 phone: "+33450627163"
-opening_hours: "Mo-Sa 09:30-13:00, 14:30-19:00"
-website: "https://daybyday-shop.com/magasin/annecy"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-13:00, 14:30-19:00
+website: https://daybyday-shop.com/magasin/annecy
diff --git a/data/cities/annecy/decathlon.yml b/data/cities/annecy/decathlon.yml
index 8cf9cfb7a..6b0202582 100644
--- a/data/cities/annecy/decathlon.yml
+++ b/data/cities/annecy/decathlon.yml
@@ -4,8 +4,8 @@ latitude: 45.90346
 longitude: 6.12635
 postcode: "74000"
 city: Annecy
-street: "Rue de la Paix"
-housenumber: 7
+street: Rue de la Paix
+housenumber: "7"
 phone: "+33485720003"
-opening_hours: "Mo-Sa 10:00-19:30"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-annecy-city-centre-ville-0070253102531"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:30
+website: https://www.decathlon.fr/store-view/magasin-de-sports-annecy-city-centre-ville-0070253102531
diff --git a/data/cities/annecy/decitre.yml b/data/cities/annecy/decitre.yml
index ef56e1336..c9c0c5f8d 100644
--- a/data/cities/annecy/decitre.yml
+++ b/data/cities/annecy/decitre.yml
@@ -4,8 +4,8 @@ latitude: 45.90219
 longitude: 6.12452
 postcode: "74000"
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 18
-phone: "+33 4 50 33 00 00"
+street: Rue Sommeiller
+housenumber: "18"
+phone: +33 4 50 33 00 00
 opening_hours: ""
-website: "https://www.decitre.fr/aide/nos-librairies/annecy"
\ No newline at end of file
+website: https://www.decitre.fr/aide/nos-librairies/annecy
diff --git a/data/cities/annecy/descamps.yml b/data/cities/annecy/descamps.yml
index 95cb40f00..1ee6e9c46 100644
--- a/data/cities/annecy/descamps.yml
+++ b/data/cities/annecy/descamps.yml
@@ -4,8 +4,8 @@ latitude: 45.90175
 longitude: 6.12542
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 26
+street: Rue Carnot
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/design-led.yml b/data/cities/annecy/design-led.yml
index 47e05d5d8..cd9a8f7e9 100644
--- a/data/cities/annecy/design-led.yml
+++ b/data/cities/annecy/design-led.yml
@@ -4,8 +4,9 @@ latitude: 45.91056
 longitude: 6.09827
 postcode: "74960"
 city: Annecy
-street: "Avenue du Pont de Tasset"
-housenumber: 2
+street: Avenue du Pont de Tasset
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Th 09:00-12:00,14:00-18:00; Fr 09:00-12:00,14:00-17:00; Sa-Su off; PH off"
-website: "https://design-led.fr/"
\ No newline at end of file
+opening_hours: Mo-Th 09:00-12:00,14:00-18:00; Fr 09:00-12:00,14:00-17:00; Sa-Su off;
+    PH off
+website: https://design-led.fr/
diff --git a/data/cities/annecy/diesel.yml b/data/cities/annecy/diesel.yml
index 3bed92cd2..c33503d68 100644
--- a/data/cities/annecy/diesel.yml
+++ b/data/cities/annecy/diesel.yml
@@ -4,8 +4,8 @@ latitude: 45.90664
 longitude: 6.1323
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/dim.yml b/data/cities/annecy/dim.yml
index 1b2809a57..5c51ff13f 100644
--- a/data/cities/annecy/dim.yml
+++ b/data/cities/annecy/dim.yml
@@ -4,8 +4,8 @@ latitude: 45.90641
 longitude: 6.13275
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/e-rider-velos-electriques.yml b/data/cities/annecy/e-rider-velos-electriques.yml
index b16017c1a..fdbe2dfa2 100644
--- a/data/cities/annecy/e-rider-velos-electriques.yml
+++ b/data/cities/annecy/e-rider-velos-electriques.yml
@@ -4,8 +4,8 @@ latitude: 45.89927
 longitude: 6.1172
 postcode: "74000"
 city: Annecy
-street: "Avenue du Rhône"
-housenumber: 9
-phone: "+33 4 56 34 83 31"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-21:00,14:00-19:00"
-website: "https://www.eridershop.fr/"
\ No newline at end of file
+street: Avenue du Rhône
+housenumber: "9"
+phone: +33 4 56 34 83 31
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-21:00,14:00-19:00
+website: https://www.eridershop.fr/
diff --git a/data/cities/annecy/epicerie-uni-asiatique.yml b/data/cities/annecy/epicerie-uni-asiatique.yml
index 91d6c8bb8..017d23810 100644
--- a/data/cities/annecy/epicerie-uni-asiatique.yml
+++ b/data/cities/annecy/epicerie-uni-asiatique.yml
@@ -4,8 +4,8 @@ latitude: 45.90679
 longitude: 6.11246
 postcode: "74960"
 city: Annecy
-street: "Avenue de la République"
-housenumber: 16
+street: Avenue de la République
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Sa 09:30-12:30,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-12:30,13:30-19:00
+website: ""
diff --git a/data/cities/annecy/epil-services.yml b/data/cities/annecy/epil-services.yml
index 9250246be..557c865c1 100644
--- a/data/cities/annecy/epil-services.yml
+++ b/data/cities/annecy/epil-services.yml
@@ -4,8 +4,8 @@ latitude: 45.90612
 longitude: 6.14565
 postcode: "74940"
 city: Annecy
-street: "Rue Centrale"
-housenumber: 8
+street: Rue Centrale
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: "http://epilservices-epilation.com/"
\ No newline at end of file
+website: http://epilservices-epilation.com/
diff --git a/data/cities/annecy/etam.yml b/data/cities/annecy/etam.yml
index 55c953ea7..cfe888c3c 100644
--- a/data/cities/annecy/etam.yml
+++ b/data/cities/annecy/etam.yml
@@ -4,8 +4,8 @@ latitude: 45.9011
 longitude: 6.12564
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/eureka-droguerie-du-parmelan.yml b/data/cities/annecy/eureka-droguerie-du-parmelan.yml
index 8e6c63ed4..dbb80c1bb 100644
--- a/data/cities/annecy/eureka-droguerie-du-parmelan.yml
+++ b/data/cities/annecy/eureka-droguerie-du-parmelan.yml
@@ -4,8 +4,8 @@ latitude: 45.907
 longitude: 6.13442
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 37
+street: Avenue du Parmelan
+housenumber: "37"
 phone: ""
 opening_hours: ""
-website: "https://www.eurekamamaison.fr/"
\ No newline at end of file
+website: https://www.eurekamamaison.fr/
diff --git a/data/cities/annecy/evolution-2-events.yml b/data/cities/annecy/evolution-2-events.yml
index 6f376458b..08a8afe29 100644
--- a/data/cities/annecy/evolution-2-events.yml
+++ b/data/cities/annecy/evolution-2-events.yml
@@ -4,8 +4,8 @@ latitude: 45.92285
 longitude: 6.16617
 postcode: "74940"
 city: Annecy
-street: "Route de Thônes"
-housenumber: 51
+street: Route de Thônes
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: "https://www.facebook.com/Evolution-2-Events-306663558365/"
\ No newline at end of file
+website: https://www.facebook.com/Evolution-2-Events-306663558365/
diff --git a/data/cities/annecy/ferme-de-vergloz.yml b/data/cities/annecy/ferme-de-vergloz.yml
index b761736e1..d6ffb2177 100644
--- a/data/cities/annecy/ferme-de-vergloz.yml
+++ b/data/cities/annecy/ferme-de-vergloz.yml
@@ -4,8 +4,8 @@ latitude: 45.8702
 longitude: 6.09324
 postcode: "74600"
 city: Annecy
-street: "Route de Vergloz"
-housenumber: 46
+street: Route de Vergloz
+housenumber: "46"
 phone: ""
-opening_hours: "Tu 16:00-19:00; Fr 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 16:00-19:00; Fr 16:00-19:00
+website: ""
diff --git a/data/cities/annecy/feu-vert.yml b/data/cities/annecy/feu-vert.yml
index a4fe1cc0b..d8bb2b72a 100644
--- a/data/cities/annecy/feu-vert.yml
+++ b/data/cities/annecy/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 989055445
-type: way
+type: node
 latitude: 45.87786
 longitude: 6.08873
 postcode: "74600"
 city: Annecy
-street: "Avenue de Periaz"
-housenumber: 22
+street: Avenue de Periaz
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Su off; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Su off; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/annecy/fnac.yml b/data/cities/annecy/fnac.yml
index 1d5e915f1..86697de05 100644
--- a/data/cities/annecy/fnac.yml
+++ b/data/cities/annecy/fnac.yml
@@ -1,11 +1,11 @@
 id: 889285932
-type: way
+type: node
 latitude: 45.90369
 longitude: 6.12358
 postcode: "74000"
 city: Annecy
-street: "Rue Carnot"
-housenumber: 65
+street: Rue Carnot
+housenumber: "65"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; PH off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; PH off
+website: ""
diff --git a/data/cities/annecy/follement-fleur.yml b/data/cities/annecy/follement-fleur.yml
index 75c764d92..452d0024e 100644
--- a/data/cities/annecy/follement-fleur.yml
+++ b/data/cities/annecy/follement-fleur.yml
@@ -4,8 +4,8 @@ latitude: 45.90708
 longitude: 6.11563
 postcode: "74000"
 city: Annecy
-street: "Boulevard de la Rocade"
-housenumber: 28
+street: Boulevard de la Rocade
+housenumber: "28"
 phone: ""
-opening_hours: "08:30-20:30"
-website: "https://www.follementfleur.fr/"
\ No newline at end of file
+opening_hours: 08:30-20:30
+website: https://www.follementfleur.fr/
diff --git a/data/cities/annecy/foot-locker.yml b/data/cities/annecy/foot-locker.yml
index 22ace64b5..62bfd559b 100644
--- a/data/cities/annecy/foot-locker.yml
+++ b/data/cities/annecy/foot-locker.yml
@@ -4,8 +4,8 @@ latitude: 45.90278
 longitude: 6.12499
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 50
-phone: "+33 4 58 13 00 51"
-opening_hours: "Mo-Sa 10:00-19:00; Su closed"
-website: "https://stores.footlocker.fr/en/fr-69/annecy/50-avenue-carnot-261_31_05172.html"
\ No newline at end of file
+street: Rue Carnot
+housenumber: "50"
+phone: +33 4 58 13 00 51
+opening_hours: Mo-Sa 10:00-19:00; Su closed
+website: https://stores.footlocker.fr/en/fr-69/annecy/50-avenue-carnot-261_31_05172.html
diff --git a/data/cities/annecy/franprix.yml b/data/cities/annecy/franprix.yml
index ac025f92d..5e8e1fde4 100644
--- a/data/cities/annecy/franprix.yml
+++ b/data/cities/annecy/franprix.yml
@@ -4,8 +4,8 @@ latitude: 45.9008
 longitude: 6.12427
 postcode: "74100"
 city: Annecy
-street: "Rue de l'Annexion"
-housenumber: 7
+street: Rue de l'Annexion
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:50"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:50
+website: ""
diff --git a/data/cities/annecy/fred-tatoo.yml b/data/cities/annecy/fred-tatoo.yml
index b2bc1c1f8..01ea984b3 100644
--- a/data/cities/annecy/fred-tatoo.yml
+++ b/data/cities/annecy/fred-tatoo.yml
@@ -4,8 +4,8 @@ latitude: 45.91075
 longitude: 6.12362
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 43
+street: Avenue de Genève
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: "http://fredtattoo.fr/"
\ No newline at end of file
+website: http://fredtattoo.fr/
diff --git a/data/cities/annecy/free-center-annecy.yml b/data/cities/annecy/free-center-annecy.yml
index d9d7c03bb..4c316422a 100644
--- a/data/cities/annecy/free-center-annecy.yml
+++ b/data/cities/annecy/free-center-annecy.yml
@@ -4,8 +4,8 @@ latitude: 45.90119
 longitude: 6.12558
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 13
+street: Rue Carnot
+housenumber: "13"
 phone: ""
-opening_hours: "10:00-19:00; Su off"
-website: "https://www.free.fr/boutiques/free-center/free-center-annecy/"
\ No newline at end of file
+opening_hours: 10:00-19:00; Su off
+website: https://www.free.fr/boutiques/free-center/free-center-annecy/
diff --git a/data/cities/annecy/fursac.yml b/data/cities/annecy/fursac.yml
index c9986593b..51fd8986a 100644
--- a/data/cities/annecy/fursac.yml
+++ b/data/cities/annecy/fursac.yml
@@ -4,8 +4,8 @@ latitude: 45.90657
 longitude: 6.13242
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/generale-doptique.yml b/data/cities/annecy/generale-doptique.yml
index 141a2417a..920959e0c 100644
--- a/data/cities/annecy/generale-doptique.yml
+++ b/data/cities/annecy/generale-doptique.yml
@@ -1,11 +1,11 @@
 id: 946952717
-type: way
+type: node
 latitude: 45.9243
 longitude: 6.12405
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450460362"
-opening_hours: "Mo-Sa 09:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: ""
diff --git a/data/cities/annecy/guess.yml b/data/cities/annecy/guess.yml
index 0ba5a9105..977ed2c68 100644
--- a/data/cities/annecy/guess.yml
+++ b/data/cities/annecy/guess.yml
@@ -4,8 +4,8 @@ latitude: 45.90631
 longitude: 6.13243
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/guidon.yml b/data/cities/annecy/guidon.yml
index a3f0467a8..e2691c231 100644
--- a/data/cities/annecy/guidon.yml
+++ b/data/cities/annecy/guidon.yml
@@ -4,8 +4,8 @@ latitude: 45.91156
 longitude: 6.09898
 postcode: "74960"
 city: Annecy
-street: "Avenue du pont de tasset"
+street: Avenue du pont de tasset
 housenumber: 4bis
-phone: "+33 607803676"
+phone: +33 607803676
 opening_hours: ""
-website: "https://www.guidonmtb.com/"
\ No newline at end of file
+website: https://www.guidonmtb.com/
diff --git a/data/cities/annecy/hairsuit.yml b/data/cities/annecy/hairsuit.yml
index 98999a144..6c42bbb1b 100644
--- a/data/cities/annecy/hairsuit.yml
+++ b/data/cities/annecy/hairsuit.yml
@@ -1,11 +1,11 @@
 id: 946952726
-type: way
+type: node
 latitude: 45.92512
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/havas-voyages.yml b/data/cities/annecy/havas-voyages.yml
index a4b7ed8a9..974e03840 100644
--- a/data/cities/annecy/havas-voyages.yml
+++ b/data/cities/annecy/havas-voyages.yml
@@ -4,8 +4,8 @@ latitude: 45.9016
 longitude: 6.12247
 postcode: "74000"
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 8
+street: Rue Sommeiller
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Fr 09:30-13:00,14:00-18:30; Sa 09:00-13:00,14:00-17:00"
-website: "https://agences.havas-voyages.fr/1555282-havas-voyages-annecy-sommeiller"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-13:00,14:00-18:30; Sa 09:00-13:00,14:00-17:00
+website: https://agences.havas-voyages.fr/1555282-havas-voyages-annecy-sommeiller
diff --git a/data/cities/annecy/horace.yml b/data/cities/annecy/horace.yml
index 59fc0745d..6eb5d3c31 100644
--- a/data/cities/annecy/horace.yml
+++ b/data/cities/annecy/horace.yml
@@ -4,8 +4,8 @@ latitude: 45.90262
 longitude: 6.12506
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 48
+street: Rue Carnot
+housenumber: "48"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/hugo-boss.yml b/data/cities/annecy/hugo-boss.yml
index 8ae944f66..ba96c42fe 100644
--- a/data/cities/annecy/hugo-boss.yml
+++ b/data/cities/annecy/hugo-boss.yml
@@ -4,8 +4,8 @@ latitude: 45.90648
 longitude: 6.132
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/ikks-avenue-du-parmelan.yml b/data/cities/annecy/ikks-avenue-du-parmelan.yml
index d3b924d55..660258cfd 100644
--- a/data/cities/annecy/ikks-avenue-du-parmelan.yml
+++ b/data/cities/annecy/ikks-avenue-du-parmelan.yml
@@ -4,8 +4,8 @@ latitude: 45.90651
 longitude: 6.13217
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/ikks-junior.yml b/data/cities/annecy/ikks-junior.yml
index 3af9cce8d..a72bc019b 100644
--- a/data/cities/annecy/ikks-junior.yml
+++ b/data/cities/annecy/ikks-junior.yml
@@ -4,8 +4,8 @@ latitude: 45.90287
 longitude: 6.1248
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/ikks.yml b/data/cities/annecy/ikks.yml
index bb0484908..5e54bd6cc 100644
--- a/data/cities/annecy/ikks.yml
+++ b/data/cities/annecy/ikks.yml
@@ -4,8 +4,8 @@ latitude: 45.90269
 longitude: 6.12489
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/intermarche-rue-du-travail.yml b/data/cities/annecy/intermarche-rue-du-travail.yml
index b4e946fa7..fab84449a 100644
--- a/data/cities/annecy/intermarche-rue-du-travail.yml
+++ b/data/cities/annecy/intermarche-rue-du-travail.yml
@@ -1,11 +1,11 @@
 id: 636901998
-type: way
+type: node
 latitude: 45.89496
 longitude: 6.1197
 postcode: "74000"
 city: Annecy
-street: "Rue du Travail"
-housenumber: 4
+street: Rue du Travail
+housenumber: "4"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/annecy/intermarche.yml b/data/cities/annecy/intermarche.yml
index b9c5e3d75..122b21cc3 100644
--- a/data/cities/annecy/intermarche.yml
+++ b/data/cities/annecy/intermarche.yml
@@ -1,11 +1,11 @@
 id: 40617415
-type: way
+type: node
 latitude: 45.89458
 longitude: 6.11974
 postcode: "74000"
 city: Annecy
-street: "Rue du Travail"
-housenumber: 4
+street: Rue du Travail
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-13:00
+website: ""
diff --git a/data/cities/annecy/intersport.yml b/data/cities/annecy/intersport.yml
index ab44ba9cb..0279346cb 100644
--- a/data/cities/annecy/intersport.yml
+++ b/data/cities/annecy/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.90173
 longitude: 6.12746
 postcode: "74000"
 city: Annecy
-street: "Rue Jean Jaurès"
-housenumber: 1
+street: Rue Jean Jaurès
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/annecy/jeff-de-bruges.yml b/data/cities/annecy/jeff-de-bruges.yml
index 9c8235add..cd60896d9 100644
--- a/data/cities/annecy/jeff-de-bruges.yml
+++ b/data/cities/annecy/jeff-de-bruges.yml
@@ -4,8 +4,8 @@ latitude: 45.9013
 longitude: 6.12567
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 18
+street: Rue Carnot
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/jules.yml b/data/cities/annecy/jules.yml
index 1fcf0cea0..692493252 100644
--- a/data/cities/annecy/jules.yml
+++ b/data/cities/annecy/jules.yml
@@ -4,8 +4,8 @@ latitude: 45.90271
 longitude: 6.12502
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
-phone: "+33 4 50 23 82 75"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.jules.com/fr-fr/magasins/16001393/"
\ No newline at end of file
+street: Rue Carnot
+housenumber: ""
+phone: +33 4 50 23 82 75
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.jules.com/fr-fr/magasins/16001393/
diff --git a/data/cities/annecy/kama-sutra.yml b/data/cities/annecy/kama-sutra.yml
index 4f66b79c8..3186d8725 100644
--- a/data/cities/annecy/kama-sutra.yml
+++ b/data/cities/annecy/kama-sutra.yml
@@ -4,8 +4,8 @@ latitude: 45.91242
 longitude: 6.12608
 postcode: "74000"
 city: Annecy
-street: "Avenue de Brogny"
-housenumber: 
+street: Avenue de Brogny
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/karl-lagerfeld.yml b/data/cities/annecy/karl-lagerfeld.yml
index 7b87bf612..d2c98f266 100644
--- a/data/cities/annecy/karl-lagerfeld.yml
+++ b/data/cities/annecy/karl-lagerfeld.yml
@@ -4,8 +4,8 @@ latitude: 45.9063
 longitude: 6.13256
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/kookai.yml b/data/cities/annecy/kookai.yml
index 3dbf2a7ac..2a5981c84 100644
--- a/data/cities/annecy/kookai.yml
+++ b/data/cities/annecy/kookai.yml
@@ -4,8 +4,8 @@ latitude: 45.90647
 longitude: 6.13271
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/kunz-pressing.yml b/data/cities/annecy/kunz-pressing.yml
index 4634e9423..33a1463fc 100644
--- a/data/cities/annecy/kunz-pressing.yml
+++ b/data/cities/annecy/kunz-pressing.yml
@@ -4,8 +4,8 @@ latitude: 45.9065
 longitude: 6.13421
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 30
-phone: "+33 4 50 51 12 70"
-opening_hours: "Mo-Sa 07:30-20:30"
-website: "https://www.kunz.fr/"
\ No newline at end of file
+street: Avenue du Parmelan
+housenumber: "30"
+phone: +33 4 50 51 12 70
+opening_hours: Mo-Sa 07:30-20:30
+website: https://www.kunz.fr/
diff --git a/data/cities/annecy/kunz.yml b/data/cities/annecy/kunz.yml
index 9b68bd5b8..1838630e8 100644
--- a/data/cities/annecy/kunz.yml
+++ b/data/cities/annecy/kunz.yml
@@ -4,8 +4,8 @@ latitude: 45.89988
 longitude: 6.12236
 postcode: "74000"
 city: Annecy
-street: "Rue Royale"
-housenumber: 24
+street: Rue Royale
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: "https://www.kunz.fr/"
\ No newline at end of file
+website: https://www.kunz.fr/
diff --git a/data/cities/annecy/la-boutique-du-coiffeur.yml b/data/cities/annecy/la-boutique-du-coiffeur.yml
index 2aea772fc..15dad7d60 100644
--- a/data/cities/annecy/la-boutique-du-coiffeur.yml
+++ b/data/cities/annecy/la-boutique-du-coiffeur.yml
@@ -1,11 +1,11 @@
 id: 946952729
-type: way
+type: node
 latitude: 45.92527
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/la-compagnie-des-petits.yml b/data/cities/annecy/la-compagnie-des-petits.yml
index aa33791cb..a0d9fd4be 100644
--- a/data/cities/annecy/la-compagnie-des-petits.yml
+++ b/data/cities/annecy/la-compagnie-des-petits.yml
@@ -4,8 +4,8 @@ latitude: 45.90199
 longitude: 6.12516
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 31
+street: Rue Carnot
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/la-librairie-imaginaire.yml b/data/cities/annecy/la-librairie-imaginaire.yml
index e04e54454..6b88d3d8b 100644
--- a/data/cities/annecy/la-librairie-imaginaire.yml
+++ b/data/cities/annecy/la-librairie-imaginaire.yml
@@ -4,8 +4,8 @@ latitude: 45.90078
 longitude: 6.1232
 postcode: "74000"
 city: Annecy
-street: "Rue de la Poste"
+street: Rue de la Poste
 housenumber: 4 bis
-phone: "+33 4 50 51 75 17"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 9:00-19:00"
-website: "https://librairieimaginaire-annecy.fr/"
\ No newline at end of file
+phone: +33 4 50 51 75 17
+opening_hours: Mo 14:00-19:00; Tu-Sa 9:00-19:00
+website: https://librairieimaginaire-annecy.fr/
diff --git a/data/cities/annecy/la-maison-des-fleurs.yml b/data/cities/annecy/la-maison-des-fleurs.yml
index b6c3ab1c2..92b1594ab 100644
--- a/data/cities/annecy/la-maison-des-fleurs.yml
+++ b/data/cities/annecy/la-maison-des-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.91008
 longitude: 6.13751
 postcode: "74000"
 city: Annecy
-street: "Avenue de Thônes"
-housenumber: 10
-phone: "+33 4 50 23 77 32"
+street: Avenue de Thônes
+housenumber: "10"
+phone: +33 4 50 23 77 32
 opening_hours: ""
-website: "https://www.annecy-donzier-fleurs.fr/"
\ No newline at end of file
+website: https://www.annecy-donzier-fleurs.fr/
diff --git a/data/cities/annecy/la-maison-du-pain.yml b/data/cities/annecy/la-maison-du-pain.yml
index 09625ba4c..a7fee40ac 100644
--- a/data/cities/annecy/la-maison-du-pain.yml
+++ b/data/cities/annecy/la-maison-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 45.91154
 longitude: 6.12402
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 22
+street: Avenue de Genève
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Su 06:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:30-20:00
+website: ""
diff --git a/data/cities/annecy/la-manufacture.yml b/data/cities/annecy/la-manufacture.yml
index dd30fb9fb..ab94c9bb0 100644
--- a/data/cities/annecy/la-manufacture.yml
+++ b/data/cities/annecy/la-manufacture.yml
@@ -4,8 +4,8 @@ latitude: 45.90089
 longitude: 6.12578
 postcode: "74000"
 city: Annecy
-street: "Rue Carnot"
-housenumber: 1
-phone: "+336 07 42 09 43"
-opening_hours: "Tu-Sa 12:30-19:00"
-website: "https://manufacture-perrin.com"
\ No newline at end of file
+street: Rue Carnot
+housenumber: "1"
+phone: +336 07 42 09 43
+opening_hours: Tu-Sa 12:30-19:00
+website: https://manufacture-perrin.com
diff --git a/data/cities/annecy/la-mie-caline.yml b/data/cities/annecy/la-mie-caline.yml
index a38915538..01a7679aa 100644
--- a/data/cities/annecy/la-mie-caline.yml
+++ b/data/cities/annecy/la-mie-caline.yml
@@ -4,8 +4,8 @@ latitude: 45.90228
 longitude: 6.12528
 postcode: ""
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 23
+street: Rue Sommeiller
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:30; Su 08:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:30; Su 08:00-19:30
+website: ""
diff --git a/data/cities/annecy/la-vie-claire.yml b/data/cities/annecy/la-vie-claire.yml
index 315edae8c..554d04acd 100644
--- a/data/cities/annecy/la-vie-claire.yml
+++ b/data/cities/annecy/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 45.90598
 longitude: 6.1129
 postcode: "74000"
 city: Annecy
-street: "Rue de la Poterie"
-housenumber: 16
-phone: "+33 4 50 09 51 41"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.lavieclaire.com/"
\ No newline at end of file
+street: Rue de la Poterie
+housenumber: "16"
+phone: +33 4 50 09 51 41
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.lavieclaire.com/
diff --git a/data/cities/annecy/lacoste.yml b/data/cities/annecy/lacoste.yml
index 26cb79912..b3be25236 100644
--- a/data/cities/annecy/lacoste.yml
+++ b/data/cities/annecy/lacoste.yml
@@ -4,8 +4,8 @@ latitude: 45.90668
 longitude: 6.13223
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/lancaster.yml b/data/cities/annecy/lancaster.yml
index 597630596..7c0f792c6 100644
--- a/data/cities/annecy/lancaster.yml
+++ b/data/cities/annecy/lancaster.yml
@@ -4,8 +4,8 @@ latitude: 45.90624
 longitude: 6.13255
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/lancel.yml b/data/cities/annecy/lancel.yml
index 094f31541..511c58347 100644
--- a/data/cities/annecy/lancel.yml
+++ b/data/cities/annecy/lancel.yml
@@ -4,8 +4,8 @@ latitude: 45.90627
 longitude: 6.13248
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/lannecienne.yml b/data/cities/annecy/lannecienne.yml
index bdca56355..b1a054dc4 100644
--- a/data/cities/annecy/lannecienne.yml
+++ b/data/cities/annecy/lannecienne.yml
@@ -4,8 +4,8 @@ latitude: 45.89905
 longitude: 6.12183
 postcode: ""
 city: Annecy
-street: "Rue de la Gare"
-housenumber: 7
-phone: "+33 450527543"
-opening_hours: "Tu-Sa 08:30-13:00,15:00-19:00"
-website: "https://compagnonsdugout.fr/compagnons-du-gout/boucherie-charcuterie-traiteur-lannecienne-annecy/"
\ No newline at end of file
+street: Rue de la Gare
+housenumber: "7"
+phone: +33 450527543
+opening_hours: Tu-Sa 08:30-13:00,15:00-19:00
+website: https://compagnonsdugout.fr/compagnons-du-gout/boucherie-charcuterie-traiteur-lannecienne-annecy/
diff --git a/data/cities/annecy/latelier-damaya.yml b/data/cities/annecy/latelier-damaya.yml
index 89a191659..2734060b9 100644
--- a/data/cities/annecy/latelier-damaya.yml
+++ b/data/cities/annecy/latelier-damaya.yml
@@ -4,8 +4,8 @@ latitude: 45.90095
 longitude: 6.12575
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 1
+street: Rue Carnot
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://atelier-amaya.com/fr/boutiques/bijouterie-annecy"
\ No newline at end of file
+website: https://atelier-amaya.com/fr/boutiques/bijouterie-annecy
diff --git a/data/cities/annecy/latelier-dangelina.yml b/data/cities/annecy/latelier-dangelina.yml
index c53ad7941..a09b769d4 100644
--- a/data/cities/annecy/latelier-dangelina.yml
+++ b/data/cities/annecy/latelier-dangelina.yml
@@ -4,8 +4,8 @@ latitude: 45.8989
 longitude: 6.12231
 postcode: "74000"
 city: Annecy
-street: "Quai des Cordeliers"
-housenumber: 1
+street: Quai des Cordeliers
+housenumber: "1"
 phone: ""
-opening_hours: "Tu-Th 10:00-19:00; Fr 09:00-19:00; Sa 09:00-18:00"
-website: "https://www.planity.com/latelier-dangelina"
\ No newline at end of file
+opening_hours: Tu-Th 10:00-19:00; Fr 09:00-19:00; Sa 09:00-18:00
+website: https://www.planity.com/latelier-dangelina
diff --git a/data/cities/annecy/lavomatique.yml b/data/cities/annecy/lavomatique.yml
index f35154788..40f95450b 100644
--- a/data/cities/annecy/lavomatique.yml
+++ b/data/cities/annecy/lavomatique.yml
@@ -4,8 +4,8 @@ latitude: 45.91118
 longitude: 6.12401
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
+street: Avenue de Genève
 housenumber: 16 bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/ldlc-apple.yml b/data/cities/annecy/ldlc-apple.yml
index dd8822e4f..e5c822048 100644
--- a/data/cities/annecy/ldlc-apple.yml
+++ b/data/cities/annecy/ldlc-apple.yml
@@ -4,8 +4,8 @@ latitude: 45.90049
 longitude: 6.123
 postcode: "74000"
 city: Annecy
-street: "Rue de la Poste"
-housenumber: 7
-phone: "+33 4 50 32 89 07"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.ldlc.com/magasins-ldlc/magasin-470111/74-ldlc-annecy/"
\ No newline at end of file
+street: Rue de la Poste
+housenumber: "7"
+phone: +33 4 50 32 89 07
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.ldlc.com/magasins-ldlc/magasin-470111/74-ldlc-annecy/
diff --git a/data/cities/annecy/le-coq-sportif.yml b/data/cities/annecy/le-coq-sportif.yml
index cdee973b7..d0448ea95 100644
--- a/data/cities/annecy/le-coq-sportif.yml
+++ b/data/cities/annecy/le-coq-sportif.yml
@@ -4,8 +4,8 @@ latitude: 45.90662
 longitude: 6.13251
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/le-jardin-damely.yml b/data/cities/annecy/le-jardin-damely.yml
index 74d6976e7..a71fc38a0 100644
--- a/data/cities/annecy/le-jardin-damely.yml
+++ b/data/cities/annecy/le-jardin-damely.yml
@@ -4,8 +4,8 @@ latitude: 45.90972
 longitude: 6.13374
 postcode: "74000"
 city: Annecy
-street: "Rue Henry Bordeaux"
-housenumber: 13
+street: Rue Henry Bordeaux
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/le-petit-casino.yml b/data/cities/annecy/le-petit-casino.yml
index 750976cba..8ebf82cfe 100644
--- a/data/cities/annecy/le-petit-casino.yml
+++ b/data/cities/annecy/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.90637
 longitude: 6.145
 postcode: "74940"
 city: Annecy
-street: "Rue Centrale"
-housenumber: 1
+street: Rue Centrale
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/annecy/le-rhone.yml b/data/cities/annecy/le-rhone.yml
index 1be6d227d..7c8d86cb9 100644
--- a/data/cities/annecy/le-rhone.yml
+++ b/data/cities/annecy/le-rhone.yml
@@ -4,8 +4,8 @@ latitude: 45.89981
 longitude: 6.11636
 postcode: "74000"
 city: Annecy
-street: "Avenue du Rhône"
-housenumber: 17
+street: Avenue du Rhône
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Fr 09:00-13:00,15:00-19:00; Sa 09:00-19:00; Su 09:00-13:00"
-website: "https://www.supermarchelerhone.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-13:00,15:00-19:00; Sa 09:00-19:00; Su 09:00-13:00
+website: https://www.supermarchelerhone.fr/
diff --git a/data/cities/annecy/le-tanneur.yml b/data/cities/annecy/le-tanneur.yml
index 58c014f5a..675b1fc5e 100644
--- a/data/cities/annecy/le-tanneur.yml
+++ b/data/cities/annecy/le-tanneur.yml
@@ -4,8 +4,8 @@ latitude: 45.9062
 longitude: 6.13261
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/les-contes-de-la-mer.yml b/data/cities/annecy/les-contes-de-la-mer.yml
index eab9cf2d4..3c2abbe24 100644
--- a/data/cities/annecy/les-contes-de-la-mer.yml
+++ b/data/cities/annecy/les-contes-de-la-mer.yml
@@ -4,8 +4,8 @@ latitude: 45.90681
 longitude: 6.13468
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 38
+street: Avenue du Parmelan
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/les-filles-de-lair.yml b/data/cities/annecy/les-filles-de-lair.yml
index 919f09d9e..9bf7da071 100644
--- a/data/cities/annecy/les-filles-de-lair.yml
+++ b/data/cities/annecy/les-filles-de-lair.yml
@@ -4,8 +4,8 @@ latitude: 45.9022
 longitude: 6.12564
 postcode: "74000"
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 32
+street: Rue Sommeiller
+housenumber: "32"
 phone: "0450523332"
-opening_hours: "Mo 10:00-19:00; Tu-Sa 09:00-20:00; Su 09:00-13:00"
-website: "https://www.lesfillesdelair.com"
\ No newline at end of file
+opening_hours: Mo 10:00-19:00; Tu-Sa 09:00-20:00; Su 09:00-13:00
+website: https://www.lesfillesdelair.com
diff --git a/data/cities/annecy/les-mondes-fantastiques.yml b/data/cities/annecy/les-mondes-fantastiques.yml
index 95c6a9119..568c68b3d 100644
--- a/data/cities/annecy/les-mondes-fantastiques.yml
+++ b/data/cities/annecy/les-mondes-fantastiques.yml
@@ -4,8 +4,8 @@ latitude: 45.91937
 longitude: 6.12248
 postcode: "74000"
 city: Annecy
-street: "Rue Lucie Aubrac"
-housenumber: 4
-phone: "+33 9 88 37 44 74"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Lucie Aubrac
+housenumber: "4"
+phone: +33 9 88 37 44 74
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annecy/les-notes-de-the.yml b/data/cities/annecy/les-notes-de-the.yml
index 7d02ed7e3..139bb13cc 100644
--- a/data/cities/annecy/les-notes-de-the.yml
+++ b/data/cities/annecy/les-notes-de-the.yml
@@ -4,8 +4,8 @@ latitude: 45.89919
 longitude: 6.12452
 postcode: "74000"
 city: Annecy
-street: "Rue Jean-Jacques Rousseau"
-housenumber: 12
+street: Rue Jean-Jacques Rousseau
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: "http://www.salon-the-darjeeling-annecy.com/"
\ No newline at end of file
+website: http://www.salon-the-darjeeling-annecy.com/
diff --git a/data/cities/annecy/les-pains-de-remi.yml b/data/cities/annecy/les-pains-de-remi.yml
index 15566a04c..bc0254565 100644
--- a/data/cities/annecy/les-pains-de-remi.yml
+++ b/data/cities/annecy/les-pains-de-remi.yml
@@ -4,8 +4,8 @@ latitude: 45.90692
 longitude: 6.13484
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 38
-phone: "+33 4 50 88 25 90"
-opening_hours: "Mo-We-Fr 06:30-19:00; Th-Sa-Su 07:00-13:00"
-website: ""
\ No newline at end of file
+street: Avenue du Parmelan
+housenumber: "38"
+phone: +33 4 50 88 25 90
+opening_hours: Mo-We-Fr 06:30-19:00; Th-Sa-Su 07:00-13:00
+website: ""
diff --git a/data/cities/annecy/les-saveurs-de-la-halle.yml b/data/cities/annecy/les-saveurs-de-la-halle.yml
index 2f7ab0d17..9f2e883aa 100644
--- a/data/cities/annecy/les-saveurs-de-la-halle.yml
+++ b/data/cities/annecy/les-saveurs-de-la-halle.yml
@@ -4,8 +4,8 @@ latitude: 45.90709
 longitude: 6.10827
 postcode: "74960"
 city: Annecy
-street: "Avenue de la République"
-housenumber: 
+street: Avenue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/les-vins-du-capitan.yml b/data/cities/annecy/les-vins-du-capitan.yml
index 100240374..893575572 100644
--- a/data/cities/annecy/les-vins-du-capitan.yml
+++ b/data/cities/annecy/les-vins-du-capitan.yml
@@ -4,8 +4,8 @@ latitude: 45.87743
 longitude: 6.08389
 postcode: "74600"
 city: Annecy
-street: "Route des Émognes"
-housenumber: 64
+street: Route des Émognes
+housenumber: "64"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/letoile-institut-de-beaute-mp-studio.yml b/data/cities/annecy/letoile-institut-de-beaute-mp-studio.yml
index 260d1a927..84d620e8e 100644
--- a/data/cities/annecy/letoile-institut-de-beaute-mp-studio.yml
+++ b/data/cities/annecy/letoile-institut-de-beaute-mp-studio.yml
@@ -4,8 +4,8 @@ latitude: 45.90573
 longitude: 6.12495
 postcode: "74000"
 city: Annecy
-street: "Boulevard du Lycée"
-housenumber: 7
+street: Boulevard du Lycée
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: "https://www.annecy-piercing.fr/"
\ No newline at end of file
+website: https://www.annecy-piercing.fr/
diff --git a/data/cities/annecy/levis.yml b/data/cities/annecy/levis.yml
index 919b2e958..d02610d9a 100644
--- a/data/cities/annecy/levis.yml
+++ b/data/cities/annecy/levis.yml
@@ -4,8 +4,8 @@ latitude: 45.9066
 longitude: 6.13221
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/liber-art.yml b/data/cities/annecy/liber-art.yml
index c345da268..290e053c5 100644
--- a/data/cities/annecy/liber-art.yml
+++ b/data/cities/annecy/liber-art.yml
@@ -4,8 +4,8 @@ latitude: 45.90103
 longitude: 6.1226
 postcode: "74000"
 city: Annecy
-street: "Rue Vaugelas"
-housenumber: 41
+street: Rue Vaugelas
+housenumber: "41"
 phone: ""
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "https://www.libertart.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:00
+website: https://www.libertart.fr/
diff --git a/data/cities/annecy/ligne-roset.yml b/data/cities/annecy/ligne-roset.yml
index a1e2f6233..9a1bada4d 100644
--- a/data/cities/annecy/ligne-roset.yml
+++ b/data/cities/annecy/ligne-roset.yml
@@ -4,8 +4,8 @@ latitude: 45.90309
 longitude: 6.12473
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/lile-aux-livres.yml b/data/cities/annecy/lile-aux-livres.yml
index e8846f3c2..b7baa920d 100644
--- a/data/cities/annecy/lile-aux-livres.yml
+++ b/data/cities/annecy/lile-aux-livres.yml
@@ -4,8 +4,8 @@ latitude: 45.89981
 longitude: 6.12457
 postcode: "74000"
 city: Annecy
-street: "Square de l'Évéché"
-housenumber: 
+street: Square de l'Évéché
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:30,14:30-19:00; Sa 10:00-12:30,14:30-19:00"
-website: "https://www.librairie-ileauxlivres-savoie.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30,14:30-19:00; Sa 10:00-12:30,14:30-19:00
+website: https://www.librairie-ileauxlivres-savoie.com/
diff --git a/data/cities/annecy/linvosges.yml b/data/cities/annecy/linvosges.yml
index 71df14288..47abd78ef 100644
--- a/data/cities/annecy/linvosges.yml
+++ b/data/cities/annecy/linvosges.yml
@@ -4,8 +4,8 @@ latitude: 45.90006
 longitude: 6.12722
 postcode: "74000"
 city: Annecy
-street: "Rue Joseph Blanc"
-housenumber: 2
+street: Rue Joseph Blanc
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: "https://www.linvosges.com/fr/nos-magasins/annecy/"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: https://www.linvosges.com/fr/nos-magasins/annecy/
diff --git a/data/cities/annecy/longchamp.yml b/data/cities/annecy/longchamp.yml
index 5f6beab19..cb413776f 100644
--- a/data/cities/annecy/longchamp.yml
+++ b/data/cities/annecy/longchamp.yml
@@ -4,8 +4,8 @@ latitude: 45.90633
 longitude: 6.13251
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/ludocortex.yml b/data/cities/annecy/ludocortex.yml
index b16f607a9..523723cc1 100644
--- a/data/cities/annecy/ludocortex.yml
+++ b/data/cities/annecy/ludocortex.yml
@@ -4,8 +4,8 @@ latitude: 45.90568
 longitude: 6.12425
 postcode: "74000"
 city: Annecy
-street: "Boulevard du Lycée"
-housenumber: 3
+street: Boulevard du Lycée
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 10:00-12:30, Mo-Sa 14:00-19:00"
-website: "https://www.ludocortex.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-12:30, Mo-Sa 14:00-19:00
+website: https://www.ludocortex.fr/
diff --git a/data/cities/annecy/maisons-du-monde.yml b/data/cities/annecy/maisons-du-monde.yml
index 2ab58c81d..cd9b69f6d 100644
--- a/data/cities/annecy/maisons-du-monde.yml
+++ b/data/cities/annecy/maisons-du-monde.yml
@@ -4,8 +4,8 @@ latitude: 45.90256
 longitude: 6.12508
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/maje.yml b/data/cities/annecy/maje.yml
index eae1c1eda..f3ca3e0eb 100644
--- a/data/cities/annecy/maje.yml
+++ b/data/cities/annecy/maje.yml
@@ -4,8 +4,8 @@ latitude: 45.90239
 longitude: 6.125
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/mango.yml b/data/cities/annecy/mango.yml
index 9590347c4..dbcfe1b8d 100644
--- a/data/cities/annecy/mango.yml
+++ b/data/cities/annecy/mango.yml
@@ -4,8 +4,8 @@ latitude: 45.90095
 longitude: 6.12729
 postcode: "74000"
 city: Annecy
-street: "Quai Eustache Chappuis"
-housenumber: 4
+street: Quai Eustache Chappuis
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/mauboussin.yml b/data/cities/annecy/mauboussin.yml
index 04092a729..5f1b0efef 100644
--- a/data/cities/annecy/mauboussin.yml
+++ b/data/cities/annecy/mauboussin.yml
@@ -4,8 +4,8 @@ latitude: 45.90204
 longitude: 6.12514
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 33
+street: Rue Carnot
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/michael-kors.yml b/data/cities/annecy/michael-kors.yml
index 7070d3d1e..bb6a23170 100644
--- a/data/cities/annecy/michael-kors.yml
+++ b/data/cities/annecy/michael-kors.yml
@@ -4,8 +4,8 @@ latitude: 45.90626
 longitude: 6.13262
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/micromania.yml b/data/cities/annecy/micromania.yml
index 4b33cea7b..907c3fc08 100644
--- a/data/cities/annecy/micromania.yml
+++ b/data/cities/annecy/micromania.yml
@@ -1,11 +1,11 @@
 id: 946952719
-type: way
+type: node
 latitude: 45.92446
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450109630"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/minelli.yml b/data/cities/annecy/minelli.yml
index 5aea77376..31a1e7beb 100644
--- a/data/cities/annecy/minelli.yml
+++ b/data/cities/annecy/minelli.yml
@@ -4,8 +4,8 @@ latitude: 45.90153
 longitude: 6.12533
 postcode: ""
 city: Annecy
-street: "Rue Vaugelas"
-housenumber: 14
+street: Rue Vaugelas
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/minimint.yml b/data/cities/annecy/minimint.yml
index cd3f49df1..61e0fb8ed 100644
--- a/data/cities/annecy/minimint.yml
+++ b/data/cities/annecy/minimint.yml
@@ -4,8 +4,8 @@ latitude: 45.90215
 longitude: 6.12622
 postcode: "74000"
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 36
+street: Rue Sommeiller
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: "https://minimint.fr/"
\ No newline at end of file
+website: https://minimint.fr/
diff --git a/data/cities/annecy/mobile-avenue.yml b/data/cities/annecy/mobile-avenue.yml
index a9114f90e..70034e718 100644
--- a/data/cities/annecy/mobile-avenue.yml
+++ b/data/cities/annecy/mobile-avenue.yml
@@ -4,8 +4,8 @@ latitude: 45.91093
 longitude: 6.12362
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
+street: Avenue de Genève
 housenumber: 43 bis
 phone: ""
 opening_hours: ""
-website: "https://www.mobileavenue74.com/"
\ No newline at end of file
+website: https://www.mobileavenue74.com/
diff --git a/data/cities/annecy/mondovelo-seynod.yml b/data/cities/annecy/mondovelo-seynod.yml
index 2b3650012..6edf04494 100644
--- a/data/cities/annecy/mondovelo-seynod.yml
+++ b/data/cities/annecy/mondovelo-seynod.yml
@@ -4,8 +4,8 @@ latitude: 45.89403
 longitude: 6.11337
 postcode: "74600"
 city: Annecy
-street: "Avenue Henri Zanaroli"
+street: Avenue Henri Zanaroli
 housenumber: 2b
 phone: ""
 opening_hours: ""
-website: "https://www.madeinvelo.fr/"
\ No newline at end of file
+website: https://www.madeinvelo.fr/
diff --git a/data/cities/annecy/monica-fruits-et-legumes.yml b/data/cities/annecy/monica-fruits-et-legumes.yml
index 055d78e25..af2c530fc 100644
--- a/data/cities/annecy/monica-fruits-et-legumes.yml
+++ b/data/cities/annecy/monica-fruits-et-legumes.yml
@@ -4,8 +4,8 @@ latitude: 45.9032
 longitude: 6.12621
 postcode: "74000"
 city: Annecy
-street: "Rue du Président Favre"
-housenumber: 10
+street: Rue du Président Favre
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/moulin-de-paiou.yml b/data/cities/annecy/moulin-de-paiou.yml
index 7a68f297a..87a42198c 100644
--- a/data/cities/annecy/moulin-de-paiou.yml
+++ b/data/cities/annecy/moulin-de-paiou.yml
@@ -4,8 +4,8 @@ latitude: 45.91605
 longitude: 6.1237
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 79
-phone: "+33 4 50 57 06 81"
+street: Avenue de Genève
+housenumber: "79"
+phone: +33 4 50 57 06 81
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/multisecu.yml b/data/cities/annecy/multisecu.yml
index 8a99b3bc6..ff4e61dda 100644
--- a/data/cities/annecy/multisecu.yml
+++ b/data/cities/annecy/multisecu.yml
@@ -4,8 +4,8 @@ latitude: 45.94346
 longitude: 6.1253
 postcode: "74370"
 city: Annecy
-street: "Route des Rutys, Pringy"
-housenumber: 183
-phone: "+33 6 08 82 53 54"
-opening_hours: "24/7"
-website: "https://multisecu.fr/"
\ No newline at end of file
+street: Route des Rutys, Pringy
+housenumber: "183"
+phone: +33 6 08 82 53 54
+opening_hours: 24/7
+website: https://multisecu.fr/
diff --git a/data/cities/annecy/music-leader.yml b/data/cities/annecy/music-leader.yml
index ece217ab4..6b2589cab 100644
--- a/data/cities/annecy/music-leader.yml
+++ b/data/cities/annecy/music-leader.yml
@@ -4,8 +4,8 @@ latitude: 45.89989
 longitude: 6.1162
 postcode: "74000"
 city: Annecy
-street: "Avenue du Rhône"
-housenumber: 17
+street: Avenue du Rhône
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/nike.yml b/data/cities/annecy/nike.yml
index 59c166721..b60a2eae1 100644
--- a/data/cities/annecy/nike.yml
+++ b/data/cities/annecy/nike.yml
@@ -4,8 +4,8 @@ latitude: 45.90663
 longitude: 6.13243
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/nocibe.yml b/data/cities/annecy/nocibe.yml
index 92f84487a..f8d94e9f9 100644
--- a/data/cities/annecy/nocibe.yml
+++ b/data/cities/annecy/nocibe.yml
@@ -1,11 +1,11 @@
 id: 946952724
-type: way
+type: node
 latitude: 45.9249
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450571173"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/one-step.yml b/data/cities/annecy/one-step.yml
index 57d075bba..d4b2e9bcb 100644
--- a/data/cities/annecy/one-step.yml
+++ b/data/cities/annecy/one-step.yml
@@ -4,8 +4,8 @@ latitude: 45.90227
 longitude: 6.12521
 postcode: ""
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 23
+street: Rue Sommeiller
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/opinel-savoie.yml b/data/cities/annecy/opinel-savoie.yml
index 163a94b5d..c5eee9c06 100644
--- a/data/cities/annecy/opinel-savoie.yml
+++ b/data/cities/annecy/opinel-savoie.yml
@@ -4,8 +4,8 @@ latitude: 45.89907
 longitude: 6.12631
 postcode: "74000"
 city: Annecy
-street: "Rue Filaterie"
-housenumber: 22
-phone: "+33 4 50 11 75 16"
+street: Rue Filaterie
+housenumber: "22"
+phone: +33 4 50 11 75 16
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/optical-center.yml b/data/cities/annecy/optical-center.yml
index 980633460..ac049af2b 100644
--- a/data/cities/annecy/optical-center.yml
+++ b/data/cities/annecy/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.90781
 longitude: 6.12401
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
+street: Avenue de Genève
 housenumber: 10 bis
-phone: "+33 4 50 46 00 46"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/3551-optical-center-annecy"
\ No newline at end of file
+phone: +33 4 50 46 00 46
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/3551-optical-center-annecy
diff --git a/data/cities/annecy/opticien-krys.yml b/data/cities/annecy/opticien-krys.yml
index 08f4456b5..4d5594247 100644
--- a/data/cities/annecy/opticien-krys.yml
+++ b/data/cities/annecy/opticien-krys.yml
@@ -4,8 +4,8 @@ latitude: 45.90264
 longitude: 6.12491
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 43
+street: Rue Carnot
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/orange.yml b/data/cities/annecy/orange.yml
index 6b2ca95f6..1aa3e8a56 100644
--- a/data/cities/annecy/orange.yml
+++ b/data/cities/annecy/orange.yml
@@ -4,8 +4,8 @@ latitude: 45.90131
 longitude: 6.12551
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 19
+street: Rue Carnot
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annecy/organdi.yml b/data/cities/annecy/organdi.yml
index 580a3e8be..74fd4c290 100644
--- a/data/cities/annecy/organdi.yml
+++ b/data/cities/annecy/organdi.yml
@@ -4,8 +4,8 @@ latitude: 45.9022
 longitude: 6.12379
 postcode: "74000"
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 13
+street: Rue Sommeiller
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/pain-et-copains.yml b/data/cities/annecy/pain-et-copains.yml
index 261b8b7a5..e190d0ba5 100644
--- a/data/cities/annecy/pain-et-copains.yml
+++ b/data/cities/annecy/pain-et-copains.yml
@@ -4,8 +4,8 @@ latitude: 45.90118
 longitude: 6.12219
 postcode: "74000"
 city: Annecy
-street: "Rue Vaugelas"
-housenumber: 42
+street: Rue Vaugelas
+housenumber: "42"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30; Su 07:30-19:30"
-website: "https://www.instagram.com/painetcopains/"
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30; Su 07:30-19:30
+website: https://www.instagram.com/painetcopains/
diff --git a/data/cities/annecy/pan-et-gato.yml b/data/cities/annecy/pan-et-gato.yml
index b1c6d7913..799603d7e 100644
--- a/data/cities/annecy/pan-et-gato.yml
+++ b/data/cities/annecy/pan-et-gato.yml
@@ -4,8 +4,8 @@ latitude: 45.90694
 longitude: 6.14693
 postcode: "74940"
 city: Annecy
-street: "Rue du Pré d'Avril"
-housenumber: 6
+street: Rue du Pré d'Avril
+housenumber: "6"
 phone: "+33450232503"
-opening_hours: "Mo-Su 06:30-19:30"
-website: "https://pan-et-gato.fr/"
\ No newline at end of file
+opening_hours: Mo-Su 06:30-19:30
+website: https://pan-et-gato.fr/
diff --git a/data/cities/annecy/pascal-coste.yml b/data/cities/annecy/pascal-coste.yml
index 975cfc88e..1a26080e3 100644
--- a/data/cities/annecy/pascal-coste.yml
+++ b/data/cities/annecy/pascal-coste.yml
@@ -1,11 +1,11 @@
 id: 946952721
-type: way
+type: node
 latitude: 45.92457
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/patrick-agnelet-chocolatier-patissier.yml b/data/cities/annecy/patrick-agnelet-chocolatier-patissier.yml
index 3bb339397..907841f35 100644
--- a/data/cities/annecy/patrick-agnelet-chocolatier-patissier.yml
+++ b/data/cities/annecy/patrick-agnelet-chocolatier-patissier.yml
@@ -4,8 +4,8 @@ latitude: 45.9066
 longitude: 6.14613
 postcode: "74940"
 city: Annecy
-street: "Rue Centrale"
-housenumber: 17
+street: Rue Centrale
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: "https://www.patrickagnellet.com/"
\ No newline at end of file
+website: https://www.patrickagnellet.com/
diff --git a/data/cities/annecy/pearl-skateboards.yml b/data/cities/annecy/pearl-skateboards.yml
index 79a45def6..0e1db159e 100644
--- a/data/cities/annecy/pearl-skateboards.yml
+++ b/data/cities/annecy/pearl-skateboards.yml
@@ -4,8 +4,8 @@ latitude: 45.9023
 longitude: 6.12539
 postcode: ""
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 23
+street: Rue Sommeiller
+housenumber: "23"
 phone: "0485461809"
 opening_hours: ""
-website: "https://pearlskateboards.fr/"
\ No newline at end of file
+website: https://pearlskateboards.fr/
diff --git a/data/cities/annecy/perrucshop.yml b/data/cities/annecy/perrucshop.yml
index 7ecbeaaec..9909b7259 100644
--- a/data/cities/annecy/perrucshop.yml
+++ b/data/cities/annecy/perrucshop.yml
@@ -4,8 +4,8 @@ latitude: 45.90188
 longitude: 6.12534
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 30
+street: Rue Carnot
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/philippe-rigollot.yml b/data/cities/annecy/philippe-rigollot.yml
index 21699b7dc..a229270f5 100644
--- a/data/cities/annecy/philippe-rigollot.yml
+++ b/data/cities/annecy/philippe-rigollot.yml
@@ -4,8 +4,8 @@ latitude: 45.89832
 longitude: 6.12312
 postcode: "74000"
 city: Annecy
-street: "Place George Volland"
-housenumber: 1
+street: Place George Volland
+housenumber: "1"
 phone: ""
-opening_hours: "Mo,Tu,Th-Sa 08:00-19:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th-Sa 08:00-19:00; Su 08:00-13:00
+website: ""
diff --git a/data/cities/annecy/picard.yml b/data/cities/annecy/picard.yml
index 52cb2156f..1ecc965cc 100644
--- a/data/cities/annecy/picard.yml
+++ b/data/cities/annecy/picard.yml
@@ -1,11 +1,11 @@
 id: 32321285
-type: way
+type: node
 latitude: 45.92217
 longitude: 6.12407
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 110
-phone: "+33 4 50 57 65 66"
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: "https://magasins.picard.fr/35-picard-annecy"
\ No newline at end of file
+street: Avenue de Genève
+housenumber: "110"
+phone: +33 4 50 57 65 66
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: https://magasins.picard.fr/35-picard-annecy
diff --git a/data/cities/annecy/pierre-gay.yml b/data/cities/annecy/pierre-gay.yml
index bebd43d20..0ab27b670 100644
--- a/data/cities/annecy/pierre-gay.yml
+++ b/data/cities/annecy/pierre-gay.yml
@@ -4,8 +4,8 @@ latitude: 45.90283
 longitude: 6.12484
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 47
+street: Rue Carnot
+housenumber: "47"
 phone: ""
-opening_hours: "Mo 10:00-12:00, 14:00-18:00; Tu-Sa 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 10:00-12:00, 14:00-18:00; Tu-Sa 08:00-19:00
+website: ""
diff --git a/data/cities/annecy/pimkie.yml b/data/cities/annecy/pimkie.yml
index 93be885ff..f627c966d 100644
--- a/data/cities/annecy/pimkie.yml
+++ b/data/cities/annecy/pimkie.yml
@@ -4,8 +4,8 @@ latitude: 45.90285
 longitude: 6.12497
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 50
+street: Rue Carnot
+housenumber: "50"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/playin-annecy.yml b/data/cities/annecy/playin-annecy.yml
index d1d52488f..1ce48979e 100644
--- a/data/cities/annecy/playin-annecy.yml
+++ b/data/cities/annecy/playin-annecy.yml
@@ -4,8 +4,8 @@ latitude: 45.90273
 longitude: 6.12773
 postcode: "74000"
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 39
-phone: "+33 950508289"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "https://www.play-in.com/jeux_de_societe/"
\ No newline at end of file
+street: Rue Sommeiller
+housenumber: "39"
+phone: +33 950508289
+opening_hours: Tu-Sa 10:00-19:00
+website: https://www.play-in.com/jeux_de_societe/
diff --git a/data/cities/annecy/polo-ralph-lauren.yml b/data/cities/annecy/polo-ralph-lauren.yml
index c339f6684..81a9a5f1d 100644
--- a/data/cities/annecy/polo-ralph-lauren.yml
+++ b/data/cities/annecy/polo-ralph-lauren.yml
@@ -4,8 +4,8 @@ latitude: 45.90665
 longitude: 6.13213
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "m"
-website: ""
\ No newline at end of file
+opening_hours: m
+website: ""
diff --git a/data/cities/annecy/pomcannelle.yml b/data/cities/annecy/pomcannelle.yml
index c1ede5987..2734bf80c 100644
--- a/data/cities/annecy/pomcannelle.yml
+++ b/data/cities/annecy/pomcannelle.yml
@@ -4,8 +4,8 @@ latitude: 45.90193
 longitude: 6.12532
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 32
+street: Rue Carnot
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/porcelanosa.yml b/data/cities/annecy/porcelanosa.yml
index bcbdcf85a..c5e4fd8d1 100644
--- a/data/cities/annecy/porcelanosa.yml
+++ b/data/cities/annecy/porcelanosa.yml
@@ -4,8 +4,8 @@ latitude: 45.9015
 longitude: 6.12625
 postcode: "74000"
 city: Annecy
-street: "Rue Vaugelas"
-housenumber: 13
+street: Rue Vaugelas
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30,14:00-18:30, Sa 09:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30,14:00-18:30, Sa 09:30-18:00
+website: ""
diff --git a/data/cities/annecy/promod.yml b/data/cities/annecy/promod.yml
index 3ca99ba49..ad9b2d4dc 100644
--- a/data/cities/annecy/promod.yml
+++ b/data/cities/annecy/promod.yml
@@ -4,8 +4,8 @@ latitude: 45.90277
 longitude: 6.12486
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 45
+street: Rue Carnot
+housenumber: "45"
 phone: ""
-opening_hours: "Mo 10:00-19:00; Tu-Fr 09:30-19:00; Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 10:00-19:00; Tu-Fr 09:30-19:00; Sa 09:00-19:00
+website: ""
diff --git a/data/cities/annecy/propreco.yml b/data/cities/annecy/propreco.yml
index 8db1c1314..dbd615693 100644
--- a/data/cities/annecy/propreco.yml
+++ b/data/cities/annecy/propreco.yml
@@ -1,11 +1,11 @@
 id: 946952723
-type: way
+type: node
 latitude: 45.92474
 longitude: 6.12404
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 134
+street: Avenue de Genève
+housenumber: "134"
 phone: "+33450576267"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/puma.yml b/data/cities/annecy/puma.yml
index c292e7a1d..97597c787 100644
--- a/data/cities/annecy/puma.yml
+++ b/data/cities/annecy/puma.yml
@@ -4,8 +4,8 @@ latitude: 45.90668
 longitude: 6.1325
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/purvapor.yml b/data/cities/annecy/purvapor.yml
index eb0aa498c..7be220468 100644
--- a/data/cities/annecy/purvapor.yml
+++ b/data/cities/annecy/purvapor.yml
@@ -4,8 +4,8 @@ latitude: 45.901
 longitude: 6.12248
 postcode: "74000"
 city: Annecy
-street: "Rue Vaugelas"
-housenumber: 43
+street: Rue Vaugelas
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: "https://www.purvapor.fr/"
\ No newline at end of file
+website: https://www.purvapor.fr/
diff --git a/data/cities/annecy/renaud-mouthon.yml b/data/cities/annecy/renaud-mouthon.yml
index 72b78e9b6..270e6e799 100644
--- a/data/cities/annecy/renaud-mouthon.yml
+++ b/data/cities/annecy/renaud-mouthon.yml
@@ -4,8 +4,8 @@ latitude: 45.91229
 longitude: 6.14356
 postcode: "74940"
 city: Annecy
-street: "Rue des Écoles"
-housenumber: 11
+street: Rue des Écoles
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: "http://www.alexandreperchat.com/"
\ No newline at end of file
+website: http://www.alexandreperchat.com/
diff --git a/data/cities/annecy/roche-bobois-rue-sainte-claire.yml b/data/cities/annecy/roche-bobois-rue-sainte-claire.yml
index 267cd4999..95fc6ab86 100644
--- a/data/cities/annecy/roche-bobois-rue-sainte-claire.yml
+++ b/data/cities/annecy/roche-bobois-rue-sainte-claire.yml
@@ -4,8 +4,8 @@ latitude: 45.89844
 longitude: 6.12438
 postcode: ""
 city: Annecy
-street: "Rue Sainte-Claire"
-housenumber: 18
-phone: "+33 04 50 45 11 18"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 10:00-12:00,14:00-19:00; Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Sainte-Claire
+housenumber: "18"
+phone: +33 04 50 45 11 18
+opening_hours: Mo 14:00-19:00; Tu-Fr 10:00-12:00,14:00-19:00; Sa 09:00-19:00
+website: ""
diff --git a/data/cities/annecy/roche-bobois.yml b/data/cities/annecy/roche-bobois.yml
index ff9f5a256..47e6d46b0 100644
--- a/data/cities/annecy/roche-bobois.yml
+++ b/data/cities/annecy/roche-bobois.yml
@@ -4,8 +4,8 @@ latitude: 45.8985
 longitude: 6.12356
 postcode: ""
 city: Annecy
-street: "Place Sainte-Claire"
-housenumber: 2
+street: Place Sainte-Claire
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/salewa.yml b/data/cities/annecy/salewa.yml
index bb446bb70..b74bd6ceb 100644
--- a/data/cities/annecy/salewa.yml
+++ b/data/cities/annecy/salewa.yml
@@ -4,8 +4,8 @@ latitude: 45.90224
 longitude: 6.12648
 postcode: "74000"
 city: Annecy
-street: "Rue du Président Favre"
-housenumber: 9
+street: Rue du Président Favre
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/sesame-et-lin.yml b/data/cities/annecy/sesame-et-lin.yml
index bfa12a499..d43318821 100644
--- a/data/cities/annecy/sesame-et-lin.yml
+++ b/data/cities/annecy/sesame-et-lin.yml
@@ -4,8 +4,8 @@ latitude: 45.90674
 longitude: 6.12362
 postcode: "74000"
 city: Annecy
-street: "Avenue de Genève"
-housenumber: 1
-phone: "+33 4 50 57 39 29"
-opening_hours: "Mo-Sa 08:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue de Genève
+housenumber: "1"
+phone: +33 4 50 57 39 29
+opening_hours: Mo-Sa 08:00-19:00
+website: ""
diff --git a/data/cities/annecy/sesame-pasteque.yml b/data/cities/annecy/sesame-pasteque.yml
index 16bb28af6..7db9ef345 100644
--- a/data/cities/annecy/sesame-pasteque.yml
+++ b/data/cities/annecy/sesame-pasteque.yml
@@ -4,8 +4,8 @@ latitude: 45.90423
 longitude: 6.12883
 postcode: "74000"
 city: Annecy
-street: "Rue Guillaume Fichet"
-housenumber: 8
-phone: "±33450022119"
+street: Rue Guillaume Fichet
+housenumber: "8"
+phone: ±33450022119
 opening_hours: ""
-website: "https://www.sesame-pasteque.com/"
\ No newline at end of file
+website: https://www.sesame-pasteque.com/
diff --git a/data/cities/annecy/snowleader.yml b/data/cities/annecy/snowleader.yml
index eee667ac4..2399fca21 100644
--- a/data/cities/annecy/snowleader.yml
+++ b/data/cities/annecy/snowleader.yml
@@ -4,8 +4,8 @@ latitude: 45.90291
 longitude: 6.12609
 postcode: "74000"
 city: Annecy
-street: "Rue du Président Favre"
-housenumber: 15
+street: Rue du Président Favre
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annecy/source.yml b/data/cities/annecy/source.yml
index f1fcc3b63..1956a9754 100644
--- a/data/cities/annecy/source.yml
+++ b/data/cities/annecy/source.yml
@@ -1,11 +1,11 @@
 id: 62502919
-type: way
+type: node
 latitude: 45.90452
 longitude: 6.15999
 postcode: "74940"
 city: Annecy
-street: "Avenue de Chavoires,"
-housenumber: 13
+street: Avenue de Chavoires,
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/st-germain.yml b/data/cities/annecy/st-germain.yml
index 7fdde456e..9b5eb1823 100644
--- a/data/cities/annecy/st-germain.yml
+++ b/data/cities/annecy/st-germain.yml
@@ -4,8 +4,8 @@ latitude: 45.90311
 longitude: 6.12572
 postcode: "74000"
 city: Annecy
-street: "Rue de la Paix"
-housenumber: 4
+street: Rue de la Paix
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/stilbag.yml b/data/cities/annecy/stilbag.yml
index 75322806c..c5ac42f13 100644
--- a/data/cities/annecy/stilbag.yml
+++ b/data/cities/annecy/stilbag.yml
@@ -4,8 +4,8 @@ latitude: 45.90321
 longitude: 6.12468
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/studio.yml b/data/cities/annecy/studio.yml
index 1573a4afa..25670974d 100644
--- a/data/cities/annecy/studio.yml
+++ b/data/cities/annecy/studio.yml
@@ -4,8 +4,8 @@ latitude: 45.90169
 longitude: 6.12529
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 23
+street: Rue Carnot
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/sud-express.yml b/data/cities/annecy/sud-express.yml
index 9a4165aea..4397f04b3 100644
--- a/data/cities/annecy/sud-express.yml
+++ b/data/cities/annecy/sud-express.yml
@@ -4,8 +4,8 @@ latitude: 45.90294
 longitude: 6.12477
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 
+street: Rue Carnot
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/tabac-presse-le-central.yml b/data/cities/annecy/tabac-presse-le-central.yml
index c0335aecd..d101317e1 100644
--- a/data/cities/annecy/tabac-presse-le-central.yml
+++ b/data/cities/annecy/tabac-presse-le-central.yml
@@ -4,8 +4,8 @@ latitude: 45.90641
 longitude: 6.14558
 postcode: "74940"
 city: Annecy
-street: "Rue Centrale"
-housenumber: 7
+street: Rue Centrale
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/tendance-et-creation-coiffure.yml b/data/cities/annecy/tendance-et-creation-coiffure.yml
index c670a6e58..241163d61 100644
--- a/data/cities/annecy/tendance-et-creation-coiffure.yml
+++ b/data/cities/annecy/tendance-et-creation-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.91412
 longitude: 6.13691
 postcode: "74000"
 city: Annecy
-street: "Route du Périmètre"
-housenumber: 23
-phone: "+33 4 50 44 72 58"
+street: Route du Périmètre
+housenumber: "23"
+phone: +33 4 50 44 72 58
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/the-kooples.yml b/data/cities/annecy/the-kooples.yml
index e1f4e0784..43a1b5077 100644
--- a/data/cities/annecy/the-kooples.yml
+++ b/data/cities/annecy/the-kooples.yml
@@ -4,8 +4,8 @@ latitude: 45.90652
 longitude: 6.13234
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/timberland.yml b/data/cities/annecy/timberland.yml
index fec1c3b31..5140d1e85 100644
--- a/data/cities/annecy/timberland.yml
+++ b/data/cities/annecy/timberland.yml
@@ -4,8 +4,8 @@ latitude: 45.90671
 longitude: 6.13246
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/tommy-hilfiger.yml b/data/cities/annecy/tommy-hilfiger.yml
index 0fa2f9436..714e00264 100644
--- a/data/cities/annecy/tommy-hilfiger.yml
+++ b/data/cities/annecy/tommy-hilfiger.yml
@@ -4,8 +4,8 @@ latitude: 45.90653
 longitude: 6.13192
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/triumph.yml b/data/cities/annecy/triumph.yml
index ca990db78..9823e9f0c 100644
--- a/data/cities/annecy/triumph.yml
+++ b/data/cities/annecy/triumph.yml
@@ -4,8 +4,8 @@ latitude: 45.90631
 longitude: 6.13278
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parmelan"
-housenumber: 25
+street: Avenue du Parmelan
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-20:00
+website: ""
diff --git a/data/cities/annecy/tui.yml b/data/cities/annecy/tui.yml
index e85286218..9a5da9602 100644
--- a/data/cities/annecy/tui.yml
+++ b/data/cities/annecy/tui.yml
@@ -4,8 +4,8 @@ latitude: 45.9002
 longitude: 6.12736
 postcode: "74000"
 city: Annecy
-street: "Rue du Lac"
-housenumber: 1
+street: Rue du Lac
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/un-brin-creatif.yml b/data/cities/annecy/un-brin-creatif.yml
index 6c00021d1..faacb0b09 100644
--- a/data/cities/annecy/un-brin-creatif.yml
+++ b/data/cities/annecy/un-brin-creatif.yml
@@ -4,8 +4,8 @@ latitude: 45.90887
 longitude: 6.12216
 postcode: "74000"
 city: Annecy
-street: "Avenue du Parc des Sports"
-housenumber: 2
+street: Avenue du Parc des Sports
+housenumber: "2"
 phone: "+33450572804"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/vapeur-absolue.yml b/data/cities/annecy/vapeur-absolue.yml
index e8af5f32c..147f8d0f6 100644
--- a/data/cities/annecy/vapeur-absolue.yml
+++ b/data/cities/annecy/vapeur-absolue.yml
@@ -4,8 +4,8 @@ latitude: 45.91143
 longitude: 6.13136
 postcode: "74000"
 city: Annecy
-street: "Avenue de la Plaine"
-housenumber: 27
-phone: "+33 450016031"
-opening_hours: "10:00-12:30,14:00-19:00"
-website: "https://vapeurabsolue.fr/"
\ No newline at end of file
+street: Avenue de la Plaine
+housenumber: "27"
+phone: +33 450016031
+opening_hours: 10:00-12:30,14:00-19:00
+website: https://vapeurabsolue.fr/
diff --git a/data/cities/annecy/veran-musique.yml b/data/cities/annecy/veran-musique.yml
index 9f6460bb6..c5983fca9 100644
--- a/data/cities/annecy/veran-musique.yml
+++ b/data/cities/annecy/veran-musique.yml
@@ -4,8 +4,8 @@ latitude: 45.89992
 longitude: 6.12243
 postcode: "74000"
 city: Annecy
-street: "Rue Royale"
-housenumber: 24
+street: Rue Royale
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/vintage-coiffure-et-beaute.yml b/data/cities/annecy/vintage-coiffure-et-beaute.yml
index babd54162..9a467f7e4 100644
--- a/data/cities/annecy/vintage-coiffure-et-beaute.yml
+++ b/data/cities/annecy/vintage-coiffure-et-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.90985
 longitude: 6.13359
 postcode: "74000"
 city: Annecy
-street: "Rue Henry Bordeaux"
-housenumber: 13
+street: Rue Henry Bordeaux
+housenumber: "13"
 phone: ""
-opening_hours: "Mo 09:00-16:00; Tu 09:00-19:00; Th-Fr 09:00-21:00; Sa 08:00-16:00"
-website: "http://www.vintagecoiffure.fr/"
\ No newline at end of file
+opening_hours: Mo 09:00-16:00; Tu 09:00-19:00; Th-Fr 09:00-21:00; Sa 08:00-16:00
+website: http://www.vintagecoiffure.fr/
diff --git a/data/cities/annecy/vival-rue-de-lindustrie.yml b/data/cities/annecy/vival-rue-de-lindustrie.yml
index 16493e08f..32fc9e2d0 100644
--- a/data/cities/annecy/vival-rue-de-lindustrie.yml
+++ b/data/cities/annecy/vival-rue-de-lindustrie.yml
@@ -4,8 +4,8 @@ latitude: 45.90134
 longitude: 6.12055
 postcode: "74000"
 city: Annecy
-street: "Rue de l'Industrie"
-housenumber: 1
+street: Rue de l'Industrie
+housenumber: "1"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 09:00-21:00; Su 09:00-13:00, 15:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 09:00-21:00; Su 09:00-13:00, 15:00-21:00
+website: ""
diff --git a/data/cities/annecy/vival-rue-georges-martin.yml b/data/cities/annecy/vival-rue-georges-martin.yml
index 9ccedb0fe..015887a7c 100644
--- a/data/cities/annecy/vival-rue-georges-martin.yml
+++ b/data/cities/annecy/vival-rue-georges-martin.yml
@@ -4,8 +4,8 @@ latitude: 45.91192
 longitude: 6.13321
 postcode: "74000"
 city: Annecy
-street: "Rue Georges Martin"
-housenumber: 2
+street: Rue Georges Martin
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Su 09:00-13:00, 15:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-13:00, 15:00-21:00
+website: ""
diff --git a/data/cities/annecy/vival.yml b/data/cities/annecy/vival.yml
index b57a15546..1de9580bb 100644
--- a/data/cities/annecy/vival.yml
+++ b/data/cities/annecy/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.90593
 longitude: 6.11841
 postcode: "74000"
 city: Annecy
-street: "Avenue de Cran"
-housenumber: 20
+street: Avenue de Cran
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Su 07:00-23:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-23:00
+website: ""
diff --git a/data/cities/annecy/wax-station.yml b/data/cities/annecy/wax-station.yml
index 8413fa4a8..2c3c664f9 100644
--- a/data/cities/annecy/wax-station.yml
+++ b/data/cities/annecy/wax-station.yml
@@ -4,8 +4,8 @@ latitude: 45.906
 longitude: 6.13025
 postcode: "74000"
 city: Annecy
-street: "Boulevard du Lycée"
-housenumber: 20
+street: Boulevard du Lycée
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annecy/wolford.yml b/data/cities/annecy/wolford.yml
index ced878b84..829706d9c 100644
--- a/data/cities/annecy/wolford.yml
+++ b/data/cities/annecy/wolford.yml
@@ -4,8 +4,8 @@ latitude: 45.90029
 longitude: 6.12386
 postcode: "74000"
 city: Annecy
-street: "Rue Royale"
-housenumber: 14
+street: Rue Royale
+housenumber: "14"
 phone: "+33450516916"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annecy/yves-rocher.yml b/data/cities/annecy/yves-rocher.yml
index f2808d324..d4d1e8eb2 100644
--- a/data/cities/annecy/yves-rocher.yml
+++ b/data/cities/annecy/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.90223
 longitude: 6.12499
 postcode: "74000"
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 21
+street: Rue Sommeiller
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/annecy/zara-home.yml b/data/cities/annecy/zara-home.yml
index 71ba11365..0cb568a0a 100644
--- a/data/cities/annecy/zara-home.yml
+++ b/data/cities/annecy/zara-home.yml
@@ -4,8 +4,8 @@ latitude: 45.90234
 longitude: 6.12565
 postcode: ""
 city: Annecy
-street: "Rue Sommeiller"
-housenumber: 23
+street: Rue Sommeiller
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: "https://www.zarahome.com/"
\ No newline at end of file
+website: https://www.zarahome.com/
diff --git a/data/cities/annecy/zoom-28.yml b/data/cities/annecy/zoom-28.yml
index aea160917..91a7a5647 100644
--- a/data/cities/annecy/zoom-28.yml
+++ b/data/cities/annecy/zoom-28.yml
@@ -4,8 +4,8 @@ latitude: 45.90179
 longitude: 6.12538
 postcode: ""
 city: Annecy
-street: "Rue Carnot"
-housenumber: 28
+street: Rue Carnot
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/action-rue-de-la-resistance.yml b/data/cities/annemasse/action-rue-de-la-resistance.yml
index 726e9d944..29e8bc413 100644
--- a/data/cities/annemasse/action-rue-de-la-resistance.yml
+++ b/data/cities/annemasse/action-rue-de-la-resistance.yml
@@ -1,11 +1,11 @@
 id: 885861649
-type: way
+type: node
 latitude: 46.19631
 longitude: 6.26207
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 34
+street: Rue de la Résistance
+housenumber: "34"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/action.yml b/data/cities/annemasse/action.yml
index 78106fb27..c4ec9783e 100644
--- a/data/cities/annemasse/action.yml
+++ b/data/cities/annemasse/action.yml
@@ -1,11 +1,11 @@
 id: 200360791
-type: way
+type: node
 latitude: 46.19353
 longitude: 6.24061
 postcode: "74100"
 city: Annemasse
-street: "Avenue Henri Barbusse"
-housenumber: 4
+street: Avenue Henri Barbusse
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/adapt-hair-concept.yml b/data/cities/annemasse/adapt-hair-concept.yml
index e83ef9558..f92fbb3fa 100644
--- a/data/cities/annemasse/adapt-hair-concept.yml
+++ b/data/cities/annemasse/adapt-hair-concept.yml
@@ -4,8 +4,8 @@ latitude: 46.19618
 longitude: 6.23682
 postcode: "74100"
 city: Annemasse
-street: "Rue du Chablais"
-housenumber: 17
+street: Rue du Chablais
+housenumber: "17"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 10:00-19:00; Sa 10:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 10:00-19:00; Sa 10:00-18:00
+website: ""
diff --git a/data/cities/annemasse/aero-techniccolor.yml b/data/cities/annemasse/aero-techniccolor.yml
index f061e2ff3..8ca9391cb 100644
--- a/data/cities/annemasse/aero-techniccolor.yml
+++ b/data/cities/annemasse/aero-techniccolor.yml
@@ -4,8 +4,8 @@ latitude: 46.19414
 longitude: 6.2687
 postcode: "74100"
 city: Annemasse
-street: "Rue Germain Sommeiller"
-housenumber: 
+street: Rue Germain Sommeiller
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/alarme-concept.yml b/data/cities/annemasse/alarme-concept.yml
index bbd95e59c..e97473df4 100644
--- a/data/cities/annemasse/alarme-concept.yml
+++ b/data/cities/annemasse/alarme-concept.yml
@@ -4,8 +4,8 @@ latitude: 46.19045
 longitude: 6.23746
 postcode: "74100"
 city: Annemasse
-street: "Rue Léandre Vaillat"
-housenumber: 18
+street: Rue Léandre Vaillat
+housenumber: "18"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/annemasse/alltricks.yml b/data/cities/annemasse/alltricks.yml
index 36e526bc3..d69f78b30 100644
--- a/data/cities/annemasse/alltricks.yml
+++ b/data/cities/annemasse/alltricks.yml
@@ -4,8 +4,8 @@ latitude: 46.19507
 longitude: 6.25878
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 26
+street: Rue de la Résistance
+housenumber: "26"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/alpmoto.yml b/data/cities/annemasse/alpmoto.yml
index bf7882989..998fd2c37 100644
--- a/data/cities/annemasse/alpmoto.yml
+++ b/data/cities/annemasse/alpmoto.yml
@@ -4,8 +4,8 @@ latitude: 46.19686
 longitude: 6.26723
 postcode: "74100"
 city: Annemasse
-street: "Rue Germain Sommeiller"
+street: Rue Germain Sommeiller
 housenumber: 2 Bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/alterovrac.yml b/data/cities/annemasse/alterovrac.yml
index be10eb0ec..360f929f4 100644
--- a/data/cities/annemasse/alterovrac.yml
+++ b/data/cities/annemasse/alterovrac.yml
@@ -4,8 +4,8 @@ latitude: 46.18923
 longitude: 6.23717
 postcode: "74100"
 city: Annemasse
-street: "Rue du Château Rouge"
-housenumber: 29
+street: Rue du Château Rouge
+housenumber: "29"
 phone: ""
-opening_hours: "Mo-Su 10:00-19:00"
-website: "https://alterovrac.com"
\ No newline at end of file
+opening_hours: Mo-Su 10:00-19:00
+website: https://alterovrac.com
diff --git a/data/cities/annemasse/amplifon.yml b/data/cities/annemasse/amplifon.yml
index 109f70992..e2815ed92 100644
--- a/data/cities/annemasse/amplifon.yml
+++ b/data/cities/annemasse/amplifon.yml
@@ -4,8 +4,8 @@ latitude: 46.19378
 longitude: 6.23671
 postcode: "74100"
 city: Annemasse
-street: "Rue René Blanc"
-housenumber: 4
+street: Rue René Blanc
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/antonelle.yml b/data/cities/annemasse/antonelle.yml
index 12ca7c773..eaf3fdea2 100644
--- a/data/cities/annemasse/antonelle.yml
+++ b/data/cities/annemasse/antonelle.yml
@@ -4,8 +4,8 @@ latitude: 46.19324
 longitude: 6.23492
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 4
+street: Rue du Commerce
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/aqualpa.yml b/data/cities/annemasse/aqualpa.yml
index 0e2495fde..9592cf728 100644
--- a/data/cities/annemasse/aqualpa.yml
+++ b/data/cities/annemasse/aqualpa.yml
@@ -1,11 +1,11 @@
 id: 86299311
-type: way
+type: node
 latitude: 46.19848
 longitude: 6.26406
 postcode: "74100"
 city: Annemasse
-street: "Rue des Esserts"
-housenumber: 4
+street: Rue des Esserts
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/armand-thiery.yml b/data/cities/annemasse/armand-thiery.yml
index 596cbc3a7..d210d19ea 100644
--- a/data/cities/annemasse/armand-thiery.yml
+++ b/data/cities/annemasse/armand-thiery.yml
@@ -4,8 +4,8 @@ latitude: 46.19342
 longitude: 6.23501
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 8
+street: Rue du Commerce
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/art-coiffure.yml b/data/cities/annemasse/art-coiffure.yml
index 2fd563fdf..24817c589 100644
--- a/data/cities/annemasse/art-coiffure.yml
+++ b/data/cities/annemasse/art-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.1961
 longitude: 6.24203
 postcode: "74100"
 city: Annemasse
-street: "Rue des Tournelles"
-housenumber: 26
+street: Rue des Tournelles
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/au-fournil-dore.yml b/data/cities/annemasse/au-fournil-dore.yml
index 5820bef43..dba36efdc 100644
--- a/data/cities/annemasse/au-fournil-dore.yml
+++ b/data/cities/annemasse/au-fournil-dore.yml
@@ -4,8 +4,8 @@ latitude: 46.19485
 longitude: 6.23314
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 4
+street: Rue du Parc
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 05:30-20:30; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 05:30-20:30; Su 07:00-13:00
+website: ""
diff --git a/data/cities/annemasse/au-petrin-des-saveurs-rue-de-romagny.yml b/data/cities/annemasse/au-petrin-des-saveurs-rue-de-romagny.yml
index a7edf403b..83cb11edc 100644
--- a/data/cities/annemasse/au-petrin-des-saveurs-rue-de-romagny.yml
+++ b/data/cities/annemasse/au-petrin-des-saveurs-rue-de-romagny.yml
@@ -4,8 +4,8 @@ latitude: 46.19668
 longitude: 6.2477
 postcode: "74100"
 city: Annemasse
-street: "Rue de Romagny"
-housenumber: 50
+street: Rue de Romagny
+housenumber: "50"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:30; Su 06:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:30; Su 06:00-12:30
+website: ""
diff --git a/data/cities/annemasse/au-petrin-des-saveurs.yml b/data/cities/annemasse/au-petrin-des-saveurs.yml
index bac8b5ab9..009c22431 100644
--- a/data/cities/annemasse/au-petrin-des-saveurs.yml
+++ b/data/cities/annemasse/au-petrin-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 46.18595
 longitude: 6.24355
 postcode: "74100"
 city: Annemasse
-street: "Avenue de Verdun"
-housenumber: 21
+street: Avenue de Verdun
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 07:15-13:00, 14:00-19:00; Su 07:15-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:15-13:00, 14:00-19:00; Su 07:15-12:30
+website: ""
diff --git a/data/cities/annemasse/baetsh.yml b/data/cities/annemasse/baetsh.yml
index 209d81bdc..5b4a555cb 100644
--- a/data/cities/annemasse/baetsh.yml
+++ b/data/cities/annemasse/baetsh.yml
@@ -4,8 +4,8 @@ latitude: 46.19392
 longitude: 6.23494
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 9
+street: Rue du Commerce
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/barber-city.yml b/data/cities/annemasse/barber-city.yml
index 656e8beeb..b0197e22b 100644
--- a/data/cities/annemasse/barber-city.yml
+++ b/data/cities/annemasse/barber-city.yml
@@ -4,8 +4,8 @@ latitude: 46.19231
 longitude: 6.23213
 postcode: "74100"
 city: Annemasse
-street: "Rue du Clos Fleury"
-housenumber: 5
+street: Rue du Clos Fleury
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/annemasse/beauty-people.yml b/data/cities/annemasse/beauty-people.yml
index 502b5bbcf..abec6addb 100644
--- a/data/cities/annemasse/beauty-people.yml
+++ b/data/cities/annemasse/beauty-people.yml
@@ -4,8 +4,8 @@ latitude: 46.19602
 longitude: 6.25325
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Fr 09:00-20:00; Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-20:00; Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/besson-chaussures.yml b/data/cities/annemasse/besson-chaussures.yml
index 531709128..edf26c562 100644
--- a/data/cities/annemasse/besson-chaussures.yml
+++ b/data/cities/annemasse/besson-chaussures.yml
@@ -1,11 +1,11 @@
 id: 179087642
-type: way
+type: node
 latitude: 46.1961
 longitude: 6.26188
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 32
+street: Rue de la Résistance
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/annemasse/bocage.yml b/data/cities/annemasse/bocage.yml
index 7355317af..da7df7635 100644
--- a/data/cities/annemasse/bocage.yml
+++ b/data/cities/annemasse/bocage.yml
@@ -4,8 +4,8 @@ latitude: 46.19307
 longitude: 6.23486
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 2
+street: Rue du Commerce
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/boconcept.yml b/data/cities/annemasse/boconcept.yml
index e09a30d76..4654202bf 100644
--- a/data/cities/annemasse/boconcept.yml
+++ b/data/cities/annemasse/boconcept.yml
@@ -4,8 +4,9 @@ latitude: 46.1993
 longitude: 6.26544
 postcode: "74100"
 city: Annemasse
-street: "Rue des Buchillons"
-housenumber: 5
+street: Rue des Buchillons
+housenumber: "5"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-19:00; Su
+    off
+website: ""
diff --git a/data/cities/annemasse/bonobo.yml b/data/cities/annemasse/bonobo.yml
index 461cbc649..9daff7c07 100644
--- a/data/cities/annemasse/bonobo.yml
+++ b/data/cities/annemasse/bonobo.yml
@@ -4,8 +4,8 @@ latitude: 46.19608
 longitude: 6.25415
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/boucherie-chappaz.yml b/data/cities/annemasse/boucherie-chappaz.yml
index cdc6d8293..daae696d7 100644
--- a/data/cities/annemasse/boucherie-chappaz.yml
+++ b/data/cities/annemasse/boucherie-chappaz.yml
@@ -4,8 +4,8 @@ latitude: 46.18615
 longitude: 6.23662
 postcode: "74100"
 city: Annemasse
-street: "Route de Bonneville"
-housenumber: 39
+street: Route de Bonneville
+housenumber: "39"
 phone: ""
-opening_hours: "Mo-We,Fr,Sa 05:20-12:00,15:35-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr,Sa 05:20-12:00,15:35-19:00
+website: ""
diff --git a/data/cities/annemasse/boucherie-charcuterie-contat.yml b/data/cities/annemasse/boucherie-charcuterie-contat.yml
index 1f0fee7f6..2cf7b2263 100644
--- a/data/cities/annemasse/boucherie-charcuterie-contat.yml
+++ b/data/cities/annemasse/boucherie-charcuterie-contat.yml
@@ -4,8 +4,9 @@ latitude: 46.19386
 longitude: 6.23454
 postcode: "74100"
 city: Annemasse
-street: "Rue des Vétérans"
-housenumber: 3
+street: Rue des Vétérans
+housenumber: "3"
 phone: ""
-opening_hours: "Mo 08:15-12:15, 15:00-18:30; Tu-Fr 07:15-12:30, 15:00-19:00; Sa 07:15-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 08:15-12:15, 15:00-18:30; Tu-Fr 07:15-12:30, 15:00-19:00; Sa 07:15-19:00;
+    Su off
+website: ""
diff --git a/data/cities/annemasse/boulanger.yml b/data/cities/annemasse/boulanger.yml
index 875a26749..14c08fe87 100644
--- a/data/cities/annemasse/boulanger.yml
+++ b/data/cities/annemasse/boulanger.yml
@@ -1,11 +1,11 @@
 id: 158605545
-type: way
+type: node
 latitude: 46.19483
 longitude: 6.25585
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 53
+street: Route de Thonon
+housenumber: "53"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/boutique-sfr.yml b/data/cities/annemasse/boutique-sfr.yml
index d8b24fab9..775d60bd7 100644
--- a/data/cities/annemasse/boutique-sfr.yml
+++ b/data/cities/annemasse/boutique-sfr.yml
@@ -4,8 +4,8 @@ latitude: 46.196
 longitude: 6.25414
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/breal.yml b/data/cities/annemasse/breal.yml
index 6eb0b2a4e..e68552ea0 100644
--- a/data/cities/annemasse/breal.yml
+++ b/data/cities/annemasse/breal.yml
@@ -4,8 +4,8 @@ latitude: 46.19608
 longitude: 6.254
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/brioche-doree.yml b/data/cities/annemasse/brioche-doree.yml
index 790a6449e..1c36e5d6f 100644
--- a/data/cities/annemasse/brioche-doree.yml
+++ b/data/cities/annemasse/brioche-doree.yml
@@ -4,8 +4,8 @@ latitude: 46.19588
 longitude: 6.25391
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00
+website: ""
diff --git a/data/cities/annemasse/bubble-brothers.yml b/data/cities/annemasse/bubble-brothers.yml
index 0a49b1031..af220c244 100644
--- a/data/cities/annemasse/bubble-brothers.yml
+++ b/data/cities/annemasse/bubble-brothers.yml
@@ -4,8 +4,8 @@ latitude: 46.19684
 longitude: 6.2352
 postcode: "74100"
 city: Annemasse
-street: "Avenue de la Gare"
-housenumber: 47
+street: Avenue de la Gare
+housenumber: "47"
 phone: ""
-opening_hours: "Mo 14:00-19:30; Tu-Sa 13:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:30; Tu-Sa 13:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/burdin-interflora.yml b/data/cities/annemasse/burdin-interflora.yml
index bead5fbaa..b5d203318 100644
--- a/data/cities/annemasse/burdin-interflora.yml
+++ b/data/cities/annemasse/burdin-interflora.yml
@@ -4,8 +4,8 @@ latitude: 46.19388
 longitude: 6.23524
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 14
-phone: "+33 4 50 92 11 80"
-opening_hours: "Mo-Sa 07:30-19:30; Su off"
-website: "http://www.burdin-fleurs-interflora.fr/"
\ No newline at end of file
+street: Rue du Commerce
+housenumber: "14"
+phone: +33 4 50 92 11 80
+opening_hours: Mo-Sa 07:30-19:30; Su off
+website: http://www.burdin-fleurs-interflora.fr/
diff --git a/data/cities/annemasse/burton.yml b/data/cities/annemasse/burton.yml
index 4ff55c98e..fbb9c78c6 100644
--- a/data/cities/annemasse/burton.yml
+++ b/data/cities/annemasse/burton.yml
@@ -4,8 +4,8 @@ latitude: 46.19356
 longitude: 6.23376
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Gare"
-housenumber: 2
+street: Rue de la Gare
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/cache-cache.yml b/data/cities/annemasse/cache-cache.yml
index cf78d9e9c..f489ea2d9 100644
--- a/data/cities/annemasse/cache-cache.yml
+++ b/data/cities/annemasse/cache-cache.yml
@@ -4,8 +4,8 @@ latitude: 46.19613
 longitude: 6.25387
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/calzedonia.yml b/data/cities/annemasse/calzedonia.yml
index fafe98415..192eb5aaa 100644
--- a/data/cities/annemasse/calzedonia.yml
+++ b/data/cities/annemasse/calzedonia.yml
@@ -4,8 +4,8 @@ latitude: 46.19652
 longitude: 6.23695
 postcode: "74100"
 city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 4
+street: Allée François Truffaut
+housenumber: "4"
 phone: ""
-opening_hours: "Mo 11:00-19:00; Tu-Fr 10:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 11:00-19:00; Tu-Fr 10:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/carrefour-city.yml b/data/cities/annemasse/carrefour-city.yml
index 2896f9f3c..670b6d5d7 100644
--- a/data/cities/annemasse/carrefour-city.yml
+++ b/data/cities/annemasse/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 46.19437
 longitude: 6.23396
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Gare"
-housenumber: 12
+street: Rue de la Gare
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Sa 07:00-18:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-18:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/annemasse/carrefour-market-avenue-florissant.yml b/data/cities/annemasse/carrefour-market-avenue-florissant.yml
index fb4c5e402..18016171f 100644
--- a/data/cities/annemasse/carrefour-market-avenue-florissant.yml
+++ b/data/cities/annemasse/carrefour-market-avenue-florissant.yml
@@ -1,11 +1,11 @@
 id: 84915664
-type: way
+type: node
 latitude: 46.19598
 longitude: 6.24364
 postcode: "74100"
 city: Annemasse
-street: "Avenue Florissant"
-housenumber: 25
+street: Avenue Florissant
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/carrefour-market-route-de-bonneville.yml b/data/cities/annemasse/carrefour-market-route-de-bonneville.yml
index 08d137741..a9aab658d 100644
--- a/data/cities/annemasse/carrefour-market-route-de-bonneville.yml
+++ b/data/cities/annemasse/carrefour-market-route-de-bonneville.yml
@@ -1,11 +1,11 @@
 id: 91369616
-type: way
+type: node
 latitude: 46.18161
 longitude: 6.23654
 postcode: "74100"
 city: Annemasse
-street: "Route de Bonneville"
-housenumber: 90
+street: Route de Bonneville
+housenumber: "90"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/annemasse/carrefour-market.yml b/data/cities/annemasse/carrefour-market.yml
index a380121c2..d82952d30 100644
--- a/data/cities/annemasse/carrefour-market.yml
+++ b/data/cities/annemasse/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 46.18621
 longitude: 6.24348
 postcode: "74100"
 city: Annemasse
-street: "Avenue de Verdun"
-housenumber: 21
+street: Avenue de Verdun
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-18:00; Su off
+website: ""
diff --git a/data/cities/annemasse/carrosserie-bajolaz.yml b/data/cities/annemasse/carrosserie-bajolaz.yml
index 2c5a6908d..6c6abd5bb 100644
--- a/data/cities/annemasse/carrosserie-bajolaz.yml
+++ b/data/cities/annemasse/carrosserie-bajolaz.yml
@@ -1,11 +1,11 @@
 id: 86265928
-type: way
+type: node
 latitude: 46.1976
 longitude: 6.25962
 postcode: "74100"
 city: Annemasse
-street: "Rue Lavalette"
-housenumber: 5
+street: Rue Lavalette
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00; Sa 08:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00; Sa 08:00-12:00; Su off
+website: ""
diff --git a/data/cities/annemasse/cash-express.yml b/data/cities/annemasse/cash-express.yml
index 114bcc02c..85ffcd3a5 100644
--- a/data/cities/annemasse/cash-express.yml
+++ b/data/cities/annemasse/cash-express.yml
@@ -1,11 +1,11 @@
 id: 86299453
-type: way
+type: node
 latitude: 46.19678
 longitude: 6.25514
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 17
+street: Rue de la Résistance
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:30, 14:00-19:00; Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:30, 14:00-19:00; Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/caves-du-chatelet-fichard.yml b/data/cities/annemasse/caves-du-chatelet-fichard.yml
index 92e63162e..86039974d 100644
--- a/data/cities/annemasse/caves-du-chatelet-fichard.yml
+++ b/data/cities/annemasse/caves-du-chatelet-fichard.yml
@@ -1,11 +1,11 @@
 id: 885534290
-type: way
+type: node
 latitude: 46.19661
 longitude: 6.26606
 postcode: "74100"
 city: Annemasse
-street: "Rue Germain Sommeiller"
-housenumber: 24
+street: Rue Germain Sommeiller
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/celin-coiffure.yml b/data/cities/annemasse/celin-coiffure.yml
index 486028210..829f5be6c 100644
--- a/data/cities/annemasse/celin-coiffure.yml
+++ b/data/cities/annemasse/celin-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.18912
 longitude: 6.23759
 postcode: "74100"
 city: Annemasse
-street: "Rue du Château Rouge"
-housenumber: 33
+street: Rue du Château Rouge
+housenumber: "33"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Th 08:30-12:30,13:30-17:30; Fr 08:30-18:30; Sa 08:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Th 08:30-12:30,13:30-17:30; Fr 08:30-18:30; Sa 08:30-18:00
+website: ""
diff --git a/data/cities/annemasse/celio-rue-du-commerce.yml b/data/cities/annemasse/celio-rue-du-commerce.yml
index 53a66ae04..1c937bd98 100644
--- a/data/cities/annemasse/celio-rue-du-commerce.yml
+++ b/data/cities/annemasse/celio-rue-du-commerce.yml
@@ -4,8 +4,8 @@ latitude: 46.19435
 longitude: 6.2355
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 20
+street: Rue du Commerce
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/celio.yml b/data/cities/annemasse/celio.yml
index 2df0ae0da..6446cf25f 100644
--- a/data/cities/annemasse/celio.yml
+++ b/data/cities/annemasse/celio.yml
@@ -4,8 +4,8 @@ latitude: 46.19587
 longitude: 6.254
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/centre-commercial-du-perrier.yml b/data/cities/annemasse/centre-commercial-du-perrier.yml
index 7e6205775..ca5c7b6a1 100644
--- a/data/cities/annemasse/centre-commercial-du-perrier.yml
+++ b/data/cities/annemasse/centre-commercial-du-perrier.yml
@@ -1,11 +1,11 @@
 id: 86255782
-type: way
+type: node
 latitude: 46.18576
 longitude: 6.24307
 postcode: "74100"
 city: Annemasse
-street: "Avenue de Verdun"
-housenumber: 21
+street: Avenue de Verdun
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/chaussea.yml b/data/cities/annemasse/chaussea.yml
index e780c1a98..22b835788 100644
--- a/data/cities/annemasse/chaussea.yml
+++ b/data/cities/annemasse/chaussea.yml
@@ -1,11 +1,11 @@
 id: 86267545
-type: way
+type: node
 latitude: 46.19589
 longitude: 6.25741
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 22
+street: Rue de la Résistance
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/christine-laure.yml b/data/cities/annemasse/christine-laure.yml
index dfbbc3b86..3c8eb2518 100644
--- a/data/cities/annemasse/christine-laure.yml
+++ b/data/cities/annemasse/christine-laure.yml
@@ -4,8 +4,8 @@ latitude: 46.19615
 longitude: 6.25355
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/ciseaux-dor.yml b/data/cities/annemasse/ciseaux-dor.yml
index 4b8bb10d0..600a3c6ed 100644
--- a/data/cities/annemasse/ciseaux-dor.yml
+++ b/data/cities/annemasse/ciseaux-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.19489
 longitude: 6.23277
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 6
+street: Rue du Parc
+housenumber: "6"
 phone: ""
-opening_hours: "Mo,Th,Sa 9:00-18:00; Tu-We,Fr 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Th,Sa 9:00-18:00; Tu-We,Fr 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/citymod.yml b/data/cities/annemasse/citymod.yml
index 2f2c326fd..2c9841d5d 100644
--- a/data/cities/annemasse/citymod.yml
+++ b/data/cities/annemasse/citymod.yml
@@ -4,8 +4,8 @@ latitude: 46.19452
 longitude: 6.23247
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 5
+street: Rue du Parc
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/claires.yml b/data/cities/annemasse/claires.yml
index 3968c1f85..b5840decb 100644
--- a/data/cities/annemasse/claires.yml
+++ b/data/cities/annemasse/claires.yml
@@ -4,8 +4,8 @@ latitude: 46.19644
 longitude: 6.23633
 postcode: "74100"
 city: Annemasse
-street: "Place Antoine Lumière"
-housenumber: 8
+street: Place Antoine Lumière
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/cleor.yml b/data/cities/annemasse/cleor.yml
index b0e2005e5..ed938dd0f 100644
--- a/data/cities/annemasse/cleor.yml
+++ b/data/cities/annemasse/cleor.yml
@@ -4,8 +4,8 @@ latitude: 46.1963
 longitude: 6.25339
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/coffee-meuble.yml b/data/cities/annemasse/coffee-meuble.yml
index 95a458c55..6e0cebfe7 100644
--- a/data/cities/annemasse/coffee-meuble.yml
+++ b/data/cities/annemasse/coffee-meuble.yml
@@ -1,11 +1,11 @@
 id: 86265931
-type: way
+type: node
 latitude: 46.19817
 longitude: 6.25995
 postcode: "74100"
 city: Annemasse
-street: "Rue de l'Industrie"
-housenumber: 10
+street: Rue de l'Industrie
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:30, 14:00-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:30, 14:00-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/annemasse/comptor-national-de-lor.yml b/data/cities/annemasse/comptor-national-de-lor.yml
index 9569f2207..276557689 100644
--- a/data/cities/annemasse/comptor-national-de-lor.yml
+++ b/data/cities/annemasse/comptor-national-de-lor.yml
@@ -4,8 +4,8 @@ latitude: 46.19397
 longitude: 6.23528
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 16
+street: Rue du Commerce
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/concept-coiffure-annemasse.yml b/data/cities/annemasse/concept-coiffure-annemasse.yml
index 6d98fddad..aebd4951e 100644
--- a/data/cities/annemasse/concept-coiffure-annemasse.yml
+++ b/data/cities/annemasse/concept-coiffure-annemasse.yml
@@ -4,8 +4,8 @@ latitude: 46.19354
 longitude: 6.23587
 postcode: "74100"
 city: Annemasse
-street: "Avenue Louis Pasteur"
-housenumber: 5
+street: Avenue Louis Pasteur
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/courir.yml b/data/cities/annemasse/courir.yml
index 18ecafc3f..9a13d96c1 100644
--- a/data/cities/annemasse/courir.yml
+++ b/data/cities/annemasse/courir.yml
@@ -4,8 +4,8 @@ latitude: 46.19615
 longitude: 6.25328
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/crazy-needles.yml b/data/cities/annemasse/crazy-needles.yml
index e087e47ef..d9f23246e 100644
--- a/data/cities/annemasse/crazy-needles.yml
+++ b/data/cities/annemasse/crazy-needles.yml
@@ -4,8 +4,8 @@ latitude: 46.1904
 longitude: 6.23771
 postcode: "74100"
 city: Annemasse
-street: "Rue Léandre Vaillat"
-housenumber: 18
+street: Rue Léandre Vaillat
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/creation-parquets-et-carrelages.yml b/data/cities/annemasse/creation-parquets-et-carrelages.yml
index d281ab18e..ffa5de8d9 100644
--- a/data/cities/annemasse/creation-parquets-et-carrelages.yml
+++ b/data/cities/annemasse/creation-parquets-et-carrelages.yml
@@ -1,11 +1,11 @@
 id: 86299454
-type: way
+type: node
 latitude: 46.19644
 longitude: 6.25626
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 19
+street: Rue de la Résistance
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Fr 08:45-12:30, 14:00-18:45; Sa 09:45-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:45-12:30, 14:00-18:45; Sa 09:45-18:00; Su off
+website: ""
diff --git a/data/cities/annemasse/d2r-auto.yml b/data/cities/annemasse/d2r-auto.yml
index 138c433e5..d7dbc10fc 100644
--- a/data/cities/annemasse/d2r-auto.yml
+++ b/data/cities/annemasse/d2r-auto.yml
@@ -4,8 +4,8 @@ latitude: 46.1975
 longitude: 6.25658
 postcode: "74100"
 city: Annemasse
-street: "Rue du Mont Rond"
-housenumber: 3
+street: Rue du Mont Rond
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-14:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-14:00; Su off
+website: ""
diff --git a/data/cities/annemasse/damart.yml b/data/cities/annemasse/damart.yml
index 3fc94ad18..625a45fc2 100644
--- a/data/cities/annemasse/damart.yml
+++ b/data/cities/annemasse/damart.yml
@@ -4,8 +4,8 @@ latitude: 46.19459
 longitude: 6.23401
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Gare"
-housenumber: 16
+street: Rue de la Gare
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/darty.yml b/data/cities/annemasse/darty.yml
index 5409598d8..f2526b4e1 100644
--- a/data/cities/annemasse/darty.yml
+++ b/data/cities/annemasse/darty.yml
@@ -1,11 +1,11 @@
 id: 61975904
-type: way
+type: node
 latitude: 46.19813
 longitude: 6.26442
 postcode: "74100"
 city: Annemasse
-street: "Rue des Esserts"
-housenumber: 2
+street: Rue des Esserts
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/decathlon.yml b/data/cities/annemasse/decathlon.yml
index e5e841963..7fcb04394 100644
--- a/data/cities/annemasse/decathlon.yml
+++ b/data/cities/annemasse/decathlon.yml
@@ -1,11 +1,11 @@
 id: 737855516
-type: way
+type: node
 latitude: 46.19595
 longitude: 6.25781
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 26
+street: Rue de la Résistance
+housenumber: "26"
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: ""
diff --git a/data/cities/annemasse/decitre.yml b/data/cities/annemasse/decitre.yml
index 9742c0a79..4c44f07d3 100644
--- a/data/cities/annemasse/decitre.yml
+++ b/data/cities/annemasse/decitre.yml
@@ -4,8 +4,8 @@ latitude: 46.197
 longitude: 6.23598
 postcode: "74100"
 city: Annemasse
-street: "Allée Simone Signoret"
-housenumber: 3
+street: Allée Simone Signoret
+housenumber: "3"
 phone: ""
-opening_hours: "Mo 12:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 12:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/deletraz-decoration.yml b/data/cities/annemasse/deletraz-decoration.yml
index 5d89ee243..2d2e04054 100644
--- a/data/cities/annemasse/deletraz-decoration.yml
+++ b/data/cities/annemasse/deletraz-decoration.yml
@@ -4,8 +4,8 @@ latitude: 46.19485
 longitude: 6.23325
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 2
+street: Rue du Parc
+housenumber: "2"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 10:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 10:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/annemasse/des-petits-hauts.yml b/data/cities/annemasse/des-petits-hauts.yml
index a96f9b37e..26d64be86 100644
--- a/data/cities/annemasse/des-petits-hauts.yml
+++ b/data/cities/annemasse/des-petits-hauts.yml
@@ -4,8 +4,8 @@ latitude: 46.19386
 longitude: 6.23491
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 7
+street: Rue du Commerce
+housenumber: "7"
 phone: ""
-opening_hours: "Mo, Su off; Tu,Th 11:00-13:00, 14:00-18:00; We,Fr-Sa 10:00-13:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo, Su off; Tu,Th 11:00-13:00, 14:00-18:00; We,Fr-Sa 10:00-13:00, 14:00-19:00
+website: ""
diff --git a/data/cities/annemasse/durand-services.yml b/data/cities/annemasse/durand-services.yml
index 166ba510f..4adfa3d3e 100644
--- a/data/cities/annemasse/durand-services.yml
+++ b/data/cities/annemasse/durand-services.yml
@@ -1,11 +1,11 @@
 id: 86265938
-type: way
+type: node
 latitude: 46.19833
 longitude: 6.25922
 postcode: "74100"
 city: Annemasse
-street: "Rue de l'Industrie"
-housenumber: 8
+street: Rue de l'Industrie
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/annemasse/eco-center.yml b/data/cities/annemasse/eco-center.yml
index b98cea66c..e9d83b93d 100644
--- a/data/cities/annemasse/eco-center.yml
+++ b/data/cities/annemasse/eco-center.yml
@@ -4,8 +4,8 @@ latitude: 46.1975
 longitude: 6.25667
 postcode: "74100"
 city: Annemasse
-street: "Rue du Mont Rond"
-housenumber: 3
+street: Rue du Mont Rond
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:30, 14:00-19:00; Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:30, 14:00-19:00; Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/ecobike.yml b/data/cities/annemasse/ecobike.yml
index 7b9803460..6b4716065 100644
--- a/data/cities/annemasse/ecobike.yml
+++ b/data/cities/annemasse/ecobike.yml
@@ -4,8 +4,8 @@ latitude: 46.19243
 longitude: 6.23253
 postcode: "74100"
 city: Annemasse
-street: "Rue du Clos Fleury"
-housenumber: 16
+street: Rue du Clos Fleury
+housenumber: "16"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 09:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 09:00-18:30; Su off
+website: ""
diff --git a/data/cities/annemasse/ecouter-voir-place-de-lhotel-de-ville.yml b/data/cities/annemasse/ecouter-voir-place-de-lhotel-de-ville.yml
index e94775d22..2828ada59 100644
--- a/data/cities/annemasse/ecouter-voir-place-de-lhotel-de-ville.yml
+++ b/data/cities/annemasse/ecouter-voir-place-de-lhotel-de-ville.yml
@@ -4,8 +4,8 @@ latitude: 46.19278
 longitude: 6.23416
 postcode: "74100"
 city: Annemasse
-street: "Place de l'Hôtel de Ville"
-housenumber: 12
+street: Place de l'Hôtel de Ville
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:00; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:00; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/annemasse/ecouter-voir.yml b/data/cities/annemasse/ecouter-voir.yml
index 40d557d7b..4c7996833 100644
--- a/data/cities/annemasse/ecouter-voir.yml
+++ b/data/cities/annemasse/ecouter-voir.yml
@@ -4,8 +4,9 @@ latitude: 46.19705
 longitude: 6.23532
 postcode: "74100"
 city: Annemasse
-street: "Avenue de la Gare"
-housenumber: 51
+street: Avenue de la Gare
+housenumber: "51"
 phone: ""
-opening_hours: "Mo 13:30-19:00; Tu-Fr 09:00-12:30, 13:30-18:00; Sa 09:00-12:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 13:30-19:00; Tu-Fr 09:00-12:30, 13:30-18:00; Sa 09:00-12:30; Su
+    off
+website: ""
diff --git a/data/cities/annemasse/ekosport.yml b/data/cities/annemasse/ekosport.yml
index fe0843c90..c6219478c 100644
--- a/data/cities/annemasse/ekosport.yml
+++ b/data/cities/annemasse/ekosport.yml
@@ -1,11 +1,11 @@
 id: 179087641
-type: way
+type: node
 latitude: 46.19639
 longitude: 6.26166
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 32
+street: Rue de la Résistance
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Sa 09:30-18:45; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-18:45; Su off
+website: ""
diff --git a/data/cities/annemasse/epicerie-les-4-saisons.yml b/data/cities/annemasse/epicerie-les-4-saisons.yml
index f333101a7..34d5950d1 100644
--- a/data/cities/annemasse/epicerie-les-4-saisons.yml
+++ b/data/cities/annemasse/epicerie-les-4-saisons.yml
@@ -4,8 +4,8 @@ latitude: 46.18643
 longitude: 6.23673
 postcode: "74100"
 city: Annemasse
-street: "Rue de l'Annexion"
-housenumber: 1
+street: Rue de l'Annexion
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/europa-press.yml b/data/cities/annemasse/europa-press.yml
index 044a5522f..664d9aa2f 100644
--- a/data/cities/annemasse/europa-press.yml
+++ b/data/cities/annemasse/europa-press.yml
@@ -4,8 +4,8 @@ latitude: 46.19635
 longitude: 6.25355
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/feu-vert-annemasse.yml b/data/cities/annemasse/feu-vert-annemasse.yml
index a2bcd3466..c27c24b8f 100644
--- a/data/cities/annemasse/feu-vert-annemasse.yml
+++ b/data/cities/annemasse/feu-vert-annemasse.yml
@@ -4,8 +4,8 @@ latitude: 46.19483
 longitude: 6.2545
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-19:00
+website: ""
diff --git a/data/cities/annemasse/feu-vert.yml b/data/cities/annemasse/feu-vert.yml
index d3b87b265..646ea651e 100644
--- a/data/cities/annemasse/feu-vert.yml
+++ b/data/cities/annemasse/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 80134766
-type: way
+type: node
 latitude: 46.19586
 longitude: 6.26069
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 28
+street: Rue de la Résistance
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/annemasse/fla-automobile-annemasse.yml b/data/cities/annemasse/fla-automobile-annemasse.yml
index 3d40ae658..0625ce42b 100644
--- a/data/cities/annemasse/fla-automobile-annemasse.yml
+++ b/data/cities/annemasse/fla-automobile-annemasse.yml
@@ -1,11 +1,11 @@
 id: 86266672
-type: way
+type: node
 latitude: 46.19753
 longitude: 6.26067
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 31
+street: Rue de la Résistance
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/fnac.yml b/data/cities/annemasse/fnac.yml
index 5c85ca606..9d746daa9 100644
--- a/data/cities/annemasse/fnac.yml
+++ b/data/cities/annemasse/fnac.yml
@@ -4,8 +4,8 @@ latitude: 46.19626
 longitude: 6.25369
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/foot-korner.yml b/data/cities/annemasse/foot-korner.yml
index 44a9154b4..60e00a418 100644
--- a/data/cities/annemasse/foot-korner.yml
+++ b/data/cities/annemasse/foot-korner.yml
@@ -4,8 +4,8 @@ latitude: 46.19711
 longitude: 6.23615
 postcode: "74100"
 city: Annemasse
-street: "Allée Simone Signoret"
-housenumber: 4
+street: Allée Simone Signoret
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/franck-provost-place-alexandre-moret.yml b/data/cities/annemasse/franck-provost-place-alexandre-moret.yml
index d3f5b2dfe..3eb6b7bb0 100644
--- a/data/cities/annemasse/franck-provost-place-alexandre-moret.yml
+++ b/data/cities/annemasse/franck-provost-place-alexandre-moret.yml
@@ -4,8 +4,8 @@ latitude: 46.19162
 longitude: 6.23424
 postcode: "74100"
 city: Annemasse
-street: "Place Alexandre Moret"
-housenumber: 1
+street: Place Alexandre Moret
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-18:30; Su off
+website: ""
diff --git a/data/cities/annemasse/franck-provost-rue-de-la-resistance.yml b/data/cities/annemasse/franck-provost-rue-de-la-resistance.yml
index 1dba77c56..feaf876a9 100644
--- a/data/cities/annemasse/franck-provost-rue-de-la-resistance.yml
+++ b/data/cities/annemasse/franck-provost-rue-de-la-resistance.yml
@@ -4,8 +4,8 @@ latitude: 46.19638
 longitude: 6.25333
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/franck-provost.yml b/data/cities/annemasse/franck-provost.yml
index f0fb04eda..eff3a6abc 100644
--- a/data/cities/annemasse/franck-provost.yml
+++ b/data/cities/annemasse/franck-provost.yml
@@ -4,8 +4,8 @@ latitude: 46.19648
 longitude: 6.23703
 postcode: "74100"
 city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 6
+street: Allée François Truffaut
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Th 10:00-19:30; Fr-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 10:00-19:30; Fr-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/fresh.yml b/data/cities/annemasse/fresh.yml
index 28139d2e8..b3f3ead89 100644
--- a/data/cities/annemasse/fresh.yml
+++ b/data/cities/annemasse/fresh.yml
@@ -1,11 +1,11 @@
 id: 521939198
-type: way
+type: node
 latitude: 46.19726
 longitude: 6.25651
 postcode: "74100"
 city: Annemasse
-street: "Rue du Mont Rond"
-housenumber: 1
+street: Rue du Mont Rond
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/annemasse/fromagerie-du-noyer.yml b/data/cities/annemasse/fromagerie-du-noyer.yml
index eabb0dca5..4883cec43 100644
--- a/data/cities/annemasse/fromagerie-du-noyer.yml
+++ b/data/cities/annemasse/fromagerie-du-noyer.yml
@@ -4,8 +4,8 @@ latitude: 46.1929
 longitude: 6.2331
 postcode: "74100"
 city: Annemasse
-street: "Rue de Genève"
-housenumber: 1
+street: Rue de Genève
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/gemo.yml b/data/cities/annemasse/gemo.yml
index b858f6bf7..d89550e18 100644
--- a/data/cities/annemasse/gemo.yml
+++ b/data/cities/annemasse/gemo.yml
@@ -1,11 +1,11 @@
 id: 80139688
-type: way
+type: node
 latitude: 46.19288
 longitude: 6.25346
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 31
+street: Route de Thonon
+housenumber: "31"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/generale-doptique.yml b/data/cities/annemasse/generale-doptique.yml
index a0e8529e2..44d7d93e0 100644
--- a/data/cities/annemasse/generale-doptique.yml
+++ b/data/cities/annemasse/generale-doptique.yml
@@ -4,8 +4,8 @@ latitude: 46.19712
 longitude: 6.26148
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 33
+street: Rue de la Résistance
+housenumber: "33"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/groupe-ppu.yml b/data/cities/annemasse/groupe-ppu.yml
index 2a5501932..0df688986 100644
--- a/data/cities/annemasse/groupe-ppu.yml
+++ b/data/cities/annemasse/groupe-ppu.yml
@@ -1,11 +1,11 @@
 id: 886684802
-type: way
+type: node
 latitude: 46.19828
 longitude: 6.25811
 postcode: "74100"
 city: Annemasse
-street: "Rue de l'Industrie"
-housenumber: 2
+street: Rue de l'Industrie
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/gtt-market.yml b/data/cities/annemasse/gtt-market.yml
index 10433e53e..7a870fa98 100644
--- a/data/cities/annemasse/gtt-market.yml
+++ b/data/cities/annemasse/gtt-market.yml
@@ -4,8 +4,8 @@ latitude: 46.19769
 longitude: 6.23514
 postcode: "74100"
 city: Annemasse
-street: "Rue du Docteur Aimé Coquand"
-housenumber: 43
+street: Rue du Docteur Aimé Coquand
+housenumber: "43"
 phone: ""
-opening_hours: "Mo-Th,Su 15:00-27:00; Fr-Sa 15:00-28:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th,Su 15:00-27:00; Fr-Sa 15:00-28:00
+website: ""
diff --git a/data/cities/annemasse/hetm.yml b/data/cities/annemasse/hetm.yml
index 3d69ee7e6..094e77c7d 100644
--- a/data/cities/annemasse/hetm.yml
+++ b/data/cities/annemasse/hetm.yml
@@ -4,8 +4,8 @@ latitude: 46.19674
 longitude: 6.23747
 postcode: "74100"
 city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 5
+street: Allée François Truffaut
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/heytens.yml b/data/cities/annemasse/heytens.yml
index a88e2557a..ea0026edc 100644
--- a/data/cities/annemasse/heytens.yml
+++ b/data/cities/annemasse/heytens.yml
@@ -4,8 +4,8 @@ latitude: 46.19433
 longitude: 6.25748
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 65
+street: Route de Thonon
+housenumber: "65"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:30-12:30, 14:00-18:30; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:30-12:30, 14:00-18:30; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml b/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml
index 6d56fe95b..361f7d05d 100644
--- a/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml
+++ b/data/cities/annemasse/histoire-dor-rue-de-la-resistance.yml
@@ -4,8 +4,8 @@ latitude: 46.19592
 longitude: 6.25349
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/histoire-dor.yml b/data/cities/annemasse/histoire-dor.yml
index b0b0263d1..f1aa4841a 100644
--- a/data/cities/annemasse/histoire-dor.yml
+++ b/data/cities/annemasse/histoire-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.1966
 longitude: 6.2368
 postcode: "74100"
 city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 2
+street: Allée François Truffaut
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annemasse/ikks.yml b/data/cities/annemasse/ikks.yml
index 045f476ae..c332a4ab8 100644
--- a/data/cities/annemasse/ikks.yml
+++ b/data/cities/annemasse/ikks.yml
@@ -4,8 +4,8 @@ latitude: 46.19317
 longitude: 6.23489
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 4
+street: Rue du Commerce
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/intermarche-hyper.yml b/data/cities/annemasse/intermarche-hyper.yml
index 4e2495e47..beb83278e 100644
--- a/data/cities/annemasse/intermarche-hyper.yml
+++ b/data/cities/annemasse/intermarche-hyper.yml
@@ -4,8 +4,8 @@ latitude: 46.19568
 longitude: 6.25385
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/annemasse/intersport.yml b/data/cities/annemasse/intersport.yml
index 91c03e9f4..3eca86734 100644
--- a/data/cities/annemasse/intersport.yml
+++ b/data/cities/annemasse/intersport.yml
@@ -4,8 +4,8 @@ latitude: 46.19498
 longitude: 6.25453
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/jardin-danthyllis.yml b/data/cities/annemasse/jardin-danthyllis.yml
index a8ddfa2b8..adb8bafe5 100644
--- a/data/cities/annemasse/jardin-danthyllis.yml
+++ b/data/cities/annemasse/jardin-danthyllis.yml
@@ -4,8 +4,8 @@ latitude: 46.19125
 longitude: 6.23427
 postcode: "74100"
 city: Annemasse
-street: "Place Alexandre Moret"
-housenumber: 3
+street: Place Alexandre Moret
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/jean-lain-annemasse-vw-vul.yml b/data/cities/annemasse/jean-lain-annemasse-vw-vul.yml
index 97cbab598..ada70197f 100644
--- a/data/cities/annemasse/jean-lain-annemasse-vw-vul.yml
+++ b/data/cities/annemasse/jean-lain-annemasse-vw-vul.yml
@@ -1,11 +1,11 @@
 id: 86299445
-type: way
+type: node
 latitude: 46.19688
 longitude: 6.26366
 postcode: "74105"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 36
+street: Rue de la Résistance
+housenumber: "36"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/annemasse/joueclub.yml b/data/cities/annemasse/joueclub.yml
index ffea6bb89..8cc216426 100644
--- a/data/cities/annemasse/joueclub.yml
+++ b/data/cities/annemasse/joueclub.yml
@@ -1,11 +1,11 @@
 id: 86299394
-type: way
+type: node
 latitude: 46.19763
 longitude: 6.26181
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 35
+street: Rue de la Résistance
+housenumber: "35"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/jour-de-fete.yml b/data/cities/annemasse/jour-de-fete.yml
index 646530a58..a7b14e2f8 100644
--- a/data/cities/annemasse/jour-de-fete.yml
+++ b/data/cities/annemasse/jour-de-fete.yml
@@ -4,8 +4,8 @@ latitude: 46.1989
 longitude: 6.26536
 postcode: "74100"
 city: Annemasse
-street: "Rue des Buchillons"
-housenumber: 5
+street: Rue des Buchillons
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/jour-de-fleuraison.yml b/data/cities/annemasse/jour-de-fleuraison.yml
index 431c6c937..0e51d7e31 100644
--- a/data/cities/annemasse/jour-de-fleuraison.yml
+++ b/data/cities/annemasse/jour-de-fleuraison.yml
@@ -4,8 +4,8 @@ latitude: 46.19426
 longitude: 6.23873
 postcode: "74100"
 city: Annemasse
-street: "Rue du Faucigny"
-housenumber: 19
+street: Rue du Faucigny
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/kiko.yml b/data/cities/annemasse/kiko.yml
index b8c20cc9c..fd5238488 100644
--- a/data/cities/annemasse/kiko.yml
+++ b/data/cities/annemasse/kiko.yml
@@ -4,8 +4,8 @@ latitude: 46.19657
 longitude: 6.23687
 postcode: "74100"
 city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 4
+street: Allée François Truffaut
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/king-jouet.yml b/data/cities/annemasse/king-jouet.yml
index d74f1c88b..a32bd21d5 100644
--- a/data/cities/annemasse/king-jouet.yml
+++ b/data/cities/annemasse/king-jouet.yml
@@ -4,8 +4,8 @@ latitude: 46.2021
 longitude: 6.27769
 postcode: "74100"
 city: Annemasse
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00, Su 10:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00, Su 10:00-18:00
+website: ""
diff --git a/data/cities/annemasse/krys.yml b/data/cities/annemasse/krys.yml
index 4b6af1770..e1bb4691d 100644
--- a/data/cities/annemasse/krys.yml
+++ b/data/cities/annemasse/krys.yml
@@ -4,8 +4,8 @@ latitude: 46.1926
 longitude: 6.23439
 postcode: "74100"
 city: Annemasse
-street: "Rue Fernand David"
-housenumber: 4
+street: Rue Fernand David
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/kunz-pressing-avenue-louis-pasteur.yml b/data/cities/annemasse/kunz-pressing-avenue-louis-pasteur.yml
index 492ab83a3..e78874884 100644
--- a/data/cities/annemasse/kunz-pressing-avenue-louis-pasteur.yml
+++ b/data/cities/annemasse/kunz-pressing-avenue-louis-pasteur.yml
@@ -4,8 +4,8 @@ latitude: 46.19311
 longitude: 6.23739
 postcode: "74100"
 city: Annemasse
-street: "Avenue Louis Pasteur"
-housenumber: 21
+street: Avenue Louis Pasteur
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/kunz-pressing.yml b/data/cities/annemasse/kunz-pressing.yml
index dca2a314a..9a505b7df 100644
--- a/data/cities/annemasse/kunz-pressing.yml
+++ b/data/cities/annemasse/kunz-pressing.yml
@@ -4,8 +4,8 @@ latitude: 46.19595
 longitude: 6.25324
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/la-barbe-a-papa.yml b/data/cities/annemasse/la-barbe-a-papa.yml
index a996765aa..1145881db 100644
--- a/data/cities/annemasse/la-barbe-a-papa.yml
+++ b/data/cities/annemasse/la-barbe-a-papa.yml
@@ -4,8 +4,8 @@ latitude: 46.19619
 longitude: 6.25374
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/la-cerise-sur-le-chameau.yml b/data/cities/annemasse/la-cerise-sur-le-chameau.yml
index 49a103193..579eba1aa 100644
--- a/data/cities/annemasse/la-cerise-sur-le-chameau.yml
+++ b/data/cities/annemasse/la-cerise-sur-le-chameau.yml
@@ -4,8 +4,8 @@ latitude: 46.19441
 longitude: 6.23742
 postcode: "74100"
 city: Annemasse
-street: "Rue du Faucigny"
-housenumber: 9
+street: Rue du Faucigny
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/la-foirfouille.yml b/data/cities/annemasse/la-foirfouille.yml
index 40db3f4eb..093b9de9a 100644
--- a/data/cities/annemasse/la-foirfouille.yml
+++ b/data/cities/annemasse/la-foirfouille.yml
@@ -1,11 +1,11 @@
 id: 86299292
-type: way
+type: node
 latitude: 46.1975
 longitude: 6.26624
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 85
+street: Route de Thonon
+housenumber: "85"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/la-galerie-annemasse.yml b/data/cities/annemasse/la-galerie-annemasse.yml
index 06925081f..d8ae7b495 100644
--- a/data/cities/annemasse/la-galerie-annemasse.yml
+++ b/data/cities/annemasse/la-galerie-annemasse.yml
@@ -1,11 +1,11 @@
 id: 38208337
-type: way
+type: node
 latitude: 46.19449
 longitude: 6.25329
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/annemasse/la-halle-au-sommeil.yml b/data/cities/annemasse/la-halle-au-sommeil.yml
index a64d0e474..bbc017c01 100644
--- a/data/cities/annemasse/la-halle-au-sommeil.yml
+++ b/data/cities/annemasse/la-halle-au-sommeil.yml
@@ -4,8 +4,8 @@ latitude: 46.19723
 longitude: 6.26129
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 
+street: Rue de la Résistance
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/la-halle.yml b/data/cities/annemasse/la-halle.yml
index 1b72ac9d1..09fe0cd9f 100644
--- a/data/cities/annemasse/la-halle.yml
+++ b/data/cities/annemasse/la-halle.yml
@@ -1,11 +1,11 @@
 id: 86299393
-type: way
+type: node
 latitude: 46.19732
 longitude: 6.26295
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 
+street: Rue de la Résistance
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/la-jonquille.yml b/data/cities/annemasse/la-jonquille.yml
index c77b56b70..89d45e94b 100644
--- a/data/cities/annemasse/la-jonquille.yml
+++ b/data/cities/annemasse/la-jonquille.yml
@@ -4,8 +4,8 @@ latitude: 46.19428
 longitude: 6.23705
 postcode: "74100"
 city: Annemasse
-street: "Rue du Faucigny"
-housenumber: 12
+street: Rue du Faucigny
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/la-maison-dursule.yml b/data/cities/annemasse/la-maison-dursule.yml
index e6afc9a03..301202234 100644
--- a/data/cities/annemasse/la-maison-dursule.yml
+++ b/data/cities/annemasse/la-maison-dursule.yml
@@ -4,8 +4,8 @@ latitude: 46.19696
 longitude: 6.26143
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 
+street: Rue de la Résistance
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/la-marquise.yml b/data/cities/annemasse/la-marquise.yml
index 5ef7b8f76..a96e674fe 100644
--- a/data/cities/annemasse/la-marquise.yml
+++ b/data/cities/annemasse/la-marquise.yml
@@ -4,8 +4,8 @@ latitude: 46.19659
 longitude: 6.235
 postcode: "74100"
 city: Annemasse
-street: "Avenue de la Gare"
-housenumber: 43
+street: Avenue de la Gare
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/la-paniere-avenue-marechal-leclerc.yml b/data/cities/annemasse/la-paniere-avenue-marechal-leclerc.yml
index 5d1f4d9e1..29ac2bcac 100644
--- a/data/cities/annemasse/la-paniere-avenue-marechal-leclerc.yml
+++ b/data/cities/annemasse/la-paniere-avenue-marechal-leclerc.yml
@@ -4,8 +4,8 @@ latitude: 46.18647
 longitude: 6.24822
 postcode: "74100"
 city: Annemasse
-street: "Avenue Maréchal Leclerc"
-housenumber: 17
+street: Avenue Maréchal Leclerc
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/annemasse/la-paniere-place-antoine-lumiere.yml b/data/cities/annemasse/la-paniere-place-antoine-lumiere.yml
index fcdd08648..7e4458901 100644
--- a/data/cities/annemasse/la-paniere-place-antoine-lumiere.yml
+++ b/data/cities/annemasse/la-paniere-place-antoine-lumiere.yml
@@ -4,8 +4,8 @@ latitude: 46.1967
 longitude: 6.23661
 postcode: "74100"
 city: Annemasse
-street: "Place Antoine Lumière"
-housenumber: 10
+street: Place Antoine Lumière
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:30; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:30; Su 07:00-13:00
+website: ""
diff --git a/data/cities/annemasse/la-paniere.yml b/data/cities/annemasse/la-paniere.yml
index 2e249e41b..6699e9501 100644
--- a/data/cities/annemasse/la-paniere.yml
+++ b/data/cities/annemasse/la-paniere.yml
@@ -4,8 +4,8 @@ latitude: 46.19327
 longitude: 6.23602
 postcode: "74100"
 city: Annemasse
-street: "Place de la Libération"
-housenumber: 7
+street: Place de la Libération
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Su 06:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:30-20:00
+website: ""
diff --git a/data/cities/annemasse/la-papetheque.yml b/data/cities/annemasse/la-papetheque.yml
index 321e87c14..419fa3e50 100644
--- a/data/cities/annemasse/la-papetheque.yml
+++ b/data/cities/annemasse/la-papetheque.yml
@@ -4,8 +4,8 @@ latitude: 46.19465
 longitude: 6.23305
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 1
+street: Rue du Parc
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:30, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:30, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/la-symphonie-des-douceurs.yml b/data/cities/annemasse/la-symphonie-des-douceurs.yml
index 18255f2d3..52df9079e 100644
--- a/data/cities/annemasse/la-symphonie-des-douceurs.yml
+++ b/data/cities/annemasse/la-symphonie-des-douceurs.yml
@@ -4,8 +4,8 @@ latitude: 46.19459
 longitude: 6.23482
 postcode: "74100"
 city: Annemasse
-street: "Rue des Voirons"
-housenumber: 8
+street: Rue des Voirons
+housenumber: "8"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:00-13:00, 14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:00-13:00, 14:00-18:30
+website: ""
diff --git a/data/cities/annemasse/la-vie-claire.yml b/data/cities/annemasse/la-vie-claire.yml
index 623ded7e7..e2aeca2cf 100644
--- a/data/cities/annemasse/la-vie-claire.yml
+++ b/data/cities/annemasse/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 46.19659
 longitude: 6.23769
 postcode: "74100"
 city: Annemasse
-street: "Rue du Chablais"
-housenumber: 20
-phone: "+33 4 50 15 05 00"
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+street: Rue du Chablais
+housenumber: "20"
+phone: +33 4 50 15 05 00
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/la-vitrine-medicale.yml b/data/cities/annemasse/la-vitrine-medicale.yml
index 6fa853cb1..5af15e27c 100644
--- a/data/cities/annemasse/la-vitrine-medicale.yml
+++ b/data/cities/annemasse/la-vitrine-medicale.yml
@@ -4,8 +4,8 @@ latitude: 46.1972
 longitude: 6.23838
 postcode: "74100"
 city: Annemasse
-street: "Avenue du Giffre"
+street: Avenue du Giffre
 housenumber: 2-4
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 13:30-18:30; Sa 09:00-12:00, 14:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 13:30-18:30; Sa 09:00-12:00, 14:00-17:00; Su off
+website: ""
diff --git a/data/cities/annemasse/lacoste.yml b/data/cities/annemasse/lacoste.yml
index e50919761..c1f483b89 100644
--- a/data/cities/annemasse/lacoste.yml
+++ b/data/cities/annemasse/lacoste.yml
@@ -4,8 +4,8 @@ latitude: 46.19435
 longitude: 6.2351
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 13
+street: Rue du Commerce
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/lapeyre.yml b/data/cities/annemasse/lapeyre.yml
index f06ad1c99..7cc90d9d5 100644
--- a/data/cities/annemasse/lapeyre.yml
+++ b/data/cities/annemasse/lapeyre.yml
@@ -1,11 +1,11 @@
 id: 86299293
-type: way
+type: node
 latitude: 46.1983
 longitude: 6.26575
 postcode: "74100"
 city: Annemasse
-street: "Rue des Buchillons"
-housenumber: 4
+street: Rue des Buchillons
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/lavomatic.yml b/data/cities/annemasse/lavomatic.yml
index 90a1af7ab..0453525eb 100644
--- a/data/cities/annemasse/lavomatic.yml
+++ b/data/cities/annemasse/lavomatic.yml
@@ -4,8 +4,8 @@ latitude: 46.19225
 longitude: 6.2352
 postcode: "74100"
 city: Annemasse
-street: "Rue Alfred Bastin"
-housenumber: 9
+street: Rue Alfred Bastin
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/ldlc.yml b/data/cities/annemasse/ldlc.yml
index 33d391c68..5e94af0bf 100644
--- a/data/cities/annemasse/ldlc.yml
+++ b/data/cities/annemasse/ldlc.yml
@@ -4,8 +4,8 @@ latitude: 46.1943
 longitude: 6.25739
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 65
+street: Route de Thonon
+housenumber: "65"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:30-19:00; Sa 09:30-12:30, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:30-19:00; Sa 09:30-12:30, 14:00-19:00
+website: ""
diff --git a/data/cities/annemasse/le-chalet-savoyard.yml b/data/cities/annemasse/le-chalet-savoyard.yml
index 3baaf7871..ad209ed9d 100644
--- a/data/cities/annemasse/le-chalet-savoyard.yml
+++ b/data/cities/annemasse/le-chalet-savoyard.yml
@@ -4,8 +4,8 @@ latitude: 46.18298
 longitude: 6.23774
 postcode: "74100"
 city: Annemasse
-street: "Route de Bonneville"
-housenumber: 80
-phone: "+33 9 61 36 08 07"
+street: Route de Bonneville
+housenumber: "80"
+phone: +33 9 61 36 08 07
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/le-royaume-de-noor.yml b/data/cities/annemasse/le-royaume-de-noor.yml
index 3a3226f3a..711c171ea 100644
--- a/data/cities/annemasse/le-royaume-de-noor.yml
+++ b/data/cities/annemasse/le-royaume-de-noor.yml
@@ -4,8 +4,8 @@ latitude: 46.19601
 longitude: 6.23294
 postcode: "74100"
 city: Annemasse
-street: "Rue du Docteur Aimé Coquand"
-housenumber: 13
+street: Rue du Docteur Aimé Coquand
+housenumber: "13"
 phone: ""
-opening_hours: "Mo off; Tu-Fr 10:00-19:00; Fr-Sa 10:00-20:00; Su 11:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Fr 10:00-19:00; Fr-Sa 10:00-20:00; Su 11:00-20:00
+website: ""
diff --git a/data/cities/annemasse/leader-price.yml b/data/cities/annemasse/leader-price.yml
index 57beea9b0..c13cfa20f 100644
--- a/data/cities/annemasse/leader-price.yml
+++ b/data/cities/annemasse/leader-price.yml
@@ -1,11 +1,11 @@
 id: 61976019
-type: way
+type: node
 latitude: 46.19787
 longitude: 6.26716
 postcode: "74100"
 city: Annemasse
-street: "Rue des Buchillons"
+street: Rue des Buchillons
 housenumber: 4 bis
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:30; Su 08:00-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:30; Su 08:00-12:45
+website: ""
diff --git a/data/cities/annemasse/leau-vive.yml b/data/cities/annemasse/leau-vive.yml
index f6d5e90b5..46511002b 100644
--- a/data/cities/annemasse/leau-vive.yml
+++ b/data/cities/annemasse/leau-vive.yml
@@ -4,8 +4,8 @@ latitude: 46.193
 longitude: 6.23223
 postcode: "74100"
 city: Annemasse
-street: "Rue de Genève"
-housenumber: 10
+street: Rue de Genève
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 09:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-17:00; Su off
+website: ""
diff --git a/data/cities/annemasse/lentrepot-du-bricolage.yml b/data/cities/annemasse/lentrepot-du-bricolage.yml
index f6a96bc82..9ab03db3e 100644
--- a/data/cities/annemasse/lentrepot-du-bricolage.yml
+++ b/data/cities/annemasse/lentrepot-du-bricolage.yml
@@ -1,11 +1,11 @@
 id: 1082054369
-type: way
+type: node
 latitude: 46.19541
 longitude: 6.26055
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 28
+street: Rue de la Résistance
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Sa 07:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/les-affame-es.yml b/data/cities/annemasse/les-affame-es.yml
index 4fb9490ad..d22e2f67a 100644
--- a/data/cities/annemasse/les-affame-es.yml
+++ b/data/cities/annemasse/les-affame-es.yml
@@ -4,8 +4,8 @@ latitude: 46.19241
 longitude: 6.23329
 postcode: "74100"
 city: Annemasse
-street: "Passage Jean Moulin"
-housenumber: 6
-phone: "04 50 49 26 82"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Passage Jean Moulin
+housenumber: "6"
+phone: 04 50 49 26 82
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/annemasse/les-maitres-bouchers.yml b/data/cities/annemasse/les-maitres-bouchers.yml
index 6da1dd071..1c9d9ae31 100644
--- a/data/cities/annemasse/les-maitres-bouchers.yml
+++ b/data/cities/annemasse/les-maitres-bouchers.yml
@@ -1,11 +1,11 @@
 id: 179087640
-type: way
+type: node
 latitude: 46.19624
 longitude: 6.26042
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 28
+street: Rue de la Résistance
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Th 08:00-12:30, 14:30-19:00; Fr-Sa 08:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:00-12:30, 14:30-19:00; Fr-Sa 08:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/lesage.yml b/data/cities/annemasse/lesage.yml
index bb6cb345c..566a2c5ec 100644
--- a/data/cities/annemasse/lesage.yml
+++ b/data/cities/annemasse/lesage.yml
@@ -4,8 +4,8 @@ latitude: 46.1935
 longitude: 6.23401
 postcode: "74100"
 city: Annemasse
-street: "Place Jean-Jacques Rousseau"
-housenumber: 8
+street: Place Jean-Jacques Rousseau
+housenumber: "8"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 08:30-19:00
+website: ""
diff --git a/data/cities/annemasse/levis.yml b/data/cities/annemasse/levis.yml
index 2411cd0ee..2bbecff8e 100644
--- a/data/cities/annemasse/levis.yml
+++ b/data/cities/annemasse/levis.yml
@@ -4,8 +4,8 @@ latitude: 46.19352
 longitude: 6.23473
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 3
+street: Rue du Commerce
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/lidl.yml b/data/cities/annemasse/lidl.yml
index f4ce9c6e3..478fc22c4 100644
--- a/data/cities/annemasse/lidl.yml
+++ b/data/cities/annemasse/lidl.yml
@@ -1,11 +1,11 @@
 id: 84405017
-type: way
+type: node
 latitude: 46.19323
 longitude: 6.24217
 postcode: "74100"
 city: Annemasse
-street: "Route des Vallées"
-housenumber: 18
+street: Route des Vallées
+housenumber: "18"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/lissac.yml b/data/cities/annemasse/lissac.yml
index 8d3a79a4a..260a7da8b 100644
--- a/data/cities/annemasse/lissac.yml
+++ b/data/cities/annemasse/lissac.yml
@@ -4,8 +4,8 @@ latitude: 46.19451
 longitude: 6.23559
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 24
-phone: "+33 4 50 79 32 17"
-opening_hours: "Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:30"
-website: "https://lissac-l-opticien-annemasse.webnode.fr/"
\ No newline at end of file
+street: Rue du Commerce
+housenumber: "24"
+phone: +33 4 50 79 32 17
+opening_hours: Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:30
+website: https://lissac-l-opticien-annemasse.webnode.fr/
diff --git a/data/cities/annemasse/locabox.yml b/data/cities/annemasse/locabox.yml
index 55f5d94dc..e952d846b 100644
--- a/data/cities/annemasse/locabox.yml
+++ b/data/cities/annemasse/locabox.yml
@@ -1,11 +1,11 @@
 id: 86267250
-type: way
+type: node
 latitude: 46.19827
 longitude: 6.25693
 postcode: "74100"
 city: Annemasse
-street: "Rue du Mont Rond"
-housenumber: 5
+street: Rue du Mont Rond
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/annemasse/made-4-baby.yml b/data/cities/annemasse/made-4-baby.yml
index 4a165c191..6b92ac97e 100644
--- a/data/cities/annemasse/made-4-baby.yml
+++ b/data/cities/annemasse/made-4-baby.yml
@@ -1,11 +1,11 @@
 id: 80134903
-type: way
+type: node
 latitude: 46.19658
 longitude: 6.25911
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 27
+street: Rue de la Résistance
+housenumber: "27"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-18:30; Su off
+website: ""
diff --git a/data/cities/annemasse/maison-de-la-literie.yml b/data/cities/annemasse/maison-de-la-literie.yml
index 75ae4ce3a..21b59ffd6 100644
--- a/data/cities/annemasse/maison-de-la-literie.yml
+++ b/data/cities/annemasse/maison-de-la-literie.yml
@@ -1,11 +1,11 @@
 id: 86266147
-type: way
+type: node
 latitude: 46.1964
 longitude: 6.25742
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 21
+street: Rue de la Résistance
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/mango.yml b/data/cities/annemasse/mango.yml
index 942424bff..d55ca3c4e 100644
--- a/data/cities/annemasse/mango.yml
+++ b/data/cities/annemasse/mango.yml
@@ -4,8 +4,8 @@ latitude: 46.19609
 longitude: 6.23672
 postcode: "74100"
 city: Annemasse
-street: "Rue du Chablais"
-housenumber: 11
+street: Rue du Chablais
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Sa 11:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 11:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/marbrerie-funeraire-ghielmetti.yml b/data/cities/annemasse/marbrerie-funeraire-ghielmetti.yml
index 5ca4f2c01..47612cc76 100644
--- a/data/cities/annemasse/marbrerie-funeraire-ghielmetti.yml
+++ b/data/cities/annemasse/marbrerie-funeraire-ghielmetti.yml
@@ -1,11 +1,11 @@
 id: 129065932
-type: way
+type: node
 latitude: 46.19448
 longitude: 6.23213
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 11
+street: Rue du Parc
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/marionnaud.yml b/data/cities/annemasse/marionnaud.yml
index 1fba57f33..cb10cac11 100644
--- a/data/cities/annemasse/marionnaud.yml
+++ b/data/cities/annemasse/marionnaud.yml
@@ -4,8 +4,8 @@ latitude: 46.1959
 longitude: 6.25364
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/maroquinerie-jordan.yml b/data/cities/annemasse/maroquinerie-jordan.yml
index 1c9a373e5..13f33f27d 100644
--- a/data/cities/annemasse/maroquinerie-jordan.yml
+++ b/data/cities/annemasse/maroquinerie-jordan.yml
@@ -4,8 +4,8 @@ latitude: 46.1928
 longitude: 6.23475
 postcode: "74100"
 city: Annemasse
-street: "Rue Fernand David"
-housenumber: 1
+street: Rue Fernand David
+housenumber: "1"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/masson-fromageries.yml b/data/cities/annemasse/masson-fromageries.yml
index baa24e9fd..29cd6de19 100644
--- a/data/cities/annemasse/masson-fromageries.yml
+++ b/data/cities/annemasse/masson-fromageries.yml
@@ -1,11 +1,11 @@
 id: 86267549
-type: way
+type: node
 latitude: 46.19605
 longitude: 6.25623
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 20
+street: Rue de la Résistance
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 15:00-19:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 15:00-19:30; Sa-Su off
+website: ""
diff --git a/data/cities/annemasse/maxi-bazar.yml b/data/cities/annemasse/maxi-bazar.yml
index e9af78f94..030658666 100644
--- a/data/cities/annemasse/maxi-bazar.yml
+++ b/data/cities/annemasse/maxi-bazar.yml
@@ -1,11 +1,11 @@
 id: 86267559
-type: way
+type: node
 latitude: 46.19558
 longitude: 6.25655
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 22
+street: Rue de la Résistance
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/maxi-zoo.yml b/data/cities/annemasse/maxi-zoo.yml
index bd60b5a48..a515b9516 100644
--- a/data/cities/annemasse/maxi-zoo.yml
+++ b/data/cities/annemasse/maxi-zoo.yml
@@ -1,11 +1,11 @@
 id: 86267245
-type: way
+type: node
 latitude: 46.19689
 longitude: 6.25661
 postcode: "74100"
 city: Annemasse
-street: "Rue du Mont Rond"
-housenumber: 1
+street: Rue du Mont Rond
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/minelli.yml b/data/cities/annemasse/minelli.yml
index 13eb386c4..24691fa08 100644
--- a/data/cities/annemasse/minelli.yml
+++ b/data/cities/annemasse/minelli.yml
@@ -4,8 +4,8 @@ latitude: 46.19373
 longitude: 6.23515
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 12
-phone: "+33 4 50 92 83 78"
+street: Rue du Commerce
+housenumber: "12"
+phone: +33 4 50 92 83 78
 opening_hours: ""
-website: "http://magasin.minelli.fr/155481-minelli-annemasse"
\ No newline at end of file
+website: http://magasin.minelli.fr/155481-minelli-annemasse
diff --git a/data/cities/annemasse/mister-minit.yml b/data/cities/annemasse/mister-minit.yml
index 20aad68a1..590ce1e87 100644
--- a/data/cities/annemasse/mister-minit.yml
+++ b/data/cities/annemasse/mister-minit.yml
@@ -4,8 +4,8 @@ latitude: 46.19589
 longitude: 6.25379
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/mistigriff.yml b/data/cities/annemasse/mistigriff.yml
index 9dfd72bdb..63ab29ba5 100644
--- a/data/cities/annemasse/mistigriff.yml
+++ b/data/cities/annemasse/mistigriff.yml
@@ -4,8 +4,8 @@ latitude: 46.19697
 longitude: 6.23773
 postcode: "74100"
 city: Annemasse
-street: "Rue du Chablais"
-housenumber: 27
+street: Rue du Chablais
+housenumber: "27"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/moa.yml b/data/cities/annemasse/moa.yml
index cfbe33a91..ef7d4c3eb 100644
--- a/data/cities/annemasse/moa.yml
+++ b/data/cities/annemasse/moa.yml
@@ -4,8 +4,8 @@ latitude: 46.19681
 longitude: 6.23629
 postcode: "74100"
 city: Annemasse
-street: "Place Antoine Lumière"
-housenumber: 9
+street: Place Antoine Lumière
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/moba-mode.yml b/data/cities/annemasse/moba-mode.yml
index 274b5f09e..ae6daf5e8 100644
--- a/data/cities/annemasse/moba-mode.yml
+++ b/data/cities/annemasse/moba-mode.yml
@@ -4,8 +4,8 @@ latitude: 46.19766
 longitude: 6.23611
 postcode: "74100"
 city: Annemasse
-street: "Avenue de la Gare"
-housenumber: 54
+street: Avenue de la Gare
+housenumber: "54"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/modern-street.yml b/data/cities/annemasse/modern-street.yml
index 845bfbc4c..58216a63a 100644
--- a/data/cities/annemasse/modern-street.yml
+++ b/data/cities/annemasse/modern-street.yml
@@ -4,8 +4,8 @@ latitude: 46.19613
 longitude: 6.25337
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/molotow.yml b/data/cities/annemasse/molotow.yml
index ea7d546dd..c360bbd39 100644
--- a/data/cities/annemasse/molotow.yml
+++ b/data/cities/annemasse/molotow.yml
@@ -4,8 +4,8 @@ latitude: 46.19624
 longitude: 6.23743
 postcode: "74100"
 city: Annemasse
-street: "Rue Adolphe Magnin"
-housenumber: 2
+street: Rue Adolphe Magnin
+housenumber: "2"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 10:00-13:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 10:00-13:00, 14:00-19:00
+website: ""
diff --git a/data/cities/annemasse/mondial-pare-brise.yml b/data/cities/annemasse/mondial-pare-brise.yml
index cf500e0e0..3d6d399fe 100644
--- a/data/cities/annemasse/mondial-pare-brise.yml
+++ b/data/cities/annemasse/mondial-pare-brise.yml
@@ -4,8 +4,8 @@ latitude: 46.19783
 longitude: 6.23646
 postcode: "74100"
 city: Annemasse
-street: "Rue du Môle"
-housenumber: 1
+street: Rue du Môle
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/monique-touzeau.yml b/data/cities/annemasse/monique-touzeau.yml
index 47d6ac27b..3e0aa6d1f 100644
--- a/data/cities/annemasse/monique-touzeau.yml
+++ b/data/cities/annemasse/monique-touzeau.yml
@@ -4,8 +4,8 @@ latitude: 46.19316
 longitude: 6.23327
 postcode: "74100"
 city: Annemasse
-street: "Rue de Genève"
-housenumber: 2
+street: Rue de Genève
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/monoprix-rue-de-la-gare.yml b/data/cities/annemasse/monoprix-rue-de-la-gare.yml
index 4d0af72a4..54ab9e523 100644
--- a/data/cities/annemasse/monoprix-rue-de-la-gare.yml
+++ b/data/cities/annemasse/monoprix-rue-de-la-gare.yml
@@ -1,11 +1,11 @@
 id: 793812864
-type: way
+type: node
 latitude: 46.19433
 longitude: 6.23385
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Gare"
-housenumber: 10
+street: Rue de la Gare
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:15; Su off"
-website: "https://www.monoprix.fr/189.html"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:15; Su off
+website: https://www.monoprix.fr/189.html
diff --git a/data/cities/annemasse/monoprix.yml b/data/cities/annemasse/monoprix.yml
index b5563d026..2972e606f 100644
--- a/data/cities/annemasse/monoprix.yml
+++ b/data/cities/annemasse/monoprix.yml
@@ -4,8 +4,8 @@ latitude: 46.19667
 longitude: 6.23707
 postcode: "74100"
 city: Annemasse
-street: "Allée François Truffaut"
-housenumber: 3
+street: Allée François Truffaut
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 13:00-19:30"
-website: "https://www.monoprix.fr/1644.html"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 13:00-19:30
+website: https://www.monoprix.fr/1644.html
diff --git a/data/cities/annemasse/nocibe.yml b/data/cities/annemasse/nocibe.yml
index b1bab1eb4..421a19f2a 100644
--- a/data/cities/annemasse/nocibe.yml
+++ b/data/cities/annemasse/nocibe.yml
@@ -4,8 +4,8 @@ latitude: 46.19413
 longitude: 6.23538
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 18
+street: Rue du Commerce
+housenumber: "18"
 phone: ""
-opening_hours: "Mo 10:00-19:00; Su off; Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 10:00-19:00; Su off; Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/annemasse/normal.yml b/data/cities/annemasse/normal.yml
index a56459d6e..5b3a47b62 100644
--- a/data/cities/annemasse/normal.yml
+++ b/data/cities/annemasse/normal.yml
@@ -4,8 +4,8 @@ latitude: 46.19342
 longitude: 6.23469
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 1
+street: Rue du Commerce
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Su 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/novasanit.yml b/data/cities/annemasse/novasanit.yml
index a613c1cb3..1755af7ac 100644
--- a/data/cities/annemasse/novasanit.yml
+++ b/data/cities/annemasse/novasanit.yml
@@ -1,11 +1,11 @@
 id: 158463244
-type: way
+type: node
 latitude: 46.19558
 longitude: 6.26977
 postcode: "74100"
 city: Annemasse
-street: "Rue Germain Sommeiller"
-housenumber: 7
+street: Rue Germain Sommeiller
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:30; Sa-Su,Mo-Tu off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:30; Sa-Su,Mo-Tu off
+website: ""
diff --git a/data/cities/annemasse/old-school-racing.yml b/data/cities/annemasse/old-school-racing.yml
index d71a1bb0b..8fda53b3d 100644
--- a/data/cities/annemasse/old-school-racing.yml
+++ b/data/cities/annemasse/old-school-racing.yml
@@ -4,8 +4,8 @@ latitude: 46.19459
 longitude: 6.23275
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 3
+street: Rue du Parc
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/omaez.yml b/data/cities/annemasse/omaez.yml
index c6c554fac..e205e0477 100644
--- a/data/cities/annemasse/omaez.yml
+++ b/data/cities/annemasse/omaez.yml
@@ -4,8 +4,8 @@ latitude: 46.19704
 longitude: 6.23636
 postcode: "74100"
 city: Annemasse
-street: "Allée Simone Signoret"
-housenumber: 4
+street: Allée Simone Signoret
+housenumber: "4"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/onalavie.yml b/data/cities/annemasse/onalavie.yml
index 9eadedefd..931bcc767 100644
--- a/data/cities/annemasse/onalavie.yml
+++ b/data/cities/annemasse/onalavie.yml
@@ -1,11 +1,11 @@
 id: 417072673
-type: way
+type: node
 latitude: 46.19777
 longitude: 6.26317
 postcode: "74100"
 city: Annemasse
-street: "Rue des Esserts"
-housenumber: 5
+street: Rue des Esserts
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/annemasse/onyris.yml b/data/cities/annemasse/onyris.yml
index dbf7f6248..e43be709d 100644
--- a/data/cities/annemasse/onyris.yml
+++ b/data/cities/annemasse/onyris.yml
@@ -4,8 +4,8 @@ latitude: 46.19277
 longitude: 6.24147
 postcode: "74100"
 city: Annemasse
-street: "Avenue Henri Barbusse"
-housenumber: 11
-phone: "+33 4 50 75 45 57"
-opening_hours: "Mo 14:00-18:30; Tu-Sa 09:30-12:00, 14:00-18:30"
-website: "https://www.onyris-games.com/"
\ No newline at end of file
+street: Avenue Henri Barbusse
+housenumber: "11"
+phone: +33 4 50 75 45 57
+opening_hours: Mo 14:00-18:30; Tu-Sa 09:30-12:00, 14:00-18:30
+website: https://www.onyris-games.com/
diff --git a/data/cities/annemasse/optic-2000.yml b/data/cities/annemasse/optic-2000.yml
index 8dc6cf98a..1ff7fa5a0 100644
--- a/data/cities/annemasse/optic-2000.yml
+++ b/data/cities/annemasse/optic-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.19586
 longitude: 6.2541
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/optical-center.yml b/data/cities/annemasse/optical-center.yml
index 41bcb3b01..e92904c2c 100644
--- a/data/cities/annemasse/optical-center.yml
+++ b/data/cities/annemasse/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 46.19255
 longitude: 6.23139
 postcode: "74100"
 city: Annemasse
-street: "Rue de Genève"
-housenumber: 11
+street: Rue de Genève
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/orchestra.yml b/data/cities/annemasse/orchestra.yml
index 5ae1d6505..8d4cb34cf 100644
--- a/data/cities/annemasse/orchestra.yml
+++ b/data/cities/annemasse/orchestra.yml
@@ -1,11 +1,11 @@
 id: 886647362
-type: way
+type: node
 latitude: 46.19781
 longitude: 6.26223
 postcode: "74100"
 city: Annemasse
-street: "Rue de l'Industrie"
-housenumber: 35
+street: Rue de l'Industrie
+housenumber: "35"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/pachacamac.yml b/data/cities/annemasse/pachacamac.yml
index 5454a7945..2616538ac 100644
--- a/data/cities/annemasse/pachacamac.yml
+++ b/data/cities/annemasse/pachacamac.yml
@@ -4,8 +4,8 @@ latitude: 46.19421
 longitude: 6.23295
 postcode: "74100"
 city: Annemasse
-street: "Rue Adrien Ligué"
-housenumber: 13
+street: Rue Adrien Ligué
+housenumber: "13"
 phone: ""
-opening_hours: "Mo,Su off; Tu,Th-Fr 14:00-18:00; We,Sa 13:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu,Th-Fr 14:00-18:00; We,Sa 13:00-18:00
+website: ""
diff --git a/data/cities/annemasse/panier-du-monde.yml b/data/cities/annemasse/panier-du-monde.yml
index 4bc8fcf62..90105b64b 100644
--- a/data/cities/annemasse/panier-du-monde.yml
+++ b/data/cities/annemasse/panier-du-monde.yml
@@ -1,11 +1,11 @@
 id: 86265933
-type: way
+type: node
 latitude: 46.19796
 longitude: 6.25811
 postcode: "74100"
 city: Annemasse
-street: "Rue de l'Industrie"
-housenumber: 2
+street: Rue de l'Industrie
+housenumber: "2"
 phone: ""
-opening_hours: "Mo off; Tu-Fr 09:00-19:00; Sa 09:00-19:30; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Fr 09:00-19:00; Sa 09:00-19:30; Su 09:00-13:00
+website: ""
diff --git a/data/cities/annemasse/parashop.yml b/data/cities/annemasse/parashop.yml
index 9ccd22420..5627d7738 100644
--- a/data/cities/annemasse/parashop.yml
+++ b/data/cities/annemasse/parashop.yml
@@ -4,8 +4,8 @@ latitude: 46.19382
 longitude: 6.2352
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 14
+street: Rue du Commerce
+housenumber: "14"
 phone: ""
-opening_hours: "Tu-Sa 10:00-18:00; Su-Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-18:00; Su-Mo off
+website: ""
diff --git a/data/cities/annemasse/pascal-coste.yml b/data/cities/annemasse/pascal-coste.yml
index 9dbf9292d..23a14717c 100644
--- a/data/cities/annemasse/pascal-coste.yml
+++ b/data/cities/annemasse/pascal-coste.yml
@@ -4,8 +4,8 @@ latitude: 46.19598
 longitude: 6.25334
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/paul.yml b/data/cities/annemasse/paul.yml
index 53ee074a5..17c204811 100644
--- a/data/cities/annemasse/paul.yml
+++ b/data/cities/annemasse/paul.yml
@@ -4,8 +4,8 @@ latitude: 46.19425
 longitude: 6.25725
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 65
+street: Route de Thonon
+housenumber: "65"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/peace-korner.yml b/data/cities/annemasse/peace-korner.yml
index 75341a914..98c4b648c 100644
--- a/data/cities/annemasse/peace-korner.yml
+++ b/data/cities/annemasse/peace-korner.yml
@@ -4,8 +4,8 @@ latitude: 46.19645
 longitude: 6.2371
 postcode: "74100"
 city: Annemasse
-street: "Rue du Chablais"
-housenumber: 21
+street: Rue du Chablais
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/pearl-design.yml b/data/cities/annemasse/pearl-design.yml
index bdd6eaf0b..91c2982f3 100644
--- a/data/cities/annemasse/pearl-design.yml
+++ b/data/cities/annemasse/pearl-design.yml
@@ -4,8 +4,8 @@ latitude: 46.19456
 longitude: 6.236
 postcode: "74100"
 city: Annemasse
-street: "Place Jean Deffaugt"
-housenumber: 6
+street: Place Jean Deffaugt
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/peugeot.yml b/data/cities/annemasse/peugeot.yml
index 0df80cb5a..e117d28cd 100644
--- a/data/cities/annemasse/peugeot.yml
+++ b/data/cities/annemasse/peugeot.yml
@@ -1,11 +1,11 @@
 id: 80139673
-type: way
+type: node
 latitude: 46.19433
 longitude: 6.25597
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 57
+street: Route de Thonon
+housenumber: "57"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/pfg.yml b/data/cities/annemasse/pfg.yml
index f914ccefc..7836c3f72 100644
--- a/data/cities/annemasse/pfg.yml
+++ b/data/cities/annemasse/pfg.yml
@@ -1,11 +1,11 @@
 id: 83339298
-type: way
+type: node
 latitude: 46.18961
 longitude: 6.23107
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Paix"
-housenumber: 9
+street: Rue de la Paix
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-18:00; Sa 09:00-12:00, 14:00-17:00; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-18:00; Sa 09:00-12:00, 14:00-17:00; Su 09:00-12:00
+website: ""
diff --git a/data/cities/annemasse/picard-rue-de-geneve.yml b/data/cities/annemasse/picard-rue-de-geneve.yml
index 5bf90961f..7a33f7a07 100644
--- a/data/cities/annemasse/picard-rue-de-geneve.yml
+++ b/data/cities/annemasse/picard-rue-de-geneve.yml
@@ -1,11 +1,11 @@
 id: 128117605
-type: way
+type: node
 latitude: 46.19316
 longitude: 6.23211
 postcode: "74100"
 city: Annemasse
-street: "Rue de Genève"
-housenumber: 10
+street: Rue de Genève
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 09:00-13:00, 14:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-13:00, 14:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/picard.yml b/data/cities/annemasse/picard.yml
index 9ecb09e13..c852e7826 100644
--- a/data/cities/annemasse/picard.yml
+++ b/data/cities/annemasse/picard.yml
@@ -1,11 +1,11 @@
 id: 80134902
-type: way
+type: node
 latitude: 46.19705
 longitude: 6.25988
 postcode: "74100"
 city: Annemasse
-street: "Rue Lavalette"
-housenumber: 1
+street: Rue Lavalette
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/pilvite.yml b/data/cities/annemasse/pilvite.yml
index 94ccf6cd5..070074616 100644
--- a/data/cities/annemasse/pilvite.yml
+++ b/data/cities/annemasse/pilvite.yml
@@ -4,8 +4,8 @@ latitude: 46.19593
 longitude: 6.25333
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/placards-du-leman.yml b/data/cities/annemasse/placards-du-leman.yml
index 0577c1f7d..a7342750b 100644
--- a/data/cities/annemasse/placards-du-leman.yml
+++ b/data/cities/annemasse/placards-du-leman.yml
@@ -1,11 +1,11 @@
 id: 84915675
-type: way
+type: node
 latitude: 46.19631
 longitude: 6.24386
 postcode: "74100"
 city: Annemasse
-street: "Rue des Tournelles"
-housenumber: 38
+street: Rue des Tournelles
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/poltronesofa.yml b/data/cities/annemasse/poltronesofa.yml
index 29fecc2d6..71e06c6bf 100644
--- a/data/cities/annemasse/poltronesofa.yml
+++ b/data/cities/annemasse/poltronesofa.yml
@@ -1,11 +1,11 @@
 id: 978416782
-type: way
+type: node
 latitude: 46.19754
 longitude: 6.26489
 postcode: "74100"
 city: Annemasse
-street: "Rue des Esserts"
-housenumber: 2
+street: Rue des Esserts
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/pressing-du-centre.yml b/data/cities/annemasse/pressing-du-centre.yml
index 562a3a4dc..e531ad0f9 100644
--- a/data/cities/annemasse/pressing-du-centre.yml
+++ b/data/cities/annemasse/pressing-du-centre.yml
@@ -4,8 +4,8 @@ latitude: 46.19514
 longitude: 6.23565
 postcode: "74100"
 city: Annemasse
-street: "Place Jean Deffaugt"
-housenumber: 9
+street: Place Jean Deffaugt
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/promod.yml b/data/cities/annemasse/promod.yml
index 60cc63f96..f40ca2cfb 100644
--- a/data/cities/annemasse/promod.yml
+++ b/data/cities/annemasse/promod.yml
@@ -4,8 +4,8 @@ latitude: 46.19701
 longitude: 6.23644
 postcode: "74100"
 city: Annemasse
-street: "Allée Simone Signoret"
-housenumber: 2
+street: Allée Simone Signoret
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/red-zone.yml b/data/cities/annemasse/red-zone.yml
index 14e60e549..c4ce4a2dc 100644
--- a/data/cities/annemasse/red-zone.yml
+++ b/data/cities/annemasse/red-zone.yml
@@ -1,11 +1,11 @@
 id: 86266144
-type: way
+type: node
 latitude: 46.1968
 longitude: 6.25734
 postcode: "74100"
 city: Annemasse
-street: "Rue du Mont Rond"
-housenumber: 2
+street: Rue du Mont Rond
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/relay.yml b/data/cities/annemasse/relay.yml
index fa3f64681..7847dd127 100644
--- a/data/cities/annemasse/relay.yml
+++ b/data/cities/annemasse/relay.yml
@@ -4,8 +4,8 @@ latitude: 46.19934
 longitude: 6.23678
 postcode: "74100"
 city: Annemasse
-street: "Esplanade François-Mitterrand"
-housenumber: 11
-phone: "+33 4 50 80 23 12"
-opening_hours: "Mo-Fr 06:00-19:00"
-website: "https://www.relay.com/stores/relay-gare-de-wojo-annemasse/"
\ No newline at end of file
+street: Esplanade François-Mitterrand
+housenumber: "11"
+phone: +33 4 50 80 23 12
+opening_hours: Mo-Fr 06:00-19:00
+website: https://www.relay.com/stores/relay-gare-de-wojo-annemasse/
diff --git a/data/cities/annemasse/renault-annemasse.yml b/data/cities/annemasse/renault-annemasse.yml
index 8b8c0d781..d1a9d03c3 100644
--- a/data/cities/annemasse/renault-annemasse.yml
+++ b/data/cities/annemasse/renault-annemasse.yml
@@ -1,11 +1,11 @@
 id: 158604308
-type: way
+type: node
 latitude: 46.19903
 longitude: 6.26775
 postcode: "74100"
 city: Annemasse
-street: "Rue des Buchillons"
-housenumber: 6
+street: Rue des Buchillons
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/richardson.yml b/data/cities/annemasse/richardson.yml
index 45cab10cd..6dc05c67d 100644
--- a/data/cities/annemasse/richardson.yml
+++ b/data/cities/annemasse/richardson.yml
@@ -1,11 +1,12 @@
 id: 86299354
-type: way
+type: node
 latitude: 46.19903
 longitude: 6.26276
 postcode: "74100"
 city: Annemasse
-street: "Rue des Esserts"
-housenumber: 11
+street: Rue des Esserts
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Th 07:30-11:45, 13:30-17:00; Fr 07:30-11:45, 13:30-16:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:30-11:45, 13:30-17:00; Fr 07:30-11:45, 13:30-16:00; Sa-Su
+    off
+website: ""
diff --git a/data/cities/annemasse/rossat-traiteur.yml b/data/cities/annemasse/rossat-traiteur.yml
index d8621b201..7f741a8a6 100644
--- a/data/cities/annemasse/rossat-traiteur.yml
+++ b/data/cities/annemasse/rossat-traiteur.yml
@@ -4,8 +4,8 @@ latitude: 46.19448
 longitude: 6.23631
 postcode: "74100"
 city: Annemasse
-street: "Rue du Faucigny"
-housenumber: 4
+street: Rue du Faucigny
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/running-conseil.yml b/data/cities/annemasse/running-conseil.yml
index 1d255096b..e77347145 100644
--- a/data/cities/annemasse/running-conseil.yml
+++ b/data/cities/annemasse/running-conseil.yml
@@ -4,8 +4,8 @@ latitude: 46.19445
 longitude: 6.23302
 postcode: "74100"
 city: Annemasse
-street: "Rue Adrien Ligué"
-housenumber: 15
+street: Rue Adrien Ligué
+housenumber: "15"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 10:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 10:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/annemasse/saint-maclou.yml b/data/cities/annemasse/saint-maclou.yml
index 106fcaec8..740c67c9a 100644
--- a/data/cities/annemasse/saint-maclou.yml
+++ b/data/cities/annemasse/saint-maclou.yml
@@ -1,11 +1,11 @@
 id: 61975911
-type: way
+type: node
 latitude: 46.1974
 longitude: 6.26451
 postcode: "74100"
 city: Annemasse
-street: "Rue des Esserts"
+street: Rue des Esserts
 housenumber: 2 A
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/santal.yml b/data/cities/annemasse/santal.yml
index 0be697733..9df7b4e7c 100644
--- a/data/cities/annemasse/santal.yml
+++ b/data/cities/annemasse/santal.yml
@@ -4,8 +4,8 @@ latitude: 46.1944
 longitude: 6.23672
 postcode: "74100"
 city: Annemasse
-street: "Rue du Faucigny"
-housenumber: 8
+street: Rue du Faucigny
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/saphi-cuir.yml b/data/cities/annemasse/saphi-cuir.yml
index 74822bb72..cab0e6577 100644
--- a/data/cities/annemasse/saphi-cuir.yml
+++ b/data/cities/annemasse/saphi-cuir.yml
@@ -4,8 +4,8 @@ latitude: 46.19585
 longitude: 6.25422
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/sas-industry.yml b/data/cities/annemasse/sas-industry.yml
index 25f125f36..d620a4da9 100644
--- a/data/cities/annemasse/sas-industry.yml
+++ b/data/cities/annemasse/sas-industry.yml
@@ -4,8 +4,8 @@ latitude: 46.19734
 longitude: 6.26152
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 
+street: Rue de la Résistance
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/sat.yml b/data/cities/annemasse/sat.yml
index 3d46bb46b..1d5c4c254 100644
--- a/data/cities/annemasse/sat.yml
+++ b/data/cities/annemasse/sat.yml
@@ -4,8 +4,8 @@ latitude: 46.1935
 longitude: 6.23505
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 
+street: Rue du Commerce
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/scoot-parc.yml b/data/cities/annemasse/scoot-parc.yml
index 62bf539dc..efc168754 100644
--- a/data/cities/annemasse/scoot-parc.yml
+++ b/data/cities/annemasse/scoot-parc.yml
@@ -4,8 +4,8 @@ latitude: 46.19386
 longitude: 6.23011
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 23
+street: Rue du Parc
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/sephora.yml b/data/cities/annemasse/sephora.yml
index 78d1b81f2..7e8c8a0f2 100644
--- a/data/cities/annemasse/sephora.yml
+++ b/data/cities/annemasse/sephora.yml
@@ -4,8 +4,8 @@ latitude: 46.19412
 longitude: 6.23501
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 11
+street: Rue du Commerce
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/speed-queen.yml b/data/cities/annemasse/speed-queen.yml
index 44752b8e9..9d2daff58 100644
--- a/data/cities/annemasse/speed-queen.yml
+++ b/data/cities/annemasse/speed-queen.yml
@@ -4,8 +4,8 @@ latitude: 46.19641
 longitude: 6.23487
 postcode: "74100"
 city: Annemasse
-street: "Avenue de la Gare"
-housenumber: 39
+street: Avenue de la Gare
+housenumber: "39"
 phone: ""
-opening_hours: "Mo-Su 06:00-22:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-22:00
+website: ""
diff --git a/data/cities/annemasse/sugar-et-salt.yml b/data/cities/annemasse/sugar-et-salt.yml
index 1dcd48835..4b1bd5965 100644
--- a/data/cities/annemasse/sugar-et-salt.yml
+++ b/data/cities/annemasse/sugar-et-salt.yml
@@ -4,8 +4,8 @@ latitude: 46.19486
 longitude: 6.23336
 postcode: "74100"
 city: Annemasse
-street: "Rue du Parc"
-housenumber: 2
+street: Rue du Parc
+housenumber: "2"
 phone: ""
-opening_hours: "Mo off; Tu-Fr 09:00-19:00; Sa 09:00-18:00; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Fr 09:00-19:00; Sa 09:00-18:00; Su 09:00-12:00
+website: ""
diff --git a/data/cities/annemasse/superdry.yml b/data/cities/annemasse/superdry.yml
index 99228b136..70229e907 100644
--- a/data/cities/annemasse/superdry.yml
+++ b/data/cities/annemasse/superdry.yml
@@ -4,8 +4,8 @@ latitude: 46.19419
 longitude: 6.23541
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 18
-phone: "+33 4 50 83 06 90"
-opening_hours: "Mo 14:00-19:00; Tu-Th 10:00-13:00, 14:00-19:00; Fr, Sa 09:00-19:00"
-website: "https://www.superdry.fr/"
\ No newline at end of file
+street: Rue du Commerce
+housenumber: "18"
+phone: +33 4 50 83 06 90
+opening_hours: Mo 14:00-19:00; Tu-Th 10:00-13:00, 14:00-19:00; Fr, Sa 09:00-19:00
+website: https://www.superdry.fr/
diff --git a/data/cities/annemasse/swarovski-place-antoine-lumiere.yml b/data/cities/annemasse/swarovski-place-antoine-lumiere.yml
index de3eddccd..7308cac61 100644
--- a/data/cities/annemasse/swarovski-place-antoine-lumiere.yml
+++ b/data/cities/annemasse/swarovski-place-antoine-lumiere.yml
@@ -4,8 +4,8 @@ latitude: 46.19686
 longitude: 6.23633
 postcode: "74100"
 city: Annemasse
-street: "Place Antoine Lumière"
-housenumber: 9
+street: Place Antoine Lumière
+housenumber: "9"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/annemasse/swarovski.yml b/data/cities/annemasse/swarovski.yml
index b8d16f267..fcc736faa 100644
--- a/data/cities/annemasse/swarovski.yml
+++ b/data/cities/annemasse/swarovski.yml
@@ -4,8 +4,8 @@ latitude: 46.19618
 longitude: 6.25392
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+street: Rue de la Résistance
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/tabac-chateau-rouge.yml b/data/cities/annemasse/tabac-chateau-rouge.yml
index d6730c6df..22ecbfee1 100644
--- a/data/cities/annemasse/tabac-chateau-rouge.yml
+++ b/data/cities/annemasse/tabac-chateau-rouge.yml
@@ -4,8 +4,8 @@ latitude: 46.18907
 longitude: 6.2378
 postcode: "74100"
 city: Annemasse
-street: "Rue du Château Rouge"
-housenumber: 35
-phone: "+33 4 50 74 20 76"
-opening_hours: "Mo-Sa 07:00-20:00; Su 08:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue du Château Rouge
+housenumber: "35"
+phone: +33 4 50 74 20 76
+opening_hours: Mo-Sa 07:00-20:00; Su 08:00-19:00
+website: ""
diff --git a/data/cities/annemasse/tabac-presse-du-livron.yml b/data/cities/annemasse/tabac-presse-du-livron.yml
index bc41b18db..289bd908d 100644
--- a/data/cities/annemasse/tabac-presse-du-livron.yml
+++ b/data/cities/annemasse/tabac-presse-du-livron.yml
@@ -4,8 +4,8 @@ latitude: 46.18664
 longitude: 6.24804
 postcode: "74100"
 city: Annemasse
-street: "Avenue Maréchal Leclerc"
-housenumber: 17
+street: Avenue Maréchal Leclerc
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/tamtam.yml b/data/cities/annemasse/tamtam.yml
index f02077e67..e95c9c7c5 100644
--- a/data/cities/annemasse/tamtam.yml
+++ b/data/cities/annemasse/tamtam.yml
@@ -1,11 +1,11 @@
 id: 885534289
-type: way
+type: node
 latitude: 46.19574
 longitude: 6.26684
 postcode: "74100"
 city: Annemasse
-street: "Rue Germain Sommeiller"
-housenumber: 22
+street: Rue Germain Sommeiller
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/tarantola.yml b/data/cities/annemasse/tarantola.yml
index 815bddabc..684082564 100644
--- a/data/cities/annemasse/tarantola.yml
+++ b/data/cities/annemasse/tarantola.yml
@@ -4,8 +4,8 @@ latitude: 46.19329
 longitude: 6.23495
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 6
+street: Rue du Commerce
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/telmont.yml b/data/cities/annemasse/telmont.yml
index 9c714e9a9..e891b2ead 100644
--- a/data/cities/annemasse/telmont.yml
+++ b/data/cities/annemasse/telmont.yml
@@ -1,11 +1,11 @@
 id: 84915649
-type: way
+type: node
 latitude: 46.1966
 longitude: 6.24287
 postcode: "74100"
 city: Annemasse
-street: "Rue des Tournelles"
-housenumber: 38
+street: Rue des Tournelles
+housenumber: "38"
 phone: ""
-opening_hours: "Tu-Th 09:00-12:00, 14:00-19:00; Fr-Sa 09:00-19:00; Mo,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-12:00, 14:00-19:00; Fr-Sa 09:00-19:00; Mo,Su off
+website: ""
diff --git a/data/cities/annemasse/total-les-voirons.yml b/data/cities/annemasse/total-les-voirons.yml
index b35d045a4..6aca4b8eb 100644
--- a/data/cities/annemasse/total-les-voirons.yml
+++ b/data/cities/annemasse/total-les-voirons.yml
@@ -1,11 +1,11 @@
 id: 179052128
-type: way
+type: node
 latitude: 46.19563
 longitude: 6.26119
 postcode: "74100"
 city: Annemasse
-street: "Route de Thonon"
-housenumber: 81
+street: Route de Thonon
+housenumber: "81"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/annemasse/united-colors-of-benetton.yml b/data/cities/annemasse/united-colors-of-benetton.yml
index da8fe78a6..cdeebe338 100644
--- a/data/cities/annemasse/united-colors-of-benetton.yml
+++ b/data/cities/annemasse/united-colors-of-benetton.yml
@@ -4,8 +4,8 @@ latitude: 46.19337
 longitude: 6.23498
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 6
+street: Rue du Commerce
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/urban-bike.yml b/data/cities/annemasse/urban-bike.yml
index 1a2478883..d371194ac 100644
--- a/data/cities/annemasse/urban-bike.yml
+++ b/data/cities/annemasse/urban-bike.yml
@@ -4,8 +4,8 @@ latitude: 46.19442
 longitude: 6.23661
 postcode: "74100"
 city: Annemasse
-street: "Rue du Faucigny"
-housenumber: 8
+street: Rue du Faucigny
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/annemasse/v-market.yml b/data/cities/annemasse/v-market.yml
index 6f28f1120..6ffbe2c87 100644
--- a/data/cities/annemasse/v-market.yml
+++ b/data/cities/annemasse/v-market.yml
@@ -4,8 +4,8 @@ latitude: 46.19179
 longitude: 6.23367
 postcode: "74100"
 city: Annemasse
-street: "Place Alexandre Moret"
-housenumber: 1
+street: Place Alexandre Moret
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/annemasse/vap-concept.yml b/data/cities/annemasse/vap-concept.yml
index a22cfb982..fc4179a7a 100644
--- a/data/cities/annemasse/vap-concept.yml
+++ b/data/cities/annemasse/vap-concept.yml
@@ -4,8 +4,8 @@ latitude: 46.1959
 longitude: 6.25405
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 14
+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
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/annemasse/vival.yml b/data/cities/annemasse/vival.yml
index 74b7605df..c1f62c56f 100644
--- a/data/cities/annemasse/vival.yml
+++ b/data/cities/annemasse/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.19208
 longitude: 6.23442
 postcode: "74100"
 city: Annemasse
-street: "Rue Fernand David"
-housenumber: 7
+street: Rue Fernand David
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Su 07:30-22:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-22:00
+website: ""
diff --git a/data/cities/annemasse/vrakopolis.yml b/data/cities/annemasse/vrakopolis.yml
index 6a0e66cd0..90d465182 100644
--- a/data/cities/annemasse/vrakopolis.yml
+++ b/data/cities/annemasse/vrakopolis.yml
@@ -4,8 +4,8 @@ latitude: 46.19259
 longitude: 6.23369
 postcode: "74100"
 city: Annemasse
-street: "Passage Jean Moulin"
-housenumber: 3
+street: Passage Jean Moulin
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 09:30-12:30, 14:00-19:00"
-website: "https://www.vrakopolis.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-12:30, 14:00-19:00
+website: https://www.vrakopolis.com/
diff --git a/data/cities/annemasse/xxl-barbier.yml b/data/cities/annemasse/xxl-barbier.yml
index 86f4c5814..9b932073e 100644
--- a/data/cities/annemasse/xxl-barbier.yml
+++ b/data/cities/annemasse/xxl-barbier.yml
@@ -4,8 +4,8 @@ latitude: 46.19285
 longitude: 6.23268
 postcode: "74100"
 city: Annemasse
-street: "Rue de Genève"
-housenumber: 5
+street: Rue de Genève
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Tu,Su off; We-Th 09:00-09:00; Fr 09:00-20:00; Sa 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Su off; We-Th 09:00-09:00; Fr 09:00-20:00; Sa 09:00-17:00
+website: ""
diff --git a/data/cities/annemasse/xxl-coiffure.yml b/data/cities/annemasse/xxl-coiffure.yml
index 12cb53121..09f0e68f1 100644
--- a/data/cities/annemasse/xxl-coiffure.yml
+++ b/data/cities/annemasse/xxl-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 46.19364
 longitude: 6.23279
 postcode: "74100"
 city: Annemasse
-street: "Rue Adrien Ligué"
-housenumber: 5
+street: Rue Adrien Ligué
+housenumber: "5"
 phone: ""
-opening_hours: "Mo 10:00-18:00; Tu-Th 09:00-19:00; Fr 09:00-20:00; Sa 09:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 10:00-18:00; Tu-Th 09:00-19:00; Fr 09:00-20:00; Sa 09:00-17:00;
+    Su off
+website: ""
diff --git a/data/cities/annemasse/yesss-electrique.yml b/data/cities/annemasse/yesss-electrique.yml
index 66be5ce90..e6de90116 100644
--- a/data/cities/annemasse/yesss-electrique.yml
+++ b/data/cities/annemasse/yesss-electrique.yml
@@ -1,11 +1,12 @@
 id: 80134905
-type: way
+type: node
 latitude: 46.1967
 longitude: 6.25943
 postcode: "74100"
 city: Annemasse
-street: "Rue de la Résistance"
-housenumber: 29
+street: Rue de la Résistance
+housenumber: "29"
 phone: ""
-opening_hours: "Mo-Th 07:00-12:00, 13:30-17:30; Fr 07:00-12:00, 13:30-16:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:00-12:00, 13:30-17:30; Fr 07:00-12:00, 13:30-16:30; Sa-Su
+    off
+website: ""
diff --git a/data/cities/annemasse/yves-rocher.yml b/data/cities/annemasse/yves-rocher.yml
index 56f55218d..d6937febb 100644
--- a/data/cities/annemasse/yves-rocher.yml
+++ b/data/cities/annemasse/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 46.19377
 longitude: 6.23484
 postcode: "74100"
 city: Annemasse
-street: "Rue du Commerce"
-housenumber: 7
+street: Rue du Commerce
+housenumber: "7"
 phone: ""
-opening_hours: "Tu-Sa 09:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/annemasse/annemasse/S-FRYROC559"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/annemasse/annemasse/S-FRYROC559
diff --git a/data/cities/annonay/fnac.yml b/data/cities/annonay/fnac.yml
index 6e7b46086..f400f576c 100644
--- a/data/cities/annonay/fnac.yml
+++ b/data/cities/annonay/fnac.yml
@@ -4,8 +4,8 @@ latitude: 45.24412
 longitude: 4.6682
 postcode: "07100"
 city: Annonay
-street: "Avenue de l'Europe"
-housenumber: 49
+street: Avenue de l'Europe
+housenumber: "49"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anse/biere-depot.yml b/data/cities/anse/biere-depot.yml
index 53ee6f8c5..c4c5f6e38 100644
--- a/data/cities/anse/biere-depot.yml
+++ b/data/cities/anse/biere-depot.yml
@@ -4,8 +4,8 @@ latitude: 45.93437
 longitude: 4.72386
 postcode: "69480"
 city: Anse
-street: "Route de Lyon"
-housenumber: 411
-phone: "+33 4 27 49 36 07"
-opening_hours: "Mo-Fr 14:30-19:30; Sa 09:30-12:00,14:30-19:30"
-website: "https://www.biere-depot.com/"
\ No newline at end of file
+street: Route de Lyon
+housenumber: "411"
+phone: +33 4 27 49 36 07
+opening_hours: Mo-Fr 14:30-19:30; Sa 09:30-12:00,14:30-19:30
+website: https://www.biere-depot.com/
diff --git a/data/cities/anse/jardiland.yml b/data/cities/anse/jardiland.yml
index 28470a237..9c1dd8eb1 100644
--- a/data/cities/anse/jardiland.yml
+++ b/data/cities/anse/jardiland.yml
@@ -5,7 +5,7 @@ longitude: 4.71384
 postcode: ""
 city: Anse
 street: ""
-housenumber: 
-phone: "+33 4 74 09 95 10"
-opening_hours: "Mo-Su 09:30-12:30,14:00-19:00"
-website: "https://www.jardiland.com/magasins/magasin-anse-villefranche-sur-saone"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 09 95 10
+opening_hours: Mo-Su 09:30-12:30,14:00-19:00
+website: https://www.jardiland.com/magasins/magasin-anse-villefranche-sur-saone
diff --git a/data/cities/anse/kashoes.yml b/data/cities/anse/kashoes.yml
index a8d50e965..6464822e7 100644
--- a/data/cities/anse/kashoes.yml
+++ b/data/cities/anse/kashoes.yml
@@ -4,8 +4,8 @@ latitude: 45.93326
 longitude: 4.71494
 postcode: "69480"
 city: Anse
-street: "Avenue de la Première Armée"
-housenumber: 
-phone: "+33 4 74 03 81 93"
+street: Avenue de la Première Armée
+housenumber: ""
+phone: +33 4 74 03 81 93
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anse/librairie-cafe-motamo.yml b/data/cities/anse/librairie-cafe-motamo.yml
index 6f4626de5..19d43c997 100644
--- a/data/cities/anse/librairie-cafe-motamo.yml
+++ b/data/cities/anse/librairie-cafe-motamo.yml
@@ -1,11 +1,11 @@
 id: 134452651
-type: way
+type: node
 latitude: 45.93554
 longitude: 4.72192
 postcode: "69480"
 city: Anse
-street: "Route de Lyon"
-housenumber: 613
-phone: "04 69 17 49 50"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "https://www.librairie-motamo.fr/"
\ No newline at end of file
+street: Route de Lyon
+housenumber: "613"
+phone: 04 69 17 49 50
+opening_hours: Tu-Sa 10:00-19:00
+website: https://www.librairie-motamo.fr/
diff --git a/data/cities/anthy-sur-leman/action.yml b/data/cities/anthy-sur-leman/action.yml
index 3e8a0868e..2f2159f61 100644
--- a/data/cities/anthy-sur-leman/action.yml
+++ b/data/cities/anthy-sur-leman/action.yml
@@ -1,11 +1,11 @@
 id: 69004897
-type: way
+type: node
 latitude: 46.35038
 longitude: 6.43897
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route de Margencel"
-housenumber: 
+street: Route de Margencel
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/alpes-bureau.yml b/data/cities/anthy-sur-leman/alpes-bureau.yml
index ecf6bd269..4fa1249c5 100644
--- a/data/cities/anthy-sur-leman/alpes-bureau.yml
+++ b/data/cities/anthy-sur-leman/alpes-bureau.yml
@@ -1,11 +1,11 @@
 id: 450813950
-type: way
+type: node
 latitude: 46.35004
 longitude: 6.44003
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 4
+street: Boulevard du Pré Biollat
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/bebe-9.yml b/data/cities/anthy-sur-leman/bebe-9.yml
index eb37b74f4..80ff913e3 100644
--- a/data/cities/anthy-sur-leman/bebe-9.yml
+++ b/data/cities/anthy-sur-leman/bebe-9.yml
@@ -1,11 +1,11 @@
 id: 265312525
-type: way
+type: node
 latitude: 46.34979
 longitude: 6.43906
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 8
+street: Boulevard du Pré Biollat
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/besson-chaussures.yml b/data/cities/anthy-sur-leman/besson-chaussures.yml
index e263f638b..ee660b91b 100644
--- a/data/cities/anthy-sur-leman/besson-chaussures.yml
+++ b/data/cities/anthy-sur-leman/besson-chaussures.yml
@@ -1,11 +1,11 @@
 id: 265312823
-type: way
+type: node
 latitude: 46.35002
 longitude: 6.43424
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 35
+street: Avenue du Pré Robert Sud
+housenumber: "35"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-thonon_anthy-sur-leman_74200/238.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-thonon_anthy-sur-leman_74200/238.html
diff --git a/data/cities/anthy-sur-leman/boujon-carrelage.yml b/data/cities/anthy-sur-leman/boujon-carrelage.yml
index 54aeb08f1..1bfd7eaac 100644
--- a/data/cities/anthy-sur-leman/boujon-carrelage.yml
+++ b/data/cities/anthy-sur-leman/boujon-carrelage.yml
@@ -1,11 +1,11 @@
 id: 69005277
-type: way
+type: node
 latitude: 46.35186
 longitude: 6.43619
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue Pré Robert Nord"
-housenumber: 8
+street: Avenue Pré Robert Nord
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anthy-sur-leman/boulangerie-marie-blachere.yml b/data/cities/anthy-sur-leman/boulangerie-marie-blachere.yml
deleted file mode 100644
index d0b4d0ec2..000000000
--- a/data/cities/anthy-sur-leman/boulangerie-marie-blachere.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1123127897
-type: way
-latitude: 46.35315
-longitude: 6.43978
-postcode: "74200"
-city: Anthy-sur-Léman
-street: "Route du Champ du Puits"
-housenumber: 1
-phone: ""
-opening_hours: "Mo-Sa 06:30-19:30; Su off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/anthy-sur-leman/bricorama.yml b/data/cities/anthy-sur-leman/bricorama.yml
index 2fe3a6240..919d456e9 100644
--- a/data/cities/anthy-sur-leman/bricorama.yml
+++ b/data/cities/anthy-sur-leman/bricorama.yml
@@ -1,11 +1,11 @@
 id: 69003910
-type: way
+type: node
 latitude: 46.34815
 longitude: 6.43656
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 11
+street: Boulevard du Pré Biollat
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/but.yml b/data/cities/anthy-sur-leman/but.yml
index d619ec8fe..d03689400 100644
--- a/data/cities/anthy-sur-leman/but.yml
+++ b/data/cities/anthy-sur-leman/but.yml
@@ -1,11 +1,11 @@
 id: 69004110
-type: way
+type: node
 latitude: 46.34959
 longitude: 6.43794
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 9
+street: Boulevard du Pré Biollat
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/cache-cache.yml b/data/cities/anthy-sur-leman/cache-cache.yml
index 2868b6127..34cc044e0 100644
--- a/data/cities/anthy-sur-leman/cache-cache.yml
+++ b/data/cities/anthy-sur-leman/cache-cache.yml
@@ -1,11 +1,11 @@
 id: 1118849247
-type: way
+type: node
 latitude: 46.3499
 longitude: 6.43389
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 35
-phone: "+33 4 50 16 03 04"
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: "https://www.cache-cache.fr/magasins-haute-savoie-74-thonon-les-bains-anthy-sur-leman-701.html"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "35"
+phone: +33 4 50 16 03 04
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: https://www.cache-cache.fr/magasins-haute-savoie-74-thonon-les-bains-anthy-sur-leman-701.html
diff --git a/data/cities/anthy-sur-leman/cafes-richard.yml b/data/cities/anthy-sur-leman/cafes-richard.yml
index 164d26dc9..28a501a58 100644
--- a/data/cities/anthy-sur-leman/cafes-richard.yml
+++ b/data/cities/anthy-sur-leman/cafes-richard.yml
@@ -1,11 +1,11 @@
 id: 69005553
-type: way
+type: node
 latitude: 46.34848
 longitude: 6.43954
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 5
+street: Boulevard du Pré Biollat
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anthy-sur-leman/carnaby.yml b/data/cities/anthy-sur-leman/carnaby.yml
index 4398d89bb..57208a163 100644
--- a/data/cities/anthy-sur-leman/carnaby.yml
+++ b/data/cities/anthy-sur-leman/carnaby.yml
@@ -4,8 +4,8 @@ latitude: 46.3509
 longitude: 6.43659
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 21
-phone: "+33 4 50 26 18 30"
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: "https://e-carnaby.com/magasins/89-magasin-carnaby-anthy-sur-leman-haute-savoie.html"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "21"
+phone: +33 4 50 26 18 30
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: https://e-carnaby.com/magasins/89-magasin-carnaby-anthy-sur-leman-haute-savoie.html
diff --git a/data/cities/anthy-sur-leman/carre-lumiere.yml b/data/cities/anthy-sur-leman/carre-lumiere.yml
index fbf6bf7ad..9712402e9 100644
--- a/data/cities/anthy-sur-leman/carre-lumiere.yml
+++ b/data/cities/anthy-sur-leman/carre-lumiere.yml
@@ -1,11 +1,11 @@
 id: 69004674
-type: way
+type: node
 latitude: 46.34921
 longitude: 6.436
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 16
+street: Boulevard du Pré Biollat
+housenumber: "16"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 10:00-12:30,13:30-19:00; Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 10:00-12:30,13:30-19:00; Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/cedeo.yml b/data/cities/anthy-sur-leman/cedeo.yml
index 43a9588f9..92d4f0de0 100644
--- a/data/cities/anthy-sur-leman/cedeo.yml
+++ b/data/cities/anthy-sur-leman/cedeo.yml
@@ -1,11 +1,12 @@
 id: 1120276435
-type: way
+type: node
 latitude: 46.34868
 longitude: 6.4371
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
+street: Boulevard du Pré Biollat
 housenumber: 9 bis
 phone: ""
-opening_hours: "Mo-Th 7:30-12:00,13:30-17:30; Fr 7:30-12:00,13:30-16:00; Sa 8:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 7:30-12:00,13:30-17:30; Fr 7:30-12:00,13:30-16:00; Sa 8:00-12:00;
+    Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/ceta.yml b/data/cities/anthy-sur-leman/ceta.yml
index 61b25a351..491c98d6e 100644
--- a/data/cities/anthy-sur-leman/ceta.yml
+++ b/data/cities/anthy-sur-leman/ceta.yml
@@ -1,11 +1,11 @@
 id: 69006556
-type: way
+type: node
 latitude: 46.34974
 longitude: 6.43515
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 29
-phone: "+33 1 44 88 79 79"
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: "https://www.c-and-a.com/stores/fr-fr/auvergne-rhone-alpes/anthy-sur-leman/avenue-du-pre-robert-sud-29.html"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "29"
+phone: +33 1 44 88 79 79
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: https://www.c-and-a.com/stores/fr-fr/auvergne-rhone-alpes/anthy-sur-leman/avenue-du-pre-robert-sud-29.html
diff --git a/data/cities/anthy-sur-leman/chollet-moto.yml b/data/cities/anthy-sur-leman/chollet-moto.yml
index 7b2cf20e8..98564404a 100644
--- a/data/cities/anthy-sur-leman/chollet-moto.yml
+++ b/data/cities/anthy-sur-leman/chollet-moto.yml
@@ -1,11 +1,11 @@
 id: 1119666382
-type: way
+type: node
 latitude: 46.34823
 longitude: 6.42964
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Chemin de Verniaz"
-housenumber: 
+street: Chemin de Verniaz
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00; Su-Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00; Su-Mo off
+website: ""
diff --git a/data/cities/anthy-sur-leman/citroen.yml b/data/cities/anthy-sur-leman/citroen.yml
index 226a28dd9..dfdb1b618 100644
--- a/data/cities/anthy-sur-leman/citroen.yml
+++ b/data/cities/anthy-sur-leman/citroen.yml
@@ -1,11 +1,11 @@
 id: 974148527
-type: way
+type: node
 latitude: 46.35049
 longitude: 6.43112
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue Pré Robert Nord"
-housenumber: 26
+street: Avenue Pré Robert Nord
+housenumber: "26"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 13:30-18:30; Sa 09:00-12:00, 14:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 13:30-18:30; Sa 09:00-12:00, 14:00-18:30; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/codex-et-co-traiteur.yml b/data/cities/anthy-sur-leman/codex-et-co-traiteur.yml
index bca843857..503b3b8f1 100644
--- a/data/cities/anthy-sur-leman/codex-et-co-traiteur.yml
+++ b/data/cities/anthy-sur-leman/codex-et-co-traiteur.yml
@@ -1,11 +1,11 @@
 id: 974148522
-type: way
+type: node
 latitude: 46.34981
 longitude: 6.4307
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue Pré Robert Nord"
-housenumber: 28
+street: Avenue Pré Robert Nord
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anthy-sur-leman/cote-chaussures.yml b/data/cities/anthy-sur-leman/cote-chaussures.yml
index 3a9034ac3..c14969fbd 100644
--- a/data/cities/anthy-sur-leman/cote-chaussures.yml
+++ b/data/cities/anthy-sur-leman/cote-chaussures.yml
@@ -1,11 +1,11 @@
 id: 513966136
-type: way
+type: node
 latitude: 46.34965
 longitude: 6.44004
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
+street: Boulevard du Pré Biollat
 housenumber: 4 ter
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-12:30, 14:00-19:00, Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-12:30, 14:00-19:00, Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/crozatier.yml b/data/cities/anthy-sur-leman/crozatier.yml
index 67990d2c3..fd23f540b 100644
--- a/data/cities/anthy-sur-leman/crozatier.yml
+++ b/data/cities/anthy-sur-leman/crozatier.yml
@@ -1,11 +1,11 @@
 id: 1120107639
-type: way
+type: node
 latitude: 46.34907
 longitude: 6.43534
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 18
+street: Boulevard du Pré Biollat
+housenumber: "18"
 phone: ""
-opening_hours: "Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00; Su-Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00; Su-Mo off
+website: ""
diff --git a/data/cities/anthy-sur-leman/cuisinella.yml b/data/cities/anthy-sur-leman/cuisinella.yml
index 09889d0de..03bac548e 100644
--- a/data/cities/anthy-sur-leman/cuisinella.yml
+++ b/data/cities/anthy-sur-leman/cuisinella.yml
@@ -1,11 +1,11 @@
 id: 265308730
-type: way
+type: node
 latitude: 46.35153
 longitude: 6.43941
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route de Margencel"
-housenumber: 5
+street: Route de Margencel
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/darty.yml b/data/cities/anthy-sur-leman/darty.yml
index adb555b70..132a99546 100644
--- a/data/cities/anthy-sur-leman/darty.yml
+++ b/data/cities/anthy-sur-leman/darty.yml
@@ -1,11 +1,11 @@
 id: 69005328
-type: way
+type: node
 latitude: 46.35053
 longitude: 6.43564
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 23
+street: Avenue du Pré Robert Sud
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/dsm-auto-74.yml b/data/cities/anthy-sur-leman/dsm-auto-74.yml
index f2aeb7516..dce29f32c 100644
--- a/data/cities/anthy-sur-leman/dsm-auto-74.yml
+++ b/data/cities/anthy-sur-leman/dsm-auto-74.yml
@@ -1,11 +1,11 @@
 id: 1119666380
-type: way
+type: node
 latitude: 46.3482
 longitude: 6.42955
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Chemin de Verniaz"
-housenumber: 
+street: Chemin de Verniaz
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 8:30-12:00,14:00-18:30; Sa 8:30-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 8:30-12:00,14:00-18:30; Sa 8:30-12:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/ecocuisine-thonon-les-bains.yml b/data/cities/anthy-sur-leman/ecocuisine-thonon-les-bains.yml
index 70b7b1080..1c9d75e79 100644
--- a/data/cities/anthy-sur-leman/ecocuisine-thonon-les-bains.yml
+++ b/data/cities/anthy-sur-leman/ecocuisine-thonon-les-bains.yml
@@ -1,11 +1,11 @@
 id: 1122315414
-type: way
+type: node
 latitude: 46.35102
 longitude: 6.4399
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route de Margencel"
-housenumber: 
+street: Route de Margencel
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/envie-de-salle-de-bain.yml b/data/cities/anthy-sur-leman/envie-de-salle-de-bain.yml
index b1635d4bb..0953cd008 100644
--- a/data/cities/anthy-sur-leman/envie-de-salle-de-bain.yml
+++ b/data/cities/anthy-sur-leman/envie-de-salle-de-bain.yml
@@ -1,11 +1,11 @@
 id: 1120276436
-type: way
+type: node
 latitude: 46.3485
 longitude: 6.43721
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
+street: Boulevard du Pré Biollat
 housenumber: 9 bis
 phone: ""
-opening_hours: "Mo-Fr 9:00-12:00,14:00-18:00; Sa 10:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 9:00-12:00,14:00-18:00; Sa 10:00-17:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/feu-vert.yml b/data/cities/anthy-sur-leman/feu-vert.yml
index c8bcdd1fa..c0b29d7a0 100644
--- a/data/cities/anthy-sur-leman/feu-vert.yml
+++ b/data/cities/anthy-sur-leman/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 989055448
-type: way
+type: node
 latitude: 46.35006
 longitude: 6.43745
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 10
+street: Boulevard du Pré Biollat
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:45; Sa 09:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:45; Sa 09:00-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/first-stop.yml b/data/cities/anthy-sur-leman/first-stop.yml
index 634dab700..ca26d3d0c 100644
--- a/data/cities/anthy-sur-leman/first-stop.yml
+++ b/data/cities/anthy-sur-leman/first-stop.yml
@@ -1,11 +1,11 @@
 id: 69006574
-type: way
+type: node
 latitude: 46.34952
 longitude: 6.4364
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 14
+street: Boulevard du Pré Biollat
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00,13:30-18:00; Sa 09:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00,13:30-18:00; Sa 09:00-12:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/fleurs-et-plantes-du-lac.yml b/data/cities/anthy-sur-leman/fleurs-et-plantes-du-lac.yml
index 58eaaee66..df0dffd6c 100644
--- a/data/cities/anthy-sur-leman/fleurs-et-plantes-du-lac.yml
+++ b/data/cities/anthy-sur-leman/fleurs-et-plantes-du-lac.yml
@@ -1,11 +1,11 @@
 id: 1162126405
-type: way
+type: node
 latitude: 46.35098
 longitude: 6.43144
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue Pré Robert Nord"
-housenumber: 24
+street: Avenue Pré Robert Nord
+housenumber: "24"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su 09:00-12:30, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su 09:00-12:30, 14:00-18:00
+website: ""
diff --git a/data/cities/anthy-sur-leman/fly.yml b/data/cities/anthy-sur-leman/fly.yml
index d78d1c838..19b8bf026 100644
--- a/data/cities/anthy-sur-leman/fly.yml
+++ b/data/cities/anthy-sur-leman/fly.yml
@@ -1,11 +1,11 @@
 id: 69006156
-type: way
+type: node
 latitude: 46.35129
 longitude: 6.43502
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
-housenumber: 12
-phone: "+33 4 50 17 04 30"
+street: Route Impériale
+housenumber: "12"
+phone: +33 4 50 17 04 30
 opening_hours: ""
-website: "https://www.fly74.fr"
\ No newline at end of file
+website: https://www.fly74.fr
diff --git a/data/cities/anthy-sur-leman/france-literie.yml b/data/cities/anthy-sur-leman/france-literie.yml
index 6e2dea881..03594622b 100644
--- a/data/cities/anthy-sur-leman/france-literie.yml
+++ b/data/cities/anthy-sur-leman/france-literie.yml
@@ -1,11 +1,11 @@
 id: 1120107640
-type: way
+type: node
 latitude: 46.34904
 longitude: 6.43519
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 18
+street: Boulevard du Pré Biollat
+housenumber: "18"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/fresh.yml b/data/cities/anthy-sur-leman/fresh.yml
index b2a456deb..a541b8dc6 100644
--- a/data/cities/anthy-sur-leman/fresh.yml
+++ b/data/cities/anthy-sur-leman/fresh.yml
@@ -1,11 +1,11 @@
 id: 1123127891
-type: way
+type: node
 latitude: 46.35298
 longitude: 6.43991
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route du Champ du Puits"
-housenumber: 1
+street: Route du Champ du Puits
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 8:30-20:00; Su 8:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 8:30-20:00; Su 8:30-12:30
+website: ""
diff --git a/data/cities/anthy-sur-leman/gamm-vert.yml b/data/cities/anthy-sur-leman/gamm-vert.yml
index bac9e51ea..ad98c1b1f 100644
--- a/data/cities/anthy-sur-leman/gamm-vert.yml
+++ b/data/cities/anthy-sur-leman/gamm-vert.yml
@@ -1,11 +1,11 @@
 id: 1122240121
-type: way
+type: node
 latitude: 46.34925
 longitude: 6.44023
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 3
+street: Boulevard du Pré Biollat
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:30,14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:30,14:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/garage-de-verniaz.yml b/data/cities/anthy-sur-leman/garage-de-verniaz.yml
index 3ed08caa9..b1a56814c 100644
--- a/data/cities/anthy-sur-leman/garage-de-verniaz.yml
+++ b/data/cities/anthy-sur-leman/garage-de-verniaz.yml
@@ -1,11 +1,11 @@
 id: 1119666381
-type: way
+type: node
 latitude: 46.34807
 longitude: 6.42964
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Chemin de Verniaz"
-housenumber: 
+street: Chemin de Verniaz
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anthy-sur-leman/garage-du-lac.yml b/data/cities/anthy-sur-leman/garage-du-lac.yml
index 5896815ea..09d85916b 100644
--- a/data/cities/anthy-sur-leman/garage-du-lac.yml
+++ b/data/cities/anthy-sur-leman/garage-du-lac.yml
@@ -1,11 +1,11 @@
 id: 1117555497
-type: way
+type: node
 latitude: 46.35227
 longitude: 6.43345
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
-housenumber: 7
+street: Route Impériale
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/gemo.yml b/data/cities/anthy-sur-leman/gemo.yml
index 1df5e1ada..564f9d699 100644
--- a/data/cities/anthy-sur-leman/gemo.yml
+++ b/data/cities/anthy-sur-leman/gemo.yml
@@ -1,11 +1,11 @@
 id: 1119130546
-type: way
+type: node
 latitude: 46.35225
 longitude: 6.43794
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Nord"
-housenumber: 2
-phone: "+33 4 50 70 65 75"
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: "https://www.gemo.fr/magasin/GEMO_2221"
\ No newline at end of file
+street: Avenue du Pré Robert Nord
+housenumber: "2"
+phone: +33 4 50 70 65 75
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: https://www.gemo.fr/magasin/GEMO_2221
diff --git a/data/cities/anthy-sur-leman/generale-doptique.yml b/data/cities/anthy-sur-leman/generale-doptique.yml
index 94ed0a1ad..0d088a067 100644
--- a/data/cities/anthy-sur-leman/generale-doptique.yml
+++ b/data/cities/anthy-sur-leman/generale-doptique.yml
@@ -1,11 +1,12 @@
 id: 1120152214
-type: way
+type: node
 latitude: 46.34792
 longitude: 6.4346
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 15
+street: Boulevard du Pré Biollat
+housenumber: "15"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:00-12:30,14:00-19:00; Sa 09:00-13:00,14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:00-12:30,14:00-19:00; Sa 09:00-13:00,14:00-19:00;
+    Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/gifi.yml b/data/cities/anthy-sur-leman/gifi.yml
index ad68667df..f38466844 100644
--- a/data/cities/anthy-sur-leman/gifi.yml
+++ b/data/cities/anthy-sur-leman/gifi.yml
@@ -1,11 +1,11 @@
 id: 69006350
-type: way
+type: node
 latitude: 46.35051
 longitude: 6.43782
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 13
-phone: "+33 4 50 17 00 33"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://magasins.gifi.fr/fr/gifi-thonon-les-bains-29565"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "13"
+phone: +33 4 50 17 00 33
+opening_hours: Mo-Sa 09:30-19:00
+website: https://magasins.gifi.fr/fr/gifi-thonon-les-bains-29565
diff --git a/data/cities/anthy-sur-leman/green2go.yml b/data/cities/anthy-sur-leman/green2go.yml
index cdc5d728a..00eeef122 100644
--- a/data/cities/anthy-sur-leman/green2go.yml
+++ b/data/cities/anthy-sur-leman/green2go.yml
@@ -1,11 +1,11 @@
 id: 1121182038
-type: way
+type: node
 latitude: 46.35037
 longitude: 6.4383
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
+street: Boulevard du Pré Biollat
 housenumber: 8 bis
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00, Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00, Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/gt-automobiles.yml b/data/cities/anthy-sur-leman/gt-automobiles.yml
index 147aee1c5..3f67f9e11 100644
--- a/data/cities/anthy-sur-leman/gt-automobiles.yml
+++ b/data/cities/anthy-sur-leman/gt-automobiles.yml
@@ -1,11 +1,11 @@
 id: 69005253
-type: way
+type: node
 latitude: 46.35147
 longitude: 6.43378
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Chemin de l'Etroz"
-housenumber: 
-phone: "+33 4 50 81 60 81"
+street: Chemin de l'Etroz
+housenumber: ""
+phone: +33 4 50 81 60 81
 opening_hours: ""
-website: "https://gtautomobiles.fr"
\ No newline at end of file
+website: https://gtautomobiles.fr
diff --git a/data/cities/anthy-sur-leman/hermone-automobiles.yml b/data/cities/anthy-sur-leman/hermone-automobiles.yml
index a8da92a71..ca6bf9e06 100644
--- a/data/cities/anthy-sur-leman/hermone-automobiles.yml
+++ b/data/cities/anthy-sur-leman/hermone-automobiles.yml
@@ -1,11 +1,11 @@
 id: 931388125
-type: way
+type: node
 latitude: 46.34941
 longitude: 6.44216
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Rue de l'Europe"
-housenumber: 3
-phone: "+33 4 58 55 01 43"
+street: Rue de l'Europe
+housenumber: "3"
+phone: +33 4 58 55 01 43
 opening_hours: ""
-website: "https://partenaire.bmw.fr/hermone-automobiles/concession-hermone-automobiles"
\ No newline at end of file
+website: https://partenaire.bmw.fr/hermone-automobiles/concession-hermone-automobiles
diff --git a/data/cities/anthy-sur-leman/home-salons.yml b/data/cities/anthy-sur-leman/home-salons.yml
index 89af817c7..e8e27a528 100644
--- a/data/cities/anthy-sur-leman/home-salons.yml
+++ b/data/cities/anthy-sur-leman/home-salons.yml
@@ -1,11 +1,11 @@
 id: 1119582774
-type: way
+type: node
 latitude: 46.35157
 longitude: 6.43978
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route de Margencel"
-housenumber: 
+street: Route de Margencel
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/ibs-son-et-lumiere.yml b/data/cities/anthy-sur-leman/ibs-son-et-lumiere.yml
index 1f35418cb..b2574bd3d 100644
--- a/data/cities/anthy-sur-leman/ibs-son-et-lumiere.yml
+++ b/data/cities/anthy-sur-leman/ibs-son-et-lumiere.yml
@@ -1,11 +1,11 @@
 id: 265308728
-type: way
+type: node
 latitude: 46.35104
 longitude: 6.43356
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
+street: Route Impériale
 housenumber: 8 Bis
-phone: "+33 4 50 70 17 23"
+phone: +33 4 50 70 17 23
 opening_hours: ""
-website: "https://www.ibs-sonlumiere.com"
\ No newline at end of file
+website: https://www.ibs-sonlumiere.com
diff --git a/data/cities/anthy-sur-leman/id-clos.yml b/data/cities/anthy-sur-leman/id-clos.yml
index 82607d0e0..49ceec697 100644
--- a/data/cities/anthy-sur-leman/id-clos.yml
+++ b/data/cities/anthy-sur-leman/id-clos.yml
@@ -1,11 +1,11 @@
 id: 1123127890
-type: way
+type: node
 latitude: 46.35316
 longitude: 6.43968
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
+street: Route Impériale
 housenumber: 22 bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anthy-sur-leman/j-vaudaux.yml b/data/cities/anthy-sur-leman/j-vaudaux.yml
index 8b77b1b47..c72d89a85 100644
--- a/data/cities/anthy-sur-leman/j-vaudaux.yml
+++ b/data/cities/anthy-sur-leman/j-vaudaux.yml
@@ -1,11 +1,11 @@
 id: 69004732
-type: way
+type: node
 latitude: 46.34905
 longitude: 6.441
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 1
+street: Boulevard du Pré Biollat
+housenumber: "1"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-17:00
+website: ""
diff --git a/data/cities/anthy-sur-leman/jacquet-automobiles.yml b/data/cities/anthy-sur-leman/jacquet-automobiles.yml
index 0b22755f6..692d86c0d 100644
--- a/data/cities/anthy-sur-leman/jacquet-automobiles.yml
+++ b/data/cities/anthy-sur-leman/jacquet-automobiles.yml
@@ -1,11 +1,11 @@
 id: 69050714
-type: way
+type: node
 latitude: 46.34713
 longitude: 6.42574
 postcode: "74200"
 city: Anthy-sur-Léman
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/joueclub.yml b/data/cities/anthy-sur-leman/joueclub.yml
index 8a5fa3bf4..4bc734763 100644
--- a/data/cities/anthy-sur-leman/joueclub.yml
+++ b/data/cities/anthy-sur-leman/joueclub.yml
@@ -1,11 +1,11 @@
 id: 69004660
-type: way
+type: node
 latitude: 46.34997
 longitude: 6.4393
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 8
+street: Boulevard du Pré Biollat
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/kickmoto.yml b/data/cities/anthy-sur-leman/kickmoto.yml
index 4bad41b86..5f232c27a 100644
--- a/data/cities/anthy-sur-leman/kickmoto.yml
+++ b/data/cities/anthy-sur-leman/kickmoto.yml
@@ -1,11 +1,11 @@
 id: 69005916
-type: way
+type: node
 latitude: 46.35017
 longitude: 6.4381
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 10
+street: Boulevard du Pré Biollat
+housenumber: "10"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00, Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00, Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/la-ferme-du-pecheur.yml b/data/cities/anthy-sur-leman/la-ferme-du-pecheur.yml
index 3081c7ab7..c53ee4108 100644
--- a/data/cities/anthy-sur-leman/la-ferme-du-pecheur.yml
+++ b/data/cities/anthy-sur-leman/la-ferme-du-pecheur.yml
@@ -1,11 +1,11 @@
 id: 69004142
-type: way
+type: node
 latitude: 46.35832
 longitude: 6.42657
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Rue des Pêcheurs"
-housenumber: 19
-phone: "+33 4 50 70 36 13"
+street: Rue des Pêcheurs
+housenumber: "19"
+phone: +33 4 50 70 36 13
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anthy-sur-leman/la-foirfouille.yml b/data/cities/anthy-sur-leman/la-foirfouille.yml
index ff60ae764..c8ee85940 100644
--- a/data/cities/anthy-sur-leman/la-foirfouille.yml
+++ b/data/cities/anthy-sur-leman/la-foirfouille.yml
@@ -1,11 +1,11 @@
 id: 265308729
-type: way
+type: node
 latitude: 46.35089
 longitude: 6.43871
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 9
+street: Avenue du Pré Robert Sud
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/anthy-sur-leman/la-halle.yml b/data/cities/anthy-sur-leman/la-halle.yml
index f0e0a367a..0a3849b07 100644
--- a/data/cities/anthy-sur-leman/la-halle.yml
+++ b/data/cities/anthy-sur-leman/la-halle.yml
@@ -1,11 +1,11 @@
 id: 1118849248
-type: way
+type: node
 latitude: 46.34926
 longitude: 6.43437
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 35
+street: Avenue du Pré Robert Sud
+housenumber: "35"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/la-rmize.yml b/data/cities/anthy-sur-leman/la-rmize.yml
index fc90669d1..05718d2e3 100644
--- a/data/cities/anthy-sur-leman/la-rmize.yml
+++ b/data/cities/anthy-sur-leman/la-rmize.yml
@@ -4,8 +4,8 @@ latitude: 46.35274
 longitude: 6.43595
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
-housenumber: 19
+street: Route Impériale
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: "https://www.larmize.com"
\ No newline at end of file
+website: https://www.larmize.com
diff --git a/data/cities/anthy-sur-leman/lalliard.yml b/data/cities/anthy-sur-leman/lalliard.yml
index b4ea75609..66484552a 100644
--- a/data/cities/anthy-sur-leman/lalliard.yml
+++ b/data/cities/anthy-sur-leman/lalliard.yml
@@ -1,11 +1,11 @@
 id: 69005446
-type: way
+type: node
 latitude: 46.34812
 longitude: 6.43893
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 7
+street: Boulevard du Pré Biollat
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-12:30, 14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-12:30, 14:00-17:00
+website: ""
diff --git a/data/cities/anthy-sur-leman/lariviere.yml b/data/cities/anthy-sur-leman/lariviere.yml
index c74433140..5eb351ed8 100644
--- a/data/cities/anthy-sur-leman/lariviere.yml
+++ b/data/cities/anthy-sur-leman/lariviere.yml
@@ -1,11 +1,11 @@
 id: 1118062867
-type: way
+type: node
 latitude: 46.35153
 longitude: 6.43301
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
-housenumber: 6
+street: Route Impériale
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: "https://www.lariviere.fr/trouver-votre-agence/lariviere-SEB/entry-458-lariviere-thonon-les-bains.html"
\ No newline at end of file
+website: https://www.lariviere.fr/trouver-votre-agence/lariviere-SEB/entry-458-lariviere-thonon-les-bains.html
diff --git a/data/cities/anthy-sur-leman/laverie-carrefour.yml b/data/cities/anthy-sur-leman/laverie-carrefour.yml
index b5760cd73..74c629925 100644
--- a/data/cities/anthy-sur-leman/laverie-carrefour.yml
+++ b/data/cities/anthy-sur-leman/laverie-carrefour.yml
@@ -1,11 +1,11 @@
 id: 69006379
-type: way
+type: node
 latitude: 46.34794
 longitude: 6.43291
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue de Verniaz"
-housenumber: 
+street: Avenue de Verniaz
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 06:00-22:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/anthy-sur-leman/leman-primeurs.yml b/data/cities/anthy-sur-leman/leman-primeurs.yml
index a9eb26882..1544d7c4b 100644
--- a/data/cities/anthy-sur-leman/leman-primeurs.yml
+++ b/data/cities/anthy-sur-leman/leman-primeurs.yml
@@ -1,11 +1,11 @@
 id: 1122315391
-type: way
+type: node
 latitude: 46.35066
 longitude: 6.43949
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route de Margencel"
-housenumber: 
+street: Route de Margencel
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-17:00; Sa 09:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-17:00; Sa 09:00-12:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/lexpert-fenetre.yml b/data/cities/anthy-sur-leman/lexpert-fenetre.yml
index 71c05be5a..ec2fcc8dd 100644
--- a/data/cities/anthy-sur-leman/lexpert-fenetre.yml
+++ b/data/cities/anthy-sur-leman/lexpert-fenetre.yml
@@ -1,11 +1,11 @@
 id: 69006106
-type: way
+type: node
 latitude: 46.34912
 longitude: 6.43515
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Chemin du Pré Biollat"
-housenumber: 
-phone: "+33 4 50 81 76 63"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00,14:00-17:00; Su off"
-website: "https://www.lexpertfenetre.fr/trouvez-un-expert/thonon-les-bains"
\ No newline at end of file
+street: Chemin du Pré Biollat
+housenumber: ""
+phone: +33 4 50 81 76 63
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00,14:00-17:00; Su off
+website: https://www.lexpertfenetre.fr/trouvez-un-expert/thonon-les-bains
diff --git a/data/cities/anthy-sur-leman/lidl.yml b/data/cities/anthy-sur-leman/lidl.yml
index 5bb2db546..9d5e0acd4 100644
--- a/data/cities/anthy-sur-leman/lidl.yml
+++ b/data/cities/anthy-sur-leman/lidl.yml
@@ -1,11 +1,11 @@
 id: 977084210
-type: way
+type: node
 latitude: 46.34961
 longitude: 6.43294
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 37
+street: Avenue du Pré Robert Sud
+housenumber: "37"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/anthy-sur-leman/lieb-auto-leman.yml b/data/cities/anthy-sur-leman/lieb-auto-leman.yml
index ccd3126b8..f52868113 100644
--- a/data/cities/anthy-sur-leman/lieb-auto-leman.yml
+++ b/data/cities/anthy-sur-leman/lieb-auto-leman.yml
@@ -1,11 +1,11 @@
 id: 69004753
-type: way
+type: node
 latitude: 46.35364
 longitude: 6.43976
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
-housenumber: 37
+street: Route Impériale
+housenumber: "37"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/maison-de-la-literie.yml b/data/cities/anthy-sur-leman/maison-de-la-literie.yml
index addd21c76..7247277f3 100644
--- a/data/cities/anthy-sur-leman/maison-de-la-literie.yml
+++ b/data/cities/anthy-sur-leman/maison-de-la-literie.yml
@@ -1,11 +1,11 @@
 id: 1118584407
-type: way
+type: node
 latitude: 46.35004
 longitude: 6.43519
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 25
+street: Avenue du Pré Robert Sud
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/majuscule.yml b/data/cities/anthy-sur-leman/majuscule.yml
index 52eaea608..8522ebcd4 100644
--- a/data/cities/anthy-sur-leman/majuscule.yml
+++ b/data/cities/anthy-sur-leman/majuscule.yml
@@ -1,11 +1,11 @@
 id: 69005163
-type: way
+type: node
 latitude: 46.35008
 longitude: 6.43842
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
+street: Boulevard du Pré Biollat
 housenumber: 8 bis
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-12:00, 14:00-19:00, Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-12:00, 14:00-19:00, Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/marche-pernoud.yml b/data/cities/anthy-sur-leman/marche-pernoud.yml
index 8c789c097..8ca97c4e7 100644
--- a/data/cities/anthy-sur-leman/marche-pernoud.yml
+++ b/data/cities/anthy-sur-leman/marche-pernoud.yml
@@ -1,11 +1,11 @@
 id: 69006348
-type: way
+type: node
 latitude: 46.35083
 longitude: 6.43822
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 11
-phone: "+33 4 50 76 19 62"
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: "https://marchepernoud.com"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "11"
+phone: +33 4 50 76 19 62
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: https://marchepernoud.com
diff --git a/data/cities/anthy-sur-leman/marie-blachere.yml b/data/cities/anthy-sur-leman/marie-blachere.yml
new file mode 100644
index 000000000..ff3f3ee6e
--- /dev/null
+++ b/data/cities/anthy-sur-leman/marie-blachere.yml
@@ -0,0 +1,11 @@
+id: 1123127897
+type: node
+latitude: 46.35315
+longitude: 6.43978
+postcode: "74200"
+city: Anthy-sur-Léman
+street: Route du Champ du Puits
+housenumber: "1"
+phone: ""
+opening_hours: Mo-Sa 06:30-19:30; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/maxi-bazar.yml b/data/cities/anthy-sur-leman/maxi-bazar.yml
index b3dc264c5..c59bc79e0 100644
--- a/data/cities/anthy-sur-leman/maxi-bazar.yml
+++ b/data/cities/anthy-sur-leman/maxi-bazar.yml
@@ -1,11 +1,11 @@
 id: 1119130545
-type: way
+type: node
 latitude: 46.35272
 longitude: 6.43759
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Nord"
-housenumber: 2
-phone: "+33 4 50 81 00 95"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-18:00"
-website: "https://maxibazar.fr/anthy-sur-leman.html"
\ No newline at end of file
+street: Avenue du Pré Robert Nord
+housenumber: "2"
+phone: +33 4 50 81 00 95
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-18:00
+website: https://maxibazar.fr/anthy-sur-leman.html
diff --git a/data/cities/anthy-sur-leman/maxi-zoo.yml b/data/cities/anthy-sur-leman/maxi-zoo.yml
index acd018929..ca4d8860e 100644
--- a/data/cities/anthy-sur-leman/maxi-zoo.yml
+++ b/data/cities/anthy-sur-leman/maxi-zoo.yml
@@ -1,11 +1,11 @@
 id: 1120152213
-type: way
+type: node
 latitude: 46.3481
 longitude: 6.43449
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 15
+street: Boulevard du Pré Biollat
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/mercedes-benz-thonon-emb-leman.yml b/data/cities/anthy-sur-leman/mercedes-benz-thonon-emb-leman.yml
index d5c0fb218..6c760c85c 100644
--- a/data/cities/anthy-sur-leman/mercedes-benz-thonon-emb-leman.yml
+++ b/data/cities/anthy-sur-leman/mercedes-benz-thonon-emb-leman.yml
@@ -1,11 +1,11 @@
 id: 1117836258
-type: way
+type: node
 latitude: 46.35101
 longitude: 6.43411
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Chemin de l'Etroz"
-housenumber: 2
+street: Chemin de l'Etroz
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/anthy-sur-leman/mg-motor.yml b/data/cities/anthy-sur-leman/mg-motor.yml
index 8d92deb1c..be2ae0f83 100644
--- a/data/cities/anthy-sur-leman/mg-motor.yml
+++ b/data/cities/anthy-sur-leman/mg-motor.yml
@@ -1,11 +1,11 @@
 id: 265308731
-type: way
+type: node
 latitude: 46.35081
 longitude: 6.4398
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route de Margencel"
-housenumber: 
+street: Route de Margencel
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/anthy-sur-leman/mobalpa.yml b/data/cities/anthy-sur-leman/mobalpa.yml
index 4f060f61a..549d01fae 100644
--- a/data/cities/anthy-sur-leman/mobalpa.yml
+++ b/data/cities/anthy-sur-leman/mobalpa.yml
@@ -4,8 +4,8 @@ latitude: 46.35325
 longitude: 6.4409
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route du Champ du Puits"
-housenumber: 5
+street: Route du Champ du Puits
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:30-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:30-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/mondovelo.yml b/data/cities/anthy-sur-leman/mondovelo.yml
index d4bbf95cf..9eb1506d9 100644
--- a/data/cities/anthy-sur-leman/mondovelo.yml
+++ b/data/cities/anthy-sur-leman/mondovelo.yml
@@ -1,11 +1,11 @@
 id: 1120057856
-type: way
+type: node
 latitude: 46.34846
 longitude: 6.43371
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 24
+street: Boulevard du Pré Biollat
+housenumber: "24"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/nissan-segny-automobiles.yml b/data/cities/anthy-sur-leman/nissan-segny-automobiles.yml
index f979f72b6..fece17f38 100644
--- a/data/cities/anthy-sur-leman/nissan-segny-automobiles.yml
+++ b/data/cities/anthy-sur-leman/nissan-segny-automobiles.yml
@@ -1,11 +1,11 @@
 id: 1117555498
-type: way
+type: node
 latitude: 46.35206
 longitude: 6.43354
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route Impériale"
-housenumber: 7
+street: Route Impériale
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/norauto.yml b/data/cities/anthy-sur-leman/norauto.yml
index 252144faf..80a188757 100644
--- a/data/cities/anthy-sur-leman/norauto.yml
+++ b/data/cities/anthy-sur-leman/norauto.yml
@@ -1,11 +1,11 @@
 id: 265308732
-type: way
+type: node
 latitude: 46.34847
 longitude: 6.43341
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue de Verniaz"
-housenumber: 
+street: Avenue de Verniaz
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-12:00,14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:00,14:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/o-pain-qui-chante.yml b/data/cities/anthy-sur-leman/o-pain-qui-chante.yml
index 7da7a601c..5973ba045 100644
--- a/data/cities/anthy-sur-leman/o-pain-qui-chante.yml
+++ b/data/cities/anthy-sur-leman/o-pain-qui-chante.yml
@@ -1,11 +1,11 @@
 id: 265309580
-type: way
+type: node
 latitude: 46.34843
 longitude: 6.43303
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue de Verniaz"
-housenumber: 2
+street: Avenue de Verniaz
+housenumber: "2"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 07:00-19:00; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 07:00-19:00; Su 07:00-12:30
+website: ""
diff --git a/data/cities/anthy-sur-leman/olyreve.yml b/data/cities/anthy-sur-leman/olyreve.yml
index d7ae1d937..d6e4826c6 100644
--- a/data/cities/anthy-sur-leman/olyreve.yml
+++ b/data/cities/anthy-sur-leman/olyreve.yml
@@ -1,11 +1,12 @@
 id: 1119582775
-type: way
+type: node
 latitude: 46.35164
 longitude: 6.43991
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route de Margencel"
-housenumber: 
+street: Route de Margencel
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-12:00,14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-12:00,14:00-19:00;
+    Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/only-shoes.yml b/data/cities/anthy-sur-leman/only-shoes.yml
index 5f714b404..5cccb1b55 100644
--- a/data/cities/anthy-sur-leman/only-shoes.yml
+++ b/data/cities/anthy-sur-leman/only-shoes.yml
@@ -1,11 +1,11 @@
 id: 1120152212
-type: way
+type: node
 latitude: 46.34806
 longitude: 6.43509
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 15
+street: Boulevard du Pré Biollat
+housenumber: "15"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/opel-thonon.yml b/data/cities/anthy-sur-leman/opel-thonon.yml
index 3db6cb53b..a8e007fd8 100644
--- a/data/cities/anthy-sur-leman/opel-thonon.yml
+++ b/data/cities/anthy-sur-leman/opel-thonon.yml
@@ -1,11 +1,11 @@
 id: 974148526
-type: way
+type: node
 latitude: 46.35002
 longitude: 6.43119
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue Pré Robert Nord"
-housenumber: 26
-phone: "+33 4 50 70 12 12"
+street: Avenue Pré Robert Nord
+housenumber: "26"
+phone: +33 4 50 70 12 12
 opening_hours: ""
-website: "https://www.autosphere.fr/concession-opel-anthy-sur-leman-ope016.html"
\ No newline at end of file
+website: https://www.autosphere.fr/concession-opel-anthy-sur-leman-ope016.html
diff --git a/data/cities/anthy-sur-leman/orchestra.yml b/data/cities/anthy-sur-leman/orchestra.yml
index 6b0bdf9cf..5c2fe6462 100644
--- a/data/cities/anthy-sur-leman/orchestra.yml
+++ b/data/cities/anthy-sur-leman/orchestra.yml
@@ -1,11 +1,11 @@
 id: 69005405
-type: way
+type: node
 latitude: 46.35066
 longitude: 6.43717
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 15
-phone: "+33 4 50 81 62 60"
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: "https://fr.shop-orchestra.com/fr/stores#!/l/anthy-sur-leman/15-avenue-pre-robert-sud/2783566"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "15"
+phone: +33 4 50 81 62 60
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: https://fr.shop-orchestra.com/fr/stores#!/l/anthy-sur-leman/15-avenue-pre-robert-sud/2783566
diff --git a/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope-2.yml b/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope-2.yml
index 7df242c83..30683680d 100644
--- a/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope-2.yml
+++ b/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope-2.yml
@@ -1,11 +1,11 @@
 id: 930675716
-type: way
+type: node
 latitude: 46.35058
 longitude: 6.44177
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Rue de l'Europe"
-housenumber: 29
-phone: "+33 482 291 566"
+street: Rue de l'Europe
+housenumber: "29"
+phone: +33 482 291 566
 opening_hours: ""
-website: "https://www.bymycar.fr/concessions/peugeot-thonon-les-bains-bymycar-43"
\ No newline at end of file
+website: https://www.bymycar.fr/concessions/peugeot-thonon-les-bains-bymycar-43
diff --git a/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope.yml b/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope.yml
index 552df9028..add2047a3 100644
--- a/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope.yml
+++ b/data/cities/anthy-sur-leman/peugeot-bymycar-thonon-rue-de-leurope.yml
@@ -1,11 +1,11 @@
 id: 930675715
-type: way
+type: node
 latitude: 46.35059
 longitude: 6.44186
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Rue de l'Europe"
-housenumber: 29
-phone: "+33 482 291 566"
+street: Rue de l'Europe
+housenumber: "29"
+phone: +33 482 291 566
 opening_hours: ""
-website: "https://www.bymycar.fr/concessions/peugeot-thonon-les-bains-bymycar-43"
\ No newline at end of file
+website: https://www.bymycar.fr/concessions/peugeot-thonon-les-bains-bymycar-43
diff --git a/data/cities/anthy-sur-leman/peugeot-bymycar-thonon.yml b/data/cities/anthy-sur-leman/peugeot-bymycar-thonon.yml
index f30bab386..055b29182 100644
--- a/data/cities/anthy-sur-leman/peugeot-bymycar-thonon.yml
+++ b/data/cities/anthy-sur-leman/peugeot-bymycar-thonon.yml
@@ -1,11 +1,11 @@
 id: 69004261
-type: way
+type: node
 latitude: 46.35076
 longitude: 6.44169
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Rue de l'Europe"
-housenumber: 29
-phone: "+33 482 291 566"
+street: Rue de l'Europe
+housenumber: "29"
+phone: +33 482 291 566
 opening_hours: ""
-website: "https://www.bymycar.fr/concessions/peugeot-thonon-les-bains-bymycar-43"
\ No newline at end of file
+website: https://www.bymycar.fr/concessions/peugeot-thonon-les-bains-bymycar-43
diff --git a/data/cities/anthy-sur-leman/picard.yml b/data/cities/anthy-sur-leman/picard.yml
index f916cfc6c..499ce9d2e 100644
--- a/data/cities/anthy-sur-leman/picard.yml
+++ b/data/cities/anthy-sur-leman/picard.yml
@@ -1,11 +1,11 @@
 id: 69006056
-type: way
+type: node
 latitude: 46.35178
 longitude: 6.43914
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 1
+street: Avenue du Pré Robert Sud
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: ""
diff --git a/data/cities/anthy-sur-leman/poltronesofa.yml b/data/cities/anthy-sur-leman/poltronesofa.yml
index 8b9c5e95b..33f62efc0 100644
--- a/data/cities/anthy-sur-leman/poltronesofa.yml
+++ b/data/cities/anthy-sur-leman/poltronesofa.yml
@@ -1,11 +1,11 @@
 id: 1119130547
-type: way
+type: node
 latitude: 46.3521
 longitude: 6.43752
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Nord"
-housenumber: 2
-phone: "+33 4 80 95 96 35"
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: "https://www.poltronesofa.com/fr-FR/Magasins?k=thonon"
\ No newline at end of file
+street: Avenue du Pré Robert Nord
+housenumber: "2"
+phone: +33 4 80 95 96 35
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: https://www.poltronesofa.com/fr-FR/Magasins?k=thonon
diff --git a/data/cities/anthy-sur-leman/redzone.yml b/data/cities/anthy-sur-leman/redzone.yml
index e09217067..1c711702c 100644
--- a/data/cities/anthy-sur-leman/redzone.yml
+++ b/data/cities/anthy-sur-leman/redzone.yml
@@ -4,8 +4,8 @@ latitude: 46.35329
 longitude: 6.44103
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route du Champ du Puits"
-housenumber: 5
+street: Route du Champ du Puits
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/richardson-avenue-du-pre-robert-sud.yml b/data/cities/anthy-sur-leman/richardson-avenue-du-pre-robert-sud.yml
index 495f27f05..5fce7b3e9 100644
--- a/data/cities/anthy-sur-leman/richardson-avenue-du-pre-robert-sud.yml
+++ b/data/cities/anthy-sur-leman/richardson-avenue-du-pre-robert-sud.yml
@@ -1,11 +1,12 @@
 id: 1119566425
-type: way
+type: node
 latitude: 46.35151
 longitude: 6.43846
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 7
+street: Avenue du Pré Robert Sud
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-We 8:30-12:00,14:00-18:00; Th-Fr 8:30-12:00,14:00-18:30; Sa 8:30-12:00,14:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We 8:30-12:00,14:00-18:00; Th-Fr 8:30-12:00,14:00-18:30; Sa 8:30-12:00,14:00-17:00;
+    Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/richardson.yml b/data/cities/anthy-sur-leman/richardson.yml
index a183fd387..bff1a3b4f 100644
--- a/data/cities/anthy-sur-leman/richardson.yml
+++ b/data/cities/anthy-sur-leman/richardson.yml
@@ -1,11 +1,11 @@
 id: 1119566424
-type: way
+type: node
 latitude: 46.3516
 longitude: 6.43861
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 7
+street: Avenue du Pré Robert Sud
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 7:30-11:45,13:30-17:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 7:30-11:45,13:30-17:30; Sa-Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/satoriz-thonon-anthy.yml b/data/cities/anthy-sur-leman/satoriz-thonon-anthy.yml
deleted file mode 100644
index 6006b4e9b..000000000
--- a/data/cities/anthy-sur-leman/satoriz-thonon-anthy.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1117836250
-type: way
-latitude: 46.35204
-longitude: 6.43486
-postcode: "74200"
-city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Nord"
-housenumber: 14
-phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
diff --git a/data/cities/anthy-sur-leman/satoriz.yml b/data/cities/anthy-sur-leman/satoriz.yml
new file mode 100644
index 000000000..ba2ea7511
--- /dev/null
+++ b/data/cities/anthy-sur-leman/satoriz.yml
@@ -0,0 +1,11 @@
+id: 1117836250
+type: node
+latitude: 46.35204
+longitude: 6.43486
+postcode: "74200"
+city: Anthy-sur-Léman
+street: Avenue du Pré Robert Nord
+housenumber: "14"
+phone: ""
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/anthy-sur-leman/schmidt.yml b/data/cities/anthy-sur-leman/schmidt.yml
index 35de7071e..a7b91ada8 100644
--- a/data/cities/anthy-sur-leman/schmidt.yml
+++ b/data/cities/anthy-sur-leman/schmidt.yml
@@ -1,11 +1,11 @@
 id: 1121163996
-type: way
+type: node
 latitude: 46.34986
 longitude: 6.43711
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 12
+street: Boulevard du Pré Biollat
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-18:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/socooc.yml b/data/cities/anthy-sur-leman/socooc.yml
index 76669fdd7..6b5615f32 100644
--- a/data/cities/anthy-sur-leman/socooc.yml
+++ b/data/cities/anthy-sur-leman/socooc.yml
@@ -4,8 +4,8 @@ latitude: 46.35079
 longitude: 6.43652
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 17
-phone: "+33 4 82 75 10 78"
-opening_hours: "Mo-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-19:00; Su off"
-website: "https://www.socooc.com/magasin/socooc-thonon-les-bains"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "17"
+phone: +33 4 82 75 10 78
+opening_hours: Mo-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-19:00; Su off
+website: https://www.socooc.com/magasin/socooc-thonon-les-bains
diff --git a/data/cities/anthy-sur-leman/sport-2000.yml b/data/cities/anthy-sur-leman/sport-2000.yml
index c2dcb124e..0880d5167 100644
--- a/data/cities/anthy-sur-leman/sport-2000.yml
+++ b/data/cities/anthy-sur-leman/sport-2000.yml
@@ -1,11 +1,11 @@
 id: 69005377
-type: way
+type: node
 latitude: 46.34783
 longitude: 6.43378
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 17
+street: Boulevard du Pré Biollat
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/stokomani.yml b/data/cities/anthy-sur-leman/stokomani.yml
index 57ec9d1c2..7574eb536 100644
--- a/data/cities/anthy-sur-leman/stokomani.yml
+++ b/data/cities/anthy-sur-leman/stokomani.yml
@@ -1,11 +1,11 @@
 id: 69004277
-type: way
+type: node
 latitude: 46.35005
 longitude: 6.43614
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 21
+street: Avenue du Pré Robert Sud
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/anthy-sur-leman/stosa.yml b/data/cities/anthy-sur-leman/stosa.yml
index 6ff6efa9c..d285b1fd6 100644
--- a/data/cities/anthy-sur-leman/stosa.yml
+++ b/data/cities/anthy-sur-leman/stosa.yml
@@ -1,11 +1,11 @@
 id: 1120152210
-type: way
+type: node
 latitude: 46.34827
 longitude: 6.43507
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 15
+street: Boulevard du Pré Biollat
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30,14:00-18:30; Sa 09:30-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30,14:00-18:30; Sa 09:30-18:30; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/terre-de-running.yml b/data/cities/anthy-sur-leman/terre-de-running.yml
index cad3f0851..b648a73dc 100644
--- a/data/cities/anthy-sur-leman/terre-de-running.yml
+++ b/data/cities/anthy-sur-leman/terre-de-running.yml
@@ -1,11 +1,11 @@
 id: 1120152211
-type: way
+type: node
 latitude: 46.34824
 longitude: 6.43498
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Boulevard du Pré Biollat"
-housenumber: 15
+street: Boulevard du Pré Biollat
+housenumber: "15"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/anthy-sur-leman/un-jour-une-fete.yml b/data/cities/anthy-sur-leman/un-jour-une-fete.yml
index 85ca54aec..cc9c1bf25 100644
--- a/data/cities/anthy-sur-leman/un-jour-une-fete.yml
+++ b/data/cities/anthy-sur-leman/un-jour-une-fete.yml
@@ -4,8 +4,9 @@ latitude: 46.35044
 longitude: 6.437
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 19
-phone: "+33 4 50 81 28 84"
-opening_hours: "Mo 14:00-18:00; Tu-Fr 10:00-12:30,14:30-18:00; Sa 10:00-12:30,14:00-18:00; Su off"
-website: "https://www.unjourunefete.fr"
\ No newline at end of file
+street: Avenue du Pré Robert Sud
+housenumber: "19"
+phone: +33 4 50 81 28 84
+opening_hours: Mo 14:00-18:00; Tu-Fr 10:00-12:30,14:30-18:00; Sa 10:00-12:30,14:00-18:00;
+    Su off
+website: https://www.unjourunefete.fr
diff --git a/data/cities/anthy-sur-leman/v-and-b.yml b/data/cities/anthy-sur-leman/v-and-b.yml
new file mode 100644
index 000000000..c8a0206ba
--- /dev/null
+++ b/data/cities/anthy-sur-leman/v-and-b.yml
@@ -0,0 +1,12 @@
+id: 6828270495
+type: node
+latitude: 46.3506
+longitude: 6.43682
+postcode: "74200"
+city: Anthy-sur-Léman
+street: Avenue du Pré Robert Sud
+housenumber: "19"
+phone: +33 4 50 26 11 56
+opening_hours: Mo 14:00-20:00; Tu-We 10:00-13:00,14:00-20:00; Th 10:00-13:00,14:00-21:00;
+    Fr-Sa 10:00-21:00 ; Su off
+website: https://vandb.fr/v-and-b-thonon-les-bains.html
diff --git a/data/cities/anthy-sur-leman/veran-musiques.yml b/data/cities/anthy-sur-leman/veran-musiques.yml
index b78c81ef8..8015e86e0 100644
--- a/data/cities/anthy-sur-leman/veran-musiques.yml
+++ b/data/cities/anthy-sur-leman/veran-musiques.yml
@@ -4,8 +4,8 @@ latitude: 46.35334
 longitude: 6.44116
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route du Champ du Puits"
-housenumber: 5
+street: Route du Champ du Puits
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Sa 10:00-19:00; Su,Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:00; Su,Mo off
+website: ""
diff --git a/data/cities/anthy-sur-leman/vetb.yml b/data/cities/anthy-sur-leman/vetb.yml
deleted file mode 100644
index f5edcc92d..000000000
--- a/data/cities/anthy-sur-leman/vetb.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6828270495
-type: node
-latitude: 46.3506
-longitude: 6.43682
-postcode: "74200"
-city: Anthy-sur-Léman
-street: "Avenue du Pré Robert Sud"
-housenumber: 19
-phone: "+33 4 50 26 11 56"
-opening_hours: "Mo 14:00-20:00; Tu-We 10:00-13:00,14:00-20:00; Th 10:00-13:00,14:00-21:00; Fr-Sa 10:00-21:00 ; Su off"
-website: "https://vandb.fr/v-and-b-thonon-les-bains.html"
\ No newline at end of file
diff --git a/data/cities/anthy-sur-leman/yesss-electrique.yml b/data/cities/anthy-sur-leman/yesss-electrique.yml
index 7ae2fa2f4..408c6dfa7 100644
--- a/data/cities/anthy-sur-leman/yesss-electrique.yml
+++ b/data/cities/anthy-sur-leman/yesss-electrique.yml
@@ -1,11 +1,11 @@
 id: 69004789
-type: way
+type: node
 latitude: 46.35307
 longitude: 6.44039
 postcode: "74200"
 city: Anthy-sur-Léman
-street: "Route du Champ du Puits"
-housenumber: 3
+street: Route du Champ du Puits
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Th 07:30-12:00,13:30-17:30; Fr 07:30-12:00,13:30-17:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:30-12:00,13:30-17:30; Fr 07:30-12:00,13:30-17:00; Sa-Su off
+website: ""
diff --git a/data/cities/aoste/bricomarche.yml b/data/cities/aoste/bricomarche.yml
index 4908b6ec3..737036c8c 100644
--- a/data/cities/aoste/bricomarche.yml
+++ b/data/cities/aoste/bricomarche.yml
@@ -1,11 +1,11 @@
 id: 539799353
-type: way
+type: node
 latitude: 45.59435
 longitude: 5.60927
 postcode: "38490"
 city: Aoste
-street: "Route de Belley"
-housenumber: 
+street: Route de Belley
+housenumber: ""
 phone: "+33476371075"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.bricomarche.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.bricomarche.com/
diff --git a/data/cities/aoste/de-lart-et-du-cochon.yml b/data/cities/aoste/de-lart-et-du-cochon.yml
index 429b7131c..80e643d62 100644
--- a/data/cities/aoste/de-lart-et-du-cochon.yml
+++ b/data/cities/aoste/de-lart-et-du-cochon.yml
@@ -4,8 +4,8 @@ latitude: 45.58721
 longitude: 5.60699
 postcode: "38490"
 city: Aoste
-street: "Rue Clément Gondrand"
-housenumber: 95
+street: Rue Clément Gondrand
+housenumber: "95"
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30, 15:00-19:00
+website: ""
diff --git a/data/cities/aoste/gamm-vert.yml b/data/cities/aoste/gamm-vert.yml
index 8f6ddc0ff..673b64186 100644
--- a/data/cities/aoste/gamm-vert.yml
+++ b/data/cities/aoste/gamm-vert.yml
@@ -1,11 +1,11 @@
 id: 1148425918
-type: way
+type: node
 latitude: 45.59515
 longitude: 5.60823
 postcode: "38490"
 city: Aoste
-street: "Rue Athéna"
-housenumber: 
+street: Rue Athéna
+housenumber: ""
 phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:30,14:00-19:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/aoste/le-jardin-des-lys.yml b/data/cities/aoste/le-jardin-des-lys.yml
index 779bb7b5c..3a3087476 100644
--- a/data/cities/aoste/le-jardin-des-lys.yml
+++ b/data/cities/aoste/le-jardin-des-lys.yml
@@ -4,8 +4,8 @@ latitude: 45.58682
 longitude: 5.60712
 postcode: "38490"
 city: Aoste
-street: "Rue Clément Gondrand"
-housenumber: 95
-phone: "+33 476 31 06 47"
+street: Rue Clément Gondrand
+housenumber: "95"
+phone: +33 476 31 06 47
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aoste/le-parfum-du-ble.yml b/data/cities/aoste/le-parfum-du-ble.yml
index 9c5789887..6426456b2 100644
--- a/data/cities/aoste/le-parfum-du-ble.yml
+++ b/data/cities/aoste/le-parfum-du-ble.yml
@@ -4,8 +4,8 @@ latitude: 45.59713
 longitude: 5.62864
 postcode: "38490"
 city: Aoste
-street: "Rue de la Chapelière"
-housenumber: 
+street: Rue de la Chapelière
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:00; Su 06:00-13:00"
-website: "https://www.leparfumduble.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:00; Su 06:00-13:00
+website: https://www.leparfumduble.fr/
diff --git a/data/cities/aoste/optik.yml b/data/cities/aoste/optik.yml
index 9a05e3995..91268fab1 100644
--- a/data/cities/aoste/optik.yml
+++ b/data/cities/aoste/optik.yml
@@ -4,8 +4,8 @@ latitude: 45.59404
 longitude: 5.60842
 postcode: "38490"
 city: Aoste
-street: "Route de Belley"
-housenumber: 
-phone: "04 76 93 78 61"
-opening_hours: ""
-website: ""
\ No newline at end of file
+street: Route de Belley
+housenumber: ""
+phone: 04 76 93 78 61
+opening_hours: Mo-Sa 09:30-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/aoste/peugeot-sarl-garage-lauzier.yml b/data/cities/aoste/peugeot-sarl-garage-lauzier.yml
index 2a2d1753f..012ce1479 100644
--- a/data/cities/aoste/peugeot-sarl-garage-lauzier.yml
+++ b/data/cities/aoste/peugeot-sarl-garage-lauzier.yml
@@ -4,8 +4,8 @@ latitude: 45.58371
 longitude: 5.60673
 postcode: "38490"
 city: Aoste
-street: "Route de Grenoble"
-housenumber: 84
-phone: "04 76 31 67 49"
-opening_hours: "Mo-Fr 08:00-12:00 13:30-18:30 Sa 8:00-12:00"
-website: "https://concessions.peugeot.fr/aoste/"
\ No newline at end of file
+street: Route de Grenoble
+housenumber: "84"
+phone: 04 76 31 67 49
+opening_hours: Mo-Fr 08:00-12:00 13:30-18:30 Sa 8:00-12:00
+website: https://concessions.peugeot.fr/aoste/
diff --git a/data/cities/araches-la-frasse/le-petit-casino.yml b/data/cities/araches-la-frasse/le-petit-casino.yml
index d9a7025f7..83e29756e 100644
--- a/data/cities/araches-la-frasse/le-petit-casino.yml
+++ b/data/cities/araches-la-frasse/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.02549
 longitude: 6.63734
 postcode: "74300"
 city: Arâches-la-Frasse
-street: "Route du Serveray"
-housenumber: 
+street: Route du Serveray
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-13:00, Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-13:00, Su off
+website: ""
diff --git a/data/cities/araches-la-frasse/sherpa.yml b/data/cities/araches-la-frasse/sherpa.yml
index e55d7309d..fb1aa9920 100644
--- a/data/cities/araches-la-frasse/sherpa.yml
+++ b/data/cities/araches-la-frasse/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 46.00533
 longitude: 6.69434
 postcode: "74300"
 city: Arâches-la-Frasse
-street: "Route de desserte de Flaine Forum"
-housenumber: 
+street: Route de desserte de Flaine Forum
+housenumber: ""
 phone: ""
-opening_hours: "Dec 02-May 09 Mo-Sa 08:00-13:00, Su off; Jul 04-Aug 30 Mo-Su 07:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Dec 02-May 09 Mo-Sa 08:00-13:00, Su off; Jul 04-Aug 30 Mo-Su 07:00-19:30
+website: ""
diff --git a/data/cities/araches-la-frasse/skiset-general-sport.yml b/data/cities/araches-la-frasse/skiset-general-sport.yml
index 45bb05c0e..327b02c5b 100644
--- a/data/cities/araches-la-frasse/skiset-general-sport.yml
+++ b/data/cities/araches-la-frasse/skiset-general-sport.yml
@@ -4,8 +4,9 @@ latitude: 46.00747
 longitude: 6.67532
 postcode: "74300"
 city: Arâches-la-Frasse
-street: "Route de Flaine"
-housenumber: 
+street: Route de Flaine
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 08:30-12:30,14:00-19:00; Fr 08:30-13:00,14:00-19:00; Sa 08:30-19:30; Su 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:30,14:00-19:00; Fr 08:30-13:00,14:00-19:00; Sa 08:30-19:30;
+    Su 08:00-19:00
+website: ""
diff --git a/data/cities/araches-la-frasse/spar-route-de-desserte-de-flaine-foret.yml b/data/cities/araches-la-frasse/spar-route-de-desserte-de-flaine-foret.yml
index 65f78e476..171356e64 100644
--- a/data/cities/araches-la-frasse/spar-route-de-desserte-de-flaine-foret.yml
+++ b/data/cities/araches-la-frasse/spar-route-de-desserte-de-flaine-foret.yml
@@ -4,8 +4,8 @@ latitude: 46.00727
 longitude: 6.6904
 postcode: "74300"
 city: Arâches-la-Frasse
-street: "Route de Desserte de Flaine Forêt"
-housenumber: 
+street: Route de Desserte de Flaine Forêt
+housenumber: ""
 phone: ""
-opening_hours: "Mo 08:30-12:00, 13:00-19:30; Tu-Su 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 08:30-12:00, 13:00-19:30; Tu-Su 08:30-19:30
+website: ""
diff --git a/data/cities/araches-la-frasse/spar-route-de-la-barliette.yml b/data/cities/araches-la-frasse/spar-route-de-la-barliette.yml
index e5b9e6699..ff40a5b20 100644
--- a/data/cities/araches-la-frasse/spar-route-de-la-barliette.yml
+++ b/data/cities/araches-la-frasse/spar-route-de-la-barliette.yml
@@ -1,11 +1,11 @@
 id: 815248803
-type: way
+type: node
 latitude: 46.03335
 longitude: 6.63681
 postcode: "74300"
 city: Arâches-la-Frasse
-street: "Route de la Barliette"
-housenumber: 2249
-phone: "+33 4 50 53 52 41"
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+street: Route de la Barliette
+housenumber: "2249"
+phone: +33 4 50 53 52 41
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/araches-la-frasse/spar.yml b/data/cities/araches-la-frasse/spar.yml
index 50f32bbd6..df1e1fffa 100644
--- a/data/cities/araches-la-frasse/spar.yml
+++ b/data/cities/araches-la-frasse/spar.yml
@@ -4,8 +4,8 @@ latitude: 46.00903
 longitude: 6.67979
 postcode: "74300"
 city: Arâches-la-Frasse
-street: "Route de Flaine"
-housenumber: 
+street: Route de Flaine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arbent/brin-de-paille.yml b/data/cities/arbent/brin-de-paille.yml
index 70a5a7f6d..7469c8359 100644
--- a/data/cities/arbent/brin-de-paille.yml
+++ b/data/cities/arbent/brin-de-paille.yml
@@ -4,8 +4,8 @@ latitude: 46.28281
 longitude: 5.67915
 postcode: "01100"
 city: Arbent
-street: "Avenue du Général Andréa"
-housenumber: 1080
-phone: "+33 4 74 73 07 86"
+street: Avenue du Général Andréa
+housenumber: "1080"
+phone: +33 4 74 73 07 86
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arbent/midas.yml b/data/cities/arbent/midas.yml
index 2734a7244..e1b7761d5 100644
--- a/data/cities/arbent/midas.yml
+++ b/data/cities/arbent/midas.yml
@@ -1,11 +1,11 @@
 id: 246936553
-type: way
+type: node
 latitude: 46.28169
 longitude: 5.66142
 postcode: "01100"
 city: Arbent
-street: "Avenue Jean Coutty"
-housenumber: 395
-phone: "+33 4 74 12 99 56"
+street: Avenue Jean Coutty
+housenumber: "395"
+phone: +33 4 74 12 99 56
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/arbent/thiriet.yml b/data/cities/arbent/thiriet.yml
index 99d3a36c6..5e1f65107 100644
--- a/data/cities/arbent/thiriet.yml
+++ b/data/cities/arbent/thiriet.yml
@@ -1,11 +1,11 @@
 id: 246934477
-type: way
+type: node
 latitude: 46.27537
 longitude: 5.65986
 postcode: "01100"
 city: Arbent
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arbin/emmaus-le-525-frip.yml b/data/cities/arbin/emmaus-le-525-frip.yml
index acc79aa61..470e4c124 100644
--- a/data/cities/arbin/emmaus-le-525-frip.yml
+++ b/data/cities/arbin/emmaus-le-525-frip.yml
@@ -4,8 +4,8 @@ latitude: 45.50678
 longitude: 6.07377
 postcode: "73800"
 city: Arbin
-street: "Rue de La Déserte"
-housenumber: 525
-phone: "+33 4 79 79 98 01"
-opening_hours: "Tu,Sa 10:30-18:00"
-website: "https://www.emmaus73.fr/lieux-et-horaires/"
\ No newline at end of file
+street: Rue de La Déserte
+housenumber: "525"
+phone: +33 4 79 79 98 01
+opening_hours: Tu,Sa 10:30-18:00
+website: https://www.emmaus73.fr/lieux-et-horaires/
diff --git a/data/cities/arbusigny/arbu-services.yml b/data/cities/arbusigny/arbu-services.yml
index 37e935014..d7c8938b0 100644
--- a/data/cities/arbusigny/arbu-services.yml
+++ b/data/cities/arbusigny/arbu-services.yml
@@ -4,8 +4,8 @@ latitude: 46.09157
 longitude: 6.21879
 postcode: "74930"
 city: Arbusigny
-street: "Route de Pers-Jussy"
-housenumber: 19
-phone: "+33 4 56 81 49 89;+33 6 88 01 18 18"
+street: Route de Pers-Jussy
+housenumber: "19"
+phone: +33 4 56 81 49 89;+33 6 88 01 18 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arc-1600/netski-arc-1600.yml b/data/cities/arc-1600/netski-arc-1600.yml
index 8a768a622..0076f5356 100644
--- a/data/cities/arc-1600/netski-arc-1600.yml
+++ b/data/cities/arc-1600/netski-arc-1600.yml
@@ -5,7 +5,7 @@ longitude: 6.7988
 postcode: "73700"
 city: Arc 1600
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arc-1600/precision-ski.yml b/data/cities/arc-1600/precision-ski.yml
index 586b2a881..9403a5582 100644
--- a/data/cities/arc-1600/precision-ski.yml
+++ b/data/cities/arc-1600/precision-ski.yml
@@ -5,7 +5,7 @@ longitude: 6.79418
 postcode: "73700"
 city: Arc 1600
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arc-1600/ski-service.yml b/data/cities/arc-1600/ski-service.yml
index c2b6b494c..1b2433d35 100644
--- a/data/cities/arc-1600/ski-service.yml
+++ b/data/cities/arc-1600/ski-service.yml
@@ -5,7 +5,7 @@ longitude: 6.79517
 postcode: "73700"
 city: Arc 1600
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arc-1800/precision-ski.yml b/data/cities/arc-1800/precision-ski.yml
index f72fb0bfc..108eb3a1f 100644
--- a/data/cities/arc-1800/precision-ski.yml
+++ b/data/cities/arc-1800/precision-ski.yml
@@ -4,8 +4,8 @@ latitude: 45.57635
 longitude: 6.78118
 postcode: "73700"
 city: Arc 1800
-street: "Galerie Pierre Menta"
-housenumber: 
+street: Galerie Pierre Menta
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/archamps/dodo-coiff.yml b/data/cities/archamps/dodo-coiff.yml
index 47fc97e4b..7d28ebb5d 100644
--- a/data/cities/archamps/dodo-coiff.yml
+++ b/data/cities/archamps/dodo-coiff.yml
@@ -4,8 +4,8 @@ latitude: 46.13699
 longitude: 6.12739
 postcode: "74160"
 city: Archamps
-street: "Route d'Annecy"
-housenumber: 196
+street: Route d'Annecy
+housenumber: "196"
 phone: ""
-opening_hours: "09:00-19:00"
-website: "http://dodocoiff.e-monsite.com/"
\ No newline at end of file
+opening_hours: 09:00-19:00
+website: http://dodocoiff.e-monsite.com/
diff --git a/data/cities/arcs-1800/precision-ski-edenarc-le-chantel.yml b/data/cities/arcs-1800/precision-ski-edenarc-le-chantel.yml
index 8293259d9..a51dd8e1e 100644
--- a/data/cities/arcs-1800/precision-ski-edenarc-le-chantel.yml
+++ b/data/cities/arcs-1800/precision-ski-edenarc-le-chantel.yml
@@ -4,8 +4,8 @@ latitude: 45.57369
 longitude: 6.78607
 postcode: "73700"
 city: Arcs 1800
-street: "Edenarc Le Chantel"
-housenumber: 
+street: Edenarc Le Chantel
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 09:30-13:00, 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:30-13:00, 14:30-19:00
+website: ""
diff --git a/data/cities/arcs-1800/precision-ski.yml b/data/cities/arcs-1800/precision-ski.yml
index 5bf769785..4eb261ce6 100644
--- a/data/cities/arcs-1800/precision-ski.yml
+++ b/data/cities/arcs-1800/precision-ski.yml
@@ -5,7 +5,7 @@ longitude: 6.7774
 postcode: "73700"
 city: Arcs 1800
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/areche-beaufort/sport-2000.yml b/data/cities/areche-beaufort/sport-2000.yml
index 9409c38eb..53003456b 100644
--- a/data/cities/areche-beaufort/sport-2000.yml
+++ b/data/cities/areche-beaufort/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.68671
 longitude: 6.5688
 postcode: "73270"
 city: Arêche Beaufort
-street: "Place de l'Église"
-housenumber: 
+street: Place de l'Église
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arenthon/vente-a-la-ferme-gaec-chez-coutard.yml b/data/cities/arenthon/vente-a-la-ferme-gaec-chez-coutard.yml
index cdbbc6565..3f7da658a 100644
--- a/data/cities/arenthon/vente-a-la-ferme-gaec-chez-coutard.yml
+++ b/data/cities/arenthon/vente-a-la-ferme-gaec-chez-coutard.yml
@@ -1,11 +1,11 @@
 id: 1226792646
-type: way
+type: node
 latitude: 46.10055
 longitude: 6.33786
 postcode: "74800"
 city: Arenthon
-street: "Route de Bonneville"
-housenumber: 656
+street: Route de Bonneville
+housenumber: "656"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/argentiere/hurycana-sport.yml b/data/cities/argentiere/hurycana-sport.yml
index 5108db4ff..7e3347606 100644
--- a/data/cities/argentiere/hurycana-sport.yml
+++ b/data/cities/argentiere/hurycana-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.97262
 longitude: 6.91895
 postcode: "74400"
 city: Argentière
-street: "Route d'Argentière"
-housenumber: 1850
+street: Route d'Argentière
+housenumber: "1850"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/argentiere/marche-u.yml b/data/cities/argentiere/marche-u.yml
index ae248287e..253cc09df 100644
--- a/data/cities/argentiere/marche-u.yml
+++ b/data/cities/argentiere/marche-u.yml
@@ -4,8 +4,8 @@ latitude: 45.98458
 longitude: 6.92732
 postcode: "74400"
 city: Argentière
-street: "Place du Marché"
-housenumber: 39
+street: Place du Marché
+housenumber: "39"
 phone: "+33450540597"
-opening_hours: "Mo-Sa 08:00-19:30; Su 08:30-12:30"
-website: "https://www.magasins-u.com/magasin/marcheu-argentieres"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30; Su 08:30-12:30
+website: https://www.magasins-u.com/magasin/marcheu-argentieres
diff --git a/data/cities/argentiere/namaste-sports.yml b/data/cities/argentiere/namaste-sports.yml
index e9ae6dfb3..4d69fd4b3 100644
--- a/data/cities/argentiere/namaste-sports.yml
+++ b/data/cities/argentiere/namaste-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.98284
 longitude: 6.92618
 postcode: "74400"
 city: Argentière
-street: "Rue Charlet Straton"
-housenumber: 141
+street: Rue Charlet Straton
+housenumber: "141"
 phone: ""
-opening_hours: "Mo-Su 09:00-12:00,15:00-19:00"
-website: "https://www.namastesport.com"
\ No newline at end of file
+opening_hours: Mo-Su 09:00-12:00,15:00-19:00
+website: https://www.namastesport.com
diff --git a/data/cities/argonay/les-granges-les-granges.yml b/data/cities/argonay/les-granges-les-granges.yml
index e491c7e45..2ed049e58 100644
--- a/data/cities/argonay/les-granges-les-granges.yml
+++ b/data/cities/argonay/les-granges-les-granges.yml
@@ -1,11 +1,11 @@
 id: 62518353
-type: way
+type: node
 latitude: 45.94003
 longitude: 6.13629
 postcode: "74370"
 city: Argonay
-street: "les Granges"
-housenumber: 
+street: les Granges
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/argonay/les-granges.yml b/data/cities/argonay/les-granges.yml
index 542341a3a..beffd1eff 100644
--- a/data/cities/argonay/les-granges.yml
+++ b/data/cities/argonay/les-granges.yml
@@ -1,11 +1,11 @@
 id: 62517459
-type: way
+type: node
 latitude: 45.94015
 longitude: 6.13651
 postcode: "74370"
 city: Argonay
-street: "les Granges"
-housenumber: 
+street: les Granges
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arlebosc/la-paline.yml b/data/cities/arlebosc/la-paline.yml
index 0b89f47df..bd5aef875 100644
--- a/data/cities/arlebosc/la-paline.yml
+++ b/data/cities/arlebosc/la-paline.yml
@@ -5,7 +5,7 @@ longitude: 4.65222
 postcode: ""
 city: Arlebosc
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/armoy/chez-deville-route-darmoy.yml b/data/cities/armoy/chez-deville-route-darmoy.yml
index ab9382ae0..76da7bcd2 100644
--- a/data/cities/armoy/chez-deville-route-darmoy.yml
+++ b/data/cities/armoy/chez-deville-route-darmoy.yml
@@ -1,11 +1,11 @@
 id: 69490889
-type: way
+type: node
 latitude: 46.34802
 longitude: 6.51986
 postcode: "74200"
 city: Armoy
-street: "Route d'Armoy"
-housenumber: 3574
+street: Route d'Armoy
+housenumber: "3574"
 phone: ""
-opening_hours: "Tu-Sa 06:30-12:30,15:00-19:00; Su 06:30-12:30; Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:30-12:30,15:00-19:00; Su 06:30-12:30; Mo off
+website: ""
diff --git a/data/cities/armoy/chez-deville.yml b/data/cities/armoy/chez-deville.yml
index 723cb86b7..89a10174b 100644
--- a/data/cities/armoy/chez-deville.yml
+++ b/data/cities/armoy/chez-deville.yml
@@ -4,8 +4,8 @@ latitude: 46.34811
 longitude: 6.51991
 postcode: "74200"
 city: Armoy
-street: "Route d'Armoy"
-housenumber: 3574
+street: Route d'Armoy
+housenumber: "3574"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/armoy/les-pepinieres-de-lermitage.yml b/data/cities/armoy/les-pepinieres-de-lermitage.yml
index d9f70a912..92e6e5712 100644
--- a/data/cities/armoy/les-pepinieres-de-lermitage.yml
+++ b/data/cities/armoy/les-pepinieres-de-lermitage.yml
@@ -1,11 +1,11 @@
 id: 69490388
-type: way
+type: node
 latitude: 46.35419
 longitude: 6.49689
 postcode: "74200"
 city: Armoy
-street: "Route de l'Ermitage"
-housenumber: 625
-phone: "+33 4 50 70 52 96"
+street: Route de l'Ermitage
+housenumber: "625"
+phone: +33 4 50 70 52 96
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/armoy/vival.yml b/data/cities/armoy/vival.yml
index 6eabef7fb..2d71e2794 100644
--- a/data/cities/armoy/vival.yml
+++ b/data/cities/armoy/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.3481
 longitude: 6.52053
 postcode: "74200"
 city: Armoy
-street: "Route d'Armoy"
-housenumber: 
+street: Route d'Armoy
+housenumber: ""
 phone: ""
-opening_hours: "Mo off; Tu-Sa 07:30-12:30, 15:00-19:00; Su 07:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 07:30-12:30, 15:00-19:00; Su 07:30-12:00
+website: ""
diff --git a/data/cities/arnas/futureland.yml b/data/cities/arnas/futureland.yml
index a047ef42f..5b96b3277 100644
--- a/data/cities/arnas/futureland.yml
+++ b/data/cities/arnas/futureland.yml
@@ -4,8 +4,8 @@ latitude: 46.01574
 longitude: 4.72489
 postcode: "69400"
 city: Arnas
-street: "Rue des Pépinières"
-housenumber: 118
+street: Rue des Pépinières
+housenumber: "118"
 phone: ""
 opening_hours: ""
-website: "https://www.futureland.fr/"
\ No newline at end of file
+website: https://www.futureland.fr/
diff --git a/data/cities/arnas/pompes-services.yml b/data/cities/arnas/pompes-services.yml
index 66d55d9b3..b61368e99 100644
--- a/data/cities/arnas/pompes-services.yml
+++ b/data/cities/arnas/pompes-services.yml
@@ -4,8 +4,8 @@ latitude: 46.01603
 longitude: 4.72407
 postcode: "69400"
 city: Arnas
-street: "Impasse de Chavanne"
-housenumber: 160
+street: Impasse de Chavanne
+housenumber: "160"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/arnas/sefimag.yml b/data/cities/arnas/sefimag.yml
index ea6470fe8..2915c7293 100644
--- a/data/cities/arnas/sefimag.yml
+++ b/data/cities/arnas/sefimag.yml
@@ -4,8 +4,8 @@ latitude: 46.01601
 longitude: 4.72413
 postcode: "69400"
 city: Arnas
-street: "Impasse de Chavanne"
-housenumber: 160
+street: Impasse de Chavanne
+housenumber: "160"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ars-sur-formans/slabbinck-france-sarl.yml b/data/cities/ars-sur-formans/slabbinck-france-sarl.yml
index 777adf39e..96bc7ada0 100644
--- a/data/cities/ars-sur-formans/slabbinck-france-sarl.yml
+++ b/data/cities/ars-sur-formans/slabbinck-france-sarl.yml
@@ -4,8 +4,8 @@ latitude: 45.99302
 longitude: 4.82135
 postcode: "01480"
 city: Ars-sur-Formans
-street: "Rue Jean-Marie Vianney"
-housenumber: 330
+street: Rue Jean-Marie Vianney
+housenumber: "330"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/artas/atelier-beaute.yml b/data/cities/artas/atelier-beaute.yml
index 55c5d7fc6..abd54e529 100644
--- a/data/cities/artas/atelier-beaute.yml
+++ b/data/cities/artas/atelier-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.534
 longitude: 5.16648
 postcode: "38440"
 city: Artas
-street: "Le Grand Chemin"
-housenumber: 208
-phone: "+33 6 89 86 38 37"
+street: Le Grand Chemin
+housenumber: "208"
+phone: +33 6 89 86 38 37
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/artas/boucherie-charcuterie-gerin.yml b/data/cities/artas/boucherie-charcuterie-gerin.yml
index f841f0191..dc5ff4620 100644
--- a/data/cities/artas/boucherie-charcuterie-gerin.yml
+++ b/data/cities/artas/boucherie-charcuterie-gerin.yml
@@ -4,8 +4,8 @@ latitude: 45.53512
 longitude: 5.16463
 postcode: "38440"
 city: Artas
-street: "Rue du Centre"
-housenumber: 106
-phone: "+33 4 74 58 70 51"
+street: Rue du Centre
+housenumber: "106"
+phone: +33 4 74 58 70 51
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/artas/boulangerie-patisserie-aux-ptits.yml b/data/cities/artas/boulangerie-patisserie-aux-ptits.yml
index d0e5c186e..fd7f6baeb 100644
--- a/data/cities/artas/boulangerie-patisserie-aux-ptits.yml
+++ b/data/cities/artas/boulangerie-patisserie-aux-ptits.yml
@@ -4,8 +4,8 @@ latitude: 45.53543
 longitude: 5.16478
 postcode: "38440"
 city: Artas
-street: "Rue du Centre"
-housenumber: 60
-phone: "+33 4 74 53 29 80"
+street: Rue du Centre
+housenumber: "60"
+phone: +33 4 74 53 29 80
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/artas/coiffure-dartas.yml b/data/cities/artas/coiffure-dartas.yml
index 0941f4079..3b1ccbed6 100644
--- a/data/cities/artas/coiffure-dartas.yml
+++ b/data/cities/artas/coiffure-dartas.yml
@@ -4,8 +4,8 @@ latitude: 45.53676
 longitude: 5.16495
 postcode: "38440"
 city: Artas
-street: "Rue du Métras"
-housenumber: 
-phone: "+33 4 74 58 50 89"
+street: Rue du Métras
+housenumber: ""
+phone: +33 4 74 58 50 89
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/artas/nouvel-hair-coiffure.yml b/data/cities/artas/nouvel-hair-coiffure.yml
index b3a8a21f4..97715b265 100644
--- a/data/cities/artas/nouvel-hair-coiffure.yml
+++ b/data/cities/artas/nouvel-hair-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.53549
 longitude: 5.16401
 postcode: "38440"
 city: Artas
-street: "Rue des Guinières"
-housenumber: 79
-phone: "+33 6 23 96 90 73"
+street: Rue des Guinières
+housenumber: "79"
+phone: +33 6 23 96 90 73
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/artemare/lecoserie-epicerie-bio-local-vrac.yml b/data/cities/artemare/lecoserie-epicerie-bio-local-vrac.yml
index 2bea0f2e3..36c91434a 100644
--- a/data/cities/artemare/lecoserie-epicerie-bio-local-vrac.yml
+++ b/data/cities/artemare/lecoserie-epicerie-bio-local-vrac.yml
@@ -4,8 +4,9 @@ latitude: 45.87408
 longitude: 5.69256
 postcode: "01510"
 city: Artemare
-street: "Rue Neuve"
-housenumber: 10
+street: Rue Neuve
+housenumber: "10"
 phone: ""
-opening_hours: "Mo 14:30-19:00; Tu-Fr 09:00-13:00,14:30-19:00; Sa 09:00-18:00; Su,PH off"
-website: "https://lecoserie.coop/"
\ No newline at end of file
+opening_hours: Mo 14:30-19:00; Tu-Fr 09:00-13:00,14:30-19:00; Sa 09:00-18:00; Su,PH
+    off
+website: https://lecoserie.coop/
diff --git a/data/cities/arthaz-pont-notre-dame/patachou.yml b/data/cities/arthaz-pont-notre-dame/patachou.yml
index 560088bc0..accbf129b 100644
--- a/data/cities/arthaz-pont-notre-dame/patachou.yml
+++ b/data/cities/arthaz-pont-notre-dame/patachou.yml
@@ -4,8 +4,8 @@ latitude: 46.15906
 longitude: 6.2715
 postcode: "74380"
 city: Arthaz-Pont-Notre-Dame
-street: "Route de Reignier"
-housenumber: 510
-phone: "+33 4 50 36 05 87"
-opening_hours: "Lu-Sa 06:00-19:00; Di 06:00-13h00"
-website: ""
\ No newline at end of file
+street: Route de Reignier
+housenumber: "510"
+phone: +33 4 50 36 05 87
+opening_hours: Lu-Sa 06:00-19:00; Di 06:00-13h00
+website: ""
diff --git a/data/cities/aubenas/coccimarket.yml b/data/cities/aubenas/coccimarket.yml
index 83acdbd1a..7d1dfb07c 100644
--- a/data/cities/aubenas/coccimarket.yml
+++ b/data/cities/aubenas/coccimarket.yml
@@ -4,8 +4,8 @@ latitude: 44.61754
 longitude: 4.38938
 postcode: "07200"
 city: Aubenas
-street: "Boulevard Saint-Didier"
-housenumber: 4
+street: Boulevard Saint-Didier
+housenumber: "4"
 phone: "0475360937"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aubenas/le-radal.yml b/data/cities/aubenas/le-radal.yml
index c477bf76b..94d8bece9 100644
--- a/data/cities/aubenas/le-radal.yml
+++ b/data/cities/aubenas/le-radal.yml
@@ -4,8 +4,8 @@ latitude: 44.6195
 longitude: 4.39002
 postcode: "07200"
 city: Aubenas
-street: "Rue Radal"
-housenumber: 9
+street: Rue Radal
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aubenas/station-avia.yml b/data/cities/aubenas/station-avia.yml
index 65df658b2..7c50a8e31 100644
--- a/data/cities/aubenas/station-avia.yml
+++ b/data/cities/aubenas/station-avia.yml
@@ -5,7 +5,7 @@ longitude: 4.40634
 postcode: "07200"
 city: Aubenas
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/aubenas/tabac-matimo.yml b/data/cities/aubenas/tabac-matimo.yml
index f34c631c4..d144bc8fa 100644
--- a/data/cities/aubenas/tabac-matimo.yml
+++ b/data/cities/aubenas/tabac-matimo.yml
@@ -4,8 +4,8 @@ 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
+street: Boulevard Gambetta
+housenumber: "10"
+phone: +33 4 75 89 93 04
+opening_hours: Mo-Sa 07:30-19:00
+website: https://matimo07.com
diff --git a/data/cities/auberives-sur-varezes/alizee-coiffure.yml b/data/cities/auberives-sur-varezes/alizee-coiffure.yml
index 86effb800..a8b61ec81 100644
--- a/data/cities/auberives-sur-varezes/alizee-coiffure.yml
+++ b/data/cities/auberives-sur-varezes/alizee-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.81806
 postcode: ""
 city: Auberives-sur-Varèzes
 street: ""
-housenumber: 11
+housenumber: "11"
 phone: ""
-opening_hours: "Tu-Th 07:00-12:00,14:00-19:00; Fr 08:00-18:00; Sa 07:30-15:00"
-website: "https://www.planity.com/alizee-coiffure-38550-auberives-sur-vareze"
\ No newline at end of file
+opening_hours: Tu-Th 07:00-12:00,14:00-19:00; Fr 08:00-18:00; Sa 07:30-15:00
+website: https://www.planity.com/alizee-coiffure-38550-auberives-sur-vareze
diff --git a/data/cities/auris-en-oisans/vincent-sports-skiset.yml b/data/cities/auris-en-oisans/vincent-sports-skiset.yml
index 311865c4c..d56ab6c56 100644
--- a/data/cities/auris-en-oisans/vincent-sports-skiset.yml
+++ b/data/cities/auris-en-oisans/vincent-sports-skiset.yml
@@ -4,8 +4,8 @@ latitude: 45.05612
 longitude: 6.07754
 postcode: "38142"
 city: Auris en Oisans
-street: "Place des Orgières"
-housenumber: 10
-phone: "+33 4 76 80 06 36"
+street: Place des Orgières
+housenumber: "10"
+phone: +33 4 76 80 06 36
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/auris/intersport.yml b/data/cities/auris/intersport.yml
index cf9223b7f..eac5983ad 100644
--- a/data/cities/auris/intersport.yml
+++ b/data/cities/auris/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.05519
 longitude: 6.07712
 postcode: "38142"
 city: Auris
-street: "Place des Écriins"
-housenumber: 
+street: Place des Écriins
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aussois/fromagerie-cooperative-daussois.yml b/data/cities/aussois/fromagerie-cooperative-daussois.yml
index b837b0f8e..b122a6dc6 100644
--- a/data/cities/aussois/fromagerie-cooperative-daussois.yml
+++ b/data/cities/aussois/fromagerie-cooperative-daussois.yml
@@ -4,8 +4,8 @@ latitude: 45.2291
 longitude: 6.74141
 postcode: "73500"
 city: Aussois
-street: "Le Plan Champ"
-housenumber: 2
-phone: "+33 4 79 20 32 68"
-opening_hours: "Mo-Su,PH 09:00-12:15,15:00-19:00"
-website: "https://www.coophautemaurienne.fr/"
\ No newline at end of file
+street: Le Plan Champ
+housenumber: "2"
+phone: +33 4 79 20 32 68
+opening_hours: Mo-Su,PH 09:00-12:15,15:00-19:00
+website: https://www.coophautemaurienne.fr/
diff --git a/data/cities/aussois/go-sport-montagne-everest-sport-station.yml b/data/cities/aussois/go-sport-montagne-everest-sport-station.yml
index ae9aec8d0..ac1a761a1 100644
--- a/data/cities/aussois/go-sport-montagne-everest-sport-station.yml
+++ b/data/cities/aussois/go-sport-montagne-everest-sport-station.yml
@@ -4,8 +4,8 @@ latitude: 45.23197
 longitude: 6.74136
 postcode: "73500"
 city: Aussois
-street: "Route des Barrages"
-housenumber: 20
-phone: "+33 4 79 59 41 53"
-opening_hours: "Mo-Su 08:30-18:30"
-website: "https://gosportmontagne.com/location-de-ski/aussois/everest-sport"
\ No newline at end of file
+street: Route des Barrages
+housenumber: "20"
+phone: +33 4 79 59 41 53
+opening_hours: Mo-Su 08:30-18:30
+website: https://gosportmontagne.com/location-de-ski/aussois/everest-sport
diff --git a/data/cities/aussois/go-sport-montagne-everest-sport-village.yml b/data/cities/aussois/go-sport-montagne-everest-sport-village.yml
index 6bdd6d141..09d96caa5 100644
--- a/data/cities/aussois/go-sport-montagne-everest-sport-village.yml
+++ b/data/cities/aussois/go-sport-montagne-everest-sport-village.yml
@@ -4,8 +4,8 @@ latitude: 45.2297
 longitude: 6.74113
 postcode: "73500"
 city: Aussois
-street: "Rue d'en Haut"
-housenumber: 14
-phone: "+33 4 79 20 18 08"
-opening_hours: "Mo-Su 10:00-12:30,15:00-19:00"
-website: "https://gosportmontagne.com/location-de-ski/aussois/everest-sport"
\ No newline at end of file
+street: Rue d'en Haut
+housenumber: "14"
+phone: +33 4 79 20 18 08
+opening_hours: Mo-Su 10:00-12:30,15:00-19:00
+website: https://gosportmontagne.com/location-de-ski/aussois/everest-sport
diff --git a/data/cities/aussois/la-cave-du-pere-fressard.yml b/data/cities/aussois/la-cave-du-pere-fressard.yml
index f0eb17bb8..842db7606 100644
--- a/data/cities/aussois/la-cave-du-pere-fressard.yml
+++ b/data/cities/aussois/la-cave-du-pere-fressard.yml
@@ -4,8 +4,8 @@ latitude: 45.22823
 longitude: 6.74141
 postcode: "73500"
 city: Aussois
-street: "La Place"
-housenumber: 2
-phone: "+33 4 79 20 31 95"
+street: La Place
+housenumber: "2"
+phone: +33 4 79 20 31 95
 opening_hours: ""
-website: "https://www.lacaveduperefressard.com/"
\ No newline at end of file
+website: https://www.lacaveduperefressard.com/
diff --git a/data/cities/aussois/le-bout-de-pain.yml b/data/cities/aussois/le-bout-de-pain.yml
index 0f7eb7bcf..b71616420 100644
--- a/data/cities/aussois/le-bout-de-pain.yml
+++ b/data/cities/aussois/le-bout-de-pain.yml
@@ -1,11 +1,11 @@
 id: 98785516
-type: way
+type: node
 latitude: 45.2287
 longitude: 6.74192
 postcode: "73500"
 city: Aussois
-street: "Rue du Four"
-housenumber: 3
-phone: "+33 6 76 66 43 66"
-opening_hours: "Tu-Su 07:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue du Four
+housenumber: "3"
+phone: +33 6 76 66 43 66
+opening_hours: Tu-Su 07:00-12:00
+website: ""
diff --git a/data/cities/aussois/le-lutin-tabac-loto-souvenirs.yml b/data/cities/aussois/le-lutin-tabac-loto-souvenirs.yml
index 81c8f6725..e7e80ae32 100644
--- a/data/cities/aussois/le-lutin-tabac-loto-souvenirs.yml
+++ b/data/cities/aussois/le-lutin-tabac-loto-souvenirs.yml
@@ -4,8 +4,8 @@ latitude: 45.22919
 longitude: 6.74144
 postcode: "73500"
 city: Aussois
-street: "Le Plan Champ"
-housenumber: 4
-phone: "+33 4 79 20 32 10"
-opening_hours: "Mo 08:00-12:00,15:30-19:00; Tu-Sa 08:00-12:15,15:00-19:00; Su 08:30-12:00,17:00-19:00"
-website: ""
\ No newline at end of file
+street: Le Plan Champ
+housenumber: "4"
+phone: +33 4 79 20 32 10
+opening_hours: Mo 08:00-12:00,15:30-19:00; Tu-Sa 08:00-12:15,15:00-19:00; Su 08:30-12:00,17:00-19:00
+website: ""
diff --git a/data/cities/aussois/le-transalpain.yml b/data/cities/aussois/le-transalpain.yml
index cb2a88884..ee7f54297 100644
--- a/data/cities/aussois/le-transalpain.yml
+++ b/data/cities/aussois/le-transalpain.yml
@@ -4,8 +4,8 @@ latitude: 45.22995
 longitude: 6.74108
 postcode: "73500"
 city: Aussois
-street: "Rue d'en Haut"
-housenumber: 18
-phone: "+33 4 79 20 35 19"
-opening_hours: "High season Mo-Su 07:00-12:30, 15:00-19:00; Off-season Tu-Su 08:00-12:15"
-website: ""
\ No newline at end of file
+street: Rue d'en Haut
+housenumber: "18"
+phone: +33 4 79 20 35 19
+opening_hours: High season Mo-Su 07:00-12:30, 15:00-19:00; Off-season Tu-Su 08:00-12:15
+website: ""
diff --git a/data/cities/aussois/proxi.yml b/data/cities/aussois/proxi.yml
index 974bdd62d..907e0924c 100644
--- a/data/cities/aussois/proxi.yml
+++ b/data/cities/aussois/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.22983
 longitude: 6.74113
 postcode: "73500"
 city: Aussois
-street: "Rue d'en Haut"
-housenumber: 16
-phone: "+33 4 79 20 33 31"
-opening_hours: "Mo-Su 07:30-12:30; 15:00-19:00"
-website: "https://www.facebook.com/proxiaussois/"
\ No newline at end of file
+street: Rue d'en Haut
+housenumber: "16"
+phone: +33 4 79 20 33 31
+opening_hours: Mo-Su 07:30-12:30; 15:00-19:00
+website: https://www.facebook.com/proxiaussois/
diff --git a/data/cities/aussois/savoie-sports.yml b/data/cities/aussois/savoie-sports.yml
index 0929f72a6..606ca29d5 100644
--- a/data/cities/aussois/savoie-sports.yml
+++ b/data/cities/aussois/savoie-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.23151
 longitude: 6.7403
 postcode: "73500"
 city: Aussois
-street: "Route des Barrages"
-housenumber: 37
+street: Route des Barrages
+housenumber: "37"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aussois/un-petit-coin-ditalie.yml b/data/cities/aussois/un-petit-coin-ditalie.yml
index afd0eda6b..1da4221cd 100644
--- a/data/cities/aussois/un-petit-coin-ditalie.yml
+++ b/data/cities/aussois/un-petit-coin-ditalie.yml
@@ -4,8 +4,8 @@ latitude: 45.22841
 longitude: 6.74128
 postcode: "73500"
 city: Aussois
-street: "Rue d'en Haut"
-housenumber: 3
-phone: "+33 4 79 20 18 81"
+street: Rue d'en Haut
+housenumber: "3"
+phone: +33 4 79 20 18 81
 opening_hours: ""
-website: "https://fr-fr.facebook.com/unptitcoinditalie/"
\ No newline at end of file
+website: https://fr-fr.facebook.com/unptitcoinditalie/
diff --git a/data/cities/autrans-meaudre-en-vercors/cocoon-coiffure.yml b/data/cities/autrans-meaudre-en-vercors/cocoon-coiffure.yml
index 32182c55d..45d7764ad 100644
--- a/data/cities/autrans-meaudre-en-vercors/cocoon-coiffure.yml
+++ b/data/cities/autrans-meaudre-en-vercors/cocoon-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.12554
 longitude: 5.52846
 postcode: "38112"
 city: Autrans-Méaudre en Vercors
-street: "Route de Villard-de-Lans"
-housenumber: 140
-phone: "+33 4 76 95 21 02"
+street: Route de Villard-de-Lans
+housenumber: "140"
+phone: +33 4 76 95 21 02
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aveize/creativ-coiffure.yml b/data/cities/aveize/creativ-coiffure.yml
index f4df3344b..e2f511e48 100644
--- a/data/cities/aveize/creativ-coiffure.yml
+++ b/data/cities/aveize/creativ-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.68217
 longitude: 4.47745
 postcode: "69610"
 city: Aveize
-street: "Grande Rue"
-housenumber: 57
+street: Grande Rue
+housenumber: "57"
 phone: "+33474722114"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aveize/etablissements-bernard.yml b/data/cities/aveize/etablissements-bernard.yml
index debdcdfb5..bf8e38bc5 100644
--- a/data/cities/aveize/etablissements-bernard.yml
+++ b/data/cities/aveize/etablissements-bernard.yml
@@ -4,8 +4,8 @@ latitude: 45.68109
 longitude: 4.47483
 postcode: "69610"
 city: Aveize
-street: "Rue de la Croix Michel"
-housenumber: 235
+street: Rue de la Croix Michel
+housenumber: "235"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aveize/la-boutique.yml b/data/cities/aveize/la-boutique.yml
index 05d7f0996..e4b36c457 100644
--- a/data/cities/aveize/la-boutique.yml
+++ b/data/cities/aveize/la-boutique.yml
@@ -4,8 +4,8 @@ latitude: 45.68257
 longitude: 4.47712
 postcode: "69610"
 city: Aveize
-street: "Place de l'Église"
-housenumber: 3
+street: Place de l'Église
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aveize/la-ferme-de-paquerette.yml b/data/cities/aveize/la-ferme-de-paquerette.yml
index a175fc2ca..e88b54f4b 100644
--- a/data/cities/aveize/la-ferme-de-paquerette.yml
+++ b/data/cities/aveize/la-ferme-de-paquerette.yml
@@ -4,8 +4,8 @@ latitude: 45.68411
 longitude: 4.47331
 postcode: "69610"
 city: Aveize
-street: "La Côte"
-housenumber: 
+street: La Côte
+housenumber: ""
 phone: "+33698185742"
 opening_hours: ""
-website: "http://lafermedepaquerette.fr"
\ No newline at end of file
+website: http://lafermedepaquerette.fr
diff --git a/data/cities/aveize/la-grange-aux-fruits.yml b/data/cities/aveize/la-grange-aux-fruits.yml
index 164fb196a..a5b9f99d8 100644
--- a/data/cities/aveize/la-grange-aux-fruits.yml
+++ b/data/cities/aveize/la-grange-aux-fruits.yml
@@ -4,8 +4,8 @@ latitude: 45.66846
 longitude: 4.49686
 postcode: "69610"
 city: Aveize
-street: "Le Tournet"
-housenumber: 
+street: Le Tournet
+housenumber: ""
 phone: "+33608849255"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/aveize/spiruphile.yml b/data/cities/aveize/spiruphile.yml
index 29ec25149..f31a3c7d1 100644
--- a/data/cities/aveize/spiruphile.yml
+++ b/data/cities/aveize/spiruphile.yml
@@ -4,8 +4,8 @@ latitude: 45.69074
 longitude: 4.49257
 postcode: "69610"
 city: Aveize
-street: "L'Orgeolles"
-housenumber: 
+street: L'Orgeolles
+housenumber: ""
 phone: "+33608986103"
 opening_hours: ""
-website: "https://www.spiruphile.fr"
\ No newline at end of file
+website: https://www.spiruphile.fr
diff --git a/data/cities/aveize/vival.yml b/data/cities/aveize/vival.yml
index df8653ded..edb35b7a0 100644
--- a/data/cities/aveize/vival.yml
+++ b/data/cities/aveize/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.68253
 longitude: 4.47687
 postcode: "69610"
 city: Aveize
-street: "Place de l'Église"
-housenumber: 4
+street: Place de l'Église
+housenumber: "4"
 phone: "+33474260595"
-opening_hours: "Tu-Sa 07:30-12:30,16:00-19:00; We,Su 07:30-12:30"
-website: "https://magasins.vival.fr/fr/vival-aveize"
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,16:00-19:00; We,Su 07:30-12:30
+website: https://magasins.vival.fr/fr/vival-aveize
diff --git a/data/cities/ayse/carrosserie-decroux.yml b/data/cities/ayse/carrosserie-decroux.yml
index 754eb8ae0..bd1005cdb 100644
--- a/data/cities/ayse/carrosserie-decroux.yml
+++ b/data/cities/ayse/carrosserie-decroux.yml
@@ -1,11 +1,11 @@
 id: 107799867
-type: way
+type: node
 latitude: 46.07651
 longitude: 6.42199
 postcode: "74130"
 city: Ayse
-street: "Place des Droits de l'Homme"
-housenumber: 84
-phone: "+33 450971034"
+street: Place des Droits de l'Homme
+housenumber: "84"
+phone: +33 450971034
 opening_hours: ""
-website: "https://carrosserie-decroux-bonneville.fr/"
\ No newline at end of file
+website: https://carrosserie-decroux-bonneville.fr/
diff --git a/data/cities/ayse/garage-du-mole.yml b/data/cities/ayse/garage-du-mole.yml
index 25ed8eb61..21941d351 100644
--- a/data/cities/ayse/garage-du-mole.yml
+++ b/data/cities/ayse/garage-du-mole.yml
@@ -1,11 +1,11 @@
 id: 107800171
-type: way
+type: node
 latitude: 46.07511
 longitude: 6.44748
 postcode: "74130"
 city: Ayse
-street: "Avenue du Môle"
-housenumber: 60
-phone: "+33 457437116"
+street: Avenue du Môle
+housenumber: "60"
+phone: +33 457437116
 opening_hours: ""
-website: "https://www.garagedumole.com/"
\ No newline at end of file
+website: https://www.garagedumole.com/
diff --git a/data/cities/balbigny/la-ferme-du-tilleul.yml b/data/cities/balbigny/la-ferme-du-tilleul.yml
index eca01e69c..b5a66afb3 100644
--- a/data/cities/balbigny/la-ferme-du-tilleul.yml
+++ b/data/cities/balbigny/la-ferme-du-tilleul.yml
@@ -4,8 +4,8 @@ latitude: 45.82828
 longitude: 4.18085
 postcode: "42510"
 city: Balbigny
-street: "Lachat"
-housenumber: 
-phone: "+33 4 77 28 23 30"
+street: Lachat
+housenumber: ""
+phone: +33 4 77 28 23 30
 opening_hours: ""
-website: "https://www.lafermedutilleul-bio.fr/vente-directe/"
\ No newline at end of file
+website: https://www.lafermedutilleul-bio.fr/vente-directe/
diff --git a/data/cities/balbigny/optique-dumas.yml b/data/cities/balbigny/optique-dumas.yml
index 863df3aa9..93c217226 100644
--- a/data/cities/balbigny/optique-dumas.yml
+++ b/data/cities/balbigny/optique-dumas.yml
@@ -1,11 +1,11 @@
 id: 156461575
-type: way
+type: node
 latitude: 45.8187
 longitude: 4.18818
 postcode: "42510"
 city: Balbigny
-street: "Rue du Four à Chaux"
-housenumber: 1
+street: Rue du Four à Chaux
+housenumber: "1"
 phone: "0477280977"
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: "https://optiquedumas.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: https://optiquedumas.fr/
diff --git a/data/cities/ballaison/earl-la-goutte-dor.yml b/data/cities/ballaison/earl-la-goutte-dor.yml
index 83164c449..b015a0a11 100644
--- a/data/cities/ballaison/earl-la-goutte-dor.yml
+++ b/data/cities/ballaison/earl-la-goutte-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.29598
 longitude: 6.31656
 postcode: "74140"
 city: Ballaison
-street: "Route des Gravannes"
-housenumber: 
-phone: "+33 4 50 94 01 23"
+street: Route des Gravannes
+housenumber: ""
+phone: +33 4 50 94 01 23
 opening_hours: ""
-website: "https://www.domaine-crepy-mercier-74.com/"
\ No newline at end of file
+website: https://www.domaine-crepy-mercier-74.com/
diff --git a/data/cities/ballaison/la-mere-gaud.yml b/data/cities/ballaison/la-mere-gaud.yml
index 8041e89d7..2c4125792 100644
--- a/data/cities/ballaison/la-mere-gaud.yml
+++ b/data/cities/ballaison/la-mere-gaud.yml
@@ -1,11 +1,11 @@
 id: 1230591024
-type: way
+type: node
 latitude: 46.30023
 longitude: 6.32805
 postcode: "74140"
 city: Ballaison
-street: "Impasse de Thénières"
-housenumber: 120
+street: Impasse de Thénières
+housenumber: "120"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/barberaz/abane-coiffure.yml b/data/cities/barberaz/abane-coiffure.yml
index 989cb2524..264ad2436 100644
--- a/data/cities/barberaz/abane-coiffure.yml
+++ b/data/cities/barberaz/abane-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.56286
 longitude: 5.94317
 postcode: "73000"
 city: Barberaz
-street: "Galerie de la Chartreuse"
-housenumber: 40
+street: Galerie de la Chartreuse
+housenumber: "40"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/barberaz/amap-de-lalbanne.yml b/data/cities/barberaz/amap-de-lalbanne.yml
index be2bfb1ee..3f29c649e 100644
--- a/data/cities/barberaz/amap-de-lalbanne.yml
+++ b/data/cities/barberaz/amap-de-lalbanne.yml
@@ -4,8 +4,8 @@ latitude: 45.55823
 longitude: 5.94444
 postcode: "73000"
 city: Barberaz
-street: "Avenue du Stade"
-housenumber: 
+street: Avenue du Stade
+housenumber: ""
 phone: ""
-opening_hours: "Th-Th 18:30-19:45"
-website: "http://amapalbanne.amap-aura.org/"
\ No newline at end of file
+opening_hours: Th-Th 18:30-19:45
+website: http://amapalbanne.amap-aura.org/
diff --git a/data/cities/barberaz/french-flair.yml b/data/cities/barberaz/french-flair.yml
index 78b485919..47eec5ee7 100644
--- a/data/cities/barberaz/french-flair.yml
+++ b/data/cities/barberaz/french-flair.yml
@@ -4,8 +4,8 @@ latitude: 45.56252
 longitude: 5.94319
 postcode: "73000"
 city: Barberaz
-street: "Galerie de la Chartreuse"
-housenumber: 80
+street: Galerie de la Chartreuse
+housenumber: "80"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/barberaz/pistrin-alain.yml b/data/cities/barberaz/pistrin-alain.yml
index 2d61699d0..6e96c0766 100644
--- a/data/cities/barberaz/pistrin-alain.yml
+++ b/data/cities/barberaz/pistrin-alain.yml
@@ -4,8 +4,8 @@ latitude: 45.56313
 longitude: 5.94382
 postcode: "73000"
 city: Barberaz
-street: "Galerie de la Chartreuse"
-housenumber: 10
+street: Galerie de la Chartreuse
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/barberaz/pressing-de-la-chartreuse.yml b/data/cities/barberaz/pressing-de-la-chartreuse.yml
index 638986da5..8379ea774 100644
--- a/data/cities/barberaz/pressing-de-la-chartreuse.yml
+++ b/data/cities/barberaz/pressing-de-la-chartreuse.yml
@@ -4,8 +4,8 @@ latitude: 45.56302
 longitude: 5.94347
 postcode: "73000"
 city: Barberaz
-street: "Galerie de la Chartreuse"
-housenumber: 140
+street: Galerie de la Chartreuse
+housenumber: "140"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/barraux/banette.yml b/data/cities/barraux/banette.yml
index cfe2c2321..6e49f3c45 100644
--- a/data/cities/barraux/banette.yml
+++ b/data/cities/barraux/banette.yml
@@ -4,8 +4,8 @@ latitude: 45.43445
 longitude: 5.97799
 postcode: "38530"
 city: Barraux
-street: "Grande Rue"
-housenumber: 167
+street: Grande Rue
+housenumber: "167"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bassens/action.yml b/data/cities/bassens/action.yml
index 73e1f92b7..64e62fb5a 100644
--- a/data/cities/bassens/action.yml
+++ b/data/cities/bassens/action.yml
@@ -4,8 +4,8 @@ latitude: 45.57199
 longitude: 5.94431
 postcode: "73000"
 city: Bassens
-street: "Rue de la Martiniere"
-housenumber: 661
+street: Rue de la Martiniere
+housenumber: "661"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/bassens/epicerie-et-pain-du-nivolet.yml b/data/cities/bassens/epicerie-et-pain-du-nivolet.yml
index 2d3521059..43ba9853b 100644
--- a/data/cities/bassens/epicerie-et-pain-du-nivolet.yml
+++ b/data/cities/bassens/epicerie-et-pain-du-nivolet.yml
@@ -4,8 +4,8 @@ latitude: 45.58062
 longitude: 5.94264
 postcode: "73000"
 city: Bassens
-street: "Rue de la Croix"
-housenumber: 116
-phone: "+33 6 82 01 49 24"
+street: Rue de la Croix
+housenumber: "116"
+phone: +33 6 82 01 49 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bassens/lentrepot-du-bricolage.yml b/data/cities/bassens/lentrepot-du-bricolage.yml
index 3fadafa96..402185698 100644
--- a/data/cities/bassens/lentrepot-du-bricolage.yml
+++ b/data/cities/bassens/lentrepot-du-bricolage.yml
@@ -1,11 +1,11 @@
 id: 112866630
-type: way
+type: node
 latitude: 45.57139
 longitude: 5.94971
 postcode: "73000"
 city: Bassens
-street: "Rue Jean Perrier-Gustin"
-housenumber: 185
-phone: "+33 4 79 33 66 79"
-opening_hours: "Mo-Sa 07:30-19:00"
-website: "https://chambery.entrepot-du-bricolage.fr/"
\ No newline at end of file
+street: Rue Jean Perrier-Gustin
+housenumber: "185"
+phone: +33 4 79 33 66 79
+opening_hours: Mo-Sa 07:30-19:00
+website: https://chambery.entrepot-du-bricolage.fr/
diff --git a/data/cities/bassens/les-4-sans-clope.yml b/data/cities/bassens/les-4-sans-clope.yml
index 1489434a8..cf29598da 100644
--- a/data/cities/bassens/les-4-sans-clope.yml
+++ b/data/cities/bassens/les-4-sans-clope.yml
@@ -4,8 +4,8 @@ latitude: 45.57343
 longitude: 5.94713
 postcode: "73000"
 city: Bassens
-street: "Rue Centrale"
-housenumber: 8
+street: Rue Centrale
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:00
+website: ""
diff --git a/data/cities/bassens/les-paniers-du-coin.yml b/data/cities/bassens/les-paniers-du-coin.yml
index e2cd72d80..eecd632b7 100644
--- a/data/cities/bassens/les-paniers-du-coin.yml
+++ b/data/cities/bassens/les-paniers-du-coin.yml
@@ -4,8 +4,8 @@ latitude: 45.57337
 longitude: 5.93597
 postcode: "73000"
 city: Bassens
-street: "Avenue de Bassens"
-housenumber: 79
+street: Avenue de Bassens
+housenumber: "79"
 phone: ""
-opening_hours: "th 14:30-19:00"
-website: "https://www.lamandragore.net/"
\ No newline at end of file
+opening_hours: th 14:30-19:00
+website: https://www.lamandragore.net/
diff --git a/data/cities/bassens/pair-impair.yml b/data/cities/bassens/pair-impair.yml
index 6d5a5ddd3..b38bee24e 100644
--- a/data/cities/bassens/pair-impair.yml
+++ b/data/cities/bassens/pair-impair.yml
@@ -4,8 +4,8 @@ latitude: 45.58059
 longitude: 5.94249
 postcode: "73000"
 city: Bassens
-street: "Rue Centrale"
-housenumber: 72
-phone: "+33 4 79 85 44 04"
+street: Rue Centrale
+housenumber: "72"
+phone: +33 4 79 85 44 04
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bassens/recyclerie-sportive-de-chambery.yml b/data/cities/bassens/recyclerie-sportive-de-chambery.yml
index 5ea243d45..117aaa2e7 100644
--- a/data/cities/bassens/recyclerie-sportive-de-chambery.yml
+++ b/data/cities/bassens/recyclerie-sportive-de-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.57477
 longitude: 5.94707
 postcode: "73000"
 city: Bassens
-street: "1 Rue de Bolliet"
-housenumber: 
+street: 1 Rue de Bolliet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bassens/speedy.yml b/data/cities/bassens/speedy.yml
index 68277f73e..d71225985 100644
--- a/data/cities/bassens/speedy.yml
+++ b/data/cities/bassens/speedy.yml
@@ -4,8 +4,8 @@ latitude: 45.57095
 longitude: 5.94833
 postcode: "73000"
 city: Bassens
-street: "Rue Jean Perrier-Gustin"
-housenumber: 
+street: Rue Jean Perrier-Gustin
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaucroissant/latelier-de-marcel.yml b/data/cities/beaucroissant/latelier-de-marcel.yml
index 2fd9edd8b..b9ed6af9f 100644
--- a/data/cities/beaucroissant/latelier-de-marcel.yml
+++ b/data/cities/beaucroissant/latelier-de-marcel.yml
@@ -4,8 +4,8 @@ latitude: 45.34136
 longitude: 5.47161
 postcode: ""
 city: Beaucroissant
-street: "Place de la Mairie"
-housenumber: 
+street: Place de la Mairie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaufort-sur-gervanne/boulangerie-miche-et-baguette.yml b/data/cities/beaufort-sur-gervanne/boulangerie-miche-et-baguette.yml
index 4aec9a697..e60725f0c 100644
--- a/data/cities/beaufort-sur-gervanne/boulangerie-miche-et-baguette.yml
+++ b/data/cities/beaufort-sur-gervanne/boulangerie-miche-et-baguette.yml
@@ -4,8 +4,8 @@ latitude: 44.77714
 longitude: 5.14303
 postcode: "26400"
 city: Beaufort-sur-Gervanne
-street: "Rue Du Temple"
-housenumber: 9
+street: Rue Du Temple
+housenumber: "9"
 phone: "+33769501018"
-opening_hours: "We-Su 07:000-13:00"
-website: ""
\ No newline at end of file
+opening_hours: We-Su 07:000-13:00
+website: ""
diff --git a/data/cities/beaufort/aux-1000-marmottes.yml b/data/cities/beaufort/aux-1000-marmottes.yml
index 31bdd74a3..81bf27062 100644
--- a/data/cities/beaufort/aux-1000-marmottes.yml
+++ b/data/cities/beaufort/aux-1000-marmottes.yml
@@ -4,8 +4,8 @@ latitude: 45.71703
 longitude: 6.57575
 postcode: "73270"
 city: Beaufort
-street: "Grande Rue"
-housenumber: 
-phone: "+33 4 79 38 36 41"
+street: Grande Rue
+housenumber: ""
+phone: +33 4 79 38 36 41
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaufort/boucherie-charcuterie-nivault.yml b/data/cities/beaufort/boucherie-charcuterie-nivault.yml
index d10037ffb..c234577b8 100644
--- a/data/cities/beaufort/boucherie-charcuterie-nivault.yml
+++ b/data/cities/beaufort/boucherie-charcuterie-nivault.yml
@@ -4,8 +4,8 @@ latitude: 45.7171
 longitude: 6.57567
 postcode: "73270"
 city: Beaufort
-street: "Grande Rue"
-housenumber: 
+street: Grande Rue
+housenumber: ""
 phone: "+33479383292"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaufort/gaspard-sport.yml b/data/cities/beaufort/gaspard-sport.yml
index 1669c9010..a5bf28f41 100644
--- a/data/cities/beaufort/gaspard-sport.yml
+++ b/data/cities/beaufort/gaspard-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.68692
 longitude: 6.56902
 postcode: "73270"
 city: Beaufort
-street: "Place du Capitaine Bulle"
-housenumber: 
+street: Place du Capitaine Bulle
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaufort/home-vallee.yml b/data/cities/beaufort/home-vallee.yml
index df7b2849e..f9d33da4f 100644
--- a/data/cities/beaufort/home-vallee.yml
+++ b/data/cities/beaufort/home-vallee.yml
@@ -4,8 +4,8 @@ latitude: 45.71721
 longitude: 6.57484
 postcode: "73270"
 city: Beaufort
-street: "Rue Saint-Maxime"
-housenumber: 
-phone: "+33 7 88 00 98 21"
+street: Rue Saint-Maxime
+housenumber: ""
+phone: +33 7 88 00 98 21
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaufort/lechoppe-des-artisans.yml b/data/cities/beaufort/lechoppe-des-artisans.yml
index c670bf915..ff347a60c 100644
--- a/data/cities/beaufort/lechoppe-des-artisans.yml
+++ b/data/cities/beaufort/lechoppe-des-artisans.yml
@@ -4,8 +4,8 @@ latitude: 45.71726
 longitude: 6.57487
 postcode: "73270"
 city: Beaufort
-street: "Rue Saint-Maxime"
-housenumber: 
-phone: "+33 6 52 76 53 45"
+street: Rue Saint-Maxime
+housenumber: ""
+phone: +33 6 52 76 53 45
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaufort/les-croes.yml b/data/cities/beaufort/les-croes.yml
index 34624fa35..b82785592 100644
--- a/data/cities/beaufort/les-croes.yml
+++ b/data/cities/beaufort/les-croes.yml
@@ -4,8 +4,8 @@ latitude: 45.7173
 longitude: 6.57575
 postcode: "73270"
 city: Beaufort
-street: "rue de Roselend"
-housenumber: 73
-phone: "+33 4 79 89 43 73"
-opening_hours: "Mo-Su 07:00-19:00"
-website: ""
\ No newline at end of file
+street: rue de Roselend
+housenumber: "73"
+phone: +33 4 79 89 43 73
+opening_hours: Mo-Su 07:00-19:00
+website: ""
diff --git a/data/cities/beaufort/pouilloux.yml b/data/cities/beaufort/pouilloux.yml
index 9d8563c28..1174e7d7b 100644
--- a/data/cities/beaufort/pouilloux.yml
+++ b/data/cities/beaufort/pouilloux.yml
@@ -4,8 +4,8 @@ latitude: 45.71805
 longitude: 6.5752
 postcode: "73270"
 city: Beaufort
-street: "Avenue du Capitaine Bulle"
-housenumber: 
-phone: "+33 4 79 38 70 19"
+street: Avenue du Capitaine Bulle
+housenumber: ""
+phone: +33 4 79 38 70 19
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beaufort/quincaillerie-master-pro.yml b/data/cities/beaufort/quincaillerie-master-pro.yml
index 2652dcd74..3f735e155 100644
--- a/data/cities/beaufort/quincaillerie-master-pro.yml
+++ b/data/cities/beaufort/quincaillerie-master-pro.yml
@@ -4,8 +4,8 @@ latitude: 45.71678
 longitude: 6.57613
 postcode: "73270"
 city: Beaufort
-street: "Route de Roselend"
-housenumber: 9
-phone: "+33 4 79 38 33 34"
-opening_hours: "Mo-Fr 07:30-12:00,13:30-18:30; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+street: Route de Roselend
+housenumber: "9"
+phone: +33 4 79 38 33 34
+opening_hours: Mo-Fr 07:30-12:00,13:30-18:30; Su 08:00-12:00
+website: ""
diff --git a/data/cities/beaumont/berruyer-gabrielle.yml b/data/cities/beaumont/berruyer-gabrielle.yml
index 7ee8262d0..ded0c5e73 100644
--- a/data/cities/beaumont/berruyer-gabrielle.yml
+++ b/data/cities/beaumont/berruyer-gabrielle.yml
@@ -4,8 +4,8 @@ latitude: 46.09416
 longitude: 6.102
 postcode: "74160"
 city: Beaumont
-street: "Grand Rue"
-housenumber: 36
+street: Grand Rue
+housenumber: "36"
 phone: "+33450044324"
-opening_hours: "Mo-Sa 06:30-19:00 ;Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:00 ;Su 08:00-12:00
+website: ""
diff --git a/data/cities/beaumont/institut-lembelli.yml b/data/cities/beaumont/institut-lembelli.yml
index c840d6aed..c2b2b6ff3 100644
--- a/data/cities/beaumont/institut-lembelli.yml
+++ b/data/cities/beaumont/institut-lembelli.yml
@@ -4,8 +4,8 @@ latitude: 46.09655
 longitude: 6.10234
 postcode: "74160"
 city: Beaumont
-street: "Grand' Rue"
+street: Grand' Rue
 housenumber: 300A
 phone: "+33450373490"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.embelli-beaute.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.embelli-beaute.com/
diff --git a/data/cities/beaumont/la-charolaise.yml b/data/cities/beaumont/la-charolaise.yml
index e7d24e8ae..d6ee67e65 100644
--- a/data/cities/beaumont/la-charolaise.yml
+++ b/data/cities/beaumont/la-charolaise.yml
@@ -4,8 +4,8 @@ latitude: 46.09637
 longitude: 6.10255
 postcode: "74160"
 city: Beaumont
-street: "Grand' Rue"
-housenumber: 298
+street: Grand' Rue
+housenumber: "298"
 phone: "+33450044592"
-opening_hours: "Tu-Sa 07:30-12:30; 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30; 14:30-19:00
+website: ""
diff --git a/data/cities/beaumont/le-fournil-du-chable.yml b/data/cities/beaumont/le-fournil-du-chable.yml
index 3852520e8..30ccad2b2 100644
--- a/data/cities/beaumont/le-fournil-du-chable.yml
+++ b/data/cities/beaumont/le-fournil-du-chable.yml
@@ -4,8 +4,8 @@ latitude: 46.09495
 longitude: 6.10173
 postcode: "74160"
 city: Beaumont
-street: "Grand' Rue"
-housenumber: 126
+street: Grand' Rue
+housenumber: "126"
 phone: "+33450044331"
-opening_hours: "Tu-Sa 06:00-12:30,15:00-19:00; Su 06:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:00-12:30,15:00-19:00; Su 06:00-12:30
+website: ""
diff --git a/data/cities/beaumont/le-kioque-du-saleve.yml b/data/cities/beaumont/le-kioque-du-saleve.yml
index 19968e730..4e22600eb 100644
--- a/data/cities/beaumont/le-kioque-du-saleve.yml
+++ b/data/cities/beaumont/le-kioque-du-saleve.yml
@@ -4,8 +4,8 @@ latitude: 46.09416
 longitude: 6.10161
 postcode: "74160"
 city: Beaumont
-street: "Parc de la Mairie"
-housenumber: 3
+street: Parc de la Mairie
+housenumber: "3"
 phone: "+33450042740"
-opening_hours: "Mo-Fr 07:00-12:15,15:00-19:00 ;Sa 08:00-12:00,15:00-18:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:15,15:00-19:00 ;Sa 08:00-12:00,15:00-18:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/beaumont/le-petit-casino.yml b/data/cities/beaumont/le-petit-casino.yml
index 3c45a7aec..59e2a66e1 100644
--- a/data/cities/beaumont/le-petit-casino.yml
+++ b/data/cities/beaumont/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.09638
 longitude: 6.10223
 postcode: "74160"
 city: Beaumont
-street: "Grande Rue"
-housenumber: 288
+street: Grande Rue
+housenumber: "288"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 07:30-12:45, 14:30-19:45; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 07:30-12:45, 14:30-19:45; Su 08:00-12:00
+website: ""
diff --git a/data/cities/beaurepaire/cycles-argoud.yml b/data/cities/beaurepaire/cycles-argoud.yml
index 263ae0a04..a497c7516 100644
--- a/data/cities/beaurepaire/cycles-argoud.yml
+++ b/data/cities/beaurepaire/cycles-argoud.yml
@@ -4,8 +4,8 @@ latitude: 45.33637
 longitude: 5.05193
 postcode: "38270"
 city: Beaurepaire
-street: "Avenue de la Valloire"
-housenumber: 124
+street: Avenue de la Valloire
+housenumber: "124"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00, Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00, Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/beauvallon/gazane-sonia.yml b/data/cities/beauvallon/gazane-sonia.yml
index 6015a5bac..6780953e9 100644
--- a/data/cities/beauvallon/gazane-sonia.yml
+++ b/data/cities/beauvallon/gazane-sonia.yml
@@ -5,7 +5,7 @@ longitude: 4.69602
 postcode: ""
 city: Beauvallon
 street: ""
-housenumber: 
-phone: "+33 6 07 46 32 88"
+housenumber: ""
+phone: +33 6 07 46 32 88
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beauvallon/tosolini-marilyne.yml b/data/cities/beauvallon/tosolini-marilyne.yml
index e6d18213d..05eb2e200 100644
--- a/data/cities/beauvallon/tosolini-marilyne.yml
+++ b/data/cities/beauvallon/tosolini-marilyne.yml
@@ -5,7 +5,7 @@ longitude: 4.69604
 postcode: ""
 city: Beauvallon
 street: ""
-housenumber: 
-phone: "+33 6 82 25 62 34"
+housenumber: ""
+phone: +33 6 82 25 62 34
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beauvallon/uniferme.yml b/data/cities/beauvallon/uniferme.yml
index 8f3fa337e..1368dc108 100644
--- a/data/cities/beauvallon/uniferme.yml
+++ b/data/cities/beauvallon/uniferme.yml
@@ -1,11 +1,11 @@
 id: 146983578
-type: way
+type: node
 latitude: 45.60391
 longitude: 4.69018
 postcode: "69700"
 city: Beauvallon
-street: "Route Départementale 34"
-housenumber: 90
-phone: "+33 4 78 44 05 07"
-opening_hours: "Mo-Su 15:00-19:00,Th-Fr 08:30-12:30, Sa-Su 09:00-12:30"
-website: "https://www.uniferme.fr/"
\ No newline at end of file
+street: Route Départementale 34
+housenumber: "90"
+phone: +33 4 78 44 05 07
+opening_hours: Mo-Su 15:00-19:00,Th-Fr 08:30-12:30, Sa-Su 09:00-12:30
+website: https://www.uniferme.fr/
diff --git a/data/cities/beauvoir-de-marc/garage-lassalle.yml b/data/cities/beauvoir-de-marc/garage-lassalle.yml
index 2eec0723f..d6e326e10 100644
--- a/data/cities/beauvoir-de-marc/garage-lassalle.yml
+++ b/data/cities/beauvoir-de-marc/garage-lassalle.yml
@@ -1,11 +1,11 @@
 id: 135895252
-type: way
+type: node
 latitude: 45.52371
 longitude: 5.08288
 postcode: "38440"
 city: Beauvoir-de-Marc
-street: "Les Granges"
-housenumber: 
+street: Les Granges
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belle-plagne/spar.yml b/data/cities/belle-plagne/spar.yml
index e30050024..8865b6c01 100644
--- a/data/cities/belle-plagne/spar.yml
+++ b/data/cities/belle-plagne/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.50735
 longitude: 6.70727
 postcode: "73210"
 city: Belle Plagne
-street: "Centre Cial Aval"
-housenumber: 
-phone: "+33 4 79 09 08 21"
-opening_hours: "Mo-Su 08:00-13:00,16:00-19:30"
-website: "https://www.spar.fr/"
\ No newline at end of file
+street: Centre Cial Aval
+housenumber: ""
+phone: +33 4 79 09 08 21
+opening_hours: Mo-Su 08:00-13:00,16:00-19:30
+website: https://www.spar.fr/
diff --git a/data/cities/belle-plagne/sport-2000.yml b/data/cities/belle-plagne/sport-2000.yml
index a9d97e68f..2fd2f4621 100644
--- a/data/cities/belle-plagne/sport-2000.yml
+++ b/data/cities/belle-plagne/sport-2000.yml
@@ -5,7 +5,7 @@ longitude: 6.70775
 postcode: "73210"
 city: Belle Plagne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://armandberard.sport2000.fr/"
\ No newline at end of file
+website: https://armandberard.sport2000.fr/
diff --git a/data/cities/bellegarde-en-forez/au-ptit-marche.yml b/data/cities/bellegarde-en-forez/au-ptit-marche.yml
index 9fe897dec..cce59d285 100644
--- a/data/cities/bellegarde-en-forez/au-ptit-marche.yml
+++ b/data/cities/bellegarde-en-forez/au-ptit-marche.yml
@@ -4,8 +4,8 @@ latitude: 45.64678
 longitude: 4.29657
 postcode: "42210"
 city: Bellegarde-en-Forez
-street: "Avenue des Farges"
-housenumber: 272
+street: Avenue des Farges
+housenumber: "272"
 phone: "+33477946514"
-opening_hours: "Tu-Sa 08:30-18:30; We 08:30-12:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-18:30; We 08:30-12:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/bellegarde-en-forez/la-ptite-boulangerie.yml b/data/cities/bellegarde-en-forez/la-ptite-boulangerie.yml
index b7cf1c9e7..ed5e5b188 100644
--- a/data/cities/bellegarde-en-forez/la-ptite-boulangerie.yml
+++ b/data/cities/bellegarde-en-forez/la-ptite-boulangerie.yml
@@ -4,8 +4,8 @@ latitude: 45.64618
 longitude: 4.29593
 postcode: "42210"
 city: Bellegarde-en-Forez
-street: "Rue du Stade"
-housenumber: 42
+street: Rue du Stade
+housenumber: "42"
 phone: "+33477548007"
-opening_hours: "Mo-Sa 06:00-20:00; Tu 06:00-14:00; Su 06:00-13:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-20:00; Tu 06:00-14:00; Su 06:00-13:30
+website: ""
diff --git a/data/cities/bellegarde-poussieu/coiffcreation.yml b/data/cities/bellegarde-poussieu/coiffcreation.yml
index 24afa4793..9a7ada4f3 100644
--- a/data/cities/bellegarde-poussieu/coiffcreation.yml
+++ b/data/cities/bellegarde-poussieu/coiffcreation.yml
@@ -4,8 +4,8 @@ latitude: 45.37363
 longitude: 4.95031
 postcode: "38270"
 city: Bellegarde-Poussieu
-street: "Rue du Bourg"
-housenumber: 371
+street: Rue du Bourg
+housenumber: "371"
 phone: ""
-opening_hours: "Mo-Sa 08:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-18:00
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/billet-fournier.yml b/data/cities/bellegarde-sur-valserine/billet-fournier.yml
index 0a87481d2..9f82e7050 100644
--- a/data/cities/bellegarde-sur-valserine/billet-fournier.yml
+++ b/data/cities/bellegarde-sur-valserine/billet-fournier.yml
@@ -4,8 +4,8 @@ latitude: 46.12086
 longitude: 5.81052
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Avenue du Maréchal Leclerc"
-housenumber: 
+street: Avenue du Maréchal Leclerc
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 07:30-12:00, 13:30-18:00; Fr 07:00-12:00, 13:00-17:00"
-website: "https://www.billet-fournier.fr/"
\ No newline at end of file
+opening_hours: Mo-Th 07:30-12:00, 13:30-18:00; Fr 07:00-12:00, 13:00-17:00
+website: https://www.billet-fournier.fr/
diff --git a/data/cities/bellegarde-sur-valserine/carrefour.yml b/data/cities/bellegarde-sur-valserine/carrefour.yml
index db13dd725..0062a4827 100644
--- a/data/cities/bellegarde-sur-valserine/carrefour.yml
+++ b/data/cities/bellegarde-sur-valserine/carrefour.yml
@@ -4,8 +4,8 @@ latitude: 46.12552
 longitude: 5.81363
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Avenue du Maréchal de Lattre de Tassigny"
-housenumber: 
+street: Avenue du Maréchal de Lattre de Tassigny
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/criss-musique.yml b/data/cities/bellegarde-sur-valserine/criss-musique.yml
index 752a669e1..d61366013 100644
--- a/data/cities/bellegarde-sur-valserine/criss-musique.yml
+++ b/data/cities/bellegarde-sur-valserine/criss-musique.yml
@@ -4,8 +4,8 @@ latitude: 46.10713
 longitude: 5.82497
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Rue de la République"
-housenumber: 50
+street: Rue de la République
+housenumber: "50"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:15, 14:15-19:15"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:15, 14:15-19:15
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/latelier-m.yml b/data/cities/bellegarde-sur-valserine/latelier-m.yml
index 8fb90195e..7285936e8 100644
--- a/data/cities/bellegarde-sur-valserine/latelier-m.yml
+++ b/data/cities/bellegarde-sur-valserine/latelier-m.yml
@@ -4,8 +4,8 @@ latitude: 46.11926
 longitude: 5.814
 postcode: "01200"
 city: Bellegarde Sur Valserine
-street: "Rue Joliot-Curie"
-housenumber: 
+street: Rue Joliot-Curie
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr,Sa"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr,Sa
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/le-ptit-chezery.yml b/data/cities/bellegarde-sur-valserine/le-ptit-chezery.yml
index 32d4a4b23..a2ab3f857 100644
--- a/data/cities/bellegarde-sur-valserine/le-ptit-chezery.yml
+++ b/data/cities/bellegarde-sur-valserine/le-ptit-chezery.yml
@@ -4,8 +4,8 @@ latitude: 46.10723
 longitude: 5.82578
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Rue de la République"
-housenumber: 45
+street: Rue de la République
+housenumber: "45"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/les-arts-frontieres.yml b/data/cities/bellegarde-sur-valserine/les-arts-frontieres.yml
index cb5d40015..e6ab3510c 100644
--- a/data/cities/bellegarde-sur-valserine/les-arts-frontieres.yml
+++ b/data/cities/bellegarde-sur-valserine/les-arts-frontieres.yml
@@ -4,8 +4,8 @@ latitude: 46.10704
 longitude: 5.82517
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Rue de la République"
-housenumber: 33
+street: Rue de la République
+housenumber: "33"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30,14:00-18:30"
-website: "https://www.lesartsfrontieres.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30,14:00-18:30
+website: https://www.lesartsfrontieres.fr/
diff --git a/data/cities/bellegarde-sur-valserine/marie-blachere.yml b/data/cities/bellegarde-sur-valserine/marie-blachere.yml
index e4a1c822b..c6b09dc30 100644
--- a/data/cities/bellegarde-sur-valserine/marie-blachere.yml
+++ b/data/cities/bellegarde-sur-valserine/marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 46.12036
 longitude: 5.81013
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Avenue du Maréchal Leclerc"
-housenumber: 
+street: Avenue du Maréchal Leclerc
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/renault.yml b/data/cities/bellegarde-sur-valserine/renault.yml
index d258aa6bb..1917cff0e 100644
--- a/data/cities/bellegarde-sur-valserine/renault.yml
+++ b/data/cities/bellegarde-sur-valserine/renault.yml
@@ -4,8 +4,8 @@ latitude: 46.11933
 longitude: 5.80975
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Avenue du Maréchal Leclerc"
-housenumber: 18
-phone: "+33 450482721"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue du Maréchal Leclerc
+housenumber: "18"
+phone: +33 450482721
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/rosa.yml b/data/cities/bellegarde-sur-valserine/rosa.yml
index 55360b722..56ca2c7c5 100644
--- a/data/cities/bellegarde-sur-valserine/rosa.yml
+++ b/data/cities/bellegarde-sur-valserine/rosa.yml
@@ -5,7 +5,7 @@ longitude: 5.81413
 postcode: "01200"
 city: Bellegarde sur Valserine
 street: ""
-housenumber: 3
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:00; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:00; Su 07:00-12:30
+website: ""
diff --git a/data/cities/bellegarde-sur-valserine/yves-rocher.yml b/data/cities/bellegarde-sur-valserine/yves-rocher.yml
index dc338fb6d..71a69371e 100644
--- a/data/cities/bellegarde-sur-valserine/yves-rocher.yml
+++ b/data/cities/bellegarde-sur-valserine/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 46.10799
 longitude: 5.82765
 postcode: "01200"
 city: Bellegarde-sur-Valserine
-street: "Rue de la République"
-housenumber: 18
+street: Rue de la République
+housenumber: "18"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-12:00, 14:00-18:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/bellegarde-sur-valserine/bellegarde/S-FRYROC621"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-12:00, 14:00-18:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/bellegarde-sur-valserine/bellegarde/S-FRYROC621
diff --git a/data/cities/bellentre/jean-michel-sports.yml b/data/cities/bellentre/jean-michel-sports.yml
index 6dc9da1a7..cda00bb50 100644
--- a/data/cities/bellentre/jean-michel-sports.yml
+++ b/data/cities/bellentre/jean-michel-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.56042
 longitude: 6.73671
 postcode: "73210"
 city: bellentre
-street: "Montchavin"
-housenumber: 
+street: Montchavin
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bellevaux/caisse.yml b/data/cities/bellevaux/caisse.yml
index 9aff9b9e1..8066bcbcf 100644
--- a/data/cities/bellevaux/caisse.yml
+++ b/data/cities/bellevaux/caisse.yml
@@ -4,8 +4,8 @@ latitude: 46.20912
 longitude: 6.57661
 postcode: "74470"
 city: Bellevaux
-street: "Route de la Chèvrerie"
-housenumber: 5621
+street: Route de la Chèvrerie
+housenumber: "5621"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bellevaux/foyer-de-fond-des-mouilles.yml b/data/cities/bellevaux/foyer-de-fond-des-mouilles.yml
index 6760d2db7..bd21388da 100644
--- a/data/cities/bellevaux/foyer-de-fond-des-mouilles.yml
+++ b/data/cities/bellevaux/foyer-de-fond-des-mouilles.yml
@@ -1,11 +1,11 @@
 id: 456811757
-type: way
+type: node
 latitude: 46.25011
 longitude: 6.51281
 postcode: "74470"
 city: Bellevaux
-street: "Route des Montagnes"
-housenumber: 1836
+street: Route des Montagnes
+housenumber: "1836"
 phone: ""
-opening_hours: "Mo-Su 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-17:00
+website: ""
diff --git a/data/cities/bellevaux/la-ferme-du-petit-mont.yml b/data/cities/bellevaux/la-ferme-du-petit-mont.yml
index 4873e65a8..6d416af4e 100644
--- a/data/cities/bellevaux/la-ferme-du-petit-mont.yml
+++ b/data/cities/bellevaux/la-ferme-du-petit-mont.yml
@@ -4,8 +4,8 @@ latitude: 46.26002
 longitude: 6.53132
 postcode: "74470"
 city: Bellevaux
-street: "Route de la Côte"
-housenumber: 746
+street: Route de la Côte
+housenumber: "746"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/bellevaux/les-epis-du-roc.yml b/data/cities/bellevaux/les-epis-du-roc.yml
index bed260032..0e082f55d 100644
--- a/data/cities/bellevaux/les-epis-du-roc.yml
+++ b/data/cities/bellevaux/les-epis-du-roc.yml
@@ -4,8 +4,8 @@ latitude: 46.2574
 longitude: 6.53187
 postcode: "74470"
 city: Bellevaux
-street: "Route de Thonon"
-housenumber: 136
-phone: "+33 4 50 73 81 08"
+street: Route de Thonon
+housenumber: "136"
+phone: +33 4 50 73 81 08
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bellevaux/les-escarpes.yml b/data/cities/bellevaux/les-escarpes.yml
index b215bc07e..5b7fb65b1 100644
--- a/data/cities/bellevaux/les-escarpes.yml
+++ b/data/cities/bellevaux/les-escarpes.yml
@@ -4,8 +4,8 @@ latitude: 46.24108
 longitude: 6.53211
 postcode: "74470"
 city: Bellevaux
-street: "Route de la Cheterie"
-housenumber: 656
+street: Route de la Cheterie
+housenumber: "656"
 phone: ""
-opening_hours: "Mo-Fr 09:00-17:00; Sa-Su 10:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-17:00; Sa-Su 10:00-12:00
+website: ""
diff --git a/data/cities/bellevaux/marmotte-sport-location-de-ski.yml b/data/cities/bellevaux/marmotte-sport-location-de-ski.yml
index b7ab65207..b20457345 100644
--- a/data/cities/bellevaux/marmotte-sport-location-de-ski.yml
+++ b/data/cities/bellevaux/marmotte-sport-location-de-ski.yml
@@ -4,8 +4,8 @@ latitude: 46.24762
 longitude: 6.50653
 postcode: "74470"
 city: Bellevaux
-street: "Route d'Hirmentaz"
-housenumber: 5781
+street: Route d'Hirmentaz
+housenumber: "5781"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bellevaux/vival.yml b/data/cities/bellevaux/vival.yml
index eff7a6b33..5119187ad 100644
--- a/data/cities/bellevaux/vival.yml
+++ b/data/cities/bellevaux/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.25547
 longitude: 6.53042
 postcode: "74470"
 city: Bellevaux
-street: "Route des Contamines"
-housenumber: 
+street: Route des Contamines
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 07:30-12:30, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-12:30, 14:00-19:00
+website: ""
diff --git a/data/cities/belleville-en-beaujolais/la-vie-claire-belleville-sur-saone.yml b/data/cities/belleville-en-beaujolais/la-vie-claire-belleville-sur-saone.yml
index c8b960504..8bdbba641 100644
--- a/data/cities/belleville-en-beaujolais/la-vie-claire-belleville-sur-saone.yml
+++ b/data/cities/belleville-en-beaujolais/la-vie-claire-belleville-sur-saone.yml
@@ -1,11 +1,11 @@
 id: 784089315
-type: way
+type: node
 latitude: 46.10231
 longitude: 4.74834
 postcode: "69200"
 city: Belleville en beaujolais
-street: "Rue des Prés de la Cloche"
-housenumber: 
+street: Rue des Prés de la Cloche
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belley/tonin-coiffet-sa.yml b/data/cities/belley/tonin-coiffet-sa.yml
index 981cac9a2..27c4062f5 100644
--- a/data/cities/belley/tonin-coiffet-sa.yml
+++ b/data/cities/belley/tonin-coiffet-sa.yml
@@ -5,7 +5,7 @@ longitude: 5.68199
 postcode: ""
 city: Belley
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bellignat/cycles-di-lullo.yml b/data/cities/bellignat/cycles-di-lullo.yml
index d8b352fc3..7a7080df3 100644
--- a/data/cities/bellignat/cycles-di-lullo.yml
+++ b/data/cities/bellignat/cycles-di-lullo.yml
@@ -1,11 +1,11 @@
 id: 224418530
-type: way
+type: node
 latitude: 46.24326
 longitude: 5.62675
 postcode: "01100"
 city: Bellignat
-street: "Rue des Montains"
-housenumber: 7
-phone: "+33 4 74 77 49 17"
+street: Rue des Montains
+housenumber: "7"
+phone: +33 4 74 77 49 17
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belmont-de-la-loire/boucherie-lievre.yml b/data/cities/belmont-de-la-loire/boucherie-lievre.yml
index 64da2a4c5..497ff4cfe 100644
--- a/data/cities/belmont-de-la-loire/boucherie-lievre.yml
+++ b/data/cities/belmont-de-la-loire/boucherie-lievre.yml
@@ -4,8 +4,8 @@ latitude: 46.1645
 longitude: 4.34601
 postcode: "42670"
 city: Belmont-de-la-Loire
-street: "Rue du Commerce"
-housenumber: 182
-phone: "+33 477636005"
+street: Rue du Commerce
+housenumber: "182"
+phone: +33 477636005
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belmont-de-la-loire/chevreton.yml b/data/cities/belmont-de-la-loire/chevreton.yml
index dff638fed..51242c5f9 100644
--- a/data/cities/belmont-de-la-loire/chevreton.yml
+++ b/data/cities/belmont-de-la-loire/chevreton.yml
@@ -4,8 +4,8 @@ latitude: 46.16485
 longitude: 4.34562
 postcode: "42670"
 city: Belmont-de-la-Loire
-street: "Rue du Commerce"
-housenumber: 145
-phone: "+33 477636185"
+street: Rue du Commerce
+housenumber: "145"
+phone: +33 477636185
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belmont-de-la-loire/coiffure-bea.yml b/data/cities/belmont-de-la-loire/coiffure-bea.yml
index 3ca647690..862d558ea 100644
--- a/data/cities/belmont-de-la-loire/coiffure-bea.yml
+++ b/data/cities/belmont-de-la-loire/coiffure-bea.yml
@@ -4,8 +4,8 @@ latitude: 46.16455
 longitude: 4.34589
 postcode: "42670"
 city: Belmont-de-la-Loire
-street: "Rue du Commerce"
-housenumber: 
-phone: "+33 477636805"
+street: Rue du Commerce
+housenumber: ""
+phone: +33 477636805
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belmont-de-la-loire/fromagerie-puillet.yml b/data/cities/belmont-de-la-loire/fromagerie-puillet.yml
index 1bb6aed56..cb2e92acc 100644
--- a/data/cities/belmont-de-la-loire/fromagerie-puillet.yml
+++ b/data/cities/belmont-de-la-loire/fromagerie-puillet.yml
@@ -4,8 +4,8 @@ latitude: 46.15828
 longitude: 4.3495
 postcode: "42670"
 city: Belmont-de-la-Loire
-street: "Le Perron"
-housenumber: 
+street: Le Perron
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 09:30-11:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:30-11:30
+website: ""
diff --git a/data/cities/belmont-de-la-loire/saveurs-et-traditions.yml b/data/cities/belmont-de-la-loire/saveurs-et-traditions.yml
index 9d2ae5aae..5afd2776f 100644
--- a/data/cities/belmont-de-la-loire/saveurs-et-traditions.yml
+++ b/data/cities/belmont-de-la-loire/saveurs-et-traditions.yml
@@ -4,8 +4,8 @@ latitude: 46.16442
 longitude: 4.3468
 postcode: "42670"
 city: Belmont-de-la-Loire
-street: "Rue de la Fontaine"
-housenumber: 6
-phone: "+33 477640905"
+street: Rue de la Fontaine
+housenumber: "6"
+phone: +33 477640905
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belmont-de-la-loire/tabac-presse-bruel.yml b/data/cities/belmont-de-la-loire/tabac-presse-bruel.yml
index 405b4d1a7..d514da5b3 100644
--- a/data/cities/belmont-de-la-loire/tabac-presse-bruel.yml
+++ b/data/cities/belmont-de-la-loire/tabac-presse-bruel.yml
@@ -4,8 +4,8 @@ latitude: 46.16446
 longitude: 4.34658
 postcode: "42670"
 city: Belmont-de-la-Loire
-street: "Place du Souvenir"
-housenumber: 
-phone: "+33 477637412"
+street: Place du Souvenir
+housenumber: ""
+phone: +33 477637412
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belmont-tramonet/ferme-delevage-de-vache-et-production-de-lait.yml b/data/cities/belmont-tramonet/ferme-delevage-de-vache-et-production-de-lait.yml
index 9c60786e1..1fbbca60c 100644
--- a/data/cities/belmont-tramonet/ferme-delevage-de-vache-et-production-de-lait.yml
+++ b/data/cities/belmont-tramonet/ferme-delevage-de-vache-et-production-de-lait.yml
@@ -4,8 +4,8 @@ latitude: 45.55976
 longitude: 5.68286
 postcode: "73330"
 city: Belmont-Tramonet
-street: "Route du Village"
-housenumber: 
+street: Route du Village
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/belmont-tramonet/reserve-dallimentation-pour-les-vaches.yml b/data/cities/belmont-tramonet/reserve-dallimentation-pour-les-vaches.yml
index 4f62f66ef..433d314c6 100644
--- a/data/cities/belmont-tramonet/reserve-dallimentation-pour-les-vaches.yml
+++ b/data/cities/belmont-tramonet/reserve-dallimentation-pour-les-vaches.yml
@@ -4,8 +4,8 @@ latitude: 45.55928
 longitude: 5.6825
 postcode: "73330"
 city: Belmont-Tramonet
-street: "Route du Village"
-housenumber: 
+street: Route du Village
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bernex/brasserie-doche.yml b/data/cities/bernex/brasserie-doche.yml
index 6e71b2184..1aacb45a4 100644
--- a/data/cities/bernex/brasserie-doche.yml
+++ b/data/cities/bernex/brasserie-doche.yml
@@ -1,11 +1,11 @@
 id: 766867083
-type: way
+type: node
 latitude: 46.36062
 longitude: 6.69254
 postcode: "74500"
 city: Bernex
-street: "Impasse de la Rasse"
-housenumber: 71
+street: Impasse de la Rasse
+housenumber: "71"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bernex/sport-2000.yml b/data/cities/bernex/sport-2000.yml
index fd19d03f8..151604505 100644
--- a/data/cities/bernex/sport-2000.yml
+++ b/data/cities/bernex/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.35712
 longitude: 6.68942
 postcode: "74500"
 city: Bernex
-street: "Route du Télésiège"
-housenumber: 1155
+street: Route du Télésiège
+housenumber: "1155"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bernex/vival.yml b/data/cities/bernex/vival.yml
index b9729c4ba..6d3e34295 100644
--- a/data/cities/bernex/vival.yml
+++ b/data/cities/bernex/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.36106
 longitude: 6.67488
 postcode: "74500"
 city: Bernex
-street: "Route de la Mairie"
-housenumber: 2
+street: Route de la Mairie
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Su 08:30-12:30,15:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-12:30,15:30-19:00
+website: ""
diff --git a/data/cities/bernin/boulangerie-latouche.yml b/data/cities/bernin/boulangerie-latouche.yml
index bcbb601b7..d550ffa61 100644
--- a/data/cities/bernin/boulangerie-latouche.yml
+++ b/data/cities/bernin/boulangerie-latouche.yml
@@ -4,8 +4,8 @@ latitude: 45.27118
 longitude: 5.86823
 postcode: "38190"
 city: Bernin
-street: "Route Départementale 1090"
-housenumber: 247
+street: Route Départementale 1090
+housenumber: "247"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bernin/latelier.yml b/data/cities/bernin/latelier.yml
index 3e807e533..64e5783d2 100644
--- a/data/cities/bernin/latelier.yml
+++ b/data/cities/bernin/latelier.yml
@@ -4,8 +4,8 @@ latitude: 45.27218
 longitude: 5.86923
 postcode: "38190"
 city: Bernin
-street: "Route Départementale 1090"
-housenumber: 117
-phone: "+33 4 76 51 70 61"
-opening_hours: "Tu-Fr 09:00-18:00; Sa 09:00-17:00"
-website: "https://www.atelier-meylan.com/"
\ No newline at end of file
+street: Route Départementale 1090
+housenumber: "117"
+phone: +33 4 76 51 70 61
+opening_hours: Tu-Fr 09:00-18:00; Sa 09:00-17:00
+website: https://www.atelier-meylan.com/
diff --git a/data/cities/bernin/salomon-fleurs.yml b/data/cities/bernin/salomon-fleurs.yml
index 4906ae57e..37c797165 100644
--- a/data/cities/bernin/salomon-fleurs.yml
+++ b/data/cities/bernin/salomon-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.27149
 longitude: 5.86857
 postcode: "38190"
 city: Bernin
-street: "Route Départementale 1090"
-housenumber: 207
+street: Route Départementale 1090
+housenumber: "207"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/besayes/lepicentre.yml b/data/cities/besayes/lepicentre.yml
index 034e8f5ca..e735676ba 100644
--- a/data/cities/besayes/lepicentre.yml
+++ b/data/cities/besayes/lepicentre.yml
@@ -1,11 +1,11 @@
 id: 484930419
-type: way
+type: node
 latitude: 44.966
 longitude: 5.07829
 postcode: "26300"
 city: Besayes
-street: "Rue de la Liberté"
-housenumber: 17
+street: Rue de la Liberté
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/beynost/espace-sport-cotiere.yml b/data/cities/beynost/espace-sport-cotiere.yml
index b773a5402..30160efdd 100644
--- a/data/cities/beynost/espace-sport-cotiere.yml
+++ b/data/cities/beynost/espace-sport-cotiere.yml
@@ -4,8 +4,8 @@ latitude: 45.8228
 longitude: 4.9938
 postcode: "01700"
 city: Beynost
-street: "Rue du Pré Caillat"
-housenumber: 
-phone: "+33 4 78 55 36 99"
+street: Rue du Pré Caillat
+housenumber: ""
+phone: +33 4 78 55 36 99
 opening_hours: ""
-website: "https://www.sport-cotiere.com/"
\ No newline at end of file
+website: https://www.sport-cotiere.com/
diff --git a/data/cities/beynost/le-comptoir-des-bib.yml b/data/cities/beynost/le-comptoir-des-bib.yml
index c36a49e4f..31dd75ec4 100644
--- a/data/cities/beynost/le-comptoir-des-bib.yml
+++ b/data/cities/beynost/le-comptoir-des-bib.yml
@@ -4,8 +4,8 @@ latitude: 45.8222
 longitude: 4.99294
 postcode: "01700"
 city: Beynost
-street: "Chemin des Malettes"
-housenumber: 
-phone: "+33 4 87 63 84 87"
+street: Chemin des Malettes
+housenumber: ""
+phone: +33 4 87 63 84 87
 opening_hours: ""
-website: "https://www.le-comptoir-des-bib.fr"
\ No newline at end of file
+website: https://www.le-comptoir-des-bib.fr
diff --git a/data/cities/beynost/peloton-de-beynost.yml b/data/cities/beynost/peloton-de-beynost.yml
index 02124b3f7..a862f2ea4 100644
--- a/data/cities/beynost/peloton-de-beynost.yml
+++ b/data/cities/beynost/peloton-de-beynost.yml
@@ -4,8 +4,8 @@ latitude: 45.82181
 longitude: 4.99324
 postcode: "01700"
 city: Beynost
-street: "Chemin des Malettes"
-housenumber: 660
-phone: "+33 9 81 35 28 63"
+street: Chemin des Malettes
+housenumber: "660"
+phone: +33 9 81 35 28 63
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bilieu/ma-ptite-epicerie.yml b/data/cities/bilieu/ma-ptite-epicerie.yml
index 9d224ecc2..c83ce4099 100644
--- a/data/cities/bilieu/ma-ptite-epicerie.yml
+++ b/data/cities/bilieu/ma-ptite-epicerie.yml
@@ -1,11 +1,11 @@
 id: 778806907
-type: way
+type: node
 latitude: 45.44945
 longitude: 5.55048
 postcode: "38850"
 city: Bilieu
-street: "Route de Fayarde et Côtes"
-housenumber: 25
+street: Route de Fayarde et Côtes
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/biol/acotto-maryse.yml b/data/cities/biol/acotto-maryse.yml
index 4f8a38160..3f997645e 100644
--- a/data/cities/biol/acotto-maryse.yml
+++ b/data/cities/biol/acotto-maryse.yml
@@ -4,8 +4,8 @@ latitude: 45.49185
 longitude: 5.38513
 postcode: "38690"
 city: Biol
-street: "Grande Rue"
-housenumber: 41
+street: Grande Rue
+housenumber: "41"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/biol/bouveron-frederic.yml b/data/cities/biol/bouveron-frederic.yml
index 998714021..01fca2e67 100644
--- a/data/cities/biol/bouveron-frederic.yml
+++ b/data/cities/biol/bouveron-frederic.yml
@@ -4,8 +4,8 @@ latitude: 45.49081
 longitude: 5.38724
 postcode: "38690"
 city: Biol
-street: "Grande Rue"
-housenumber: 19
+street: Grande Rue
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/biol/didier-et-corine-maljournal.yml b/data/cities/biol/didier-et-corine-maljournal.yml
index 39b514d88..ca25d9992 100644
--- a/data/cities/biol/didier-et-corine-maljournal.yml
+++ b/data/cities/biol/didier-et-corine-maljournal.yml
@@ -4,8 +4,8 @@ latitude: 45.49074
 longitude: 5.38775
 postcode: "38690"
 city: Biol
-street: "Grande Rue"
-housenumber: 10
+street: Grande Rue
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/biol/garage-perrin.yml b/data/cities/biol/garage-perrin.yml
index e9caf8267..de658211a 100644
--- a/data/cities/biol/garage-perrin.yml
+++ b/data/cities/biol/garage-perrin.yml
@@ -4,8 +4,8 @@ latitude: 45.49006
 longitude: 5.38839
 postcode: "38690"
 city: Biol
-street: "Grande Rue"
-housenumber: 3
+street: Grande Rue
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/biviers/biviers-auto.yml b/data/cities/biviers/biviers-auto.yml
index 27927a1bd..09f8f0a49 100644
--- a/data/cities/biviers/biviers-auto.yml
+++ b/data/cities/biviers/biviers-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.23964
 longitude: 5.81658
 postcode: "38330"
 city: Biviers
-street: "Chemin des Evequaux"
-housenumber: 90
-phone: "+33 4 38 60 26 64"
+street: Chemin des Evequaux
+housenumber: "90"
+phone: +33 4 38 60 26 64
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/biviers/le-comptoir-de-nos-fermes.yml b/data/cities/biviers/le-comptoir-de-nos-fermes.yml
index cbdd07cf1..2e211f97c 100644
--- a/data/cities/biviers/le-comptoir-de-nos-fermes.yml
+++ b/data/cities/biviers/le-comptoir-de-nos-fermes.yml
@@ -4,8 +4,8 @@ latitude: 45.2392
 longitude: 5.81611
 postcode: "38330"
 city: Biviers
-street: "Chemin des Evequaux"
-housenumber: 100
-phone: "+33 4 76 52 09 37"
-opening_hours: "Th-Fr 09:00-19:00, Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+street: Chemin des Evequaux
+housenumber: "100"
+phone: +33 4 76 52 09 37
+opening_hours: Th-Fr 09:00-19:00, Sa 09:00-18:00
+website: ""
diff --git a/data/cities/biviers/super-u.yml b/data/cities/biviers/super-u.yml
index cb22a43cb..b92b1f902 100644
--- a/data/cities/biviers/super-u.yml
+++ b/data/cities/biviers/super-u.yml
@@ -1,11 +1,11 @@
 id: 155821131
-type: way
+type: node
 latitude: 45.23958
 longitude: 5.81788
 postcode: "38330"
 city: Biviers
-street: "Chemin des Evequaux"
-housenumber: 60
-phone: "+33 4 76 52 95 10"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: "https://www.magasins-u.com/magasin/superu-biviers"
\ No newline at end of file
+street: Chemin des Evequaux
+housenumber: "60"
+phone: +33 4 76 52 95 10
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: https://www.magasins-u.com/magasin/superu-biviers
diff --git a/data/cities/blace/domaine-des-terres-vivantes.yml b/data/cities/blace/domaine-des-terres-vivantes.yml
index 12f5779e5..9ecb26fce 100644
--- a/data/cities/blace/domaine-des-terres-vivantes.yml
+++ b/data/cities/blace/domaine-des-terres-vivantes.yml
@@ -4,8 +4,8 @@ latitude: 46.0505
 longitude: 4.65567
 postcode: "69460"
 city: Blacé
-street: "Route de la Tallebarde"
-housenumber: 656
+street: Route de la Tallebarde
+housenumber: "656"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/boege/bio-monde.yml b/data/cities/boege/bio-monde.yml
index 37fe266f6..2e7dd2f34 100644
--- a/data/cities/boege/bio-monde.yml
+++ b/data/cities/boege/bio-monde.yml
@@ -1,11 +1,11 @@
 id: 93493667
-type: way
+type: node
 latitude: 46.20645
 longitude: 6.40339
 postcode: "74420"
 city: Boëge
-street: "Rue du Collège"
-housenumber: 152
-phone: "+33 4 50 85 45 32"
+street: Rue du Collège
+housenumber: "152"
+phone: +33 4 50 85 45 32
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/boege/boucherie-mathian.yml b/data/cities/boege/boucherie-mathian.yml
index 8e2198ef0..c4d9e84b2 100644
--- a/data/cities/boege/boucherie-mathian.yml
+++ b/data/cities/boege/boucherie-mathian.yml
@@ -4,8 +4,8 @@ latitude: 46.20957
 longitude: 6.40534
 postcode: "74420"
 city: Boëge
-street: "Rue de Carraz"
-housenumber: 87
+street: Rue de Carraz
+housenumber: "87"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/boege/gaec-le-chalet.yml b/data/cities/boege/gaec-le-chalet.yml
index 4bbba3261..4c78b6279 100644
--- a/data/cities/boege/gaec-le-chalet.yml
+++ b/data/cities/boege/gaec-le-chalet.yml
@@ -4,8 +4,8 @@ latitude: 46.20889
 longitude: 6.38378
 postcode: "74420"
 city: Boëge
-street: "Route de Chez Novelly"
-housenumber: 622
+street: Route de Chez Novelly
+housenumber: "622"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/boege/maison-janin.yml b/data/cities/boege/maison-janin.yml
index 95808ddcc..41279544d 100644
--- a/data/cities/boege/maison-janin.yml
+++ b/data/cities/boege/maison-janin.yml
@@ -1,11 +1,11 @@
 id: 122925938
-type: way
+type: node
 latitude: 46.20533
 longitude: 6.39856
 postcode: "74420"
 city: Boëge
-street: "Rue de la Vallée Verte"
-housenumber: 569
+street: Rue de la Vallée Verte
+housenumber: "569"
 phone: ""
-opening_hours: "Mo-Su 06:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-19:30
+website: ""
diff --git a/data/cities/boege/spar.yml b/data/cities/boege/spar.yml
index 8efbaff18..c15e2c421 100644
--- a/data/cities/boege/spar.yml
+++ b/data/cities/boege/spar.yml
@@ -1,11 +1,11 @@
 id: 93493533
-type: way
+type: node
 latitude: 46.20741
 longitude: 6.40265
 postcode: "74420"
 city: Boëge
-street: "Rue de la Vallée Verte"
-housenumber: 227
+street: Rue de la Vallée Verte
+housenumber: "227"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/bogeve/epicerie-de-bogeve.yml b/data/cities/bogeve/epicerie-de-bogeve.yml
index f431635f2..1e30338cb 100644
--- a/data/cities/bogeve/epicerie-de-bogeve.yml
+++ b/data/cities/bogeve/epicerie-de-bogeve.yml
@@ -4,8 +4,8 @@ latitude: 46.19336
 longitude: 6.42958
 postcode: "74250"
 city: Bogève
-street: "Route de la Vallée Verte"
-housenumber: 10
-phone: "+33 4 50 36 60 49"
-opening_hours: "Mo-Sa 07:00-12:30, 15:30-19:00; Su 07:30-12:30"
-website: "https://epiceriedebogeve.fr"
\ No newline at end of file
+street: Route de la Vallée Verte
+housenumber: "10"
+phone: +33 4 50 36 60 49
+opening_hours: Mo-Sa 07:00-12:30, 15:30-19:00; Su 07:30-12:30
+website: https://epiceriedebogeve.fr
diff --git a/data/cities/bogeve/minimal-ceramics.yml b/data/cities/bogeve/minimal-ceramics.yml
index 29883f3ae..8faa1bb11 100644
--- a/data/cities/bogeve/minimal-ceramics.yml
+++ b/data/cities/bogeve/minimal-ceramics.yml
@@ -1,11 +1,11 @@
 id: 1251519695
-type: way
+type: node
 latitude: 46.19357
 longitude: 6.42974
 postcode: "74250"
 city: Bogève
-street: "Route de la Vallée Verte"
-housenumber: 26
+street: Route de la Vallée Verte
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/boisset-les-montrond/boulangerie-rivollier.yml b/data/cities/boisset-les-montrond/boulangerie-rivollier.yml
index 64a940199..5b4bb3d65 100644
--- a/data/cities/boisset-les-montrond/boulangerie-rivollier.yml
+++ b/data/cities/boisset-les-montrond/boulangerie-rivollier.yml
@@ -4,8 +4,8 @@ latitude: 45.62121
 longitude: 4.21197
 postcode: "42210"
 city: Boisset-lès-Montrond
-street: "Route du Canal"
-housenumber: 
+street: Route du Canal
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/boisset-saint-priest/comptoir-de-campagne.yml b/data/cities/boisset-saint-priest/comptoir-de-campagne.yml
index a58ca5cfc..dd4a56df1 100644
--- a/data/cities/boisset-saint-priest/comptoir-de-campagne.yml
+++ b/data/cities/boisset-saint-priest/comptoir-de-campagne.yml
@@ -4,8 +4,8 @@ latitude: 45.5123
 longitude: 4.10636
 postcode: "42560"
 city: Boisset-Saint-Priest
-street: "Rue des Écoliers"
-housenumber: 216
-phone: "09 70 96 04 81"
+street: Rue des Écoliers
+housenumber: "216"
+phone: 09 70 96 04 81
 opening_hours: ""
-website: "https://www.facebook.com/comptoirdeboissetstpriest"
\ No newline at end of file
+website: https://www.facebook.com/comptoirdeboissetstpriest
diff --git a/data/cities/bollene/marie-blachere.yml b/data/cities/bollene/marie-blachere.yml
index 031287411..d659bafad 100644
--- a/data/cities/bollene/marie-blachere.yml
+++ b/data/cities/bollene/marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 44.32424
 longitude: 4.74217
 postcode: "84500"
 city: Bollène
-street: "Rue Colonel Fabien"
-housenumber: 
+street: Rue Colonel Fabien
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bonne/centre-de-livraison-thiriet.yml b/data/cities/bonne/centre-de-livraison-thiriet.yml
index d0cb67de6..0ce475f1c 100644
--- a/data/cities/bonne/centre-de-livraison-thiriet.yml
+++ b/data/cities/bonne/centre-de-livraison-thiriet.yml
@@ -1,11 +1,11 @@
 id: 1122850398
-type: way
+type: node
 latitude: 46.17027
 longitude: 6.31384
 postcode: "74380"
 city: Bonne
-street: "Route de Ripaille"
-housenumber: 140
+street: Route de Ripaille
+housenumber: "140"
 phone: ""
-opening_hours: "Mo-Fr 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-20:00
+website: ""
diff --git a/data/cities/bonne/duvernay.yml b/data/cities/bonne/duvernay.yml
index de65b64b8..a1ed0cff7 100644
--- a/data/cities/bonne/duvernay.yml
+++ b/data/cities/bonne/duvernay.yml
@@ -1,11 +1,11 @@
 id: 482828862
-type: way
+type: node
 latitude: 46.1721
 longitude: 6.31218
 postcode: ""
 city: Bonne
-street: "Route de chez Montagnon"
-housenumber: 249
+street: Route de chez Montagnon
+housenumber: "249"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bonne/ma-planete-bio-3.yml b/data/cities/bonne/ma-planete-bio-3.yml
index 668c28697..806cdb84c 100644
--- a/data/cities/bonne/ma-planete-bio-3.yml
+++ b/data/cities/bonne/ma-planete-bio-3.yml
@@ -4,8 +4,8 @@ latitude: 46.17174
 longitude: 6.31456
 postcode: "74380"
 city: Bonne
-street: "Avenue du Léman"
-housenumber: 724
-phone: "+33 4 50 31 54 43"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue du Léman
+housenumber: "724"
+phone: +33 4 50 31 54 43
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/bonne/sport-alpes.yml b/data/cities/bonne/sport-alpes.yml
index 6ab59c3a3..f584708b2 100644
--- a/data/cities/bonne/sport-alpes.yml
+++ b/data/cities/bonne/sport-alpes.yml
@@ -4,8 +4,8 @@ latitude: 46.17181
 longitude: 6.31463
 postcode: "74380"
 city: Bonne
-street: "Avenue du Léman"
-housenumber: 724
-phone: "+33 4 50 85 88 95"
-opening_hours: "Mo-Fr 09:00-19:00"
-website: "https://www.troc-alpes.fr/"
\ No newline at end of file
+street: Avenue du Léman
+housenumber: "724"
+phone: +33 4 50 85 88 95
+opening_hours: Mo-Fr 09:00-19:00
+website: https://www.troc-alpes.fr/
diff --git a/data/cities/bonneville/angkor-store.yml b/data/cities/bonneville/angkor-store.yml
index 23dc24fc4..a4e2df7ad 100644
--- a/data/cities/bonneville/angkor-store.yml
+++ b/data/cities/bonneville/angkor-store.yml
@@ -4,8 +4,8 @@ latitude: 46.07326
 longitude: 6.39938
 postcode: "74130"
 city: Bonneville
-street: "Av. des Glières"
-housenumber: 546
-phone: "+33 4 50 97 35 25"
-opening_hours: "Mo-Sa 09:00-19:00; Su 09:00-13:00; Tu off"
-website: ""
\ No newline at end of file
+street: Av. des Glières
+housenumber: "546"
+phone: +33 4 50 97 35 25
+opening_hours: Mo-Sa 09:00-19:00; Su 09:00-13:00; Tu off
+website: ""
diff --git a/data/cities/bonneville/biofrais-bonneville.yml b/data/cities/bonneville/biofrais-bonneville.yml
index 91c94bef1..5d074a3a4 100644
--- a/data/cities/bonneville/biofrais-bonneville.yml
+++ b/data/cities/bonneville/biofrais-bonneville.yml
@@ -4,8 +4,8 @@ latitude: 46.08023
 longitude: 6.40622
 postcode: "74130"
 city: Bonneville
-street: "Avenue de Genève"
-housenumber: 64
+street: Avenue de Genève
+housenumber: "64"
 phone: "0428384901"
-opening_hours: "Mo-Sa 08:30-20:00; Su 9:00-13:00"
-website: "https://www.biofrais.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 9:00-13:00
+website: https://www.biofrais.com/
diff --git a/data/cities/bonneville/carrefour-market.yml b/data/cities/bonneville/carrefour-market.yml
index 064745778..b0b58ab4b 100644
--- a/data/cities/bonneville/carrefour-market.yml
+++ b/data/cities/bonneville/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 820369716
-type: way
+type: node
 latitude: 46.0734
 longitude: 6.41859
 postcode: "74130"
 city: Bonneville
-street: "Rue des Grèbes Huppès"
-housenumber: 61
+street: Rue des Grèbes Huppès
+housenumber: "61"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00
+website: ""
diff --git a/data/cities/bonneville/cordonnerie-du-faucigny.yml b/data/cities/bonneville/cordonnerie-du-faucigny.yml
index 16ba1c341..371646830 100644
--- a/data/cities/bonneville/cordonnerie-du-faucigny.yml
+++ b/data/cities/bonneville/cordonnerie-du-faucigny.yml
@@ -4,8 +4,8 @@ latitude: 46.07781
 longitude: 6.41166
 postcode: "74130"
 city: Bonneville
-street: "Rue Pertuiset"
-housenumber: 174
+street: Rue Pertuiset
+housenumber: "174"
 phone: "0450970158"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bonneville/fresh.yml b/data/cities/bonneville/fresh.yml
index 35be0cdcc..1d53738bb 100644
--- a/data/cities/bonneville/fresh.yml
+++ b/data/cities/bonneville/fresh.yml
@@ -1,11 +1,11 @@
 id: 107785716
-type: way
+type: node
 latitude: 46.07403
 longitude: 6.40966
 postcode: "74130"
 city: Bonneville
-street: "Rue Charles Baudelaire"
-housenumber: 220
+street: Rue Charles Baudelaire
+housenumber: "220"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bonneville/intermarche.yml b/data/cities/bonneville/intermarche.yml
index 3ecbec8d3..7355fcca4 100644
--- a/data/cities/bonneville/intermarche.yml
+++ b/data/cities/bonneville/intermarche.yml
@@ -1,11 +1,11 @@
 id: 823067549
-type: way
+type: node
 latitude: 46.08358
 longitude: 6.40365
 postcode: "74130"
 city: Bonneville
-street: "Avenue de Genève"
-housenumber: 516
+street: Avenue de Genève
+housenumber: "516"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:45; Su 08:30-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:45; Su 08:30-12:45
+website: ""
diff --git a/data/cities/bonneville/intersport.yml b/data/cities/bonneville/intersport.yml
index 632e2484a..e7a989eb4 100644
--- a/data/cities/bonneville/intersport.yml
+++ b/data/cities/bonneville/intersport.yml
@@ -1,11 +1,11 @@
 id: 107781264
-type: way
+type: node
 latitude: 46.07318
 longitude: 6.41778
 postcode: "74130"
 city: Bonneville
-street: "Rue des Hérons Cendrés"
-housenumber: 185
+street: Rue des Hérons Cendrés
+housenumber: "185"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/bonneville/le-petit-casino.yml b/data/cities/bonneville/le-petit-casino.yml
index 2de22a1e4..70c1b397c 100644
--- a/data/cities/bonneville/le-petit-casino.yml
+++ b/data/cities/bonneville/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.07796
 longitude: 6.40747
 postcode: "74130"
 city: Bonneville
-street: "Place de l'Hôtel de Ville"
-housenumber: 110
+street: Place de l'Hôtel de Ville
+housenumber: "110"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:30
+website: ""
diff --git a/data/cities/bonneville/librairie-lettres-libres.yml b/data/cities/bonneville/librairie-lettres-libres.yml
index 7ab0e3d9b..d2e6b4942 100644
--- a/data/cities/bonneville/librairie-lettres-libres.yml
+++ b/data/cities/bonneville/librairie-lettres-libres.yml
@@ -4,8 +4,8 @@ latitude: 46.0775
 longitude: 6.40935
 postcode: "74300"
 city: Bonneville
-street: "Place de l'Hôtel de Ville"
-housenumber: 25
+street: Place de l'Hôtel de Ville
+housenumber: "25"
 phone: "0450973419"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bonneville/lidl.yml b/data/cities/bonneville/lidl.yml
index 2d07c6ebd..2e8dc1591 100644
--- a/data/cities/bonneville/lidl.yml
+++ b/data/cities/bonneville/lidl.yml
@@ -1,11 +1,11 @@
 id: 107783783
-type: way
+type: node
 latitude: 46.07419
 longitude: 6.41878
 postcode: "74130"
 city: Bonneville
-street: "Rue des Bernacles"
-housenumber: 21
+street: Rue des Bernacles
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/bons-en-chablais/au-plaisir-de-lautomobile.yml b/data/cities/bons-en-chablais/au-plaisir-de-lautomobile.yml
index 839791743..5a4e5281e 100644
--- a/data/cities/bons-en-chablais/au-plaisir-de-lautomobile.yml
+++ b/data/cities/bons-en-chablais/au-plaisir-de-lautomobile.yml
@@ -1,11 +1,11 @@
 id: 1154317247
-type: way
+type: node
 latitude: 46.27767
 longitude: 6.34518
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue des Tanières"
-housenumber: 317
+street: Rue des Tanières
+housenumber: "317"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/auto-pro-services-74.yml b/data/cities/bons-en-chablais/auto-pro-services-74.yml
index e55c9f756..f0b292591 100644
--- a/data/cities/bons-en-chablais/auto-pro-services-74.yml
+++ b/data/cities/bons-en-chablais/auto-pro-services-74.yml
@@ -4,8 +4,8 @@ latitude: 46.27769
 longitude: 6.3506
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue de Cornillat"
-housenumber: 119
+street: Rue de Cornillat
+housenumber: "119"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/auto-retro-du-leman.yml b/data/cities/bons-en-chablais/auto-retro-du-leman.yml
index 51def0c7f..adf96fb3a 100644
--- a/data/cities/bons-en-chablais/auto-retro-du-leman.yml
+++ b/data/cities/bons-en-chablais/auto-retro-du-leman.yml
@@ -1,11 +1,11 @@
 id: 1153419406
-type: way
+type: node
 latitude: 46.277
 longitude: 6.35256
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue de Cornillat"
-housenumber: 237
+street: Rue de Cornillat
+housenumber: "237"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa-Su off
+website: ""
diff --git a/data/cities/bons-en-chablais/bois-opticiens.yml b/data/cities/bons-en-chablais/bois-opticiens.yml
index 7878e0b2c..de0c7c2fa 100644
--- a/data/cities/bons-en-chablais/bois-opticiens.yml
+++ b/data/cities/bons-en-chablais/bois-opticiens.yml
@@ -4,8 +4,8 @@ latitude: 46.26616
 longitude: 6.36836
 postcode: "74890"
 city: Bons-en-Chablais
-street: "place de la Colombière"
-housenumber: 9
-phone: "+33 4 50 95 88 57"
-opening_hours: "Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: "https://boisopticiens.business.site/"
\ No newline at end of file
+street: place de la Colombière
+housenumber: "9"
+phone: +33 4 50 95 88 57
+opening_hours: Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: https://boisopticiens.business.site/
diff --git a/data/cities/bons-en-chablais/boucherie-vachat.yml b/data/cities/bons-en-chablais/boucherie-vachat.yml
index af9dc6f3f..884ac8f75 100644
--- a/data/cities/bons-en-chablais/boucherie-vachat.yml
+++ b/data/cities/bons-en-chablais/boucherie-vachat.yml
@@ -4,8 +4,8 @@ latitude: 46.26644
 longitude: 6.36893
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Place de la Colombière"
-housenumber: 
-phone: "+33 4 50 36 11 80"
-opening_hours: "Mo,Su off; Tu,Th-Sa 07:30-12:30, 14:30-18:30; We 07:30-12:30"
-website: "https://www.ollca.com/annecy/boutiques/boucherie-vachat"
\ No newline at end of file
+street: Place de la Colombière
+housenumber: ""
+phone: +33 4 50 36 11 80
+opening_hours: Mo,Su off; Tu,Th-Sa 07:30-12:30, 14:30-18:30; We 07:30-12:30
+website: https://www.ollca.com/annecy/boutiques/boucherie-vachat
diff --git a/data/cities/bons-en-chablais/boulangerie-alain-chapeau.yml b/data/cities/bons-en-chablais/boulangerie-alain-chapeau.yml
index 0f658b489..3bf4c669d 100644
--- a/data/cities/bons-en-chablais/boulangerie-alain-chapeau.yml
+++ b/data/cities/bons-en-chablais/boulangerie-alain-chapeau.yml
@@ -4,8 +4,8 @@ latitude: 46.26334
 longitude: 6.36663
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Avenue du Jura"
-housenumber: 335
+street: Avenue du Jura
+housenumber: "335"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/bons-en-chablais/carrefour-market.yml b/data/cities/bons-en-chablais/carrefour-market.yml
index 762ce961d..9f852aa65 100644
--- a/data/cities/bons-en-chablais/carrefour-market.yml
+++ b/data/cities/bons-en-chablais/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 814555823
-type: way
+type: node
 latitude: 46.26866
 longitude: 6.3666
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue de la Scie"
-housenumber: 136
+street: Rue de la Scie
+housenumber: "136"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/bons-en-chablais/classique-autowerks.yml b/data/cities/bons-en-chablais/classique-autowerks.yml
index f84e7c7d5..543f9616b 100644
--- a/data/cities/bons-en-chablais/classique-autowerks.yml
+++ b/data/cities/bons-en-chablais/classique-autowerks.yml
@@ -1,11 +1,11 @@
 id: 208379682
-type: way
+type: node
 latitude: 46.26076
 longitude: 6.3514
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue de la Golliasse"
-housenumber: 11
+street: Rue de la Golliasse
+housenumber: "11"
 phone: ""
-opening_hours: "Tu-Fr 17:00-21:00; Mo,Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 17:00-21:00; Mo,Sa-Su off
+website: ""
diff --git a/data/cities/bons-en-chablais/damien-pneu.yml b/data/cities/bons-en-chablais/damien-pneu.yml
index 904fa71d0..dd7a5118b 100644
--- a/data/cities/bons-en-chablais/damien-pneu.yml
+++ b/data/cities/bons-en-chablais/damien-pneu.yml
@@ -1,11 +1,11 @@
 id: 875120561
-type: way
+type: node
 latitude: 46.2739
 longitude: 6.35131
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue de Courchamp"
-housenumber: 31
+street: Rue de Courchamp
+housenumber: "31"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00; Su off
+website: ""
diff --git a/data/cities/bons-en-chablais/duby-auto.yml b/data/cities/bons-en-chablais/duby-auto.yml
index 0a761a8c3..83b9cb6c6 100644
--- a/data/cities/bons-en-chablais/duby-auto.yml
+++ b/data/cities/bons-en-chablais/duby-auto.yml
@@ -1,11 +1,11 @@
 id: 1153718614
-type: way
+type: node
 latitude: 46.274
 longitude: 6.35157
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue des Bracots"
-housenumber: 246
+street: Rue des Bracots
+housenumber: "246"
 phone: ""
-opening_hours: "Mo,Tu,Th,Fr 08:00-12:00,14:00-18:30; We,Sa,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th,Fr 08:00-12:00,14:00-18:30; We,Sa,Su off
+website: ""
diff --git a/data/cities/bons-en-chablais/fournil-de-langin.yml b/data/cities/bons-en-chablais/fournil-de-langin.yml
index 8de0faadd..03098e958 100644
--- a/data/cities/bons-en-chablais/fournil-de-langin.yml
+++ b/data/cities/bons-en-chablais/fournil-de-langin.yml
@@ -4,8 +4,8 @@ latitude: 46.2601
 longitude: 6.35014
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Route du Salève"
-housenumber: 627
+street: Route du Salève
+housenumber: "627"
 phone: "+33614983534"
 opening_hours: ""
-website: "https://www.chablais.bio/"
\ No newline at end of file
+website: https://www.chablais.bio/
diff --git a/data/cities/bons-en-chablais/kx-meca-auto.yml b/data/cities/bons-en-chablais/kx-meca-auto.yml
index a709327be..236e147f6 100644
--- a/data/cities/bons-en-chablais/kx-meca-auto.yml
+++ b/data/cities/bons-en-chablais/kx-meca-auto.yml
@@ -4,8 +4,8 @@ latitude: 46.27772
 longitude: 6.35066
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue de Cornillat"
-housenumber: 119
+street: Rue de Cornillat
+housenumber: "119"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/leman-demenagements.yml b/data/cities/bons-en-chablais/leman-demenagements.yml
index 1013bb512..ee520b8d9 100644
--- a/data/cities/bons-en-chablais/leman-demenagements.yml
+++ b/data/cities/bons-en-chablais/leman-demenagements.yml
@@ -1,11 +1,11 @@
 id: 208380114
-type: way
+type: node
 latitude: 46.27517
 longitude: 6.34712
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue du Grand Vire"
-housenumber: 259
+street: Rue du Grand Vire
+housenumber: "259"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/luxury-car-consulting.yml b/data/cities/bons-en-chablais/luxury-car-consulting.yml
index a8f83912e..4aa7bf3e2 100644
--- a/data/cities/bons-en-chablais/luxury-car-consulting.yml
+++ b/data/cities/bons-en-chablais/luxury-car-consulting.yml
@@ -1,11 +1,11 @@
 id: 1154968211
-type: way
+type: node
 latitude: 46.27685
 longitude: 6.34485
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue des Tanières"
-housenumber: 258
-phone: "+33 4 50 35 23 81"
-opening_hours: "Mo-Fr 07:30-18:30; Sa 09:00-12:00; Su off"
-website: "https://luxurycarconsulting.com"
\ No newline at end of file
+street: Rue des Tanières
+housenumber: "258"
+phone: +33 4 50 35 23 81
+opening_hours: Mo-Fr 07:30-18:30; Sa 09:00-12:00; Su off
+website: https://luxurycarconsulting.com
diff --git a/data/cities/bons-en-chablais/marmotard-shop.yml b/data/cities/bons-en-chablais/marmotard-shop.yml
index 1bbd36987..0262c329c 100644
--- a/data/cities/bons-en-chablais/marmotard-shop.yml
+++ b/data/cities/bons-en-chablais/marmotard-shop.yml
@@ -4,8 +4,8 @@ latitude: 46.27545
 longitude: 6.34397
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue des Tanières"
-housenumber: 65
+street: Rue des Tanières
+housenumber: "65"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/pro-clotures-74.yml b/data/cities/bons-en-chablais/pro-clotures-74.yml
index eccb78765..b71b23020 100644
--- a/data/cities/bons-en-chablais/pro-clotures-74.yml
+++ b/data/cities/bons-en-chablais/pro-clotures-74.yml
@@ -1,11 +1,11 @@
 id: 1245517753
-type: way
+type: node
 latitude: 46.27756
 longitude: 6.35298
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Impasse des Prés Vignan"
-housenumber: 40
+street: Impasse des Prés Vignan
+housenumber: "40"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/r-one-carrosserie.yml b/data/cities/bons-en-chablais/r-one-carrosserie.yml
index c97b2375a..ccebe952b 100644
--- a/data/cities/bons-en-chablais/r-one-carrosserie.yml
+++ b/data/cities/bons-en-chablais/r-one-carrosserie.yml
@@ -1,11 +1,11 @@
 id: 1154983131
-type: way
+type: node
 latitude: 46.27543
 longitude: 6.34707
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue du Grand Vire"
-housenumber: 225
+street: Rue du Grand Vire
+housenumber: "225"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/rs-auto-pieces.yml b/data/cities/bons-en-chablais/rs-auto-pieces.yml
index fc1768e40..38a06695a 100644
--- a/data/cities/bons-en-chablais/rs-auto-pieces.yml
+++ b/data/cities/bons-en-chablais/rs-auto-pieces.yml
@@ -1,11 +1,11 @@
 id: 208380428
-type: way
+type: node
 latitude: 46.27673
 longitude: 6.35115
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue des Prés Vignan"
-housenumber: 145
+street: Rue des Prés Vignan
+housenumber: "145"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/soler-automobiles.yml b/data/cities/bons-en-chablais/soler-automobiles.yml
index f44cb9835..15f3b2da4 100644
--- a/data/cities/bons-en-chablais/soler-automobiles.yml
+++ b/data/cities/bons-en-chablais/soler-automobiles.yml
@@ -1,11 +1,11 @@
 id: 208379620
-type: way
+type: node
 latitude: 46.26943
 longitude: 6.36503
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Avenue de la Gare"
-housenumber: 123
-phone: "+33 4 50 36 11 76"
+street: Avenue de la Gare
+housenumber: "123"
+phone: +33 4 50 36 11 76
 opening_hours: ""
-website: "https://www.soler-automobiles.fr/"
\ No newline at end of file
+website: https://www.soler-automobiles.fr/
diff --git a/data/cities/bons-en-chablais/tactilpad.yml b/data/cities/bons-en-chablais/tactilpad.yml
index 7248981b0..a874e757f 100644
--- a/data/cities/bons-en-chablais/tactilpad.yml
+++ b/data/cities/bons-en-chablais/tactilpad.yml
@@ -1,11 +1,11 @@
 id: 1154467875
-type: way
+type: node
 latitude: 46.27572
 longitude: 6.34432
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue des Tanières"
-housenumber: 81
+street: Rue des Tanières
+housenumber: "81"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bons-en-chablais/ulteam-motos.yml b/data/cities/bons-en-chablais/ulteam-motos.yml
index 3004369e7..be2bc2283 100644
--- a/data/cities/bons-en-chablais/ulteam-motos.yml
+++ b/data/cities/bons-en-chablais/ulteam-motos.yml
@@ -4,8 +4,8 @@ latitude: 46.27562
 longitude: 6.34382
 postcode: "74890"
 city: Bons-en-Chablais
-street: "Rue des Tanières"
-housenumber: 65
+street: Rue des Tanières
+housenumber: "65"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00,14:00-18:30; Sa 08:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00,14:00-18:30; Sa 08:00-12:00; Su off
+website: ""
diff --git a/data/cities/bouge-chambalud/boulangerie-giraud-et-banette.yml b/data/cities/bouge-chambalud/boulangerie-giraud-et-banette.yml
index f12396538..c47c05819 100644
--- a/data/cities/bouge-chambalud/boulangerie-giraud-et-banette.yml
+++ b/data/cities/bouge-chambalud/boulangerie-giraud-et-banette.yml
@@ -4,8 +4,8 @@ latitude: 45.33093
 longitude: 4.90191
 postcode: "38150"
 city: Bougé-Chambalud
-street: "Place du 8 Mai 1945"
-housenumber: 3
+street: Place du 8 Mai 1945
+housenumber: "3"
 phone: ""
-opening_hours: "tu-sa 06:00-12:00 15:30-19:00; su 06:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: tu-sa 06:00-12:00 15:30-19:00; su 06:00-13:00
+website: ""
diff --git a/data/cities/bouge-chambalud/roland-galerne-maraicher-par-nature.yml b/data/cities/bouge-chambalud/roland-galerne-maraicher-par-nature.yml
index 1dec310d2..7ad81faf3 100644
--- a/data/cities/bouge-chambalud/roland-galerne-maraicher-par-nature.yml
+++ b/data/cities/bouge-chambalud/roland-galerne-maraicher-par-nature.yml
@@ -4,8 +4,8 @@ latitude: 45.33645
 longitude: 4.90996
 postcode: "38150"
 city: Bougé-Chambalud
-street: "Route de Sonnay"
-housenumber: 489
+street: Route de Sonnay
+housenumber: "489"
 phone: ""
-opening_hours: "We 15:00-19:00; Fr 15:00-19:00; Sa 09:00-12:00"
-website: "https://rolandgalerne.fr/la-boutique/"
\ No newline at end of file
+opening_hours: We 15:00-19:00; Fr 15:00-19:00; Sa 09:00-12:00
+website: https://rolandgalerne.fr/la-boutique/
diff --git a/data/cities/bourdeaux/la-boucherie-sympa.yml b/data/cities/bourdeaux/la-boucherie-sympa.yml
index 66ed27986..efd51fe85 100644
--- a/data/cities/bourdeaux/la-boucherie-sympa.yml
+++ b/data/cities/bourdeaux/la-boucherie-sympa.yml
@@ -1,11 +1,11 @@
 id: 259230014
-type: way
+type: node
 latitude: 44.58533
 longitude: 5.13371
 postcode: "26460"
 city: Bourdeaux
-street: "Place de l’Église"
-housenumber: 9
-phone: "+33 4 75 53 32 14"
-opening_hours: "Mo off; Tu,Th,Fr,Sa 8:30-12:30, 15:00-19:30; We 8:30-12:30; Su 9:00-12:30"
-website: ""
\ No newline at end of file
+street: Place de l’Église
+housenumber: "9"
+phone: +33 4 75 53 32 14
+opening_hours: Mo off; Tu,Th,Fr,Sa 8:30-12:30, 15:00-19:30; We 8:30-12:30; Su 9:00-12:30
+website: ""
diff --git a/data/cities/bourg-en-bresse/biocoop.yml b/data/cities/bourg-en-bresse/biocoop.yml
index 8bcb00066..8f0b45715 100644
--- a/data/cities/bourg-en-bresse/biocoop.yml
+++ b/data/cities/bourg-en-bresse/biocoop.yml
@@ -5,7 +5,7 @@ longitude: 5.24069
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 10
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://magbio.biocoop.net"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://magbio.biocoop.net
diff --git a/data/cities/bourg-en-bresse/biophare.yml b/data/cities/bourg-en-bresse/biophare.yml
index fa9291864..3e0f8bc37 100644
--- a/data/cities/bourg-en-bresse/biophare.yml
+++ b/data/cities/bourg-en-bresse/biophare.yml
@@ -4,8 +4,8 @@ latitude: 46.20787
 longitude: 5.2164
 postcode: "01000"
 city: Bourg-en-Bresse
-street: "Rue du 23e R.I."
-housenumber: 24
+street: Rue du 23e R.I.
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: "https://www.biomonde.fr/biophare,3,3"
\ No newline at end of file
+website: https://www.biomonde.fr/biophare,3,3
diff --git a/data/cities/bourg-en-bresse/centre-commercial-carrefour-brou.yml b/data/cities/bourg-en-bresse/centre-commercial-carrefour-brou.yml
index af4220ea7..da73a8285 100644
--- a/data/cities/bourg-en-bresse/centre-commercial-carrefour-brou.yml
+++ b/data/cities/bourg-en-bresse/centre-commercial-carrefour-brou.yml
@@ -1,11 +1,11 @@
 id: 335689961
-type: way
+type: node
 latitude: 46.19987
 longitude: 5.24424
 postcode: "01000"
 city: Bourg-en-Bresse
-street: "Boulevard Charles de Gaulle"
-housenumber: 
-phone: "+33 4 74 50 30 00"
+street: Boulevard Charles de Gaulle
+housenumber: ""
+phone: +33 4 74 50 30 00
 opening_hours: ""
-website: "https://www.carrefour.fr/magasin/bourg-en-bresse"
\ No newline at end of file
+website: https://www.carrefour.fr/magasin/bourg-en-bresse
diff --git a/data/cities/bourg-en-bresse/cycles-01.yml b/data/cities/bourg-en-bresse/cycles-01.yml
index 82aafca9e..28438892b 100644
--- a/data/cities/bourg-en-bresse/cycles-01.yml
+++ b/data/cities/bourg-en-bresse/cycles-01.yml
@@ -4,8 +4,8 @@ latitude: 46.22241
 longitude: 5.22778
 postcode: "01000"
 city: Bourg-en-Bresse
-street: "Avenue de Marboz"
+street: Avenue de Marboz
 housenumber: 33bis
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00,Sa 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00,Sa 08:30-12:30
+website: ""
diff --git a/data/cities/bourg-en-bresse/cycles-m-v.yml b/data/cities/bourg-en-bresse/cycles-m-v.yml
index ffce6376d..132fb60f8 100644
--- a/data/cities/bourg-en-bresse/cycles-m-v.yml
+++ b/data/cities/bourg-en-bresse/cycles-m-v.yml
@@ -5,7 +5,7 @@ longitude: 5.22681
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 15
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:30,14:00-19:00; Sa 09:00-18:00"
-website: "https://cyclesmv.business.site/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:30,14:00-19:00; Sa 09:00-18:00
+website: https://cyclesmv.business.site/
diff --git a/data/cities/bourg-en-bresse/gaultier-buey-le-studio-vegetal.yml b/data/cities/bourg-en-bresse/gaultier-buey-le-studio-vegetal.yml
index 068b7353f..8205012f1 100644
--- a/data/cities/bourg-en-bresse/gaultier-buey-le-studio-vegetal.yml
+++ b/data/cities/bourg-en-bresse/gaultier-buey-le-studio-vegetal.yml
@@ -5,7 +5,7 @@ longitude: 5.22832
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 56
+housenumber: "56"
 phone: "0786768895"
 opening_hours: ""
-website: "https://gaultierbuey.fr"
\ No newline at end of file
+website: https://gaultierbuey.fr
diff --git a/data/cities/bourg-en-bresse/high-society.yml b/data/cities/bourg-en-bresse/high-society.yml
index 0d0492b3f..595a78b6a 100644
--- a/data/cities/bourg-en-bresse/high-society.yml
+++ b/data/cities/bourg-en-bresse/high-society.yml
@@ -5,7 +5,7 @@ longitude: 5.22604
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 3
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/bourg-en-bresse/intermarche-super.yml b/data/cities/bourg-en-bresse/intermarche-super.yml
index 981a08ca6..7068d1d30 100644
--- a/data/cities/bourg-en-bresse/intermarche-super.yml
+++ b/data/cities/bourg-en-bresse/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 335689964
-type: way
+type: node
 latitude: 46.19719
 longitude: 5.22842
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 56
+housenumber: "56"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-en-bresse/karactere.yml b/data/cities/bourg-en-bresse/karactere.yml
index a6eb0f6de..1a953e91b 100644
--- a/data/cities/bourg-en-bresse/karactere.yml
+++ b/data/cities/bourg-en-bresse/karactere.yml
@@ -7,5 +7,5 @@ city: Bourg-en-Bresse
 street: ""
 housenumber: 14B
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/bourg-en-bresse/laverie-speed-queen.yml b/data/cities/bourg-en-bresse/laverie-speed-queen.yml
index f52a92804..b56a36031 100644
--- a/data/cities/bourg-en-bresse/laverie-speed-queen.yml
+++ b/data/cities/bourg-en-bresse/laverie-speed-queen.yml
@@ -6,6 +6,6 @@ postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
 housenumber: 6bis
-phone: "+33 7 54 36 47 47"
-opening_hours: "Mo-Su 07:00-20:00"
-website: "https://www.speedqueenfrance.fr/Laverie-Bourg-en-Bresse/"
\ No newline at end of file
+phone: +33 7 54 36 47 47
+opening_hours: Mo-Su 07:00-20:00
+website: https://www.speedqueenfrance.fr/Laverie-Bourg-en-Bresse/
diff --git a/data/cities/bourg-en-bresse/librairie-montbarbon.yml b/data/cities/bourg-en-bresse/librairie-montbarbon.yml
index 3f9bc4cb7..97f00ec07 100644
--- a/data/cities/bourg-en-bresse/librairie-montbarbon.yml
+++ b/data/cities/bourg-en-bresse/librairie-montbarbon.yml
@@ -5,7 +5,7 @@ longitude: 5.2271
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 14
+housenumber: "14"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-19:00"
-website: "https://www.montbarbon.com/"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-19:00
+website: https://www.montbarbon.com/
diff --git a/data/cities/bourg-en-bresse/micronov.yml b/data/cities/bourg-en-bresse/micronov.yml
index 8b99f9375..a331161eb 100644
--- a/data/cities/bourg-en-bresse/micronov.yml
+++ b/data/cities/bourg-en-bresse/micronov.yml
@@ -5,7 +5,7 @@ longitude: 5.21994
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 13
-phone: "+33 4 74 22 72 72"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00"
-website: "https://www.micronov.com/"
\ No newline at end of file
+housenumber: "13"
+phone: +33 4 74 22 72 72
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00
+website: https://www.micronov.com/
diff --git a/data/cities/bourg-en-bresse/midas.yml b/data/cities/bourg-en-bresse/midas.yml
index 614a43a21..5ee755f88 100644
--- a/data/cities/bourg-en-bresse/midas.yml
+++ b/data/cities/bourg-en-bresse/midas.yml
@@ -4,8 +4,8 @@ latitude: 46.20328
 longitude: 5.24469
 postcode: "01000"
 city: Bourg-en-Bresse
-street: "Avenue Amédée Mercier"
-housenumber: 
-phone: "+33 4 74 50 31 40"
+street: Avenue Amédée Mercier
+housenumber: ""
+phone: +33 4 74 50 31 40
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/bourg-en-bresse/monoprix.yml b/data/cities/bourg-en-bresse/monoprix.yml
index 6c8db6d5a..2504f5db4 100644
--- a/data/cities/bourg-en-bresse/monoprix.yml
+++ b/data/cities/bourg-en-bresse/monoprix.yml
@@ -5,7 +5,7 @@ longitude: 5.22552
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 10
-phone: "+33 4 74 22 39 52"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.monoprix.fr/229.html"
\ No newline at end of file
+housenumber: "10"
+phone: +33 4 74 22 39 52
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.monoprix.fr/229.html
diff --git a/data/cities/bourg-en-bresse/prolians.yml b/data/cities/bourg-en-bresse/prolians.yml
index 3dc88ed2f..bc5068cb9 100644
--- a/data/cities/bourg-en-bresse/prolians.yml
+++ b/data/cities/bourg-en-bresse/prolians.yml
@@ -5,7 +5,7 @@ longitude: 5.22558
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 13
-phone: "04 74 22 20 12"
+housenumber: "13"
+phone: 04 74 22 20 12
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-en-bresse/saint-algue.yml b/data/cities/bourg-en-bresse/saint-algue.yml
index dcc6bbbe0..58630912a 100644
--- a/data/cities/bourg-en-bresse/saint-algue.yml
+++ b/data/cities/bourg-en-bresse/saint-algue.yml
@@ -5,7 +5,7 @@ longitude: 5.22889
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 1
-phone: "+33 474529665"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+housenumber: "1"
+phone: +33 474529665
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/bourg-en-bresse/spar.yml b/data/cities/bourg-en-bresse/spar.yml
index ea494793a..13ed48560 100644
--- a/data/cities/bourg-en-bresse/spar.yml
+++ b/data/cities/bourg-en-bresse/spar.yml
@@ -5,7 +5,7 @@ longitude: 5.23872
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 14
-phone: "+33 4 74 23 96 34"
-opening_hours: "Mo-Sa 08:00-13:00,15:00-19:30; Su 08:30-12:30"
-website: "https://magasins.spar.fr/fr/s/spar-supermarche-bourg-en-bresse"
\ No newline at end of file
+housenumber: "14"
+phone: +33 4 74 23 96 34
+opening_hours: Mo-Sa 08:00-13:00,15:00-19:30; Su 08:30-12:30
+website: https://magasins.spar.fr/fr/s/spar-supermarche-bourg-en-bresse
diff --git a/data/cities/bourg-en-bresse/tabac-presse.yml b/data/cities/bourg-en-bresse/tabac-presse.yml
index dd14885ca..8cfe2bb8b 100644
--- a/data/cities/bourg-en-bresse/tabac-presse.yml
+++ b/data/cities/bourg-en-bresse/tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 46.20667
 longitude: 5.22593
 postcode: "01000"
 city: Bourg-en-Bresse
-street: "Rue Paul et Louise Pioda"
-housenumber: 4
+street: Rue Paul et Louise Pioda
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-en-bresse/yves-rocher.yml b/data/cities/bourg-en-bresse/yves-rocher.yml
index 226b3547d..fbf5b06de 100644
--- a/data/cities/bourg-en-bresse/yves-rocher.yml
+++ b/data/cities/bourg-en-bresse/yves-rocher.yml
@@ -5,7 +5,7 @@ longitude: 5.22876
 postcode: "01000"
 city: Bourg-en-Bresse
 street: ""
-housenumber: 40
+housenumber: "40"
 phone: ""
-opening_hours: "Tu-Sa 09:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/bourg-en-bresse/bourg-en-bresse/S-FRYROC62"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/bourg-en-bresse/bourg-en-bresse/S-FRYROC62
diff --git a/data/cities/bourg-les-valence/asencio-arboriculteur.yml b/data/cities/bourg-les-valence/asencio-arboriculteur.yml
index 838aff95b..af3e0e3ca 100644
--- a/data/cities/bourg-les-valence/asencio-arboriculteur.yml
+++ b/data/cities/bourg-les-valence/asencio-arboriculteur.yml
@@ -4,8 +4,8 @@ latitude: 44.97736
 longitude: 4.91754
 postcode: "26500"
 city: Bourg-lès-Valence
-street: "Route de Fouillouse - Quartier Le Milieu Est"
-housenumber: 2249
-phone: "+33 6 23 49 43 79"
+street: Route de Fouillouse - Quartier Le Milieu Est
+housenumber: "2249"
+phone: +33 6 23 49 43 79
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-les-valence/boulangerie-feuillette.yml b/data/cities/bourg-les-valence/boulangerie-feuillette.yml
index b615dee2f..803529a82 100644
--- a/data/cities/bourg-les-valence/boulangerie-feuillette.yml
+++ b/data/cities/bourg-les-valence/boulangerie-feuillette.yml
@@ -4,8 +4,8 @@ latitude: 44.9591
 longitude: 4.88454
 postcode: "26500"
 city: Bourg-lès-Valence
-street: "rue des Chabanneries"
-housenumber: 165
-phone: "+33 4 75 78 92 33"
+street: rue des Chabanneries
+housenumber: "165"
+phone: +33 4 75 78 92 33
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-saint-andeol/vente-au-detail-domaine-bayard.yml b/data/cities/bourg-saint-andeol/vente-au-detail-domaine-bayard.yml
index 6f920f6c4..e31967d50 100644
--- a/data/cities/bourg-saint-andeol/vente-au-detail-domaine-bayard.yml
+++ b/data/cities/bourg-saint-andeol/vente-au-detail-domaine-bayard.yml
@@ -4,8 +4,8 @@ latitude: 44.39812
 longitude: 4.64215
 postcode: "07700"
 city: Bourg-Saint-Andéol
-street: "Route de Saint Montan"
-housenumber: 1600
+street: Route de Saint Montan
+housenumber: "1600"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-saint-maurice/allez-cafe-velo.yml b/data/cities/bourg-saint-maurice/allez-cafe-velo.yml
index 9b5db2cb8..1dc17b4c3 100644
--- a/data/cities/bourg-saint-maurice/allez-cafe-velo.yml
+++ b/data/cities/bourg-saint-maurice/allez-cafe-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.61763
 longitude: 6.76972
 postcode: "73700"
 city: Bourg Saint Maurice
-street: "Avenue du Centenaire"
-housenumber: 55
+street: Avenue du Centenaire
+housenumber: "55"
 phone: "+33619487192"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-saint-maurice/blackstore.yml b/data/cities/bourg-saint-maurice/blackstore.yml
index 0b22acf00..47d7a3630 100644
--- a/data/cities/bourg-saint-maurice/blackstore.yml
+++ b/data/cities/bourg-saint-maurice/blackstore.yml
@@ -4,8 +4,8 @@ latitude: 45.62351
 longitude: 6.77694
 postcode: "73700"
 city: Bourg-Saint-Maurice
-street: "Avenue Du Stade"
-housenumber: 
+street: Avenue Du Stade
+housenumber: ""
 phone: "+33479070525"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.blackstore-bsm.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.blackstore-bsm.com/
diff --git a/data/cities/bourg-saint-maurice/intersport-zc-super-u.yml b/data/cities/bourg-saint-maurice/intersport-zc-super-u.yml
index 4d6eaa2fb..35569e1ae 100644
--- a/data/cities/bourg-saint-maurice/intersport-zc-super-u.yml
+++ b/data/cities/bourg-saint-maurice/intersport-zc-super-u.yml
@@ -1,11 +1,11 @@
 id: 131093394
-type: way
+type: node
 latitude: 45.62445
 longitude: 6.78109
 postcode: "73700"
 city: Bourg-Saint-Maurice
-street: "ZC SUPER U"
-housenumber: 
+street: ZC SUPER U
+housenumber: ""
 phone: "+33479040430"
 opening_hours: ""
-website: "https://www.intersport-lesarcs.com/"
\ No newline at end of file
+website: https://www.intersport-lesarcs.com/
diff --git a/data/cities/bourg-saint-maurice/intersport.yml b/data/cities/bourg-saint-maurice/intersport.yml
index a427ec9d1..e70d293cd 100644
--- a/data/cities/bourg-saint-maurice/intersport.yml
+++ b/data/cities/bourg-saint-maurice/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.61413
 longitude: 6.77371
 postcode: ""
 city: Bourg Saint Maurice
-street: "Avenue de l'Arc En Ciel"
-housenumber: 725
+street: Avenue de l'Arc En Ciel
+housenumber: "725"
 phone: "+33479041245"
 opening_hours: ""
-website: "https://www.intersport-bourg.com/"
\ No newline at end of file
+website: https://www.intersport-bourg.com/
diff --git a/data/cities/bourg-saint-maurice/precision-ski-place-de-la-gare.yml b/data/cities/bourg-saint-maurice/precision-ski-place-de-la-gare.yml
index d1bfffff8..32c36d763 100644
--- a/data/cities/bourg-saint-maurice/precision-ski-place-de-la-gare.yml
+++ b/data/cities/bourg-saint-maurice/precision-ski-place-de-la-gare.yml
@@ -4,8 +4,8 @@ latitude: 45.61907
 longitude: 6.77064
 postcode: "73700"
 city: Bourg-Saint-Maurice
-street: "Place de la Gare"
-housenumber: 43
+street: Place de la Gare
+housenumber: "43"
 phone: "+33458140444"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-saint-maurice/precision-ski.yml b/data/cities/bourg-saint-maurice/precision-ski.yml
index c91a020b6..278baa311 100644
--- a/data/cities/bourg-saint-maurice/precision-ski.yml
+++ b/data/cities/bourg-saint-maurice/precision-ski.yml
@@ -4,8 +4,8 @@ latitude: 45.61925
 longitude: 6.77019
 postcode: "73700"
 city: Bourg-Saint-Maurice
-street: "Rue du Capitaine Desserteaux"
-housenumber: 88
+street: Rue du Capitaine Desserteaux
+housenumber: "88"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-saint-maurice/samse.yml b/data/cities/bourg-saint-maurice/samse.yml
index c7a2fc3b1..77caa5740 100644
--- a/data/cities/bourg-saint-maurice/samse.yml
+++ b/data/cities/bourg-saint-maurice/samse.yml
@@ -1,11 +1,11 @@
 id: 131084279
-type: way
+type: node
 latitude: 45.62124
 longitude: 6.77378
 postcode: "73700"
 city: Bourg-Saint-Maurice
-street: "Avenue du Stade"
-housenumber: 
+street: Avenue du Stade
+housenumber: ""
 phone: "+33479071855"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-saint-maurice/souvenirs-savoyard.yml b/data/cities/bourg-saint-maurice/souvenirs-savoyard.yml
index 041bac683..6e05f7481 100644
--- a/data/cities/bourg-saint-maurice/souvenirs-savoyard.yml
+++ b/data/cities/bourg-saint-maurice/souvenirs-savoyard.yml
@@ -1,11 +1,11 @@
 id: 131094175
-type: way
+type: node
 latitude: 45.61834
 longitude: 6.76925
 postcode: "73700"
 city: Bourg-Saint-Maurice
-street: "Place Marcel Gaimard"
-housenumber: 54
-phone: "+33 4 79 07 50 14"
-opening_hours: "Mo-Fr 09:00-18:00"
-website: "https://www.souvenirs-savoyards.fr"
\ No newline at end of file
+street: Place Marcel Gaimard
+housenumber: "54"
+phone: +33 4 79 07 50 14
+opening_hours: Mo-Fr 09:00-18:00
+website: https://www.souvenirs-savoyards.fr
diff --git a/data/cities/bourg-saint-maurice/sport-2000.yml b/data/cities/bourg-saint-maurice/sport-2000.yml
index b39998978..9aea761ef 100644
--- a/data/cities/bourg-saint-maurice/sport-2000.yml
+++ b/data/cities/bourg-saint-maurice/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.573
 longitude: 6.77817
 postcode: "73700"
 city: Bourg saint maurice
-street: "Chemin du Front de Neige"
-housenumber: 
+street: Chemin du Front de Neige
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourg-saint-maurice/vival.yml b/data/cities/bourg-saint-maurice/vival.yml
index d4a44ffc8..cae6e26e4 100644
--- a/data/cities/bourg-saint-maurice/vival.yml
+++ b/data/cities/bourg-saint-maurice/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.57249
 longitude: 6.83123
 postcode: "73700"
 city: Bourg Saint Maurice
-street: "Arc 2000"
-housenumber: 
+street: Arc 2000
+housenumber: ""
 phone: "+33479223985"
-opening_hours: "Mo-Su 07:30-12:30; 15:30-19:30"
-website: "https://magasins.vival.fr/fr/vival-bourg-saint-maurice-de-lours"
\ No newline at end of file
+opening_hours: Mo-Su 07:30-12:30; 15:30-19:30
+website: https://magasins.vival.fr/fr/vival-bourg-saint-maurice-de-lours
diff --git a/data/cities/bourgoin-jallieu/amarante.yml b/data/cities/bourgoin-jallieu/amarante.yml
index 69480d5ba..978d017af 100644
--- a/data/cities/bourgoin-jallieu/amarante.yml
+++ b/data/cities/bourgoin-jallieu/amarante.yml
@@ -4,8 +4,8 @@ latitude: 45.58927
 longitude: 5.27919
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Avenue du Professeur Tixier"
-housenumber: 8
-phone: "+33 4 74 43 23 24"
-opening_hours: "Mo-Th 08:00-19:30; Fr-Sa 08:00-20:00; Su 08:00-13:00"
-website: "https://amarante-bourgoin-jallieu.com/"
\ No newline at end of file
+street: Avenue du Professeur Tixier
+housenumber: "8"
+phone: +33 4 74 43 23 24
+opening_hours: Mo-Th 08:00-19:30; Fr-Sa 08:00-20:00; Su 08:00-13:00
+website: https://amarante-bourgoin-jallieu.com/
diff --git a/data/cities/bourgoin-jallieu/anndog-toilettage.yml b/data/cities/bourgoin-jallieu/anndog-toilettage.yml
index d23fd5ba5..f9b8ba577 100644
--- a/data/cities/bourgoin-jallieu/anndog-toilettage.yml
+++ b/data/cities/bourgoin-jallieu/anndog-toilettage.yml
@@ -1,11 +1,11 @@
 id: 645417749
-type: way
+type: node
 latitude: 45.59882
 longitude: 5.27224
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue Pasteur"
-housenumber: 29
+street: Rue Pasteur
+housenumber: "29"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourgoin-jallieu/atelier-osez-lvelo-de-lapie.yml b/data/cities/bourgoin-jallieu/atelier-osez-lvelo-de-lapie.yml
index 76c2f45ac..b1e6fac5d 100644
--- a/data/cities/bourgoin-jallieu/atelier-osez-lvelo-de-lapie.yml
+++ b/data/cities/bourgoin-jallieu/atelier-osez-lvelo-de-lapie.yml
@@ -4,8 +4,8 @@ latitude: 45.58716
 longitude: 5.27893
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue de l'Escot"
-housenumber: 9
+street: Rue de l'Escot
+housenumber: "9"
 phone: ""
-opening_hours: "We,Fr 15:00-19:00; Sa 09:00-12:00"
-website: "https://apie-asso.net/accueil"
\ No newline at end of file
+opening_hours: We,Fr 15:00-19:00; Sa 09:00-12:00
+website: https://apie-asso.net/accueil
diff --git a/data/cities/bourgoin-jallieu/boulangerie-jas.yml b/data/cities/bourgoin-jallieu/boulangerie-jas.yml
index 81f738072..d4bbdde7d 100644
--- a/data/cities/bourgoin-jallieu/boulangerie-jas.yml
+++ b/data/cities/bourgoin-jallieu/boulangerie-jas.yml
@@ -4,8 +4,8 @@ latitude: 45.58891
 longitude: 5.28664
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Avenue du Professeur Tixier"
+street: Avenue du Professeur Tixier
 housenumber: 87 bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourgoin-jallieu/carre-blanc.yml b/data/cities/bourgoin-jallieu/carre-blanc.yml
index eaefdbff3..99fd81b9f 100644
--- a/data/cities/bourgoin-jallieu/carre-blanc.yml
+++ b/data/cities/bourgoin-jallieu/carre-blanc.yml
@@ -4,8 +4,8 @@ latitude: 45.5889
 longitude: 5.27851
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue de la Liberté"
-housenumber: 86
-phone: "+33 9 78 46 00 20"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-19:00"
-website: "https://boutiques.carreblanc.com/linge-de-maison/bourgoin-jallieu/BGJ"
\ No newline at end of file
+street: Rue de la Liberté
+housenumber: "86"
+phone: +33 9 78 46 00 20
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-19:00
+website: https://boutiques.carreblanc.com/linge-de-maison/bourgoin-jallieu/BGJ
diff --git a/data/cities/bourgoin-jallieu/cycles-fontaine.yml b/data/cities/bourgoin-jallieu/cycles-fontaine.yml
index 2a2ac48da..d9790fbdd 100644
--- a/data/cities/bourgoin-jallieu/cycles-fontaine.yml
+++ b/data/cities/bourgoin-jallieu/cycles-fontaine.yml
@@ -4,8 +4,8 @@ latitude: 45.58583
 longitude: 5.28131
 postcode: "38300"
 city: Bourgoin Jallieu
-street: "Avenue du Maréchal Leclerc"
-housenumber: 6
+street: Avenue du Maréchal Leclerc
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/bourgoin-jallieu/decathlon.yml b/data/cities/bourgoin-jallieu/decathlon.yml
index d4c5f2eb0..1ffee48e2 100644
--- a/data/cities/bourgoin-jallieu/decathlon.yml
+++ b/data/cities/bourgoin-jallieu/decathlon.yml
@@ -1,11 +1,11 @@
 id: 120173046
-type: way
+type: node
 latitude: 45.59197
 longitude: 5.24856
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue Édouard Branly"
-housenumber: 8
-phone: "+33 4 74 43 57 43"
-opening_hours: "Mo-Sa 09:00-20:00"
-website: ""
\ No newline at end of file
+street: Rue Édouard Branly
+housenumber: "8"
+phone: +33 4 74 43 57 43
+opening_hours: Mo-Sa 09:00-20:00
+website: ""
diff --git a/data/cities/bourgoin-jallieu/du-pareil-au-meme.yml b/data/cities/bourgoin-jallieu/du-pareil-au-meme.yml
index 6da1fc721..9de02f925 100644
--- a/data/cities/bourgoin-jallieu/du-pareil-au-meme.yml
+++ b/data/cities/bourgoin-jallieu/du-pareil-au-meme.yml
@@ -4,8 +4,8 @@ latitude: 45.58895
 longitude: 5.27857
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue de la Liberté"
-housenumber: 90
+street: Rue de la Liberté
+housenumber: "90"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bourgoin-jallieu/kikourvite.yml b/data/cities/bourgoin-jallieu/kikourvite.yml
index 4553de285..ef251b5a9 100644
--- a/data/cities/bourgoin-jallieu/kikourvite.yml
+++ b/data/cities/bourgoin-jallieu/kikourvite.yml
@@ -4,8 +4,8 @@ latitude: 45.5929
 longitude: 5.26373
 postcode: "38300"
 city: Bourgoin jallieu
-street: "Avenue des Marronniers"
-housenumber: 107
+street: Avenue des Marronniers
+housenumber: "107"
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00; Mo 14:00-19:00; Su Off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00; Mo 14:00-19:00; Su Off
+website: ""
diff --git a/data/cities/bourgoin-jallieu/madame-m.yml b/data/cities/bourgoin-jallieu/madame-m.yml
index 613d4b7dc..794c2d4aa 100644
--- a/data/cities/bourgoin-jallieu/madame-m.yml
+++ b/data/cities/bourgoin-jallieu/madame-m.yml
@@ -4,8 +4,8 @@ latitude: 45.589
 longitude: 5.27864
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue de la Liberté"
-housenumber: 92
+street: Rue de la Liberté
+housenumber: "92"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 08:30-18:00"
-website: "https://madammcoiffure.wixsite.com/monsite"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 08:30-18:00
+website: https://madammcoiffure.wixsite.com/monsite
diff --git a/data/cities/bourgoin-jallieu/manou.yml b/data/cities/bourgoin-jallieu/manou.yml
index 33a68c508..7680b48ac 100644
--- a/data/cities/bourgoin-jallieu/manou.yml
+++ b/data/cities/bourgoin-jallieu/manou.yml
@@ -4,8 +4,8 @@ latitude: 45.58869
 longitude: 5.27828
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue de la Liberté"
-housenumber: 78
+street: Rue de la Liberté
+housenumber: "78"
 phone: ""
-opening_hours: "Mo 14:30-18:30; Tu-Fr 09:30-12:00,14:30-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:30-18:30; Tu-Fr 09:30-12:00,14:30-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/bourgoin-jallieu/midas.yml b/data/cities/bourgoin-jallieu/midas.yml
index 93ab6dc51..901fc44e6 100644
--- a/data/cities/bourgoin-jallieu/midas.yml
+++ b/data/cities/bourgoin-jallieu/midas.yml
@@ -4,8 +4,8 @@ latitude: 45.5834
 longitude: 5.2915
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Route de Grenoble"
-housenumber: 78
-phone: "+33 4 74 43 20 48"
+street: Route de Grenoble
+housenumber: "78"
+phone: +33 4 74 43 20 48
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/bourgoin-jallieu/optique-morel.yml b/data/cities/bourgoin-jallieu/optique-morel.yml
index 464c8085f..ff1605b6d 100644
--- a/data/cities/bourgoin-jallieu/optique-morel.yml
+++ b/data/cities/bourgoin-jallieu/optique-morel.yml
@@ -4,8 +4,8 @@ latitude: 45.59751
 longitude: 5.24393
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Avenue du Médipôle"
-housenumber: 31
+street: Avenue du Médipôle
+housenumber: "31"
 phone: "+33474433008"
-opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-12:00"
-website: "https://www.optiquemorel.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-12:00
+website: https://www.optiquemorel.com/
diff --git a/data/cities/bourgoin-jallieu/peugeot-bourgoin-jallieu.yml b/data/cities/bourgoin-jallieu/peugeot-bourgoin-jallieu.yml
index 7969b94df..5d597a676 100644
--- a/data/cities/bourgoin-jallieu/peugeot-bourgoin-jallieu.yml
+++ b/data/cities/bourgoin-jallieu/peugeot-bourgoin-jallieu.yml
@@ -4,8 +4,8 @@ latitude: 45.588
 longitude: 5.26161
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue Joseph Cugnot"
-housenumber: 1
-phone: "+33 4 74 43 68 68"
+street: Rue Joseph Cugnot
+housenumber: "1"
+phone: +33 4 74 43 68 68
 opening_hours: ""
-website: "https://concessions.peugeot.fr/bourgoin/"
\ No newline at end of file
+website: https://concessions.peugeot.fr/bourgoin/
diff --git a/data/cities/bourgoin-jallieu/scribante-dornon.yml b/data/cities/bourgoin-jallieu/scribante-dornon.yml
index 62e173228..b75be1df2 100644
--- a/data/cities/bourgoin-jallieu/scribante-dornon.yml
+++ b/data/cities/bourgoin-jallieu/scribante-dornon.yml
@@ -4,8 +4,8 @@ latitude: 45.58885
 longitude: 5.27843
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue de la Liberté"
-housenumber: 84
+street: Rue de la Liberté
+housenumber: "84"
 phone: ""
-opening_hours: "Tu-Th 09:00-12:30,14:00-19:00; Fr,Sa 09:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-12:30,14:00-19:00; Fr,Sa 09:30-18:30
+website: ""
diff --git a/data/cities/bourgoin-jallieu/yves-rocher.yml b/data/cities/bourgoin-jallieu/yves-rocher.yml
index 94403c370..3ab316554 100644
--- a/data/cities/bourgoin-jallieu/yves-rocher.yml
+++ b/data/cities/bourgoin-jallieu/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.58629
 longitude: 5.27745
 postcode: "38300"
 city: Bourgoin-Jallieu
-street: "Rue de la Liberté"
-housenumber: 7
+street: Rue de la Liberté
+housenumber: "7"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30, 13:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/bourgoin-jallieu/bourgoin-jallieu/S-FRYROC234"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30, 13:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/bourgoin-jallieu/bourgoin-jallieu/S-FRYROC234
diff --git a/data/cities/bozel/sport-2000.yml b/data/cities/bozel/sport-2000.yml
index 64cc0d91b..7a3bf0023 100644
--- a/data/cities/bozel/sport-2000.yml
+++ b/data/cities/bozel/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.44226
 longitude: 6.64764
 postcode: "73350"
 city: Bozel
-street: "Rue Émile Machet"
-housenumber: 77
+street: Rue Émile Machet
+housenumber: "77"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bregnier-cordon/au-pain-des-miss.yml b/data/cities/bregnier-cordon/au-pain-des-miss.yml
index d1af707ac..8f6a8167e 100644
--- a/data/cities/bregnier-cordon/au-pain-des-miss.yml
+++ b/data/cities/bregnier-cordon/au-pain-des-miss.yml
@@ -4,8 +4,8 @@ latitude: 45.64082
 longitude: 5.6278
 postcode: "01300"
 city: Brégnier-Cordon
-street: "Place de la Flamme Olympique"
-housenumber: 
+street: Place de la Flamme Olympique
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/brenthonne/cooperative-agricole-laitiere-de-brenthonne.yml b/data/cities/brenthonne/cooperative-agricole-laitiere-de-brenthonne.yml
index 69b1d8a18..da051593d 100644
--- a/data/cities/brenthonne/cooperative-agricole-laitiere-de-brenthonne.yml
+++ b/data/cities/brenthonne/cooperative-agricole-laitiere-de-brenthonne.yml
@@ -1,11 +1,11 @@
 id: 748978863
-type: way
+type: node
 latitude: 46.27377
 longitude: 6.39565
 postcode: "74890"
 city: Brenthonne
-street: "Route de Thonon les Bains"
-housenumber: 276
+street: Route de Thonon les Bains
+housenumber: "276"
 phone: ""
-opening_hours: "Mo-Tu,Th-Sa 08:00-12:15, 15:00-19:15; We 08:00-12:15; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Sa 08:00-12:15, 15:00-19:15; We 08:00-12:15; Su off
+website: ""
diff --git a/data/cities/brenthonne/le-petit-casino.yml b/data/cities/brenthonne/le-petit-casino.yml
index 06829eddb..8626fff89 100644
--- a/data/cities/brenthonne/le-petit-casino.yml
+++ b/data/cities/brenthonne/le-petit-casino.yml
@@ -4,8 +4,9 @@ latitude: 46.27327
 longitude: 6.39453
 postcode: "74890"
 city: Brenthonne
-street: "Route de Morzier"
-housenumber: 12
+street: Route de Morzier
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Tu,Th-Sa 07:00-12:30, 15:30-20:00; Su 07:00-12:30, 16:00-20:00; We off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Sa 07:00-12:30, 15:30-20:00; Su 07:00-12:30, 16:00-20:00;
+    We off
+website: ""
diff --git a/data/cities/brenthonne/pepinieres-matringe.yml b/data/cities/brenthonne/pepinieres-matringe.yml
index be1062854..62561d76e 100644
--- a/data/cities/brenthonne/pepinieres-matringe.yml
+++ b/data/cities/brenthonne/pepinieres-matringe.yml
@@ -1,11 +1,11 @@
 id: 224840451
-type: way
+type: node
 latitude: 46.26713
 longitude: 6.40343
 postcode: "74890"
 city: Brenthonne
-street: "Chemin de la Courbe"
-housenumber: 169
+street: Chemin de la Courbe
+housenumber: "169"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 13:30-18:00; Sa 09:00-11:30, 14:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 13:30-18:00; Sa 09:00-11:30, 14:00-17:00; Su off
+website: ""
diff --git a/data/cities/bressolles/inoe-bien-etre-et-beaute.yml b/data/cities/bressolles/inoe-bien-etre-et-beaute.yml
index 9e738bc6b..e9a3c1cfc 100644
--- a/data/cities/bressolles/inoe-bien-etre-et-beaute.yml
+++ b/data/cities/bressolles/inoe-bien-etre-et-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.86924
 longitude: 5.09299
 postcode: "01360"
 city: Bressolles
-street: "Chemin du Bois Jean"
-housenumber: 145
-phone: "+33 6 88 73 26 45"
+street: Chemin du Bois Jean
+housenumber: "145"
+phone: +33 6 88 73 26 45
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/brides-les-bains/intersport-2.yml b/data/cities/brides-les-bains/intersport-2.yml
index 167811347..0b88878c1 100644
--- a/data/cities/brides-les-bains/intersport-2.yml
+++ b/data/cities/brides-les-bains/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.56736
 postcode: "73600"
 city: Brides-les-Bains
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/brides-les-bains/intersport.yml b/data/cities/brides-les-bains/intersport.yml
index baf77e064..84eb52d2a 100644
--- a/data/cities/brides-les-bains/intersport.yml
+++ b/data/cities/brides-les-bains/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.56148
 postcode: "73570"
 city: Brides-les-Bains
 street: ""
-housenumber: 65
+housenumber: "65"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/brignais/carrefour-contact-rue-du-general-de-gaulle.yml b/data/cities/brignais/carrefour-contact-rue-du-general-de-gaulle.yml
index a78024426..a741bb372 100644
--- a/data/cities/brignais/carrefour-contact-rue-du-general-de-gaulle.yml
+++ b/data/cities/brignais/carrefour-contact-rue-du-general-de-gaulle.yml
@@ -1,11 +1,11 @@
 id: 66358964
-type: way
+type: node
 latitude: 45.66801
 longitude: 4.75299
 postcode: ""
 city: Brignais
-street: "Rue du Général de Gaulle"
-housenumber: 213
-phone: "+33 4 78 59 95 02"
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:30-12:30"
-website: "https://www.carrefour.fr/magasin/contact-brignais"
\ No newline at end of file
+street: Rue du Général de Gaulle
+housenumber: "213"
+phone: +33 4 78 59 95 02
+opening_hours: Mo-Sa 08:00-20:00; Su 09:30-12:30
+website: https://www.carrefour.fr/magasin/contact-brignais
diff --git a/data/cities/brignais/carrefour-contact.yml b/data/cities/brignais/carrefour-contact.yml
index 5fed438fc..f384bf5f7 100644
--- a/data/cities/brignais/carrefour-contact.yml
+++ b/data/cities/brignais/carrefour-contact.yml
@@ -4,8 +4,8 @@ latitude: 45.66826
 longitude: 4.75308
 postcode: ""
 city: Brignais
-street: "Rue du Général de Gaulle"
-housenumber: 213
+street: Rue du Général de Gaulle
+housenumber: "213"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/brignais/spar.yml b/data/cities/brignais/spar.yml
index 212b5e07a..a039f4443 100644
--- a/data/cities/brignais/spar.yml
+++ b/data/cities/brignais/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.67226
 longitude: 4.75353
 postcode: "69530"
 city: Brignais
-street: "Place du 8 Mai 1945"
-housenumber: 1
+street: Place du 8 Mai 1945
+housenumber: "1"
 phone: "+33478052178"
-opening_hours: "Mo-Th 08:00-13:00, 14:30-19:30; Fr, Sa 08:00-19:30; Su 08:30-12:30"
-website: "https://magasins.spar.fr/fr/s/spar-supermarche-brignais"
\ No newline at end of file
+opening_hours: Mo-Th 08:00-13:00, 14:30-19:30; Fr, Sa 08:00-19:30; Su 08:30-12:30
+website: https://magasins.spar.fr/fr/s/spar-supermarche-brignais
diff --git a/data/cities/brindas/annlor-coiffure.yml b/data/cities/brindas/annlor-coiffure.yml
index 4f5e51e7e..7fa617854 100644
--- a/data/cities/brindas/annlor-coiffure.yml
+++ b/data/cities/brindas/annlor-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 45.72068
 longitude: 4.69383
 postcode: "69126"
 city: Brindas
-street: "Rue du Vieux Bourg"
-housenumber: 36
-phone: "+33 4 78 45 57 87"
-opening_hours: "Mo 09:00-14:00; Tu 09:00-17:00; We,Fr 09:00-19:00; Th 10:00-12:00,14:00-19:00; Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+street: Rue du Vieux Bourg
+housenumber: "36"
+phone: +33 4 78 45 57 87
+opening_hours: Mo 09:00-14:00; Tu 09:00-17:00; We,Fr 09:00-19:00; Th 10:00-12:00,14:00-19:00;
+    Sa 08:00-17:00
+website: ""
diff --git a/data/cities/brindas/au-ptit-bonheur-des-champs.yml b/data/cities/brindas/au-ptit-bonheur-des-champs.yml
index cdf17b878..dde0637cb 100644
--- a/data/cities/brindas/au-ptit-bonheur-des-champs.yml
+++ b/data/cities/brindas/au-ptit-bonheur-des-champs.yml
@@ -4,8 +4,8 @@ latitude: 45.71814
 longitude: 4.69677
 postcode: "69126"
 city: Brindas
-street: "Route Neuve"
-housenumber: 
-phone: "+33 4 78 19 58 21"
-opening_hours: "We,Fr 09:30-13:00,16:00-19:30; Sa 09:00-13:00"
-website: "https://auptitbonheurdeschamps.fr"
\ No newline at end of file
+street: Route Neuve
+housenumber: ""
+phone: +33 4 78 19 58 21
+opening_hours: We,Fr 09:30-13:00,16:00-19:30; Sa 09:00-13:00
+website: https://auptitbonheurdeschamps.fr
diff --git a/data/cities/brindas/brossat-sebastien.yml b/data/cities/brindas/brossat-sebastien.yml
index e2b4d3de3..e4acc16e0 100644
--- a/data/cities/brindas/brossat-sebastien.yml
+++ b/data/cities/brindas/brossat-sebastien.yml
@@ -4,8 +4,8 @@ latitude: 45.72054
 longitude: 4.69395
 postcode: "69126"
 city: Brindas
-street: "Place de Verdun"
-housenumber: 1
-phone: "+33 4 78 45 92 07"
-opening_hours: "Tu-Sa 07:00-12:45,15:30-19:00; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+street: Place de Verdun
+housenumber: "1"
+phone: +33 4 78 45 92 07
+opening_hours: Tu-Sa 07:00-12:45,15:30-19:00; Su 07:00-12:30
+website: ""
diff --git a/data/cities/brindas/cedrine.yml b/data/cities/brindas/cedrine.yml
index c0fd89845..d6cf417a2 100644
--- a/data/cities/brindas/cedrine.yml
+++ b/data/cities/brindas/cedrine.yml
@@ -4,8 +4,8 @@ latitude: 45.72015
 longitude: 4.69377
 postcode: "69126"
 city: Brindas
-street: "Rue du Vieux Bourg"
-housenumber: 26
-phone: "+33 4 87 61 50 04"
-opening_hours: "Tu,Fr 09:30-12:30,14:30-19:00; We,Th 09:30-12:30,14:30-18:30; Sa 10:00-12:30,14:00-18:30"
-website: "https://cedrine.fr/"
\ No newline at end of file
+street: Rue du Vieux Bourg
+housenumber: "26"
+phone: +33 4 87 61 50 04
+opening_hours: Tu,Fr 09:30-12:30,14:30-19:00; We,Th 09:30-12:30,14:30-18:30; Sa 10:00-12:30,14:00-18:30
+website: https://cedrine.fr/
diff --git a/data/cities/brindas/envie-de-zen.yml b/data/cities/brindas/envie-de-zen.yml
index 452503bac..ce96b68f5 100644
--- a/data/cities/brindas/envie-de-zen.yml
+++ b/data/cities/brindas/envie-de-zen.yml
@@ -4,8 +4,8 @@ latitude: 45.72555
 longitude: 4.69803
 postcode: "69126"
 city: Brindas
-street: "Les Varennes"
+street: Les Varennes
 housenumber: 86D
-phone: "+33 6 12 18 32 93"
-opening_hours: "08:00-20:00"
-website: "https://www.enviedezen.fr/"
\ No newline at end of file
+phone: +33 6 12 18 32 93
+opening_hours: 08:00-20:00
+website: https://www.enviedezen.fr/
diff --git a/data/cities/brindas/la-cave-de-brindas.yml b/data/cities/brindas/la-cave-de-brindas.yml
index 569797852..a6a757692 100644
--- a/data/cities/brindas/la-cave-de-brindas.yml
+++ b/data/cities/brindas/la-cave-de-brindas.yml
@@ -4,8 +4,8 @@ latitude: 45.72119
 longitude: 4.69367
 postcode: "69126"
 city: Brindas
-street: "Rue du Vieux Bourg"
-housenumber: 43
-phone: "+33 4 78 87 96 85"
-opening_hours: "Tu-Fr 09:30-12:00,15:30-18:00; Sa 09:30-12:30,15:00-18:00"
-website: "https://www.lacavedebrindas.fr/"
\ No newline at end of file
+street: Rue du Vieux Bourg
+housenumber: "43"
+phone: +33 4 78 87 96 85
+opening_hours: Tu-Fr 09:30-12:00,15:30-18:00; Sa 09:30-12:30,15:00-18:00
+website: https://www.lacavedebrindas.fr/
diff --git a/data/cities/brindas/la-serre-de-christophe.yml b/data/cities/brindas/la-serre-de-christophe.yml
index 9681eccea..76441bdcc 100644
--- a/data/cities/brindas/la-serre-de-christophe.yml
+++ b/data/cities/brindas/la-serre-de-christophe.yml
@@ -4,8 +4,8 @@ latitude: 45.7215
 longitude: 4.69382
 postcode: "69126"
 city: Brindas
-street: "Rue du Vieux Bourg"
+street: Rue du Vieux Bourg
 housenumber: 6 TER
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/brindas/le-petit-casino.yml b/data/cities/brindas/le-petit-casino.yml
index 61842c0c0..911b3b573 100644
--- a/data/cities/brindas/le-petit-casino.yml
+++ b/data/cities/brindas/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.72026
 longitude: 4.69394
 postcode: "69126"
 city: Brindas
-street: "Place de Verdun"
-housenumber: 22
-phone: "+33 4 78 45 53 88"
-opening_hours: "Tu-Sa 07:00-13:00,15:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+street: Place de Verdun
+housenumber: "22"
+phone: +33 4 78 45 53 88
+opening_hours: Tu-Sa 07:00-13:00,15:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/briord/intermarche-super.yml b/data/cities/briord/intermarche-super.yml
index 91f464e2f..399d02417 100644
--- a/data/cities/briord/intermarche-super.yml
+++ b/data/cities/briord/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 224688629
-type: way
+type: node
 latitude: 45.78809
 longitude: 5.45326
 postcode: "01470"
 city: Briord
-street: "Rue des Verchères"
-housenumber: 
-phone: "+33 4 74 40 48 00"
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+street: Rue des Verchères
+housenumber: ""
+phone: +33 4 74 40 48 00
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/brison-saint-innocent/garage-dv.yml b/data/cities/brison-saint-innocent/garage-dv.yml
index ee4d922e3..229b87632 100644
--- a/data/cities/brison-saint-innocent/garage-dv.yml
+++ b/data/cities/brison-saint-innocent/garage-dv.yml
@@ -4,8 +4,8 @@ latitude: 45.72455
 longitude: 5.89227
 postcode: "73100"
 city: Brison-Saint-Innocent
-street: "Chemin des Combettes"
-housenumber: 5697
+street: Chemin des Combettes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/bron/aldi.yml b/data/cities/bron/aldi.yml
index 2a6625dc3..2b7880473 100644
--- a/data/cities/bron/aldi.yml
+++ b/data/cities/bron/aldi.yml
@@ -4,8 +4,8 @@ latitude: 45.72614
 longitude: 4.91469
 postcode: "69500"
 city: Bron
-street: "Avenue Saint-Exupéry"
-housenumber: 
-phone: "+33 1 81 09 78 25"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30; PH Off"
-website: ""
\ No newline at end of file
+street: Avenue Saint-Exupéry
+housenumber: ""
+phone: +33 1 81 09 78 25
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30; PH Off
+website: ""
diff --git a/data/cities/bron/boggys.yml b/data/cities/bron/boggys.yml
index 36a23de82..6dbc19658 100644
--- a/data/cities/bron/boggys.yml
+++ b/data/cities/bron/boggys.yml
@@ -4,8 +4,8 @@ latitude: 45.72007
 longitude: 4.91542
 postcode: "69500"
 city: Bron
-street: "Rue des Manèges"
-housenumber: 2
+street: Rue des Manèges
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 07:00-20:00, Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-20:00, Su 07:00-13:00
+website: ""
diff --git a/data/cities/bron/grand-frais.yml b/data/cities/bron/grand-frais.yml
index a7d62ae51..4d8b285d9 100644
--- a/data/cities/bron/grand-frais.yml
+++ b/data/cities/bron/grand-frais.yml
@@ -4,8 +4,8 @@ latitude: 45.72545
 longitude: 4.92965
 postcode: "69500"
 city: Bron
-street: "Avenue Général de Gaulle"
-housenumber: 332
-phone: "+33 4 37 24 33 28"
-opening_hours: "Mo-Sa 09:00 -20:00; Su 09:00-12:30"
-website: "https://www.grandfrais.com/magasins/bron-decathlon-village"
\ No newline at end of file
+street: Avenue Général de Gaulle
+housenumber: "332"
+phone: +33 4 37 24 33 28
+opening_hours: Mo-Sa 09:00 -20:00; Su 09:00-12:30
+website: https://www.grandfrais.com/magasins/bron-decathlon-village
diff --git a/data/cities/bron/hairanna.yml b/data/cities/bron/hairanna.yml
index b0415f985..a833cb209 100644
--- a/data/cities/bron/hairanna.yml
+++ b/data/cities/bron/hairanna.yml
@@ -4,8 +4,8 @@ latitude: 45.73796
 longitude: 4.89171
 postcode: ""
 city: Bron
-street: "Boulevard Pinel"
-housenumber: 
-phone: "+33 4 87 37 24 15"
-opening_hours: "Tu-Fr 10:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+street: Boulevard Pinel
+housenumber: ""
+phone: +33 4 87 37 24 15
+opening_hours: Tu-Fr 10:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/bron/la-cervoiserie.yml b/data/cities/bron/la-cervoiserie.yml
index 03bacb151..6b23acfa9 100644
--- a/data/cities/bron/la-cervoiserie.yml
+++ b/data/cities/bron/la-cervoiserie.yml
@@ -4,8 +4,8 @@ latitude: 45.72562
 longitude: 4.92984
 postcode: "69500"
 city: Bron
-street: "Avenue Général de Gaulle"
-housenumber: 332
+street: Avenue Général de Gaulle
+housenumber: "332"
 phone: ""
 opening_hours: ""
-website: "https://lacervoiserie.com/les-cervoisiers/bron/"
\ No newline at end of file
+website: https://lacervoiserie.com/les-cervoisiers/bron/
diff --git a/data/cities/bron/marie-blachere.yml b/data/cities/bron/marie-blachere.yml
index c74813127..5fd1adb2f 100644
--- a/data/cities/bron/marie-blachere.yml
+++ b/data/cities/bron/marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 45.72549
 longitude: 4.92987
 postcode: "69500"
 city: Bron
-street: "Avenue Général de Gaulle"
-housenumber: 332
-phone: "04 78 24 08 57"
-opening_hours: "Mo-Sa 07:30-20:00"
-website: ""
\ No newline at end of file
+street: Avenue Général de Gaulle
+housenumber: "332"
+phone: 04 78 24 08 57
+opening_hours: Mo-Sa 07:30-20:00
+website: ""
diff --git a/data/cities/brussieu/clinique-moto-69.yml b/data/cities/brussieu/clinique-moto-69.yml
index 824d399c4..a5b4da1d9 100644
--- a/data/cities/brussieu/clinique-moto-69.yml
+++ b/data/cities/brussieu/clinique-moto-69.yml
@@ -1,11 +1,11 @@
 id: 141757836
-type: way
+type: node
 latitude: 45.74873
 longitude: 4.54327
 postcode: "69690"
 city: Brussieu
-street: "Rue Nationale"
-housenumber: 31
-phone: "+33 6 70 17 63 88"
+street: Rue Nationale
+housenumber: "31"
+phone: +33 6 70 17 63 88
 opening_hours: ""
-website: "https://clinicmoto69.fr/"
\ No newline at end of file
+website: https://clinicmoto69.fr/
diff --git a/data/cities/bully/la-barotte.yml b/data/cities/bully/la-barotte.yml
index 74ca5f4bf..bd38f4acc 100644
--- a/data/cities/bully/la-barotte.yml
+++ b/data/cities/bully/la-barotte.yml
@@ -4,8 +4,8 @@ latitude: 45.85823
 longitude: 4.56222
 postcode: "69210"
 city: Bully
-street: "Chemin de la Plagne"
-housenumber: 
+street: Chemin de la Plagne
+housenumber: ""
 phone: "+33474720343"
-opening_hours: "We,Th 15:00-19:00; Fr,Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: We,Th 15:00-19:00; Fr,Sa 09:00-19:00
+website: ""
diff --git a/data/cities/burdignin/la-bergerie-des-roches.yml b/data/cities/burdignin/la-bergerie-des-roches.yml
index 47510894f..f3124cee7 100644
--- a/data/cities/burdignin/la-bergerie-des-roches.yml
+++ b/data/cities/burdignin/la-bergerie-des-roches.yml
@@ -4,8 +4,8 @@ latitude: 46.21822
 longitude: 6.42416
 postcode: "74420"
 city: Burdignin
-street: "Route du Col de Cou"
-housenumber: 153
+street: Route du Col de Cou
+housenumber: "153"
 phone: ""
-opening_hours: "Mo,Su off; Tu,Sa 09:00-12:00, 16:00-19:00; We-Fr 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu,Sa 09:00-12:00, 16:00-19:00; We-Fr 16:00-19:00
+website: ""
diff --git a/data/cities/burzet/boucherie-de-la-vallee-de-la-bourges.yml b/data/cities/burzet/boucherie-de-la-vallee-de-la-bourges.yml
index 32949010d..2f0eba947 100644
--- a/data/cities/burzet/boucherie-de-la-vallee-de-la-bourges.yml
+++ b/data/cities/burzet/boucherie-de-la-vallee-de-la-bourges.yml
@@ -4,8 +4,8 @@ latitude: 44.74026
 longitude: 4.24367
 postcode: "07450"
 city: Burzet
-street: "Grand Rue"
-housenumber: 6
+street: Grand Rue
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Su 07:00-12:30,15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-12:30,15:30-19:30
+website: ""
diff --git a/data/cities/burzet/la-boulangerie.yml b/data/cities/burzet/la-boulangerie.yml
index 2041c611d..1a9a4a2d0 100644
--- a/data/cities/burzet/la-boulangerie.yml
+++ b/data/cities/burzet/la-boulangerie.yml
@@ -5,7 +5,7 @@ longitude: 4.24427
 postcode: ""
 city: Burzet
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 06:30-12:30,16:30-19:00; Su 06:30-13:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:30-12:30,16:30-19:00; Su 06:30-13:30
+website: ""
diff --git a/data/cities/burzet/vival.yml b/data/cities/burzet/vival.yml
index 163bbe2eb..3307cdb9a 100644
--- a/data/cities/burzet/vival.yml
+++ b/data/cities/burzet/vival.yml
@@ -4,8 +4,8 @@ latitude: 44.74032
 longitude: 4.24362
 postcode: "07450"
 city: Burzet
-street: "Grand Rue"
-housenumber: 2
-phone: "+33 4 26 62 41 67"
-opening_hours: "Mo 08:00-12:15; Tu-Sa 08:00-12:15,15:30-19:15; Su 08:00-12:15"
-website: "https://magasins.vival.fr/fr/vival-burzet"
\ No newline at end of file
+street: Grand Rue
+housenumber: "2"
+phone: +33 4 26 62 41 67
+opening_hours: Mo 08:00-12:15; Tu-Sa 08:00-12:15,15:30-19:15; Su 08:00-12:15
+website: https://magasins.vival.fr/fr/vival-burzet
diff --git a/data/cities/bussieres/atoupress.yml b/data/cities/bussieres/atoupress.yml
index c8f55f1a3..236a18f5a 100644
--- a/data/cities/bussieres/atoupress.yml
+++ b/data/cities/bussieres/atoupress.yml
@@ -4,8 +4,8 @@ latitude: 45.83648
 longitude: 4.26727
 postcode: "42510"
 city: Bussières
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cailloux-sur-fontaines/alexandre-coiffure.yml b/data/cities/cailloux-sur-fontaines/alexandre-coiffure.yml
index 5ba0db009..f6a6171d7 100644
--- a/data/cities/cailloux-sur-fontaines/alexandre-coiffure.yml
+++ b/data/cities/cailloux-sur-fontaines/alexandre-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.87097
 postcode: ""
 city: Cailloux-sur-Fontaines
 street: ""
-housenumber: 
-phone: "+33 4 78 22 51 69"
-opening_hours: "Tu-We,Fr 09:00-19:00; Th 09:00-21:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 78 22 51 69
+opening_hours: Tu-We,Fr 09:00-19:00; Th 09:00-21:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/cailloux-sur-fontaines/au-jardin-cailloutain.yml b/data/cities/cailloux-sur-fontaines/au-jardin-cailloutain.yml
index e65026f3f..f57155c7b 100644
--- a/data/cities/cailloux-sur-fontaines/au-jardin-cailloutain.yml
+++ b/data/cities/cailloux-sur-fontaines/au-jardin-cailloutain.yml
@@ -5,7 +5,7 @@ longitude: 4.87785
 postcode: ""
 city: Cailloux-sur-Fontaines
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 09:00-12h30,15h30-19h30; 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12h30,15h30-19h30; 09:00-17:00
+website: ""
diff --git a/data/cities/cailloux-sur-fontaines/interior.yml b/data/cities/cailloux-sur-fontaines/interior.yml
index 48aa3fd69..4120a5809 100644
--- a/data/cities/cailloux-sur-fontaines/interior.yml
+++ b/data/cities/cailloux-sur-fontaines/interior.yml
@@ -5,7 +5,7 @@ longitude: 4.87113
 postcode: ""
 city: Cailloux-sur-Fontaines
 street: ""
-housenumber: 
-phone: "+33 4 78 66 13 06"
-opening_hours: "Tu-Th 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 78 66 13 06
+opening_hours: Tu-Th 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/cailloux-sur-fontaines/les-jardins-du-plateau.yml b/data/cities/cailloux-sur-fontaines/les-jardins-du-plateau.yml
index 5136d5981..1e5fbcfe5 100644
--- a/data/cities/cailloux-sur-fontaines/les-jardins-du-plateau.yml
+++ b/data/cities/cailloux-sur-fontaines/les-jardins-du-plateau.yml
@@ -1,11 +1,11 @@
 id: 129816494
-type: way
+type: node
 latitude: 45.86114
 longitude: 4.88943
 postcode: ""
 city: Cailloux-sur-Fontaines
-street: "Routes des Echets"
-housenumber: 800
+street: Routes des Echets
+housenumber: "800"
 phone: ""
-opening_hours: "Tu,Fr 16:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Fr 16:00-19:30
+website: ""
diff --git a/data/cities/cailloux-sur-fontaines/mon-maraicher.yml b/data/cities/cailloux-sur-fontaines/mon-maraicher.yml
index 2b7a14cf8..e4802d926 100644
--- a/data/cities/cailloux-sur-fontaines/mon-maraicher.yml
+++ b/data/cities/cailloux-sur-fontaines/mon-maraicher.yml
@@ -1,11 +1,11 @@
 id: 828217779
-type: way
+type: node
 latitude: 45.84504
 longitude: 4.87447
 postcode: ""
 city: Cailloux-sur-Fontaines
-street: "Chemin de Jambe de Loup"
-housenumber: 111
-phone: "+33 6 16 47 80 39"
-opening_hours: "Sa 09:00-12:00; We 16:00-19:00"
-website: "https://www.monmaraicher.fr/fr/"
\ No newline at end of file
+street: Chemin de Jambe de Loup
+housenumber: "111"
+phone: +33 6 16 47 80 39
+opening_hours: Sa 09:00-12:00; We 16:00-19:00
+website: https://www.monmaraicher.fr/fr/
diff --git a/data/cities/caluire-et-cuire/aux-amis-du-pain.yml b/data/cities/caluire-et-cuire/aux-amis-du-pain.yml
index c353d69cf..b02423c9f 100644
--- a/data/cities/caluire-et-cuire/aux-amis-du-pain.yml
+++ b/data/cities/caluire-et-cuire/aux-amis-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 45.79027
 longitude: 4.85759
 postcode: "69300"
 city: Caluire-et-Cuire
-street: "Grande Rue de Saint-Clair"
-housenumber: 
+street: Grande Rue de Saint-Clair
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:00
+website: ""
diff --git a/data/cities/caluire-et-cuire/centre-commercial-aushopping-caluire.yml b/data/cities/caluire-et-cuire/centre-commercial-aushopping-caluire.yml
index ace442be5..437d8fa11 100644
--- a/data/cities/caluire-et-cuire/centre-commercial-aushopping-caluire.yml
+++ b/data/cities/caluire-et-cuire/centre-commercial-aushopping-caluire.yml
@@ -1,11 +1,11 @@
 id: 106638861
-type: way
+type: node
 latitude: 45.80287
 longitude: 4.85709
 postcode: "69300"
 city: Caluire-et-Cuire
-street: "Chemin Jean Petit"
-housenumber: 10
+street: Chemin Jean Petit
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 08:30-21:30"
-website: "https://caluire.aushopping.com/fr"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-21:30
+website: https://caluire.aushopping.com/fr
diff --git a/data/cities/caluire-et-cuire/les-coiffeurs-morpholook.yml b/data/cities/caluire-et-cuire/les-coiffeurs-morpholook.yml
index 6e9689955..737d36bbf 100644
--- a/data/cities/caluire-et-cuire/les-coiffeurs-morpholook.yml
+++ b/data/cities/caluire-et-cuire/les-coiffeurs-morpholook.yml
@@ -4,8 +4,9 @@ latitude: 45.78674
 longitude: 4.84058
 postcode: "69300"
 city: Caluire-et-Cuire
-street: "Rue de Margnolles"
-housenumber: 47
+street: Rue de Margnolles
+housenumber: "47"
 phone: ""
-opening_hours: "Mo 14:00-18:00; Tu 09:00-12:00, 13:30-18:00; We 09:00-12:00, 14:00-19:00; Th 09:00-12:00, 13:00-19:00; Fr 09:00-19:00; Sa 08:30-17:00"
-website: "https://www.planity.com/sizodor-69300-caluire-et-cuire"
\ No newline at end of file
+opening_hours: Mo 14:00-18:00; Tu 09:00-12:00, 13:30-18:00; We 09:00-12:00, 14:00-19:00;
+    Th 09:00-12:00, 13:00-19:00; Fr 09:00-19:00; Sa 08:30-17:00
+website: https://www.planity.com/sizodor-69300-caluire-et-cuire
diff --git a/data/cities/cervens/fruitiere-du-massif-des-moises.yml b/data/cities/cervens/fruitiere-du-massif-des-moises.yml
index 2b8c4c181..c1d1008a3 100644
--- a/data/cities/cervens/fruitiere-du-massif-des-moises.yml
+++ b/data/cities/cervens/fruitiere-du-massif-des-moises.yml
@@ -1,11 +1,11 @@
 id: 1163477338
-type: way
+type: node
 latitude: 46.28887
 longitude: 6.43389
 postcode: "74550"
 city: Cervens
-street: "Chemin du Pré Nouveau"
-housenumber: 277
+street: Chemin du Pré Nouveau
+housenumber: "277"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cervens/le-relais-des-delices.yml b/data/cities/cervens/le-relais-des-delices.yml
index db7d23b22..398385b48 100644
--- a/data/cities/cervens/le-relais-des-delices.yml
+++ b/data/cities/cervens/le-relais-des-delices.yml
@@ -4,8 +4,8 @@ latitude: 46.28472
 longitude: 6.43983
 postcode: "74550"
 city: Cervens
-street: "Route des Collines"
-housenumber: 621
+street: Route des Collines
+housenumber: "621"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cervens/scorpio.yml b/data/cities/cervens/scorpio.yml
index f4ebd8d25..99a68f5bd 100644
--- a/data/cities/cervens/scorpio.yml
+++ b/data/cities/cervens/scorpio.yml
@@ -4,8 +4,8 @@ latitude: 46.29179
 longitude: 6.445
 postcode: "74550"
 city: Cervens
-street: "Route de Letroz"
-housenumber: 213
-phone: "+33 4 50 72 58 90"
+street: Route de Letroz
+housenumber: "213"
+phone: +33 4 50 72 58 90
 opening_hours: ""
-website: "https://www.scorpio.fr/"
\ No newline at end of file
+website: https://www.scorpio.fr/
diff --git a/data/cities/cessy/colruyt.yml b/data/cities/cessy/colruyt.yml
index 9df582015..8bd090c9d 100644
--- a/data/cities/cessy/colruyt.yml
+++ b/data/cities/cessy/colruyt.yml
@@ -1,11 +1,11 @@
 id: 340415941
-type: way
+type: node
 latitude: 46.30944
 longitude: 6.06721
 postcode: "01170"
 city: Cessy
-street: "Route de la Plaine"
-housenumber: 1
+street: Route de la Plaine
+housenumber: "1"
 phone: "+33450429092"
-opening_hours: "Mo-Th 08:30-12:30,14:00-19:30; Fr-Sa 08:30-19:30; Su 08:30-12:30"
-website: "http://www.colruyt.fr/colruytfr/static/magasin.shtml#4875"
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:30,14:00-19:30; Fr-Sa 08:30-19:30; Su 08:30-12:30
+website: http://www.colruyt.fr/colruytfr/static/magasin.shtml#4875
diff --git a/data/cities/cessy/lidl.yml b/data/cities/cessy/lidl.yml
index 22103f1fe..b0a7babb4 100644
--- a/data/cities/cessy/lidl.yml
+++ b/data/cities/cessy/lidl.yml
@@ -4,8 +4,8 @@ latitude: 46.30286
 longitude: 6.06693
 postcode: "01170"
 city: Cessy
-street: "Chemin du Journans"
-housenumber: 111
+street: Chemin du Journans
+housenumber: "111"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30;Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30;Su 09:00-13:00
+website: ""
diff --git a/data/cities/ceyzeriat/curt-motos-sport.yml b/data/cities/ceyzeriat/curt-motos-sport.yml
index a9c33ed2d..8c7d70151 100644
--- a/data/cities/ceyzeriat/curt-motos-sport.yml
+++ b/data/cities/ceyzeriat/curt-motos-sport.yml
@@ -1,11 +1,11 @@
 id: 296289822
-type: way
+type: node
 latitude: 46.18723
 longitude: 5.30388
 postcode: "01250"
 city: Ceyzériat
-street: "Rue Albert Metras"
-housenumber: 132
+street: Rue Albert Metras
+housenumber: "132"
 phone: ""
 opening_hours: ""
-website: "http://polarisbourgenbresse.com/"
\ No newline at end of file
+website: http://polarisbourgenbresse.com/
diff --git a/data/cities/ceyzeriat/la-panouille.yml b/data/cities/ceyzeriat/la-panouille.yml
index 8d4ccb329..46f38d529 100644
--- a/data/cities/ceyzeriat/la-panouille.yml
+++ b/data/cities/ceyzeriat/la-panouille.yml
@@ -4,8 +4,8 @@ latitude: 46.17903
 longitude: 5.32402
 postcode: "01250"
 city: Ceyzériat
-street: "Place Émile Bouvard"
-housenumber: 3
-phone: "+33 4 74 30 05 36"
-opening_hours: "We-Fr 08:30-12:30,15:00-19:00; Sa 08:00-12:30,15:00-19:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+street: Place Émile Bouvard
+housenumber: "3"
+phone: +33 4 74 30 05 36
+opening_hours: We-Fr 08:30-12:30,15:00-19:00; Sa 08:00-12:30,15:00-19:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/chabaniere/chambre-funeaire-de-la-madeleine.yml b/data/cities/chabaniere/chambre-funeaire-de-la-madeleine.yml
index 5021ae9da..f92880bef 100644
--- a/data/cities/chabaniere/chambre-funeaire-de-la-madeleine.yml
+++ b/data/cities/chabaniere/chambre-funeaire-de-la-madeleine.yml
@@ -4,8 +4,8 @@ latitude: 45.54331
 longitude: 4.6442
 postcode: "69440"
 city: Chabanière
-street: "Passage du Bozançon"
-housenumber: 153
+street: Passage du Bozançon
+housenumber: "153"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/challes-les-eaux/arnaud-bonnet-chocolatier-patissier.yml b/data/cities/challes-les-eaux/arnaud-bonnet-chocolatier-patissier.yml
index 3a46f8924..ae51c88ca 100644
--- a/data/cities/challes-les-eaux/arnaud-bonnet-chocolatier-patissier.yml
+++ b/data/cities/challes-les-eaux/arnaud-bonnet-chocolatier-patissier.yml
@@ -4,8 +4,8 @@ latitude: 45.54817
 longitude: 5.9847
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue Charles Pillet"
-housenumber: 43
+street: Avenue Charles Pillet
+housenumber: "43"
 phone: ""
-opening_hours: "Tu-Sa 08:30-19:00; Su 08:30-12:30"
-website: "https://www.arnaud-bonnet.com/"
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-19:00; Su 08:30-12:30
+website: https://www.arnaud-bonnet.com/
diff --git a/data/cities/challes-les-eaux/au-fumet-savoyard.yml b/data/cities/challes-les-eaux/au-fumet-savoyard.yml
index bb86cbff0..8c21e69b6 100644
--- a/data/cities/challes-les-eaux/au-fumet-savoyard.yml
+++ b/data/cities/challes-les-eaux/au-fumet-savoyard.yml
@@ -4,8 +4,8 @@ latitude: 45.54314
 longitude: 5.98435
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Route Royale"
-housenumber: 1600
+street: Route Royale
+housenumber: "1600"
 phone: ""
-opening_hours: "Tu-Fr 07:00-12:00; Sa 14:00-15:00"
-website: "http://aufumetsavoyard.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 07:00-12:00; Sa 14:00-15:00
+website: http://aufumetsavoyard.com/
diff --git a/data/cities/challes-les-eaux/boucherie-casula.yml b/data/cities/challes-les-eaux/boucherie-casula.yml
index 815f5cebb..5a939992f 100644
--- a/data/cities/challes-les-eaux/boucherie-casula.yml
+++ b/data/cities/challes-les-eaux/boucherie-casula.yml
@@ -4,8 +4,9 @@ latitude: 45.54858
 longitude: 5.9858
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue Louis Domenget"
-housenumber: 43
-phone: "+33 4 79 71 96 92"
-opening_hours: "Tu,We 08:00-12:30,15:00-19:00; Th 08:00-12:30; Fr 08:00-13:00,15:00-19:00; Sa 08:00-12:30,15:00-19:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+street: Avenue Louis Domenget
+housenumber: "43"
+phone: +33 4 79 71 96 92
+opening_hours: Tu,We 08:00-12:30,15:00-19:00; Th 08:00-12:30; Fr 08:00-13:00,15:00-19:00;
+    Sa 08:00-12:30,15:00-19:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/challes-les-eaux/chocolaterie-arnaud-bonnet.yml b/data/cities/challes-les-eaux/chocolaterie-arnaud-bonnet.yml
index f7af474b8..514bec840 100644
--- a/data/cities/challes-les-eaux/chocolaterie-arnaud-bonnet.yml
+++ b/data/cities/challes-les-eaux/chocolaterie-arnaud-bonnet.yml
@@ -1,11 +1,11 @@
 id: 413428600
-type: way
+type: node
 latitude: 45.54819
 longitude: 5.98477
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue Charles Pillet"
-housenumber: 43
+street: Avenue Charles Pillet
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/challes-les-eaux/cote-fleurs.yml b/data/cities/challes-les-eaux/cote-fleurs.yml
index e614c2aca..fd32230a6 100644
--- a/data/cities/challes-les-eaux/cote-fleurs.yml
+++ b/data/cities/challes-les-eaux/cote-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.54808
 longitude: 5.98529
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue Béatrice de Savoie"
-housenumber: 36
-phone: "+33 6 69 95 13 07"
-opening_hours: "Mo 14:30-19:00; Tu-Sa 09:30-12:00,14:30-19:00; Su 09:30-12:00"
-website: ""
\ No newline at end of file
+street: Avenue Béatrice de Savoie
+housenumber: "36"
+phone: +33 6 69 95 13 07
+opening_hours: Mo 14:30-19:00; Tu-Sa 09:30-12:00,14:30-19:00; Su 09:30-12:00
+website: ""
diff --git a/data/cities/challes-les-eaux/emmaus.yml b/data/cities/challes-les-eaux/emmaus.yml
index fb500a2bf..025ec1573 100644
--- a/data/cities/challes-les-eaux/emmaus.yml
+++ b/data/cities/challes-les-eaux/emmaus.yml
@@ -1,11 +1,11 @@
 id: 164117393
-type: way
+type: node
 latitude: 45.5554
 longitude: 5.97608
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue de la Breisse"
-housenumber: 88
+street: Avenue de la Breisse
+housenumber: "88"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/challes-les-eaux/fraicheur-et-terroir.yml b/data/cities/challes-les-eaux/fraicheur-et-terroir.yml
index b8c9586ee..1a6821e74 100644
--- a/data/cities/challes-les-eaux/fraicheur-et-terroir.yml
+++ b/data/cities/challes-les-eaux/fraicheur-et-terroir.yml
@@ -1,11 +1,11 @@
 id: 428986527
-type: way
+type: node
 latitude: 45.5437
 longitude: 5.98729
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue de Chambéry"
-housenumber: 
+street: Avenue de Chambéry
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/challes-les-eaux/la-fournee-challesienne.yml b/data/cities/challes-les-eaux/la-fournee-challesienne.yml
index d9fb34262..37074a6bf 100644
--- a/data/cities/challes-les-eaux/la-fournee-challesienne.yml
+++ b/data/cities/challes-les-eaux/la-fournee-challesienne.yml
@@ -1,11 +1,11 @@
 id: 164119955
-type: way
+type: node
 latitude: 45.54579
 longitude: 5.98708
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue de Chambéry"
-housenumber: 1749
+street: Avenue de Chambéry
+housenumber: "1749"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/challes-les-eaux/le-relais-du-pain.yml b/data/cities/challes-les-eaux/le-relais-du-pain.yml
index a788a9719..563174031 100644
--- a/data/cities/challes-les-eaux/le-relais-du-pain.yml
+++ b/data/cities/challes-les-eaux/le-relais-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 45.5498
 longitude: 5.98418
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue de Chambéry"
-housenumber: 1239
-phone: "+33 4 79 71 16 91"
-opening_hours: "Mo-Tu 06:30-13:00,15:30-19:00; We 06:30-13:00; Th-Su 06:30-13:00,15:30-19:00"
-website: ""
\ No newline at end of file
+street: Avenue de Chambéry
+housenumber: "1239"
+phone: +33 4 79 71 16 91
+opening_hours: Mo-Tu 06:30-13:00,15:30-19:00; We 06:30-13:00; Th-Su 06:30-13:00,15:30-19:00
+website: ""
diff --git a/data/cities/challes-les-eaux/thierry-lapierre.yml b/data/cities/challes-les-eaux/thierry-lapierre.yml
index 3bd4634f7..487d62cae 100644
--- a/data/cities/challes-les-eaux/thierry-lapierre.yml
+++ b/data/cities/challes-les-eaux/thierry-lapierre.yml
@@ -4,8 +4,8 @@ latitude: 45.55445
 longitude: 5.97852
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Avenue de Chambéry"
-housenumber: 582
-phone: "+33 6 03 43 03 07"
-opening_hours: "Sur rendez-vous uniquement"
-website: "https://chamberymeubles.fr/"
\ No newline at end of file
+street: Avenue de Chambéry
+housenumber: "582"
+phone: +33 6 03 43 03 07
+opening_hours: '"Sur rendez-vous uniquement"'
+website: https://chamberymeubles.fr/
diff --git a/data/cities/challes-les-eaux/vae-center.yml b/data/cities/challes-les-eaux/vae-center.yml
index f8e1dbf24..25b83c96d 100644
--- a/data/cities/challes-les-eaux/vae-center.yml
+++ b/data/cities/challes-les-eaux/vae-center.yml
@@ -4,8 +4,8 @@ latitude: 45.54011
 longitude: 5.99125
 postcode: "73190"
 city: Challes-les-Eaux
-street: "Rue de l'Artisanat"
-housenumber: 1867
-phone: "+33 9 84 25 15 57"
+street: Rue de l'Artisanat
+housenumber: "1867"
+phone: +33 9 84 25 15 57
 opening_hours: ""
-website: "https://www.vaecenter.fr/"
\ No newline at end of file
+website: https://www.vaecenter.fr/
diff --git a/data/cities/chalmazel-jeansagniere/alti-pep.yml b/data/cities/chalmazel-jeansagniere/alti-pep.yml
index e719ff15c..7be710ee3 100644
--- a/data/cities/chalmazel-jeansagniere/alti-pep.yml
+++ b/data/cities/chalmazel-jeansagniere/alti-pep.yml
@@ -4,8 +4,8 @@ latitude: 45.71462
 longitude: 3.84556
 postcode: "42920"
 city: Chalmazel-Jeansagnière
-street: "Route du Cheix"
-housenumber: 1712
-phone: "06 50 36 94 11"
+street: Route du Cheix
+housenumber: "1712"
+phone: 06 50 36 94 11
 opening_hours: ""
-website: "https://www.pepiniere-altitude.com/"
\ No newline at end of file
+website: https://www.pepiniere-altitude.com/
diff --git a/data/cities/chalmazel-jeansagniere/la-source-distillerie.yml b/data/cities/chalmazel-jeansagniere/la-source-distillerie.yml
index bf072509f..8ef42929e 100644
--- a/data/cities/chalmazel-jeansagniere/la-source-distillerie.yml
+++ b/data/cities/chalmazel-jeansagniere/la-source-distillerie.yml
@@ -5,7 +5,7 @@ longitude: 3.84446
 postcode: "42920"
 city: Chalmazel-Jeansagnière
 street: ""
-housenumber: 
-phone: "06 98 39 77 28"
+housenumber: ""
+phone: 06 98 39 77 28
 opening_hours: ""
-website: "https://www.lasource-distillerie.fr/"
\ No newline at end of file
+website: https://www.lasource-distillerie.fr/
diff --git a/data/cities/chambery/action.yml b/data/cities/chambery/action.yml
index 4201226f7..0608d7fd9 100644
--- a/data/cities/chambery/action.yml
+++ b/data/cities/chambery/action.yml
@@ -4,8 +4,8 @@ latitude: 45.59452
 longitude: 5.89947
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1253
+street: Avenue des Landiers
+housenumber: "1253"
 phone: ""
 opening_hours: ""
-website: "https://www.action.com/fr-fr/"
\ No newline at end of file
+website: https://www.action.com/fr-fr/
diff --git a/data/cities/chambery/agem-agencement.yml b/data/cities/chambery/agem-agencement.yml
index d557fa7b6..951542973 100644
--- a/data/cities/chambery/agem-agencement.yml
+++ b/data/cities/chambery/agem-agencement.yml
@@ -4,8 +4,8 @@ latitude: 45.56926
 longitude: 5.93146
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Turin"
-housenumber: 111
-phone: "+33 4 79 60 37 36"
-opening_hours: "Tu-Fr 09:00-12:00, 14:00-19:00; Sa 10:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+street: Avenue de Turin
+housenumber: "111"
+phone: +33 4 79 60 37 36
+opening_hours: Tu-Fr 09:00-12:00, 14:00-19:00; Sa 10:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/chambery/atelier-de-couture-de-fil.yml b/data/cities/chambery/atelier-de-couture-de-fil.yml
index 30b5036d0..bcae3e672 100644
--- a/data/cities/chambery/atelier-de-couture-de-fil.yml
+++ b/data/cities/chambery/atelier-de-couture-de-fil.yml
@@ -4,8 +4,8 @@ latitude: 45.5649
 longitude: 5.92397
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 16
+street: Rue Croix-d'Or
+housenumber: "16"
 phone: ""
-opening_hours: "Tu,Th 10:30-13:30,15:00-18:30"
-website: "https://atelier-de-couture-de-fil-chambery.business.site"
\ No newline at end of file
+opening_hours: Tu,Th 10:30-13:30,15:00-18:30
+website: https://atelier-de-couture-de-fil-chambery.business.site
diff --git a/data/cities/chambery/atelier-restelli.yml b/data/cities/chambery/atelier-restelli.yml
index 64bbd5032..8694cad55 100644
--- a/data/cities/chambery/atelier-restelli.yml
+++ b/data/cities/chambery/atelier-restelli.yml
@@ -4,8 +4,8 @@ latitude: 45.56523
 longitude: 5.91901
 postcode: "73000"
 city: Chambéry
-street: "Rue Basse du Château"
-housenumber: 77
+street: Rue Basse du Château
+housenumber: "77"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/autotuning-bose.yml b/data/cities/chambery/autotuning-bose.yml
index e34f52fbf..6bf0c10a3 100644
--- a/data/cities/chambery/autotuning-bose.yml
+++ b/data/cities/chambery/autotuning-bose.yml
@@ -4,8 +4,8 @@ latitude: 45.56962
 longitude: 5.93301
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Turin"
-housenumber: 251
+street: Avenue de Turin
+housenumber: "251"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/aux-delices-du-faubourg.yml b/data/cities/chambery/aux-delices-du-faubourg.yml
index c838fe5ca..fa4546e59 100644
--- a/data/cities/chambery/aux-delices-du-faubourg.yml
+++ b/data/cities/chambery/aux-delices-du-faubourg.yml
@@ -4,8 +4,8 @@ latitude: 45.56609
 longitude: 5.93314
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 
+street: Faubourg Montmélian
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Tu, Th-Sa 06:30-13:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu, Th-Sa 06:30-13:30, 15:00-19:00
+website: ""
diff --git a/data/cities/chambery/barber-convention.yml b/data/cities/chambery/barber-convention.yml
index 25accd108..cc6c2c914 100644
--- a/data/cities/chambery/barber-convention.yml
+++ b/data/cities/chambery/barber-convention.yml
@@ -4,8 +4,8 @@ latitude: 45.56621
 longitude: 5.92675
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 63
+street: Faubourg Montmélian
+housenumber: "63"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/chambery/bel-homme-coiffure.yml b/data/cities/chambery/bel-homme-coiffure.yml
index bf88276bc..2f99d6a73 100644
--- a/data/cities/chambery/bel-homme-coiffure.yml
+++ b/data/cities/chambery/bel-homme-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.56481
 longitude: 5.92413
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 
+street: Rue Croix-d'Or
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-24:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-24:00,14:00-19:00
+website: ""
diff --git a/data/cities/chambery/biocoop.yml b/data/cities/chambery/biocoop.yml
index 4fea5b5e9..2fcf47d78 100644
--- a/data/cities/chambery/biocoop.yml
+++ b/data/cities/chambery/biocoop.yml
@@ -1,11 +1,11 @@
 id: 108031268
-type: way
+type: node
 latitude: 45.56559
 longitude: 5.9151
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Maché"
-housenumber: 106
+street: Faubourg Maché
+housenumber: "106"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.biocoop-faubourg-mache.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.biocoop-faubourg-mache.com/
diff --git a/data/cities/chambery/boucherie-bouraoui.yml b/data/cities/chambery/boucherie-bouraoui.yml
index 2df3d88f7..666ac071b 100644
--- a/data/cities/chambery/boucherie-bouraoui.yml
+++ b/data/cities/chambery/boucherie-bouraoui.yml
@@ -4,8 +4,8 @@ latitude: 45.56614
 longitude: 5.92623
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 17
+street: Faubourg Montmélian
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Su,PH 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su,PH 08:00-19:00
+website: ""
diff --git a/data/cities/chambery/boucherie-charcuterie-de-joppet.yml b/data/cities/chambery/boucherie-charcuterie-de-joppet.yml
index fa5278440..1c5ed685e 100644
--- a/data/cities/chambery/boucherie-charcuterie-de-joppet.yml
+++ b/data/cities/chambery/boucherie-charcuterie-de-joppet.yml
@@ -4,8 +4,8 @@ latitude: 45.56935
 longitude: 5.93184
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Turin"
-housenumber: 131
+street: Avenue de Turin
+housenumber: "131"
 phone: ""
-opening_hours: "Tu,We,Fr,Sa 08:00-12:30,15:30-19:30; Th,Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu,We,Fr,Sa 08:00-12:30,15:30-19:30; Th,Su 08:00-12:30
+website: ""
diff --git a/data/cities/chambery/boucherie-el-fath.yml b/data/cities/chambery/boucherie-el-fath.yml
index 511095be3..30ad29455 100644
--- a/data/cities/chambery/boucherie-el-fath.yml
+++ b/data/cities/chambery/boucherie-el-fath.yml
@@ -4,8 +4,8 @@ latitude: 45.56627
 longitude: 5.9328
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 
+street: Faubourg Montmélian
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/boulanger.yml b/data/cities/chambery/boulanger.yml
index e882f1f32..1b9c7b0d6 100644
--- a/data/cities/chambery/boulanger.yml
+++ b/data/cities/chambery/boulanger.yml
@@ -4,8 +4,8 @@ latitude: 45.59459
 longitude: 5.89962
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1253
+street: Avenue des Landiers
+housenumber: "1253"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/boulangerie-de-la-gare.yml b/data/cities/chambery/boulangerie-de-la-gare.yml
index fbfb7f950..29381c44d 100644
--- a/data/cities/chambery/boulangerie-de-la-gare.yml
+++ b/data/cities/chambery/boulangerie-de-la-gare.yml
@@ -4,8 +4,8 @@ latitude: 45.56939
 longitude: 5.91989
 postcode: "73000"
 city: Chambéry
-street: "Rue de la Gare"
-housenumber: 32
+street: Rue de la Gare
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Fr 06:45-13:30,15:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:45-13:30,15:30-18:00
+website: ""
diff --git a/data/cities/chambery/boulangerie-driouach.yml b/data/cities/chambery/boulangerie-driouach.yml
index 16be628bb..b09fae828 100644
--- a/data/cities/chambery/boulangerie-driouach.yml
+++ b/data/cities/chambery/boulangerie-driouach.yml
@@ -4,8 +4,8 @@ latitude: 45.56623
 longitude: 5.92693
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 71
+street: Faubourg Montmélian
+housenumber: "71"
 phone: ""
-opening_hours: "Th-Tu 06:10-09:50,10:50-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Th-Tu 06:10-09:50,10:50-20:00
+website: ""
diff --git a/data/cities/chambery/boulangerie-dupraz.yml b/data/cities/chambery/boulangerie-dupraz.yml
index ebe85c28c..17afe465c 100644
--- a/data/cities/chambery/boulangerie-dupraz.yml
+++ b/data/cities/chambery/boulangerie-dupraz.yml
@@ -4,8 +4,8 @@ latitude: 45.56631
 longitude: 5.92748
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 117
+street: Faubourg Montmélian
+housenumber: "117"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/camille-albane.yml b/data/cities/chambery/camille-albane.yml
index 15c3eaf4d..bccd449a6 100644
--- a/data/cities/chambery/camille-albane.yml
+++ b/data/cities/chambery/camille-albane.yml
@@ -4,8 +4,8 @@ latitude: 45.56656
 longitude: 5.92221
 postcode: "73000"
 city: Chambéry
-street: "Rue Vieille Monnaie"
-housenumber: 
+street: Rue Vieille Monnaie
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/chambery/carlance.yml b/data/cities/chambery/carlance.yml
index 60d2490c3..3cbd50863 100644
--- a/data/cities/chambery/carlance.yml
+++ b/data/cities/chambery/carlance.yml
@@ -4,8 +4,8 @@ latitude: 45.57118
 longitude: 5.91343
 postcode: "73000"
 city: Chambéry
-street: "Avenue du Comte Vert"
-housenumber: 208
+street: Avenue du Comte Vert
+housenumber: "208"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/carrefour-city-avenue-de-turin.yml b/data/cities/chambery/carrefour-city-avenue-de-turin.yml
index 581d7f1ac..d73885b01 100644
--- a/data/cities/chambery/carrefour-city-avenue-de-turin.yml
+++ b/data/cities/chambery/carrefour-city-avenue-de-turin.yml
@@ -4,8 +4,8 @@ latitude: 45.56929
 longitude: 5.93159
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Turin"
-housenumber: 
-phone: "+33 9 81 48 24 44"
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/city-chambery-turin"
\ No newline at end of file
+street: Avenue de Turin
+housenumber: ""
+phone: +33 9 81 48 24 44
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/city-chambery-turin
diff --git a/data/cities/chambery/carrefour-city-rue-de-la-republique.yml b/data/cities/chambery/carrefour-city-rue-de-la-republique.yml
index 795ad02dc..d0f79bf67 100644
--- a/data/cities/chambery/carrefour-city-rue-de-la-republique.yml
+++ b/data/cities/chambery/carrefour-city-rue-de-la-republique.yml
@@ -4,8 +4,8 @@ latitude: 45.56408
 longitude: 5.92403
 postcode: "73000"
 city: Chambéry
-street: "Rue de la République"
-housenumber: 125
-phone: "+33 479719061"
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+street: Rue de la République
+housenumber: "125"
+phone: +33 479719061
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/chambery/carrefour-city.yml b/data/cities/chambery/carrefour-city.yml
index 55de24ad7..3877f2b49 100644
--- a/data/cities/chambery/carrefour-city.yml
+++ b/data/cities/chambery/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.56616
 longitude: 5.9322
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 
-phone: "+33 4 79 60 02 09"
-opening_hours: "Mo-Sa 07:00-21:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/city-chambery-montmelian"
\ No newline at end of file
+street: Faubourg Montmélian
+housenumber: ""
+phone: +33 4 79 60 02 09
+opening_hours: Mo-Sa 07:00-21:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/city-chambery-montmelian
diff --git a/data/cities/chambery/carrefour.yml b/data/cities/chambery/carrefour.yml
index b413c3512..0ec028307 100644
--- a/data/cities/chambery/carrefour.yml
+++ b/data/cities/chambery/carrefour.yml
@@ -4,8 +4,8 @@ latitude: 45.56451
 longitude: 5.92141
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 60
+street: Place Saint-Léger
+housenumber: "60"
 phone: ""
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/chambery/cattin-mobilites.yml b/data/cities/chambery/cattin-mobilites.yml
index 803ea850f..8a27c2c13 100644
--- a/data/cities/chambery/cattin-mobilites.yml
+++ b/data/cities/chambery/cattin-mobilites.yml
@@ -4,8 +4,8 @@ latitude: 45.57105
 longitude: 5.91372
 postcode: "73000"
 city: Chambéry
-street: "Avenue du Comte Vert"
-housenumber: 188
-phone: "+334 79 62 22 55"
-opening_hours: "Tu-Sa 09:00-12:00, 14:00-18:00"
-website: "https://cattinmobilites.fr/"
\ No newline at end of file
+street: Avenue du Comte Vert
+housenumber: "188"
+phone: +334 79 62 22 55
+opening_hours: Tu-Sa 09:00-12:00, 14:00-18:00
+website: https://cattinmobilites.fr/
diff --git a/data/cities/chambery/cedeo-chambery-bissy-sanitaire-chauffage-plomberie.yml b/data/cities/chambery/cedeo-chambery-bissy-sanitaire-chauffage-plomberie.yml
index a33f74665..9fa65e273 100644
--- a/data/cities/chambery/cedeo-chambery-bissy-sanitaire-chauffage-plomberie.yml
+++ b/data/cities/chambery/cedeo-chambery-bissy-sanitaire-chauffage-plomberie.yml
@@ -4,8 +4,9 @@ latitude: 45.58261
 longitude: 5.89114
 postcode: "73000"
 city: Chambéry
-street: "Avenue du Grand Arietaz"
-housenumber: 161
-phone: "04 79 68 52 68"
-opening_hours: "Tu-Th 07:30-12:00,13:30-17:00; Sa 08:00-12:00; Mo 08:00-12:00,13:30-16:30; Fr 07:30-12:00,13:30-16:30"
-website: ""
\ No newline at end of file
+street: Avenue du Grand Arietaz
+housenumber: "161"
+phone: 04 79 68 52 68
+opening_hours: Tu-Th 07:30-12:00,13:30-17:00; Sa 08:00-12:00; Mo 08:00-12:00,13:30-16:30;
+    Fr 07:30-12:00,13:30-16:30
+website: ""
diff --git a/data/cities/chambery/chaussea.yml b/data/cities/chambery/chaussea.yml
index 6982e0b4c..a918397aa 100644
--- a/data/cities/chambery/chaussea.yml
+++ b/data/cities/chambery/chaussea.yml
@@ -4,8 +4,8 @@ latitude: 45.59445
 longitude: 5.89929
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1253
+street: Avenue des Landiers
+housenumber: "1253"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/chocolaterie-mazet.yml b/data/cities/chambery/chocolaterie-mazet.yml
index c360a5bd8..9715ff651 100644
--- a/data/cities/chambery/chocolaterie-mazet.yml
+++ b/data/cities/chambery/chocolaterie-mazet.yml
@@ -5,7 +5,7 @@ longitude: 5.92027
 postcode: "73000"
 city: Chambéry
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/chambery/club-bouygues-telecom.yml b/data/cities/chambery/club-bouygues-telecom.yml
index 866f6c654..11326c225 100644
--- a/data/cities/chambery/club-bouygues-telecom.yml
+++ b/data/cities/chambery/club-bouygues-telecom.yml
@@ -4,8 +4,8 @@ latitude: 45.56746
 longitude: 5.92154
 postcode: "73000"
 city: Chambéry
-street: "Boulevard de la Colonne"
-housenumber: 17
+street: Boulevard de la Colonne
+housenumber: "17"
 phone: ""
-opening_hours: "Tu-Fr 10:00-12:30,14:00-19:00; Sa 10:00-12:30,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:30,14:00-19:00; Sa 10:00-12:30,14:00-18:00
+website: ""
diff --git a/data/cities/chambery/codjo.yml b/data/cities/chambery/codjo.yml
index 48b24cb29..5e3aa4b62 100644
--- a/data/cities/chambery/codjo.yml
+++ b/data/cities/chambery/codjo.yml
@@ -4,8 +4,8 @@ latitude: 45.56614
 longitude: 5.92687
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 64
+street: Faubourg Montmélian
+housenumber: "64"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/cooperatives-laitieres-du-beaufortain-et-de-yenne.yml b/data/cities/chambery/cooperatives-laitieres-du-beaufortain-et-de-yenne.yml
index 8a4bc32e3..7f52b478f 100644
--- a/data/cities/chambery/cooperatives-laitieres-du-beaufortain-et-de-yenne.yml
+++ b/data/cities/chambery/cooperatives-laitieres-du-beaufortain-et-de-yenne.yml
@@ -4,8 +4,8 @@ latitude: 45.5793
 longitude: 5.90877
 postcode: "73000"
 city: Chambéry
-street: "Avenue du Grand Verger"
-housenumber: 177
-phone: "+334 79 62 30 11"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue du Grand Verger
+housenumber: "177"
+phone: +334 79 62 30 11
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/chambery/cyclable.yml b/data/cities/chambery/cyclable.yml
index 84e244ba3..d117bcc24 100644
--- a/data/cities/chambery/cyclable.yml
+++ b/data/cities/chambery/cyclable.yml
@@ -4,8 +4,8 @@ latitude: 45.56396
 longitude: 5.92556
 postcode: "73000"
 city: Chambéry
-street: "Rue de la République"
-housenumber: 256
-phone: "+33 4 58 14 07 54"
-opening_hours: "Tu-Fr 10:00-13:00, 14:00-19:00; Sa 10:00-19:00"
-website: "https://chambery.cyclable.com/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "256"
+phone: +33 4 58 14 07 54
+opening_hours: Tu-Fr 10:00-13:00, 14:00-19:00; Sa 10:00-19:00
+website: https://chambery.cyclable.com/
diff --git a/data/cities/chambery/darty.yml b/data/cities/chambery/darty.yml
index 155ffdfb9..68b52b0ed 100644
--- a/data/cities/chambery/darty.yml
+++ b/data/cities/chambery/darty.yml
@@ -4,8 +4,8 @@ latitude: 45.5664
 longitude: 5.9192
 postcode: "73000"
 city: Chambéry
-street: "Place de Genève"
-housenumber: 
+street: Place de Genève
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/decathlon-rue-de-borolan.yml b/data/cities/chambery/decathlon-rue-de-borolan.yml
index c3088d8fe..84acda8c5 100644
--- a/data/cities/chambery/decathlon-rue-de-borolan.yml
+++ b/data/cities/chambery/decathlon-rue-de-borolan.yml
@@ -1,11 +1,11 @@
 id: 110602090
-type: way
+type: node
 latitude: 45.60807
 longitude: 5.88924
 postcode: "73000"
 city: Chambéry
-street: "Rue de Borolan"
-housenumber: 108
-phone: "+33 4 79 75 15 50"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-chamb%C3%A9ry-0070110701107"
\ No newline at end of file
+street: Rue de Borolan
+housenumber: "108"
+phone: +33 4 79 75 15 50
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.decathlon.fr/store-view/magasin-de-sports-chamb%C3%A9ry-0070110701107
diff --git a/data/cities/chambery/decathlon.yml b/data/cities/chambery/decathlon.yml
index e847f969e..e335b2708 100644
--- a/data/cities/chambery/decathlon.yml
+++ b/data/cities/chambery/decathlon.yml
@@ -4,8 +4,8 @@ latitude: 45.56634
 longitude: 5.91876
 postcode: "73000"
 city: Chambéry
-street: "Rue Bonivard"
-housenumber: 4
-phone: "+33 4 85 78 00 32"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-chambery-contact-centre-ville-0070286102861"
\ No newline at end of file
+street: Rue Bonivard
+housenumber: "4"
+phone: +33 4 85 78 00 32
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.decathlon.fr/store-view/magasin-de-sports-chambery-contact-centre-ville-0070286102861
diff --git a/data/cities/chambery/devred.yml b/data/cities/chambery/devred.yml
index b86b12e98..22767df62 100644
--- a/data/cities/chambery/devred.yml
+++ b/data/cities/chambery/devred.yml
@@ -4,8 +4,8 @@ latitude: 45.56691
 longitude: 5.92224
 postcode: "73000"
 city: Chambéry
-street: "Boulevard de la Colonne"
-housenumber: 
+street: Boulevard de la Colonne
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/chambery/droguerie-gagnere.yml b/data/cities/chambery/droguerie-gagnere.yml
index b206c0675..231ee62d7 100644
--- a/data/cities/chambery/droguerie-gagnere.yml
+++ b/data/cities/chambery/droguerie-gagnere.yml
@@ -4,8 +4,8 @@ latitude: 45.56589
 longitude: 5.91527
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Bernardines"
-housenumber: 61
+street: Avenue des Bernardines
+housenumber: "61"
 phone: ""
-opening_hours: "Mo, Sa 09:00-12:00, 14:00-18:00; Tu-Fr 08:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo, Sa 09:00-12:00, 14:00-18:00; Tu-Fr 08:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/chambery/du-pareil-au-meme.yml b/data/cities/chambery/du-pareil-au-meme.yml
index 32730662e..09e48ed37 100644
--- a/data/cities/chambery/du-pareil-au-meme.yml
+++ b/data/cities/chambery/du-pareil-au-meme.yml
@@ -4,8 +4,8 @@ latitude: 45.56436
 longitude: 5.92118
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 
+street: Place Saint-Léger
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/easycash.yml b/data/cities/chambery/easycash.yml
index 2991b426b..bf777a377 100644
--- a/data/cities/chambery/easycash.yml
+++ b/data/cities/chambery/easycash.yml
@@ -4,8 +4,8 @@ latitude: 45.59466
 longitude: 5.89977
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1253
-phone: "+33 4 11 94 00 00"
+street: Avenue des Landiers
+housenumber: "1253"
+phone: +33 4 11 94 00 00
 opening_hours: ""
-website: "https://www.easycash.fr/"
\ No newline at end of file
+website: https://www.easycash.fr/
diff --git a/data/cities/chambery/eko-systm.yml b/data/cities/chambery/eko-systm.yml
index 0dbaeab9f..b06e37d5f 100644
--- a/data/cities/chambery/eko-systm.yml
+++ b/data/cities/chambery/eko-systm.yml
@@ -4,8 +4,8 @@ latitude: 45.56864
 longitude: 5.903
 postcode: "73000"
 city: Chambéry
-street: "Boulevard Henry Bordeaux"
-housenumber: 572
+street: Boulevard Henry Bordeaux
+housenumber: "572"
 phone: "+33982235323"
-opening_hours: "Mo 16:00-19:30; Tu-Fr 09:00-13:00, 15:30-19:30; Sa 09:00-13:00, 16:00-18:00"
-website: "https://www.ekosystm.com/"
\ No newline at end of file
+opening_hours: Mo 16:00-19:30; Tu-Fr 09:00-13:00, 15:30-19:30; Sa 09:00-13:00, 16:00-18:00
+website: https://www.ekosystm.com/
diff --git a/data/cities/chambery/emmaus.yml b/data/cities/chambery/emmaus.yml
index 6f8b3b826..5a4213ae4 100644
--- a/data/cities/chambery/emmaus.yml
+++ b/data/cities/chambery/emmaus.yml
@@ -4,8 +4,8 @@ latitude: 45.56633
 longitude: 5.92764
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 127
+street: Faubourg Montmélian
+housenumber: "127"
 phone: ""
-opening_hours: "Tu-Sa 10:00-13:00,14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-13:00,14:00-18:30
+website: ""
diff --git a/data/cities/chambery/ernest-patisserie-et-cafe.yml b/data/cities/chambery/ernest-patisserie-et-cafe.yml
index 3b00771fd..f9bff6e76 100644
--- a/data/cities/chambery/ernest-patisserie-et-cafe.yml
+++ b/data/cities/chambery/ernest-patisserie-et-cafe.yml
@@ -4,8 +4,8 @@ latitude: 45.56425
 longitude: 5.92136
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 49
-phone: "+33 4 79 33 35 61"
-opening_hours: "Mo-Fr 08:00-18:30"
-website: "https://www.ernest-patisserie.fr/"
\ No newline at end of file
+street: Place Saint-Léger
+housenumber: "49"
+phone: +33 4 79 33 35 61
+opening_hours: Mo-Fr 08:00-18:30
+website: https://www.ernest-patisserie.fr/
diff --git a/data/cities/chambery/euromaster-milliand-pneus.yml b/data/cities/chambery/euromaster-milliand-pneus.yml
index ac1ba9983..eb06e9a32 100644
--- a/data/cities/chambery/euromaster-milliand-pneus.yml
+++ b/data/cities/chambery/euromaster-milliand-pneus.yml
@@ -4,8 +4,8 @@ latitude: 45.60742
 longitude: 5.89115
 postcode: "73000"
 city: Chambéry
-street: "Rue Belle-Eau"
-housenumber: 67
-phone: "+33 4 79 44 00 55"
+street: Rue Belle-Eau
+housenumber: "67"
+phone: +33 4 79 44 00 55
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/foussier-chambery.yml b/data/cities/chambery/foussier-chambery.yml
index c7d13d170..348dc3f71 100644
--- a/data/cities/chambery/foussier-chambery.yml
+++ b/data/cities/chambery/foussier-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.60764
 longitude: 5.89105
 postcode: "73000"
 city: Chambéry
-street: "Rue Belle-Eau"
-housenumber: 84
-phone: "+33 4 78 49 49 49"
+street: Rue Belle-Eau
+housenumber: "84"
+phone: +33 4 78 49 49 49
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/franprix.yml b/data/cities/chambery/franprix.yml
index aef5b6d98..ef281bee2 100644
--- a/data/cities/chambery/franprix.yml
+++ b/data/cities/chambery/franprix.yml
@@ -4,8 +4,8 @@ latitude: 45.56651
 longitude: 5.92337
 postcode: "73000"
 city: Chambéry
-street: "Boulevard du Théâtre"
-housenumber: 
+street: Boulevard du Théâtre
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/free-music.yml b/data/cities/chambery/free-music.yml
index 533914c2f..bf79701ae 100644
--- a/data/cities/chambery/free-music.yml
+++ b/data/cities/chambery/free-music.yml
@@ -4,8 +4,8 @@ latitude: 45.56462
 longitude: 5.92321
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 74
+street: Rue Croix-d'Or
+housenumber: "74"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/chambery/galeries-lafayette.yml b/data/cities/chambery/galeries-lafayette.yml
index 19defee2a..58fc0dd64 100644
--- a/data/cities/chambery/galeries-lafayette.yml
+++ b/data/cities/chambery/galeries-lafayette.yml
@@ -1,11 +1,11 @@
 id: 101971081
-type: way
+type: node
 latitude: 45.56792
 longitude: 5.921
 postcode: "73000"
 city: Chambéry
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:30
+website: ""
diff --git a/data/cities/chambery/gifi.yml b/data/cities/chambery/gifi.yml
index ce10e0e20..3c11eddd6 100644
--- a/data/cities/chambery/gifi.yml
+++ b/data/cities/chambery/gifi.yml
@@ -1,11 +1,11 @@
 id: 110600771
-type: way
+type: node
 latitude: 45.59649
 longitude: 5.89741
 postcode: "73000"
 city: Chambery
-street: "Avenue des Landiers"
-housenumber: 1549
-phone: "+33 4 79 62 84 89"
-opening_hours: "Mo-Sa 09:30-19:00; Su 14:00-18:30"
-website: "https://www.gifi.fr/?store_id=1362&utm_source=GMB&utm_medium=groupe&utm_campaign=1362"
\ No newline at end of file
+street: Avenue des Landiers
+housenumber: "1549"
+phone: +33 4 79 62 84 89
+opening_hours: Mo-Sa 09:30-19:00; Su 14:00-18:30
+website: https://www.gifi.fr/?store_id=1362&utm_source=GMB&utm_medium=groupe&utm_campaign=1362
diff --git a/data/cities/chambery/go-sport.yml b/data/cities/chambery/go-sport.yml
index 0edadc0a3..928bfe5aa 100644
--- a/data/cities/chambery/go-sport.yml
+++ b/data/cities/chambery/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.59331
 longitude: 5.89727
 postcode: "73000"
 city: Chambéry
-street: "Rue Eugène Ducretet"
-housenumber: 325
-phone: "+33 4 79 96 71 50"
-opening_hours: "Mo-Fr 10:00-19:30; Sa 09:30-19:30"
-website: "https://www.go-sport.com/stores?lang=default#/stores/1192"
\ No newline at end of file
+street: Rue Eugène Ducretet
+housenumber: "325"
+phone: +33 4 79 96 71 50
+opening_hours: Mo-Fr 10:00-19:30; Sa 09:30-19:30
+website: https://www.go-sport.com/stores?lang=default#/stores/1192
diff --git a/data/cities/chambery/gomina.yml b/data/cities/chambery/gomina.yml
index ddda68dd0..e4ac0d353 100644
--- a/data/cities/chambery/gomina.yml
+++ b/data/cities/chambery/gomina.yml
@@ -4,8 +4,8 @@ latitude: 45.56477
 longitude: 5.92405
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 
+street: Rue Croix-d'Or
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 08:00-18:00; Sa 08:00-15:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:00-18:00; Sa 08:00-15:00
+website: ""
diff --git a/data/cities/chambery/grolle-alpine.yml b/data/cities/chambery/grolle-alpine.yml
index 8f51f42d3..9554a2563 100644
--- a/data/cities/chambery/grolle-alpine.yml
+++ b/data/cities/chambery/grolle-alpine.yml
@@ -4,8 +4,8 @@ latitude: 45.57199
 longitude: 5.91138
 postcode: "73000"
 city: Chambéry
-street: "Avenue du Comte Vert"
-housenumber: 394
+street: Avenue du Comte Vert
+housenumber: "394"
 phone: "+33674196067"
-opening_hours: "Tu-Fr 08:30-19:00; Sa 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-19:00; Sa 08:30-12:30
+website: ""
diff --git a/data/cities/chambery/happy-dressing.yml b/data/cities/chambery/happy-dressing.yml
index f32e45a20..ded6d6a77 100644
--- a/data/cities/chambery/happy-dressing.yml
+++ b/data/cities/chambery/happy-dressing.yml
@@ -4,8 +4,8 @@ latitude: 45.56622
 longitude: 5.92128
 postcode: "73000"
 city: Chambéry
-street: "Rue Favre"
-housenumber: 
+street: Rue Favre
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/hexagone.yml b/data/cities/chambery/hexagone.yml
index 350952443..4b9f952e1 100644
--- a/data/cities/chambery/hexagone.yml
+++ b/data/cities/chambery/hexagone.yml
@@ -4,8 +4,8 @@ latitude: 45.56626
 longitude: 5.9194
 postcode: "73000"
 city: Chambéry
-street: "Rue Bonivard"
-housenumber: 5
+street: Rue Bonivard
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-20:00
+website: ""
diff --git a/data/cities/chambery/histoire-dor.yml b/data/cities/chambery/histoire-dor.yml
index f2a4e1433..99e89af8b 100644
--- a/data/cities/chambery/histoire-dor.yml
+++ b/data/cities/chambery/histoire-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.56511
 longitude: 5.9202
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 
+street: Place Saint-Léger
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/jolie-retro.yml b/data/cities/chambery/jolie-retro.yml
index d420d9960..8c4311fff 100644
--- a/data/cities/chambery/jolie-retro.yml
+++ b/data/cities/chambery/jolie-retro.yml
@@ -4,8 +4,8 @@ latitude: 45.56371
 longitude: 5.92739
 postcode: "73000"
 city: Chambéry
-street: "Rue de la République"
-housenumber: 393
+street: Rue de la République
+housenumber: "393"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/kamasutra.yml b/data/cities/chambery/kamasutra.yml
index 683afd092..7e0bba2a1 100644
--- a/data/cities/chambery/kamasutra.yml
+++ b/data/cities/chambery/kamasutra.yml
@@ -4,8 +4,8 @@ latitude: 45.56636
 longitude: 5.92812
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 171
+street: Faubourg Montmélian
+housenumber: "171"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/la-belle-armoire.yml b/data/cities/chambery/la-belle-armoire.yml
index 87a45abe0..7efdf226c 100644
--- a/data/cities/chambery/la-belle-armoire.yml
+++ b/data/cities/chambery/la-belle-armoire.yml
@@ -4,8 +4,8 @@ latitude: 45.56475
 longitude: 5.92359
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 38
+street: Rue Croix-d'Or
+housenumber: "38"
 phone: ""
-opening_hours: "Tu-Sa 10:30-13:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:30-13:00,14:00-19:00
+website: ""
diff --git a/data/cities/chambery/la-bellequoise.yml b/data/cities/chambery/la-bellequoise.yml
index 37f564521..a51019725 100644
--- a/data/cities/chambery/la-bellequoise.yml
+++ b/data/cities/chambery/la-bellequoise.yml
@@ -4,8 +4,8 @@ latitude: 45.56661
 longitude: 5.92031
 postcode: "73000"
 city: Chambéry
-street: "Place de l'Hôtel de Ville"
-housenumber: 13
+street: Place de l'Hôtel de Ville
+housenumber: "13"
 phone: "+33479332991"
-opening_hours: "Mo-Sa 07:00-19:30"
-website: "https://www.labellequoise73.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:30
+website: https://www.labellequoise73.fr/
diff --git a/data/cities/chambery/la-boucherie-du-senat.yml b/data/cities/chambery/la-boucherie-du-senat.yml
index c28b34967..a0582743a 100644
--- a/data/cities/chambery/la-boucherie-du-senat.yml
+++ b/data/cities/chambery/la-boucherie-du-senat.yml
@@ -4,8 +4,8 @@ latitude: 45.56597
 longitude: 5.91979
 postcode: "73000"
 city: Chambéry
-street: "Rue du Sénat de Savoie"
-housenumber: 8
+street: Rue du Sénat de Savoie
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Sa 14:30-19:00, Mo-Fr 07:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 14:30-19:00, Mo-Fr 07:30-19:30
+website: ""
diff --git a/data/cities/chambery/la-brulerie-du-senat.yml b/data/cities/chambery/la-brulerie-du-senat.yml
index 7b682a4f8..9f03942b4 100644
--- a/data/cities/chambery/la-brulerie-du-senat.yml
+++ b/data/cities/chambery/la-brulerie-du-senat.yml
@@ -4,8 +4,8 @@ latitude: 45.56612
 longitude: 5.91975
 postcode: "73000"
 city: Chambéry
-street: "Rue du Sénat de Savoie"
-housenumber: 10
+street: Rue du Sénat de Savoie
+housenumber: "10"
 phone: ""
-opening_hours: "Vente en ligne et sur RV pendant le confinement"
-website: "https://www.achat-chambery.com"
\ No newline at end of file
+opening_hours: '"Vente en ligne et sur RV pendant le confinement"'
+website: https://www.achat-chambery.com
diff --git a/data/cities/chambery/la-chaise-longue.yml b/data/cities/chambery/la-chaise-longue.yml
index f5f2087c7..0d45c2f10 100644
--- a/data/cities/chambery/la-chaise-longue.yml
+++ b/data/cities/chambery/la-chaise-longue.yml
@@ -4,8 +4,8 @@ latitude: 45.59245
 longitude: 5.90117
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1097
+street: Avenue des Landiers
+housenumber: "1097"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/la-citadelle.yml b/data/cities/chambery/la-citadelle.yml
index 73ac902d2..45ed07723 100644
--- a/data/cities/chambery/la-citadelle.yml
+++ b/data/cities/chambery/la-citadelle.yml
@@ -4,8 +4,8 @@ latitude: 45.56636
 longitude: 5.92598
 postcode: "73000"
 city: Chambéry
-street: "Place d'Italie"
-housenumber: 60
+street: Place d'Italie
+housenumber: "60"
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00; Mo 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00; Mo 14:00-19:00
+website: ""
diff --git a/data/cities/chambery/la-loge-numero-5.yml b/data/cities/chambery/la-loge-numero-5.yml
index 79d666cb8..be3e430e6 100644
--- a/data/cities/chambery/la-loge-numero-5.yml
+++ b/data/cities/chambery/la-loge-numero-5.yml
@@ -4,8 +4,8 @@ latitude: 45.56574
 longitude: 5.91583
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Bernardines"
-housenumber: 26
+street: Avenue des Bernardines
+housenumber: "26"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:00"
-website: "https://lalogenumero5.fr/"
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: https://lalogenumero5.fr/
diff --git a/data/cities/chambery/la-mercerie-cafe-creatif.yml b/data/cities/chambery/la-mercerie-cafe-creatif.yml
index 4a079ce14..56f330853 100644
--- a/data/cities/chambery/la-mercerie-cafe-creatif.yml
+++ b/data/cities/chambery/la-mercerie-cafe-creatif.yml
@@ -4,8 +4,9 @@ latitude: 45.56534
 longitude: 5.9243
 postcode: "73000"
 city: Chambéry
-street: "Rue du Théâtre"
-housenumber: 6
+street: Rue du Théâtre
+housenumber: "6"
 phone: ""
-opening_hours: "Tu 10:00-19:00, We-Th 10:00-12:30,14:00-19:00, Fr 10:00-18:30, Sa 10:00-12:30,14:00-18:00; PH off"
-website: ""
\ No newline at end of file
+opening_hours: Tu 10:00-19:00, We-Th 10:00-12:30,14:00-19:00, Fr 10:00-18:30, Sa 10:00-12:30,14:00-18:00;
+    PH off
+website: ""
diff --git a/data/cities/chambery/la-mie-caline.yml b/data/cities/chambery/la-mie-caline.yml
index 4d9ee4795..f4a8e5bfd 100644
--- a/data/cities/chambery/la-mie-caline.yml
+++ b/data/cities/chambery/la-mie-caline.yml
@@ -4,8 +4,8 @@ latitude: 45.56766
 longitude: 5.92195
 postcode: "73000"
 city: Chambéry
-street: "Boulevard de la Colonne"
-housenumber: 
+street: Boulevard de la Colonne
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/la-ptite-boulange-de-charlotte.yml b/data/cities/chambery/la-ptite-boulange-de-charlotte.yml
index 1274dc478..4f2e40802 100644
--- a/data/cities/chambery/la-ptite-boulange-de-charlotte.yml
+++ b/data/cities/chambery/la-ptite-boulange-de-charlotte.yml
@@ -4,8 +4,8 @@ latitude: 45.5872
 longitude: 5.88398
 postcode: "73000"
 city: Chambéry
-street: "Avenue de la Motte-Servolex"
-housenumber: 1460
+street: Avenue de la Motte-Servolex
+housenumber: "1460"
 phone: ""
-opening_hours: "Mo-Sa 06:30-20:00; Su 07:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-20:00; Su 07:00-20:00
+website: ""
diff --git a/data/cities/chambery/la-serrurerie.yml b/data/cities/chambery/la-serrurerie.yml
index 1e537a91d..05d8856dd 100644
--- a/data/cities/chambery/la-serrurerie.yml
+++ b/data/cities/chambery/la-serrurerie.yml
@@ -4,8 +4,8 @@ latitude: 45.56642
 longitude: 5.92598
 postcode: "73000"
 city: Chambéry
-street: "Place d'Italie"
-housenumber: 62
-phone: "04 79 85 95 20"
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-17:00"
-website: "https://www.la-serrurerie.pro/"
\ No newline at end of file
+street: Place d'Italie
+housenumber: "62"
+phone: 04 79 85 95 20
+opening_hours: Mo-Fr 08:00-12:00, 14:00-17:00
+website: https://www.la-serrurerie.pro/
diff --git a/data/cities/chambery/la-velobricolade.yml b/data/cities/chambery/la-velobricolade.yml
index 53fa83941..b5b774eb7 100644
--- a/data/cities/chambery/la-velobricolade.yml
+++ b/data/cities/chambery/la-velobricolade.yml
@@ -4,8 +4,8 @@ latitude: 45.56273
 longitude: 5.92147
 postcode: "73000"
 city: Chambéry
-street: "Rue Fodéré"
-housenumber: 58
+street: Rue Fodéré
+housenumber: "58"
 phone: ""
 opening_hours: ""
-website: "https://rouelibre.net"
\ No newline at end of file
+website: https://rouelibre.net
diff --git a/data/cities/chambery/la-vie-claire.yml b/data/cities/chambery/la-vie-claire.yml
index 152945f97..ba0fc5e08 100644
--- a/data/cities/chambery/la-vie-claire.yml
+++ b/data/cities/chambery/la-vie-claire.yml
@@ -5,7 +5,7 @@ longitude: 5.92189
 postcode: "73000"
 city: Chambéry
 street: ""
-housenumber: 
-phone: "+33 4 79 68 48 47"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://magasins.lavieclaire.com/lavieclaire/fr/store/france/auvergne-rhone-alpes/savoie/chambery/chambery-colonne/17309"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 79 68 48 47
+opening_hours: Mo-Sa 09:00-19:30
+website: https://magasins.lavieclaire.com/lavieclaire/fr/store/france/auvergne-rhone-alpes/savoie/chambery/chambery-colonne/17309
diff --git a/data/cities/chambery/latelier-58.yml b/data/cities/chambery/latelier-58.yml
index 1ce89fd48..37ee70953 100644
--- a/data/cities/chambery/latelier-58.yml
+++ b/data/cities/chambery/latelier-58.yml
@@ -4,8 +4,8 @@ latitude: 45.5647
 longitude: 5.92343
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 58
+street: Rue Croix-d'Or
+housenumber: "58"
 phone: ""
-opening_hours: "Mo-Sa 10:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-18:30
+website: ""
diff --git a/data/cities/chambery/latelier-de-la-fee-couzette.yml b/data/cities/chambery/latelier-de-la-fee-couzette.yml
index 46400bdae..63fad480d 100644
--- a/data/cities/chambery/latelier-de-la-fee-couzette.yml
+++ b/data/cities/chambery/latelier-de-la-fee-couzette.yml
@@ -4,8 +4,8 @@ latitude: 45.56558
 longitude: 5.91901
 postcode: "73000"
 city: Chambéry
-street: "Rue Juiverie"
-housenumber: 61
-phone: "+33 9 54 79 89 89"
-opening_hours: "Tu-Sa 10:00-12:00,14:00-18:30"
-website: ""
\ No newline at end of file
+street: Rue Juiverie
+housenumber: "61"
+phone: +33 9 54 79 89 89
+opening_hours: Tu-Sa 10:00-12:00,14:00-18:30
+website: ""
diff --git a/data/cities/chambery/laverie-du-comte-vert.yml b/data/cities/chambery/laverie-du-comte-vert.yml
index e6579fb9a..35fae7b6b 100644
--- a/data/cities/chambery/laverie-du-comte-vert.yml
+++ b/data/cities/chambery/laverie-du-comte-vert.yml
@@ -4,8 +4,8 @@ latitude: 45.57112
 longitude: 5.9129
 postcode: "73000"
 city: Chambéry
-street: "Avenue du Comte Vert"
-housenumber: 249
+street: Avenue du Comte Vert
+housenumber: "249"
 phone: ""
-opening_hours: "Mo-Su,PH 06:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su,PH 06:00-21:00
+website: ""
diff --git a/data/cities/chambery/laverie-du-faubourg.yml b/data/cities/chambery/laverie-du-faubourg.yml
index 778ad28c9..c367b2a27 100644
--- a/data/cities/chambery/laverie-du-faubourg.yml
+++ b/data/cities/chambery/laverie-du-faubourg.yml
@@ -4,8 +4,8 @@ latitude: 45.56625
 longitude: 5.92777
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 150
+street: Faubourg Montmélian
+housenumber: "150"
 phone: ""
-opening_hours: "Mo-Su 07:00-21:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-21:30
+website: ""
diff --git a/data/cities/chambery/ldlc.yml b/data/cities/chambery/ldlc.yml
index 82ad0db00..22791dfa3 100644
--- a/data/cities/chambery/ldlc.yml
+++ b/data/cities/chambery/ldlc.yml
@@ -4,8 +4,8 @@ latitude: 45.59351
 longitude: 5.90088
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1097
+street: Avenue des Landiers
+housenumber: "1097"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.ldlc.com/magasins-ldlc/magasin-470057/73-ldlc-chambery/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.ldlc.com/magasins-ldlc/magasin-470057/73-ldlc-chambery/
diff --git a/data/cities/chambery/le-bon-petrin.yml b/data/cities/chambery/le-bon-petrin.yml
index 60906711c..683698fc7 100644
--- a/data/cities/chambery/le-bon-petrin.yml
+++ b/data/cities/chambery/le-bon-petrin.yml
@@ -4,8 +4,8 @@ latitude: 45.56438
 longitude: 5.92492
 postcode: "73000"
 city: Chambéry
-street: "Rue du Larith"
-housenumber: 47
+street: Rue du Larith
+housenumber: "47"
 phone: ""
-opening_hours: "Mo-Fr 06:30-13:30, 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-13:30, 14:30-19:00
+website: ""
diff --git a/data/cities/chambery/le-clivia.yml b/data/cities/chambery/le-clivia.yml
index d36d66500..609633d8d 100644
--- a/data/cities/chambery/le-clivia.yml
+++ b/data/cities/chambery/le-clivia.yml
@@ -4,8 +4,8 @@ latitude: 45.56544
 longitude: 5.92052
 postcode: "73000"
 city: Chambéry
-street: "Rue de Boigne"
-housenumber: 
+street: Rue de Boigne
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00; Su 09:00-12:00
+website: ""
diff --git a/data/cities/chambery/le-coin-des-affaires-du-vieux-campeur.yml b/data/cities/chambery/le-coin-des-affaires-du-vieux-campeur.yml
index e43e5856b..1cab08dc1 100644
--- a/data/cities/chambery/le-coin-des-affaires-du-vieux-campeur.yml
+++ b/data/cities/chambery/le-coin-des-affaires-du-vieux-campeur.yml
@@ -4,8 +4,8 @@ latitude: 45.61493
 longitude: 5.88656
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Villarcher"
-housenumber: 543
+street: Avenue de Villarcher
+housenumber: "543"
 phone: ""
-opening_hours: "Mo 11:00-19:00; Tu-Fr 11:00-19:30; Sa 10:00-19:00"
-website: "https://www.auvieuxcampeur.fr/"
\ No newline at end of file
+opening_hours: Mo 11:00-19:00; Tu-Fr 11:00-19:30; Sa 10:00-19:00
+website: https://www.auvieuxcampeur.fr/
diff --git a/data/cities/chambery/le-colysee.yml b/data/cities/chambery/le-colysee.yml
index 7d6bab4a9..cd621e551 100644
--- a/data/cities/chambery/le-colysee.yml
+++ b/data/cities/chambery/le-colysee.yml
@@ -4,8 +4,8 @@ latitude: 45.56616
 longitude: 5.92599
 postcode: "73000"
 city: Chambéry
-street: "Place d'Italie"
-housenumber: 44
+street: Place d'Italie
+housenumber: "44"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/le-dressing-des-ptits-loups.yml b/data/cities/chambery/le-dressing-des-ptits-loups.yml
index 5490eca1d..bb0eed187 100644
--- a/data/cities/chambery/le-dressing-des-ptits-loups.yml
+++ b/data/cities/chambery/le-dressing-des-ptits-loups.yml
@@ -4,8 +4,8 @@ latitude: 45.56634
 longitude: 5.92791
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 147
+street: Faubourg Montmélian
+housenumber: "147"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30,13:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30,13:30-18:30
+website: ""
diff --git a/data/cities/chambery/le-fidele-berger.yml b/data/cities/chambery/le-fidele-berger.yml
index c09c09e24..bfdf81b98 100644
--- a/data/cities/chambery/le-fidele-berger.yml
+++ b/data/cities/chambery/le-fidele-berger.yml
@@ -4,8 +4,8 @@ latitude: 45.56541
 longitude: 5.92086
 postcode: "73000"
 city: Chambéry
-street: "Rue de Boigne"
-housenumber: 15
-phone: "+33 4 79 70 22 62"
-opening_hours: "Tu-Fr 08:30-19:00; Sa 08:00-19:00; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue de Boigne
+housenumber: "15"
+phone: +33 4 79 70 22 62
+opening_hours: Tu-Fr 08:30-19:00; Sa 08:00-19:00; Su 09:00-12:00
+website: ""
diff --git a/data/cities/chambery/le-tabac-jaune.yml b/data/cities/chambery/le-tabac-jaune.yml
index 05d49e427..cf3be7773 100644
--- a/data/cities/chambery/le-tabac-jaune.yml
+++ b/data/cities/chambery/le-tabac-jaune.yml
@@ -4,8 +4,8 @@ latitude: 45.56446
 longitude: 5.92301
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 97
+street: Rue Croix-d'Or
+housenumber: "97"
 phone: ""
-opening_hours: "Mo-Th 07:00-22:00; Fr-Sa 07:00-23:00; Su 07:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:00-22:00; Fr-Sa 07:00-23:00; Su 07:00-21:00
+website: ""
diff --git a/data/cities/chambery/lepi-curieux.yml b/data/cities/chambery/lepi-curieux.yml
index 3ed88b6fe..f25c59b0b 100644
--- a/data/cities/chambery/lepi-curieux.yml
+++ b/data/cities/chambery/lepi-curieux.yml
@@ -4,8 +4,8 @@ latitude: 45.57308
 longitude: 5.91469
 postcode: ""
 city: Chambéry
-street: "Boulevard Léon Gambetta"
-housenumber: 7
+street: Boulevard Léon Gambetta
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/les-4c.yml b/data/cities/chambery/les-4c.yml
index fbad523cc..9ed463792 100644
--- a/data/cities/chambery/les-4c.yml
+++ b/data/cities/chambery/les-4c.yml
@@ -1,11 +1,11 @@
 id: 107344905
-type: way
+type: node
 latitude: 45.57465
 longitude: 5.92375
 postcode: "73000"
 city: Chambéry
-street: "Boulevard de Lemenc"
-housenumber: 50
+street: Boulevard de Lemenc
+housenumber: "50"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/les-egoistes.yml b/data/cities/chambery/les-egoistes.yml
index 1b7ace478..783d39d36 100644
--- a/data/cities/chambery/les-egoistes.yml
+++ b/data/cities/chambery/les-egoistes.yml
@@ -4,8 +4,8 @@ latitude: 45.56488
 longitude: 5.91971
 postcode: "73000"
 city: Chambéry
-street: "Rue de Boigne"
-housenumber: 21
+street: Rue de Boigne
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/librairie-garin.yml b/data/cities/chambery/librairie-garin.yml
index de24c12d0..27ddb4875 100644
--- a/data/cities/chambery/librairie-garin.yml
+++ b/data/cities/chambery/librairie-garin.yml
@@ -4,8 +4,8 @@ latitude: 45.56569
 longitude: 5.92371
 postcode: "73000"
 city: Chambéry
-street: "Boulevard du Theatre"
-housenumber: 
-phone: "+33 4 79 33 53 64"
-opening_hours: "Tu-Sa 09:30-19:00; Mo 14:00-19:00"
-website: "https://www.librairiegarin.fr/"
\ No newline at end of file
+street: Boulevard du Theatre
+housenumber: ""
+phone: +33 4 79 33 53 64
+opening_hours: Tu-Sa 09:30-19:00; Mo 14:00-19:00
+website: https://www.librairiegarin.fr/
diff --git a/data/cities/chambery/librairie-jean-jacques-rousseau.yml b/data/cities/chambery/librairie-jean-jacques-rousseau.yml
index cf0f4798f..9687a28f7 100644
--- a/data/cities/chambery/librairie-jean-jacques-rousseau.yml
+++ b/data/cities/chambery/librairie-jean-jacques-rousseau.yml
@@ -4,8 +4,8 @@ latitude: 45.56467
 longitude: 5.92337
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 64
+street: Rue Croix-d'Or
+housenumber: "64"
 phone: "+33479701810"
-opening_hours: "Tu-Sa 10:00-12:30,14:30-19:00"
-website: "https://www.librairie-rousseau.com/"
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30,14:30-19:00
+website: https://www.librairie-rousseau.com/
diff --git a/data/cities/chambery/librairie-la-bible.yml b/data/cities/chambery/librairie-la-bible.yml
index 84d7a2788..415ed4608 100644
--- a/data/cities/chambery/librairie-la-bible.yml
+++ b/data/cities/chambery/librairie-la-bible.yml
@@ -4,8 +4,8 @@ latitude: 45.56621
 longitude: 5.93183
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 
+street: Faubourg Montmélian
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/librairie-momie-chambery.yml b/data/cities/chambery/librairie-momie-chambery.yml
index fda5d68d3..009ac33ce 100644
--- a/data/cities/chambery/librairie-momie-chambery.yml
+++ b/data/cities/chambery/librairie-momie-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.56819
 longitude: 5.92042
 postcode: "73000"
 city: Chambéry
-street: "Boulevard du Musée"
-housenumber: 23
+street: Boulevard du Musée
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/maison-pic.yml b/data/cities/chambery/maison-pic.yml
index 249e36315..2df820a6f 100644
--- a/data/cities/chambery/maison-pic.yml
+++ b/data/cities/chambery/maison-pic.yml
@@ -4,8 +4,8 @@ latitude: 45.55292
 longitude: 5.92124
 postcode: "73000"
 city: Chambéry
-street: "Route du Couvent Saint-Joseph"
-housenumber: 650
+street: Route du Couvent Saint-Joseph
+housenumber: "650"
 phone: ""
-opening_hours: "Tu-Sa 06:30-19:00; Su 06:30-12:30"
-website: "https://m.facebook.com/Boulangeriepatisseriepiccedric"
\ No newline at end of file
+opening_hours: Tu-Sa 06:30-19:00; Su 06:30-12:30
+website: https://m.facebook.com/Boulangeriepatisseriepiccedric
diff --git a/data/cities/chambery/mavel.yml b/data/cities/chambery/mavel.yml
index 4778d93d8..9ea2aca2d 100644
--- a/data/cities/chambery/mavel.yml
+++ b/data/cities/chambery/mavel.yml
@@ -4,8 +4,8 @@ latitude: 45.57122
 longitude: 5.91265
 postcode: "73000"
 city: Chambéry
-street: "Avenue du Comte Vert"
-housenumber: 267
+street: Avenue du Comte Vert
+housenumber: "267"
 phone: ""
-opening_hours: "Mo 15:00-19:00; Tu 06:30-13:15; We-Sa 06:30-13:15,15:30-19:00; Su 06:30-13:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo 15:00-19:00; Tu 06:30-13:15; We-Sa 06:30-13:15,15:30-19:00; Su 06:30-13:15
+website: ""
diff --git a/data/cities/chambery/medor-et-compagnie.yml b/data/cities/chambery/medor-et-compagnie.yml
index a405a1f2f..80538cfa8 100644
--- a/data/cities/chambery/medor-et-compagnie.yml
+++ b/data/cities/chambery/medor-et-compagnie.yml
@@ -4,8 +4,8 @@ latitude: 45.59494
 longitude: 5.8955
 postcode: "73000"
 city: Chambéry
-street: "Rue Eugène Ducretet"
-housenumber: 146
+street: Rue Eugène Ducretet
+housenumber: "146"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/midas.yml b/data/cities/chambery/midas.yml
index 79fc587da..9917409c0 100644
--- a/data/cities/chambery/midas.yml
+++ b/data/cities/chambery/midas.yml
@@ -4,8 +4,8 @@ latitude: 45.56845
 longitude: 5.92187
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Ducs de Savoie"
-housenumber: 20
-phone: "+33 4 79 85 00 29"
-opening_hours: "Mo-Fr 08:00-18:30; Sa 08:00-12:00"
-website: "https://www.midas.fr/"
\ No newline at end of file
+street: Avenue des Ducs de Savoie
+housenumber: "20"
+phone: +33 4 79 85 00 29
+opening_hours: Mo-Fr 08:00-18:30; Sa 08:00-12:00
+website: https://www.midas.fr/
diff --git a/data/cities/chambery/minelli.yml b/data/cities/chambery/minelli.yml
index 19eddf101..871e841ce 100644
--- a/data/cities/chambery/minelli.yml
+++ b/data/cities/chambery/minelli.yml
@@ -4,8 +4,8 @@ latitude: 45.56809
 longitude: 5.92066
 postcode: "73000"
 city: Chambéry
-street: "Rue Saint-Antoine"
-housenumber: 2
+street: Rue Saint-Antoine
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 13:00-19:00; Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 13:00-19:00; Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/mokolo-market.yml b/data/cities/chambery/mokolo-market.yml
index 3fdd40cdb..ab6251ee4 100644
--- a/data/cities/chambery/mokolo-market.yml
+++ b/data/cities/chambery/mokolo-market.yml
@@ -4,8 +4,8 @@ latitude: 45.56628
 longitude: 5.92853
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 196
+street: Faubourg Montmélian
+housenumber: "196"
 phone: ""
-opening_hours: "Mo-Su 11:00-23:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 11:00-23:00
+website: ""
diff --git a/data/cities/chambery/mondovelo-chambery.yml b/data/cities/chambery/mondovelo-chambery.yml
index f89657be4..6a73fb380 100644
--- a/data/cities/chambery/mondovelo-chambery.yml
+++ b/data/cities/chambery/mondovelo-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.60495
 longitude: 5.89089
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 2707
-phone: "+33 4 79 44 08 34"
+street: Avenue des Landiers
+housenumber: "2707"
+phone: +33 4 79 44 08 34
 opening_hours: ""
-website: "https://www.mondovelo.fr/magasins/13-mondovelo-chambery"
\ No newline at end of file
+website: https://www.mondovelo.fr/magasins/13-mondovelo-chambery
diff --git a/data/cities/chambery/monoprix.yml b/data/cities/chambery/monoprix.yml
index b78290f1d..654b8cbbc 100644
--- a/data/cities/chambery/monoprix.yml
+++ b/data/cities/chambery/monoprix.yml
@@ -4,8 +4,8 @@ latitude: 45.56691
 longitude: 5.91881
 postcode: "73000"
 city: Chambéry
-street: "Place de Genève"
-housenumber: 
-phone: "+33 4 79 26 65 50"
-opening_hours: "Mo-Sa 08:30-20:30; Su 09:00-18:45"
-website: "https://www.monoprix.fr/1516.html"
\ No newline at end of file
+street: Place de Genève
+housenumber: ""
+phone: +33 4 79 26 65 50
+opening_hours: Mo-Sa 08:30-20:30; Su 09:00-18:45
+website: https://www.monoprix.fr/1516.html
diff --git a/data/cities/chambery/nicole-voyage-autour-des-mineraux.yml b/data/cities/chambery/nicole-voyage-autour-des-mineraux.yml
index c66f1bcbd..3c595e62b 100644
--- a/data/cities/chambery/nicole-voyage-autour-des-mineraux.yml
+++ b/data/cities/chambery/nicole-voyage-autour-des-mineraux.yml
@@ -4,8 +4,8 @@ latitude: 45.5639
 longitude: 5.9207
 postcode: "73000"
 city: Chambéry
-street: "Place Porte Reine"
-housenumber: 7
+street: Place Porte Reine
+housenumber: "7"
 phone: ""
-opening_hours: "Tu-Fr 10:00-18:30; Sa 09:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-18:30; Sa 09:00-18:30
+website: ""
diff --git a/data/cities/chambery/nocibe.yml b/data/cities/chambery/nocibe.yml
index 9fe140947..e85a9246e 100644
--- a/data/cities/chambery/nocibe.yml
+++ b/data/cities/chambery/nocibe.yml
@@ -4,8 +4,8 @@ latitude: 45.56487
 longitude: 5.9243
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 
+street: Rue Croix-d'Or
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/norauto.yml b/data/cities/chambery/norauto.yml
index fc65177bc..de7ec1fbd 100644
--- a/data/cities/chambery/norauto.yml
+++ b/data/cities/chambery/norauto.yml
@@ -1,11 +1,11 @@
 id: 112872904
-type: way
+type: node
 latitude: 45.57263
 longitude: 5.94691
 postcode: "73000"
 city: Chambéry
-street: "Rue de la Martiniere"
-housenumber: 53
+street: Rue de la Martiniere
+housenumber: "53"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30
+website: ""
diff --git a/data/cities/chambery/noz.yml b/data/cities/chambery/noz.yml
index 151a1a27f..a3ce02724 100644
--- a/data/cities/chambery/noz.yml
+++ b/data/cities/chambery/noz.yml
@@ -4,8 +4,8 @@ latitude: 45.60369
 longitude: 5.89212
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 2577
+street: Avenue des Landiers
+housenumber: "2577"
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/chambery/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/chambery/
diff --git a/data/cities/chambery/okaidi.yml b/data/cities/chambery/okaidi.yml
index ce1d5816a..7a7a7bd48 100644
--- a/data/cities/chambery/okaidi.yml
+++ b/data/cities/chambery/okaidi.yml
@@ -4,8 +4,8 @@ latitude: 45.564
 longitude: 5.92182
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 
+street: Place Saint-Léger
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/chambery/optical-center.yml b/data/cities/chambery/optical-center.yml
index 7e9aabeb7..5bfe78ce8 100644
--- a/data/cities/chambery/optical-center.yml
+++ b/data/cities/chambery/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.59505
 longitude: 5.89587
 postcode: "73000"
 city: Chambéry
-street: "Rue Eugène Ducretet"
-housenumber: 142
-phone: "+33 4 79 44 48 48"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/370-opticien-chambery-chamnord-optical-center"
\ No newline at end of file
+street: Rue Eugène Ducretet
+housenumber: "142"
+phone: +33 4 79 44 48 48
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/370-opticien-chambery-chamnord-optical-center
diff --git a/data/cities/chambery/orchestra.yml b/data/cities/chambery/orchestra.yml
index d34967955..3ae8b6c63 100644
--- a/data/cities/chambery/orchestra.yml
+++ b/data/cities/chambery/orchestra.yml
@@ -4,8 +4,8 @@ latitude: 45.596
 longitude: 5.89793
 postcode: "73000"
 city: Chambéry
-street: "Rue Eugène Ducretet"
-housenumber: 87
+street: Rue Eugène Ducretet
+housenumber: "87"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/perrier-informatique.yml b/data/cities/chambery/perrier-informatique.yml
index 4223c502b..71638971e 100644
--- a/data/cities/chambery/perrier-informatique.yml
+++ b/data/cities/chambery/perrier-informatique.yml
@@ -4,8 +4,8 @@ latitude: 45.56266
 longitude: 5.90119
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Lyon"
-housenumber: 1491
+street: Avenue de Lyon
+housenumber: "1491"
 phone: ""
 opening_hours: ""
-website: "http://site.perrier-informatique.fr/"
\ No newline at end of file
+website: http://site.perrier-informatique.fr/
diff --git a/data/cities/chambery/pil-poil.yml b/data/cities/chambery/pil-poil.yml
index 47f524dbc..240c12553 100644
--- a/data/cities/chambery/pil-poil.yml
+++ b/data/cities/chambery/pil-poil.yml
@@ -4,8 +4,8 @@ latitude: 45.56923
 longitude: 5.93136
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Turin"
-housenumber: 91
+street: Avenue de Turin
+housenumber: "91"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/pimkie.yml b/data/cities/chambery/pimkie.yml
index 2813d8502..b71dc7a8b 100644
--- a/data/cities/chambery/pimkie.yml
+++ b/data/cities/chambery/pimkie.yml
@@ -4,8 +4,8 @@ latitude: 45.56495
 longitude: 5.92041
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 
+street: Place Saint-Léger
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/pneus-concept.yml b/data/cities/chambery/pneus-concept.yml
index 68d011cae..50d39f151 100644
--- a/data/cities/chambery/pneus-concept.yml
+++ b/data/cities/chambery/pneus-concept.yml
@@ -4,8 +4,8 @@ latitude: 45.56983
 longitude: 5.93331
 postcode: "73000"
 city: Chambéry
-street: "Avenue de Turin"
-housenumber: 251
+street: Avenue de Turin
+housenumber: "251"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/reflets.yml b/data/cities/chambery/reflets.yml
index ebfb725d1..74847911a 100644
--- a/data/cities/chambery/reflets.yml
+++ b/data/cities/chambery/reflets.yml
@@ -4,8 +4,8 @@ latitude: 45.56892
 longitude: 5.92146
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Reclus"
-housenumber: 
+street: Faubourg Reclus
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/chambery/rive-droite-coiffure.yml b/data/cities/chambery/rive-droite-coiffure.yml
index 9e35e5fa0..cfd67366d 100644
--- a/data/cities/chambery/rive-droite-coiffure.yml
+++ b/data/cities/chambery/rive-droite-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.5695
 longitude: 5.93192
 postcode: "73000"
 city: Chambéry
-street: "Rue Montesquiou"
-housenumber: 1
+street: Rue Montesquiou
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/rougegorge.yml b/data/cities/chambery/rougegorge.yml
index 45f96ab26..43605d4a9 100644
--- a/data/cities/chambery/rougegorge.yml
+++ b/data/cities/chambery/rougegorge.yml
@@ -4,8 +4,8 @@ latitude: 45.56481
 longitude: 5.92056
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 139
+street: Place Saint-Léger
+housenumber: "139"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/satoriz-chambery.yml b/data/cities/chambery/satoriz-chambery.yml
index 1fd8de506..1152d9841 100644
--- a/data/cities/chambery/satoriz-chambery.yml
+++ b/data/cities/chambery/satoriz-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.60841
 longitude: 5.88866
 postcode: "73000"
 city: Chambéry
-street: "Rue de Belle Eau"
-housenumber: 715
+street: Rue de Belle Eau
+housenumber: "715"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/chambery/tabara-beaute.yml b/data/cities/chambery/tabara-beaute.yml
index 6841224ff..c238bdc1d 100644
--- a/data/cities/chambery/tabara-beaute.yml
+++ b/data/cities/chambery/tabara-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.56626
 longitude: 5.92708
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 83
+street: Faubourg Montmélian
+housenumber: "83"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/tabara-exotique.yml b/data/cities/chambery/tabara-exotique.yml
index f6fc000a5..9dbe33dcc 100644
--- a/data/cities/chambery/tabara-exotique.yml
+++ b/data/cities/chambery/tabara-exotique.yml
@@ -4,8 +4,8 @@ latitude: 45.56619
 longitude: 5.92718
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Montmélian"
-housenumber: 94
+street: Faubourg Montmélian
+housenumber: "94"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/thierry-fournier.yml b/data/cities/chambery/thierry-fournier.yml
index ec4e04288..0b0c5e8ef 100644
--- a/data/cities/chambery/thierry-fournier.yml
+++ b/data/cities/chambery/thierry-fournier.yml
@@ -4,8 +4,8 @@ latitude: 45.56737
 longitude: 5.92058
 postcode: "73000"
 city: Chambéry
-street: "Rue Macornet"
-housenumber: 57
+street: Rue Macornet
+housenumber: "57"
 phone: ""
-opening_hours: "Tu-Fr 08:45-18:00; Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:45-18:00; Sa 08:00-17:00
+website: ""
diff --git a/data/cities/chambery/tommy-hilfiger.yml b/data/cities/chambery/tommy-hilfiger.yml
index 454654b5d..b15698bfb 100644
--- a/data/cities/chambery/tommy-hilfiger.yml
+++ b/data/cities/chambery/tommy-hilfiger.yml
@@ -4,8 +4,8 @@ latitude: 45.56616
 longitude: 5.92137
 postcode: "73000"
 city: Chambéry
-street: "Rue Favre"
-housenumber: 
+street: Rue Favre
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/un-jour-ailleurs.yml b/data/cities/chambery/un-jour-ailleurs.yml
index ec00f1302..726f3d509 100644
--- a/data/cities/chambery/un-jour-ailleurs.yml
+++ b/data/cities/chambery/un-jour-ailleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.56621
 longitude: 5.92236
 postcode: "73000"
 city: Chambéry
-street: "Rue de Boigne"
-housenumber: 
+street: Rue de Boigne
+housenumber: ""
 phone: ""
-opening_hours: "Tu,Sa 09:30-19:00; We,Fr 10:00-13:00,14:00-19:00; Th 10:00-12:30,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Sa 09:30-19:00; We,Fr 10:00-13:00,14:00-19:00; Th 10:00-12:30,13:30-19:00
+website: ""
diff --git a/data/cities/chambery/united-colors-of-benetton-place-saint-leger.yml b/data/cities/chambery/united-colors-of-benetton-place-saint-leger.yml
index d8b0e5e3d..b4358d0be 100644
--- a/data/cities/chambery/united-colors-of-benetton-place-saint-leger.yml
+++ b/data/cities/chambery/united-colors-of-benetton-place-saint-leger.yml
@@ -4,8 +4,8 @@ latitude: 45.56464
 longitude: 5.92124
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 
+street: Place Saint-Léger
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/chambery/united-colors-of-benetton.yml b/data/cities/chambery/united-colors-of-benetton.yml
index 365c7a4f3..45fd09d7a 100644
--- a/data/cities/chambery/united-colors-of-benetton.yml
+++ b/data/cities/chambery/united-colors-of-benetton.yml
@@ -4,8 +4,8 @@ latitude: 45.56516
 longitude: 5.92055
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 
+street: Place Saint-Léger
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/valieutic.yml b/data/cities/chambery/valieutic.yml
index 0bb98ce5a..032462fd2 100644
--- a/data/cities/chambery/valieutic.yml
+++ b/data/cities/chambery/valieutic.yml
@@ -4,8 +4,8 @@ latitude: 45.5954
 longitude: 5.90001
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1340
-phone: "+33 4 79 69 71 27"
+street: Avenue des Landiers
+housenumber: "1340"
+phone: +33 4 79 69 71 27
 opening_hours: ""
-website: "https://m.facebook.com/Valieutic"
\ No newline at end of file
+website: https://m.facebook.com/Valieutic
diff --git a/data/cities/chambery/vide-dressing-chic.yml b/data/cities/chambery/vide-dressing-chic.yml
index 08fc14e37..8d5e792b6 100644
--- a/data/cities/chambery/vide-dressing-chic.yml
+++ b/data/cities/chambery/vide-dressing-chic.yml
@@ -4,8 +4,8 @@ latitude: 45.56395
 longitude: 5.92072
 postcode: "73000"
 city: Chambéry
-street: "Place Porte Reine"
-housenumber: 
+street: Place Porte Reine
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 10:00-12:00,14:30-19:00; Sa 10:00-12:00,15:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:00,14:30-19:00; Sa 10:00-12:00,15:00-18:00
+website: ""
diff --git a/data/cities/chambery/vitrine-medicale-des-savoie.yml b/data/cities/chambery/vitrine-medicale-des-savoie.yml
index 606a1f595..40635c1ce 100644
--- a/data/cities/chambery/vitrine-medicale-des-savoie.yml
+++ b/data/cities/chambery/vitrine-medicale-des-savoie.yml
@@ -1,11 +1,11 @@
 id: 101963592
-type: way
+type: node
 latitude: 45.56413
 longitude: 5.91068
 postcode: "73000"
 city: Chambéry
-street: "Faubourg Maché"
-housenumber: 519
+street: Faubourg Maché
+housenumber: "519"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/vival.yml b/data/cities/chambery/vival.yml
index deb3b2b4f..fde4707f3 100644
--- a/data/cities/chambery/vival.yml
+++ b/data/cities/chambery/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.57141
 longitude: 5.91577
 postcode: "73000"
 city: Chambéry
-street: "Rue Nicolas Parent"
-housenumber: 
-phone: "+33 4 79 26 02 38"
-opening_hours: "Mo-Tu 08:00-12:30,15:00-19:00; We 00:00-12:30,15:00-19:00; Th-Sa 08:00-12:30,15:00-19:00"
-website: "https://magasins.vival.fr/fr/vival-chambery"
\ No newline at end of file
+street: Rue Nicolas Parent
+housenumber: ""
+phone: +33 4 79 26 02 38
+opening_hours: Mo-Tu 08:00-12:30,15:00-19:00; We 00:00-12:30,15:00-19:00; Th-Sa 08:00-12:30,15:00-19:00
+website: https://magasins.vival.fr/fr/vival-chambery
diff --git a/data/cities/chambery/vogue-coiffure.yml b/data/cities/chambery/vogue-coiffure.yml
index 7fb115a97..fba6be7c1 100644
--- a/data/cities/chambery/vogue-coiffure.yml
+++ b/data/cities/chambery/vogue-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.56418
 longitude: 5.92145
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 39
+street: Place Saint-Léger
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/wafil.yml b/data/cities/chambery/wafil.yml
index 858eaad62..51a41494a 100644
--- a/data/cities/chambery/wafil.yml
+++ b/data/cities/chambery/wafil.yml
@@ -4,8 +4,8 @@ latitude: 45.56438
 longitude: 5.92271
 postcode: "73000"
 city: Chambéry
-street: "Rue Croix-d'Or"
-housenumber: 
+street: Rue Croix-d'Or
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 11:00-22:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 11:00-22:30
+website: ""
diff --git a/data/cities/chambery/yesss-electrique.yml b/data/cities/chambery/yesss-electrique.yml
index 0e4773a89..1a0fd7b11 100644
--- a/data/cities/chambery/yesss-electrique.yml
+++ b/data/cities/chambery/yesss-electrique.yml
@@ -4,8 +4,8 @@ latitude: 45.60698
 longitude: 5.89125
 postcode: "73000"
 city: Chambéry
-street: "Rue du Pré Pagnon"
-housenumber: 159
-phone: "+33 4 79 75 32 69"
+street: Rue du Pré Pagnon
+housenumber: "159"
+phone: +33 4 79 75 32 69
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chambery/yves-rocher-place-saint-leger.yml b/data/cities/chambery/yves-rocher-place-saint-leger.yml
index 2c12dc3af..30cf31be5 100644
--- a/data/cities/chambery/yves-rocher-place-saint-leger.yml
+++ b/data/cities/chambery/yves-rocher-place-saint-leger.yml
@@ -4,8 +4,8 @@ latitude: 45.56479
 longitude: 5.92103
 postcode: "73000"
 city: Chambéry
-street: "Place Saint-Léger"
-housenumber: 106
-phone: "+33 4 79 33 22 46"
-opening_hours: "Tu-Sa 09:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/chambery/chambery/S-FRYROC515"
\ No newline at end of file
+street: Place Saint-Léger
+housenumber: "106"
+phone: +33 4 79 33 22 46
+opening_hours: Tu-Sa 09:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/chambery/chambery/S-FRYROC515
diff --git a/data/cities/chambery/yves-rocher.yml b/data/cities/chambery/yves-rocher.yml
index df4e4dc2a..e602b5693 100644
--- a/data/cities/chambery/yves-rocher.yml
+++ b/data/cities/chambery/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.59313
 longitude: 5.9005
 postcode: "73000"
 city: Chambéry
-street: "Avenue des Landiers"
-housenumber: 1097
+street: Avenue des Landiers
+housenumber: "1097"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/chambonas/biocoop-chambonas.yml b/data/cities/chambonas/biocoop-chambonas.yml
index aae61ac73..30f13bcbe 100644
--- a/data/cities/chambonas/biocoop-chambonas.yml
+++ b/data/cities/chambonas/biocoop-chambonas.yml
@@ -4,8 +4,8 @@ latitude: 44.41431
 longitude: 4.14309
 postcode: "07140"
 city: Chambonas
-street: "Chemin du Ganivay"
-housenumber: 20
+street: Chemin du Ganivay
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.biocooppaysdesvans.fr"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.biocooppaysdesvans.fr
diff --git a/data/cities/chambonas/familha-gateaux-et-pains.yml b/data/cities/chambonas/familha-gateaux-et-pains.yml
index f2c4130ae..5f6afd49a 100644
--- a/data/cities/chambonas/familha-gateaux-et-pains.yml
+++ b/data/cities/chambonas/familha-gateaux-et-pains.yml
@@ -4,8 +4,8 @@ latitude: 44.41406
 longitude: 4.14341
 postcode: "07140"
 city: Chambonas
-street: "Route de Vompdes"
-housenumber: 98
+street: Route de Vompdes
+housenumber: "98"
 phone: "+33469220263"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/alplib.yml b/data/cities/chamonix-mont-blanc/alplib.yml
index f8515c42b..038a80886 100644
--- a/data/cities/chamonix-mont-blanc/alplib.yml
+++ b/data/cities/chamonix-mont-blanc/alplib.yml
@@ -4,8 +4,8 @@ latitude: 45.92215
 longitude: 6.86883
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue du Docteur Paccard"
-housenumber: 93
-phone: "+33 4 50 53 29 76"
+street: Rue du Docteur Paccard
+housenumber: "93"
+phone: +33 4 50 53 29 76
 opening_hours: ""
-website: "https://www.alplib.com/"
\ No newline at end of file
+website: https://www.alplib.com/
diff --git a/data/cities/chamonix-mont-blanc/campervans-montblanc.yml b/data/cities/chamonix-mont-blanc/campervans-montblanc.yml
index 3e18de529..4c8e89fb5 100644
--- a/data/cities/chamonix-mont-blanc/campervans-montblanc.yml
+++ b/data/cities/chamonix-mont-blanc/campervans-montblanc.yml
@@ -4,8 +4,8 @@ latitude: 45.90441
 longitude: 6.84058
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Route des Rives"
-housenumber: 220
-phone: "+33 7 87 07 82 29"
+street: Route des Rives
+housenumber: "220"
+phone: +33 7 87 07 82 29
 opening_hours: ""
-website: "https://www.campervans-montblanc.com"
\ No newline at end of file
+website: https://www.campervans-montblanc.com
diff --git a/data/cities/chamonix-mont-blanc/carrefour-market.yml b/data/cities/chamonix-mont-blanc/carrefour-market.yml
index ccdbdba56..00e6945b0 100644
--- a/data/cities/chamonix-mont-blanc/carrefour-market.yml
+++ b/data/cities/chamonix-mont-blanc/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 97318746
-type: way
+type: node
 latitude: 45.91862
 longitude: 6.87458
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Route Blanche"
-housenumber: 339
+street: Route Blanche
+housenumber: "339"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/cave-de-laiguille.yml b/data/cities/chamonix-mont-blanc/cave-de-laiguille.yml
index 14058e4ea..536decadb 100644
--- a/data/cities/chamonix-mont-blanc/cave-de-laiguille.yml
+++ b/data/cities/chamonix-mont-blanc/cave-de-laiguille.yml
@@ -4,8 +4,8 @@ latitude: 45.91866
 longitude: 6.86937
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Place Edmond Desailloud"
-housenumber: 7
+street: Place Edmond Desailloud
+housenumber: "7"
 phone: ""
-opening_hours: "Mo,Fr 15:00-20:00; Tu-Th,Sa,Su 11:00-13:00,15:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Fr 15:00-20:00; Tu-Th,Sa,Su 11:00-13:00,15:00-20:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/chalet-4810.yml b/data/cities/chamonix-mont-blanc/chalet-4810.yml
index 40315b708..ef63e7715 100644
--- a/data/cities/chamonix-mont-blanc/chalet-4810.yml
+++ b/data/cities/chamonix-mont-blanc/chalet-4810.yml
@@ -4,8 +4,8 @@ latitude: 45.92524
 longitude: 6.86966
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue Joseph Vallot"
-housenumber: 191
-phone: "+33 4 50 53 00 43"
+street: Rue Joseph Vallot
+housenumber: "191"
+phone: +33 4 50 53 00 43
 opening_hours: ""
-website: "https://www.petitsgourmands.fr/nos-maisons"
\ No newline at end of file
+website: https://www.petitsgourmands.fr/nos-maisons
diff --git a/data/cities/chamonix-mont-blanc/cham-bio.yml b/data/cities/chamonix-mont-blanc/cham-bio.yml
index c3f6b3a8b..75c113668 100644
--- a/data/cities/chamonix-mont-blanc/cham-bio.yml
+++ b/data/cities/chamonix-mont-blanc/cham-bio.yml
@@ -4,8 +4,8 @@ latitude: 45.92499
 longitude: 6.87042
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Impasse du Génépy"
-housenumber: 46
-phone: "+33 4 50 89 31 91"
+street: Impasse du Génépy
+housenumber: "46"
+phone: +33 4 50 89 31 91
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/chamonix-resort-shop.yml b/data/cities/chamonix-mont-blanc/chamonix-resort-shop.yml
index 742e7995c..f17330a31 100644
--- a/data/cities/chamonix-mont-blanc/chamonix-resort-shop.yml
+++ b/data/cities/chamonix-mont-blanc/chamonix-resort-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.92206
 longitude: 6.86952
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue du Lyret"
-housenumber: 74
+street: Rue du Lyret
+housenumber: "74"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/chamonix-ski.yml b/data/cities/chamonix-mont-blanc/chamonix-ski.yml
index 0ec9bfd63..28883f153 100644
--- a/data/cities/chamonix-mont-blanc/chamonix-ski.yml
+++ b/data/cities/chamonix-mont-blanc/chamonix-ski.yml
@@ -4,8 +4,8 @@ latitude: 45.91846
 longitude: 6.86374
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Route des Pècles"
-housenumber: 117
-phone: "+33 4 50 55 54 80"
-opening_hours: "08:00-19:30"
-website: "https://www.chamonixski.com"
\ No newline at end of file
+street: Route des Pècles
+housenumber: "117"
+phone: +33 4 50 55 54 80
+opening_hours: 08:00-19:30
+website: https://www.chamonixski.com
diff --git a/data/cities/chamonix-mont-blanc/chaussin.yml b/data/cities/chamonix-mont-blanc/chaussin.yml
index 8c2e1dca9..96c5c100d 100644
--- a/data/cities/chamonix-mont-blanc/chaussin.yml
+++ b/data/cities/chamonix-mont-blanc/chaussin.yml
@@ -4,8 +4,8 @@ latitude: 45.92194
 longitude: 6.86826
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue paccard"
-housenumber: 135
+street: Rue paccard
+housenumber: "135"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/concept-store-pure-altitude-chamonix.yml b/data/cities/chamonix-mont-blanc/concept-store-pure-altitude-chamonix.yml
index 0f060eb20..b6704e1e1 100644
--- a/data/cities/chamonix-mont-blanc/concept-store-pure-altitude-chamonix.yml
+++ b/data/cities/chamonix-mont-blanc/concept-store-pure-altitude-chamonix.yml
@@ -4,8 +4,8 @@ latitude: 45.9251
 longitude: 6.86986
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue Joseph Vallot"
-housenumber: 202
-phone: "04 50 96 29 88"
-opening_hours: "Mo-Su 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Joseph Vallot
+housenumber: "202"
+phone: 04 50 96 29 88
+opening_hours: Mo-Su 10:00-19:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/decathlon.yml b/data/cities/chamonix-mont-blanc/decathlon.yml
index d7b220c66..04025ceca 100644
--- a/data/cities/chamonix-mont-blanc/decathlon.yml
+++ b/data/cities/chamonix-mont-blanc/decathlon.yml
@@ -4,8 +4,8 @@ latitude: 45.92366
 longitude: 6.87022
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Avenue Michel Croz"
-housenumber: 19
+street: Avenue Michel Croz
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:30
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/eyeshop-com.yml b/data/cities/chamonix-mont-blanc/eyeshop-com.yml
index 90483cc51..8e2d15fdf 100644
--- a/data/cities/chamonix-mont-blanc/eyeshop-com.yml
+++ b/data/cities/chamonix-mont-blanc/eyeshop-com.yml
@@ -4,8 +4,8 @@ latitude: 45.92119
 longitude: 6.86701
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue du Docteur Paccard"
-housenumber: 258
+street: Rue du Docteur Paccard
+housenumber: "258"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/go-sport.yml b/data/cities/chamonix-mont-blanc/go-sport.yml
index 89b53e02c..ae77b5eb5 100644
--- a/data/cities/chamonix-mont-blanc/go-sport.yml
+++ b/data/cities/chamonix-mont-blanc/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.91907
 longitude: 6.86812
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Place Edmond Dessailloud"
-housenumber: 87
+street: Place Edmond Dessailloud
+housenumber: "87"
 phone: ""
-opening_hours: "Mo-Fr 08:15-13:00, 15:30-19:30; Sa-Su 08:15-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:15-13:00, 15:30-19:30; Sa-Su 08:15-19:30
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/intersport-2.yml b/data/cities/chamonix-mont-blanc/intersport-2.yml
index ce52dccd1..e490f2003 100644
--- a/data/cities/chamonix-mont-blanc/intersport-2.yml
+++ b/data/cities/chamonix-mont-blanc/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.86985
 postcode: "74400"
 city: Chamonix-Mont-Blanc
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/intersport.yml b/data/cities/chamonix-mont-blanc/intersport.yml
index e637c675f..c702dbc93 100644
--- a/data/cities/chamonix-mont-blanc/intersport.yml
+++ b/data/cities/chamonix-mont-blanc/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.87533
 postcode: "74400"
 city: Chamonix-Mont-Blanc
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/jean-landru.yml b/data/cities/chamonix-mont-blanc/jean-landru.yml
index 75c4eafc5..f1c9f515f 100644
--- a/data/cities/chamonix-mont-blanc/jean-landru.yml
+++ b/data/cities/chamonix-mont-blanc/jean-landru.yml
@@ -4,8 +4,8 @@ latitude: 45.92405
 longitude: 6.87
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue Joseph Vallot"
-housenumber: 74
-phone: "+33 4 50 53 14 41"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-12:30, 14:30-18:00"
-website: "https://librairiejeanlandru.site-solocal.com/"
\ No newline at end of file
+street: Rue Joseph Vallot
+housenumber: "74"
+phone: +33 4 50 53 14 41
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-12:30, 14:30-18:00
+website: https://librairiejeanlandru.site-solocal.com/
diff --git a/data/cities/chamonix-mont-blanc/la-spiga-doro.yml b/data/cities/chamonix-mont-blanc/la-spiga-doro.yml
index 0902c249d..89e7234de 100644
--- a/data/cities/chamonix-mont-blanc/la-spiga-doro.yml
+++ b/data/cities/chamonix-mont-blanc/la-spiga-doro.yml
@@ -4,8 +4,8 @@ latitude: 45.92013
 longitude: 6.86633
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Avenue Ravanel le Rouge"
-housenumber: 80
-phone: "+33 4 50 53 06 49"
-opening_hours: "Mo-Su 09:00-13:00, 16:00-20:00"
-website: ""
\ No newline at end of file
+street: Avenue Ravanel le Rouge
+housenumber: "80"
+phone: +33 4 50 53 06 49
+opening_hours: Mo-Su 09:00-13:00, 16:00-20:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/le-fournil-chamoniard.yml b/data/cities/chamonix-mont-blanc/le-fournil-chamoniard.yml
index 833131030..dde849deb 100644
--- a/data/cities/chamonix-mont-blanc/le-fournil-chamoniard.yml
+++ b/data/cities/chamonix-mont-blanc/le-fournil-chamoniard.yml
@@ -4,8 +4,8 @@ latitude: 45.91929
 longitude: 6.8689
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Avenue de l'Aiguille du Midi"
-housenumber: 134
+street: Avenue de l'Aiguille du Midi
+housenumber: "210"
 phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su,PH 07:00-19:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/le-petit-casino.yml b/data/cities/chamonix-mont-blanc/le-petit-casino.yml
index 111312883..3b2e5b5fc 100644
--- a/data/cities/chamonix-mont-blanc/le-petit-casino.yml
+++ b/data/cities/chamonix-mont-blanc/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.92265
 longitude: 6.86848
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue du Docteur Paccard"
-housenumber: 50
+street: Rue du Docteur Paccard
+housenumber: "50"
 phone: ""
-opening_hours: "Mo-Su 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-19:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/place-de-laiguille-du-midi.yml b/data/cities/chamonix-mont-blanc/place-de-laiguille-du-midi.yml
index 2d498760e..06787d67a 100644
--- a/data/cities/chamonix-mont-blanc/place-de-laiguille-du-midi.yml
+++ b/data/cities/chamonix-mont-blanc/place-de-laiguille-du-midi.yml
@@ -4,8 +4,8 @@ latitude: 45.91754
 longitude: 6.87041
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Route Blanche"
-housenumber: 610
+street: Route Blanche
+housenumber: "610"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/praz-sport.yml b/data/cities/chamonix-mont-blanc/praz-sport.yml
index 5a72d8475..9b0b902fc 100644
--- a/data/cities/chamonix-mont-blanc/praz-sport.yml
+++ b/data/cities/chamonix-mont-blanc/praz-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.93993
 longitude: 6.8843
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Route des Praz"
-housenumber: 1546
-phone: "+33 4 50 53 08 56"
+street: Route des Praz
+housenumber: "1546"
+phone: +33 4 50 53 08 56
 opening_hours: ""
-website: "https://www.prazsports.com"
\ No newline at end of file
+website: https://www.prazsports.com
diff --git a/data/cities/chamonix-mont-blanc/quiksilver.yml b/data/cities/chamonix-mont-blanc/quiksilver.yml
index 24ef50975..88c827c8e 100644
--- a/data/cities/chamonix-mont-blanc/quiksilver.yml
+++ b/data/cities/chamonix-mont-blanc/quiksilver.yml
@@ -4,8 +4,8 @@ latitude: 45.92383
 longitude: 6.86963
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue Joseph Vallot"
-housenumber: 31
-phone: "+33 4 50 54 26 67"
+street: Rue Joseph Vallot
+housenumber: "31"
+phone: +33 4 50 54 26 67
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/ravanel-place-gilbert-ravanel.yml b/data/cities/chamonix-mont-blanc/ravanel-place-gilbert-ravanel.yml
index f723af744..c5617f506 100644
--- a/data/cities/chamonix-mont-blanc/ravanel-place-gilbert-ravanel.yml
+++ b/data/cities/chamonix-mont-blanc/ravanel-place-gilbert-ravanel.yml
@@ -1,11 +1,11 @@
 id: 97309570
-type: way
+type: node
 latitude: 45.94082
 longitude: 6.88534
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Place Gilbert Ravanel"
-housenumber: 60
+street: Place Gilbert Ravanel
+housenumber: "60"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/ravanel.yml b/data/cities/chamonix-mont-blanc/ravanel.yml
index 901c1c458..362404ab6 100644
--- a/data/cities/chamonix-mont-blanc/ravanel.yml
+++ b/data/cities/chamonix-mont-blanc/ravanel.yml
@@ -4,8 +4,8 @@ latitude: 45.92742
 longitude: 6.87032
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Galerie Alpina"
-housenumber: 53
-phone: "+33 4 50 53 02 49"
+street: Galerie Alpina
+housenumber: "53"
+phone: +33 4 50 53 02 49
 opening_hours: ""
-website: "https://www.ravanel-sportshop.com/"
\ No newline at end of file
+website: https://www.ravanel-sportshop.com/
diff --git a/data/cities/chamonix-mont-blanc/snell-sports.yml b/data/cities/chamonix-mont-blanc/snell-sports.yml
index 18e34c03a..a17056f10 100644
--- a/data/cities/chamonix-mont-blanc/snell-sports.yml
+++ b/data/cities/chamonix-mont-blanc/snell-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.92225
 longitude: 6.86828
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Rue du Docteur Paccard"
-housenumber: 104
-phone: "+33 4 50 53 02 17"
+street: Rue du Docteur Paccard
+housenumber: "104"
+phone: +33 4 50 53 02 17
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/snowleader.yml b/data/cities/chamonix-mont-blanc/snowleader.yml
index c6c0ee174..9c09d0cc7 100644
--- a/data/cities/chamonix-mont-blanc/snowleader.yml
+++ b/data/cities/chamonix-mont-blanc/snowleader.yml
@@ -4,8 +4,8 @@ latitude: 45.92333
 longitude: 6.87099
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Avenue Michel Croz"
-housenumber: 92
+street: Avenue Michel Croz
+housenumber: "92"
 phone: ""
-opening_hours: "Mo-Fr 10:00-13:00, 14:00-18:00; Sa, Su 10:00-18:00"
-website: "https://www.snowleader.com/magasin-chamonix"
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-13:00, 14:00-18:00; Sa, Su 10:00-18:00
+website: https://www.snowleader.com/magasin-chamonix
diff --git a/data/cities/chamonix-mont-blanc/spar-place-edmond-desailloud.yml b/data/cities/chamonix-mont-blanc/spar-place-edmond-desailloud.yml
index 4d1a0f717..92e754a97 100644
--- a/data/cities/chamonix-mont-blanc/spar-place-edmond-desailloud.yml
+++ b/data/cities/chamonix-mont-blanc/spar-place-edmond-desailloud.yml
@@ -4,8 +4,8 @@ latitude: 45.91882
 longitude: 6.86831
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Place Edmond Desailloud"
-housenumber: 96
+street: Place Edmond Desailloud
+housenumber: "96"
 phone: ""
-opening_hours: "Mo-Su 07:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-20:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/spar.yml b/data/cities/chamonix-mont-blanc/spar.yml
index 3904fb00e..c908af619 100644
--- a/data/cities/chamonix-mont-blanc/spar.yml
+++ b/data/cities/chamonix-mont-blanc/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.92528
 longitude: 6.87049
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Avenue du Mont-Blanc"
-housenumber: 17
-phone: "+33 4 50 53 11 85"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-13:00"
-website: ""
\ No newline at end of file
+street: Avenue du Mont-Blanc
+housenumber: "17"
+phone: +33 4 50 53 11 85
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-13:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/sport-2000-impasse-primevere.yml b/data/cities/chamonix-mont-blanc/sport-2000-impasse-primevere.yml
index e4dd4c209..0a915a2fc 100644
--- a/data/cities/chamonix-mont-blanc/sport-2000-impasse-primevere.yml
+++ b/data/cities/chamonix-mont-blanc/sport-2000-impasse-primevere.yml
@@ -4,8 +4,8 @@ latitude: 45.92553
 longitude: 6.86935
 postcode: "74440"
 city: Chamonix-Mont-Blanc
-street: "Impasse Primevère"
-housenumber: 28
+street: Impasse Primevère
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/sport-2000.yml b/data/cities/chamonix-mont-blanc/sport-2000.yml
index 352a4417f..2df82625a 100644
--- a/data/cities/chamonix-mont-blanc/sport-2000.yml
+++ b/data/cities/chamonix-mont-blanc/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.91917
 longitude: 6.86801
 postcode: "74440"
 city: Chamonix-Mont-Blanc
-street: "Place Edmond Desailloud"
-housenumber: 92
+street: Place Edmond Desailloud
+housenumber: "92"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/stamos-sport-2000.yml b/data/cities/chamonix-mont-blanc/stamos-sport-2000.yml
index 68a4e70da..0bed83477 100644
--- a/data/cities/chamonix-mont-blanc/stamos-sport-2000.yml
+++ b/data/cities/chamonix-mont-blanc/stamos-sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.9811
 longitude: 6.92541
 postcode: "74400"
 city: Chamonix Mont-Blanc
-street: "Centre Commercial Grand Roc"
-housenumber: 
+street: Centre Commercial Grand Roc
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/technical-extreme-chamonix.yml b/data/cities/chamonix-mont-blanc/technical-extreme-chamonix.yml
index 456eec490..ce3e6c03a 100644
--- a/data/cities/chamonix-mont-blanc/technical-extreme-chamonix.yml
+++ b/data/cities/chamonix-mont-blanc/technical-extreme-chamonix.yml
@@ -4,8 +4,8 @@ latitude: 45.92005
 longitude: 6.86771
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Avenue de l'Aiguille du Midi"
-housenumber: 80
+street: Avenue de l'Aiguille du Midi
+housenumber: "80"
 phone: ""
-opening_hours: "Mo-Su 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 10:00-19:00
+website: ""
diff --git a/data/cities/chamonix-mont-blanc/technique-extreme.yml b/data/cities/chamonix-mont-blanc/technique-extreme.yml
index 3e7bd3a95..b6881a7a2 100644
--- a/data/cities/chamonix-mont-blanc/technique-extreme.yml
+++ b/data/cities/chamonix-mont-blanc/technique-extreme.yml
@@ -4,8 +4,8 @@ latitude: 45.91938
 longitude: 6.86878
 postcode: "74400"
 city: Chamonix-Mont-Blanc
-street: "Avenue de l'Aiguille du Midi"
-housenumber: 200
+street: Avenue de l'Aiguille du Midi
+housenumber: "200"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:00"
-website: "https://www.technique-extreme.com/"
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: https://www.technique-extreme.com/
diff --git a/data/cities/chamonix/sherpa.yml b/data/cities/chamonix/sherpa.yml
index e54c243b7..d990b506e 100644
--- a/data/cities/chamonix/sherpa.yml
+++ b/data/cities/chamonix/sherpa.yml
@@ -4,8 +4,9 @@ latitude: 45.92305
 longitude: 6.87217
 postcode: "74400"
 city: Chamonix
-street: "Avenue Michel Croz"
-housenumber: 190
+street: Avenue Michel Croz
+housenumber: "190"
 phone: ""
-opening_hours: "Dec 02-Apr 10 Mo-Tu,Th-Su 08:00-13:00, 15:00-20:00; Jul 02-Sep 01 Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Dec 02-Apr 10 Mo-Tu,Th-Su 08:00-13:00, 15:00-20:00; Jul 02-Sep 01 Mo-Su
+    08:00-20:00
+website: ""
diff --git a/data/cities/champ-sur-drac/le-salon-134.yml b/data/cities/champ-sur-drac/le-salon-134.yml
index ac3da8d0c..84717be50 100644
--- a/data/cities/champ-sur-drac/le-salon-134.yml
+++ b/data/cities/champ-sur-drac/le-salon-134.yml
@@ -4,8 +4,9 @@ latitude: 45.08023
 longitude: 5.73561
 postcode: "38560"
 city: Champ-sur-Drac
-street: "Rue de Verdun"
-housenumber: 
+street: Rue de Verdun
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-18:30; Tu 09:00-12:00, 14:00-18:30; Th 09:00-12:00, 14:00-18:30; Fr 09:00-18:30; Sa 09:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:30; Tu 09:00-12:00, 14:00-18:30; Th 09:00-12:00, 14:00-18:30;
+    Fr 09:00-18:30; Sa 09:00-16:00
+website: ""
diff --git a/data/cities/champ-sur-drac/proetcie-andre-menager.yml b/data/cities/champ-sur-drac/proetcie-andre-menager.yml
index a64277569..a2780363a 100644
--- a/data/cities/champ-sur-drac/proetcie-andre-menager.yml
+++ b/data/cities/champ-sur-drac/proetcie-andre-menager.yml
@@ -4,8 +4,8 @@ latitude: 45.08022
 longitude: 5.73584
 postcode: "38560"
 city: Champ-sur-Drac
-street: "Avenue Lesdiguières"
-housenumber: 
+street: Avenue Lesdiguières
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/champ-sur-drac/tout-faire-eral.yml b/data/cities/champ-sur-drac/tout-faire-eral.yml
index 0137cda8e..e7dac46e3 100644
--- a/data/cities/champ-sur-drac/tout-faire-eral.yml
+++ b/data/cities/champ-sur-drac/tout-faire-eral.yml
@@ -1,11 +1,11 @@
 id: 105186251
-type: way
+type: node
 latitude: 45.08757
 longitude: 5.7293
 postcode: "38560"
 city: Champ sur Drac
-street: "route de St-Georges"
-housenumber: 11
-phone: "+33 476687458"
-opening_hours: "Mo-Fr 07:00-12:00, 13:30-17:30"
-website: ""
\ No newline at end of file
+street: route de St-Georges
+housenumber: "11"
+phone: +33 476687458
+opening_hours: Mo-Fr 07:00-12:00, 13:30-17:30
+website: ""
diff --git a/data/cities/champagne-au-mont-dor/1001-piles-batteries.yml b/data/cities/champagne-au-mont-dor/1001-piles-batteries.yml
index e1061d8d5..02c15b47e 100644
--- a/data/cities/champagne-au-mont-dor/1001-piles-batteries.yml
+++ b/data/cities/champagne-au-mont-dor/1001-piles-batteries.yml
@@ -4,8 +4,8 @@ latitude: 45.80005
 longitude: 4.78759
 postcode: "69410"
 city: Champagne-au-Mont-d'Or
-street: "Avenue de Lanessan"
-housenumber: 92
-phone: "+33 4 78 35 37 40"
-opening_hours: "Mo-Fr 10:00-13:00,14:00-18:00"
-website: "https://www.1001piles.com"
\ No newline at end of file
+street: Avenue de Lanessan
+housenumber: "92"
+phone: +33 4 78 35 37 40
+opening_hours: Mo-Fr 10:00-13:00,14:00-18:00
+website: https://www.1001piles.com
diff --git a/data/cities/champagne-au-mont-dor/satoriz-champagne-au-mont-dor.yml b/data/cities/champagne-au-mont-dor/satoriz-champagne-au-mont-dor.yml
index 722fc5c00..d8fbaff06 100644
--- a/data/cities/champagne-au-mont-dor/satoriz-champagne-au-mont-dor.yml
+++ b/data/cities/champagne-au-mont-dor/satoriz-champagne-au-mont-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.80464
 longitude: 4.78116
 postcode: "69410"
 city: Champagne-au-Mont-d'Or
-street: "Rue des Rosiéristes"
-housenumber: 11
+street: Rue des Rosiéristes
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "http://www.satoriz-montdor.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: http://www.satoriz-montdor.fr/
diff --git a/data/cities/champagne-au-mont-dor/size-factory-lyon.yml b/data/cities/champagne-au-mont-dor/size-factory-lyon.yml
index 6e422341e..b13f140be 100644
--- a/data/cities/champagne-au-mont-dor/size-factory-lyon.yml
+++ b/data/cities/champagne-au-mont-dor/size-factory-lyon.yml
@@ -4,8 +4,8 @@ latitude: 45.79991
 longitude: 4.78759
 postcode: "69410"
 city: Champagne-au-Mont-d'Or
-street: "Avenue de Lanessan"
-housenumber: 92
+street: Avenue de Lanessan
+housenumber: "92"
 phone: "+33966979126"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.size-factory.com/magasin-grande-taille-homme-lyon"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.size-factory.com/magasin-grande-taille-homme-lyon
diff --git a/data/cities/champagny-en-vanoise/ski-shop-vanoise.yml b/data/cities/champagny-en-vanoise/ski-shop-vanoise.yml
index ef277dc84..38a48d6a9 100644
--- a/data/cities/champagny-en-vanoise/ski-shop-vanoise.yml
+++ b/data/cities/champagny-en-vanoise/ski-shop-vanoise.yml
@@ -4,8 +4,8 @@ latitude: 45.4555
 longitude: 6.69421
 postcode: "73350"
 city: Champagny-en-Vanoise
-street: "Immeuble le reclaz"
-housenumber: 
+street: Immeuble le reclaz
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/champdieu/le-jardin-de-docteur-persil-et-mister-ail.yml b/data/cities/champdieu/le-jardin-de-docteur-persil-et-mister-ail.yml
index b67d2003c..80d7885a6 100644
--- a/data/cities/champdieu/le-jardin-de-docteur-persil-et-mister-ail.yml
+++ b/data/cities/champdieu/le-jardin-de-docteur-persil-et-mister-ail.yml
@@ -4,8 +4,8 @@ latitude: 45.6483
 longitude: 4.07185
 postcode: "42600"
 city: Champdieu
-street: "Route de Chalain"
-housenumber: 1160
-phone: "06 38 40 86 56"
+street: Route de Chalain
+housenumber: "1160"
+phone: 06 38 40 86 56
 opening_hours: ""
-website: "https://docteurpersiletmisterail.com/"
\ No newline at end of file
+website: https://docteurpersiletmisterail.com/
diff --git a/data/cities/chamrousse/au-cabanon-des-saveurs.yml b/data/cities/chamrousse/au-cabanon-des-saveurs.yml
index 115891667..432087243 100644
--- a/data/cities/chamrousse/au-cabanon-des-saveurs.yml
+++ b/data/cities/chamrousse/au-cabanon-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 45.12655
 longitude: 5.87696
 postcode: "38410"
 city: Chamrousse
-street: "Avenue Henri Duhamel"
-housenumber: 178
+street: Avenue Henri Duhamel
+housenumber: "178"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamrousse/au-faim-gourmet.yml b/data/cities/chamrousse/au-faim-gourmet.yml
index 120c3764d..685a2c131 100644
--- a/data/cities/chamrousse/au-faim-gourmet.yml
+++ b/data/cities/chamrousse/au-faim-gourmet.yml
@@ -4,8 +4,8 @@ latitude: 45.12652
 longitude: 5.87896
 postcode: "38410"
 city: Chamrousse
-street: "Avenue Henri Duhamel"
-housenumber: 
+street: Avenue Henri Duhamel
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamrousse/casino-shop-le-recoin.yml b/data/cities/chamrousse/casino-shop-le-recoin.yml
index f0240bf1c..b00bd4238 100644
--- a/data/cities/chamrousse/casino-shop-le-recoin.yml
+++ b/data/cities/chamrousse/casino-shop-le-recoin.yml
@@ -4,8 +4,8 @@ latitude: 45.12656
 longitude: 5.87746
 postcode: "38410"
 city: Chamrousse
-street: "Avenue Henri Duhamel"
-housenumber: 178
-phone: "+33 4 76 51 00 95"
+street: Avenue Henri Duhamel
+housenumber: "178"
+phone: +33 4 76 51 00 95
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamrousse/coreupt.yml b/data/cities/chamrousse/coreupt.yml
index 7532ab2a6..e0cb65d5d 100644
--- a/data/cities/chamrousse/coreupt.yml
+++ b/data/cities/chamrousse/coreupt.yml
@@ -5,7 +5,7 @@ longitude: 5.87965
 postcode: "38410"
 city: Chamrousse
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "http://www.coreupt.com"
\ No newline at end of file
+website: http://www.coreupt.com
diff --git a/data/cities/chamrousse/fouartes-sport.yml b/data/cities/chamrousse/fouartes-sport.yml
index 95715aa45..278959ca0 100644
--- a/data/cities/chamrousse/fouartes-sport.yml
+++ b/data/cities/chamrousse/fouartes-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.1098
 longitude: 5.87632
 postcode: "38410"
 city: Chamrousse
-street: "Roche Béranger 1750 - Centre Comercial"
-housenumber: 
-phone: "+33 4 76 89 94 28"
+street: Roche Béranger 1750 - Centre Comercial
+housenumber: ""
+phone: +33 4 76 89 94 28
 opening_hours: ""
-website: "https://fouartessport.com"
\ No newline at end of file
+website: https://fouartessport.com
diff --git a/data/cities/chamrousse/hermitage-cadeaux.yml b/data/cities/chamrousse/hermitage-cadeaux.yml
index 03c7bfb02..35d6d1a7b 100644
--- a/data/cities/chamrousse/hermitage-cadeaux.yml
+++ b/data/cities/chamrousse/hermitage-cadeaux.yml
@@ -4,8 +4,8 @@ latitude: 45.12655
 longitude: 5.87709
 postcode: "38410"
 city: Chamrousse
-street: "Avenue Henri Duhamel"
-housenumber: 178
-phone: "+33 4 76 89 98 63"
+street: Avenue Henri Duhamel
+housenumber: "178"
+phone: +33 4 76 89 98 63
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamrousse/intersport-1650.yml b/data/cities/chamrousse/intersport-1650.yml
index 9667b5bc5..a57d7321a 100644
--- a/data/cities/chamrousse/intersport-1650.yml
+++ b/data/cities/chamrousse/intersport-1650.yml
@@ -4,8 +4,8 @@ latitude: 45.12605
 longitude: 5.87883
 postcode: "38410"
 city: Chamrousse
-street: "Place de Belledonne"
-housenumber: 152
-phone: "+33 4 76 89 90 89"
+street: Place de Belledonne
+housenumber: "152"
+phone: +33 4 76 89 90 89
 opening_hours: ""
-website: "http://www.intersport-chamrousse.com"
\ No newline at end of file
+website: http://www.intersport-chamrousse.com
diff --git a/data/cities/chamrousse/lalpain-des-cimes.yml b/data/cities/chamrousse/lalpain-des-cimes.yml
index 42bd17549..efa95fcf6 100644
--- a/data/cities/chamrousse/lalpain-des-cimes.yml
+++ b/data/cities/chamrousse/lalpain-des-cimes.yml
@@ -4,8 +4,8 @@ latitude: 45.12652
 longitude: 5.8788
 postcode: "38410"
 city: Chamrousse
-street: "Avenue Henri Duhamel"
-housenumber: 18
-phone: "+33 4 76 59 02 53"
-opening_hours: "Mo-Tu,Th-Su 07:00-14:00,16:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Henri Duhamel
+housenumber: "18"
+phone: +33 4 76 59 02 53
+opening_hours: Mo-Tu,Th-Su 07:00-14:00,16:00-19:00
+website: ""
diff --git a/data/cities/chamrousse/no-limit.yml b/data/cities/chamrousse/no-limit.yml
index 679ef4fbe..382eb1568 100644
--- a/data/cities/chamrousse/no-limit.yml
+++ b/data/cities/chamrousse/no-limit.yml
@@ -4,8 +4,8 @@ latitude: 45.10976
 longitude: 5.87605
 postcode: "38410"
 city: Chamrousse
-street: "Roche Béranger 1750 - Centre Comercial"
-housenumber: 
-phone: "+33 476590041"
+street: Roche Béranger 1750 - Centre Comercial
+housenumber: ""
+phone: +33 476590041
 opening_hours: ""
-website: "https://fouartessport.com"
\ No newline at end of file
+website: https://fouartessport.com
diff --git a/data/cities/chamrousse/sgambato-shop-1650.yml b/data/cities/chamrousse/sgambato-shop-1650.yml
index 4a8267a53..0262f2961 100644
--- a/data/cities/chamrousse/sgambato-shop-1650.yml
+++ b/data/cities/chamrousse/sgambato-shop-1650.yml
@@ -4,8 +4,8 @@ latitude: 45.12657
 longitude: 5.87816
 postcode: "38410"
 city: Chamrousse
-street: "Avenue Henri Duhamel"
-housenumber: 76
-phone: "+33 4 76 89 91 63"
+street: Avenue Henri Duhamel
+housenumber: "76"
+phone: +33 4 76 89 91 63
 opening_hours: ""
-website: "http://www.sgambatoshop-ski.fr"
\ No newline at end of file
+website: http://www.sgambatoshop-ski.fr
diff --git a/data/cities/chamrousse/sgambato.yml b/data/cities/chamrousse/sgambato.yml
index fb556d2d6..250df7c86 100644
--- a/data/cities/chamrousse/sgambato.yml
+++ b/data/cities/chamrousse/sgambato.yml
@@ -4,8 +4,8 @@ latitude: 45.10906
 longitude: 5.87625
 postcode: "38410"
 city: Chamrousse
-street: "Avenue du Père Tasse"
-housenumber: 480
+street: Avenue du Père Tasse
+housenumber: "480"
 phone: ""
 opening_hours: ""
-website: "https://www.sgambato-ski-shop.fr/"
\ No newline at end of file
+website: https://www.sgambato-ski-shop.fr/
diff --git a/data/cities/chamrousse/skilead-intersport.yml b/data/cities/chamrousse/skilead-intersport.yml
index a04657775..0f1df2f1e 100644
--- a/data/cities/chamrousse/skilead-intersport.yml
+++ b/data/cities/chamrousse/skilead-intersport.yml
@@ -5,7 +5,7 @@ longitude: 5.87567
 postcode: "38410"
 city: Chamrousse
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamrousse/sport-2000.yml b/data/cities/chamrousse/sport-2000.yml
index bad34871b..271f3df8e 100644
--- a/data/cities/chamrousse/sport-2000.yml
+++ b/data/cities/chamrousse/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.12605
 longitude: 5.87857
 postcode: "38410"
 city: Chamrousse
-street: "Place de Belledonne"
-housenumber: 
+street: Place de Belledonne
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chamrousse/twinner-sports-1650.yml b/data/cities/chamrousse/twinner-sports-1650.yml
index e39f6981b..176150bca 100644
--- a/data/cities/chamrousse/twinner-sports-1650.yml
+++ b/data/cities/chamrousse/twinner-sports-1650.yml
@@ -4,8 +4,8 @@ latitude: 45.12601
 longitude: 5.8785
 postcode: "38410"
 city: Chamrousse
-street: "Place de Belledonne"
-housenumber: 
+street: Place de Belledonne
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "http://www.twinner-chamrousse.fr"
\ No newline at end of file
+website: http://www.twinner-chamrousse.fr
diff --git a/data/cities/chanaz/le-jardin-des-senteurs.yml b/data/cities/chanaz/le-jardin-des-senteurs.yml
index 021ac188c..9ed4f4914 100644
--- a/data/cities/chanaz/le-jardin-des-senteurs.yml
+++ b/data/cities/chanaz/le-jardin-des-senteurs.yml
@@ -4,8 +4,8 @@ latitude: 45.80866
 longitude: 5.78957
 postcode: "73310"
 city: Chanaz
-street: "Rue du Fort"
-housenumber: 77
+street: Rue du Fort
+housenumber: "77"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chanaz/proxi.yml b/data/cities/chanaz/proxi.yml
index 414e47a32..75487680a 100644
--- a/data/cities/chanaz/proxi.yml
+++ b/data/cities/chanaz/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.80893
 longitude: 5.79407
 postcode: "73310"
 city: Chanaz
-street: "Route du Canal"
-housenumber: 159
-phone: "+33 4 79 35 11 20"
-opening_hours: "Tu-Sa 08:00-19:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+street: Route du Canal
+housenumber: "159"
+phone: +33 4 79 35 11 20
+opening_hours: Tu-Sa 08:00-19:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/chanaz/terroir-cafe.yml b/data/cities/chanaz/terroir-cafe.yml
index 5488feb8d..9c037b531 100644
--- a/data/cities/chanaz/terroir-cafe.yml
+++ b/data/cities/chanaz/terroir-cafe.yml
@@ -4,8 +4,8 @@ latitude: 45.80876
 longitude: 5.78947
 postcode: "73310"
 city: Chanaz
-street: "Montée du Fort"
-housenumber: 82
-phone: "+33 6 48 55 26 51"
+street: Montée du Fort
+housenumber: "82"
+phone: +33 6 48 55 26 51
 opening_hours: ""
-website: "https://www.terroircafe.fr/"
\ No newline at end of file
+website: https://www.terroircafe.fr/
diff --git a/data/cities/chapareillan/pascal-berger.yml b/data/cities/chapareillan/pascal-berger.yml
index 01d15b92a..0f4b183ec 100644
--- a/data/cities/chapareillan/pascal-berger.yml
+++ b/data/cities/chapareillan/pascal-berger.yml
@@ -4,8 +4,8 @@ latitude: 45.4641
 longitude: 5.99039
 postcode: ""
 city: Chapareillan
-street: "Rue de L'Épinette"
-housenumber: 8
+street: Rue de L'Épinette
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Fr 06:30-12:30, 16:00-19:00; Sa-Su 06:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:30-12:30, 16:00-19:00; Sa-Su 06:30-12:30
+website: ""
diff --git a/data/cities/chaponost/carrefour-contact.yml b/data/cities/chaponost/carrefour-contact.yml
index 8c4e89e02..dc5a70786 100644
--- a/data/cities/chaponost/carrefour-contact.yml
+++ b/data/cities/chaponost/carrefour-contact.yml
@@ -4,8 +4,8 @@ latitude: 45.70925
 longitude: 4.74396
 postcode: "69630"
 city: Chaponost
-street: "Rue Jules Chaussé"
-housenumber: 10
+street: Rue Jules Chaussé
+housenumber: "10"
 phone: "+33478452205"
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/contact-chaponost"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/contact-chaponost
diff --git a/data/cities/charancieu/addiction-peche.yml b/data/cities/charancieu/addiction-peche.yml
index 25b6c9e38..45edc5ac7 100644
--- a/data/cities/charancieu/addiction-peche.yml
+++ b/data/cities/charancieu/addiction-peche.yml
@@ -4,8 +4,8 @@ latitude: 45.52988
 longitude: 5.58808
 postcode: "38490"
 city: Charancieu
-street: "RN 75"
+street: RN 75
 housenumber: 110 L
-phone: "+33 4 76 32 04 15"
-opening_hours: "Tu-Sa 09:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+phone: +33 4 76 32 04 15
+opening_hours: Tu-Sa 09:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/charancieu/atout-point-de-vue.yml b/data/cities/charancieu/atout-point-de-vue.yml
index c11b797c6..8869be265 100644
--- a/data/cities/charancieu/atout-point-de-vue.yml
+++ b/data/cities/charancieu/atout-point-de-vue.yml
@@ -1,11 +1,11 @@
 id: 1150230980
-type: way
+type: node
 latitude: 45.52896
 longitude: 5.59095
 postcode: "38490"
 city: Charancieu
-street: "Route Nationale 75"
-housenumber: 325
-phone: "+33 4 76 07 35 06"
+street: Route Nationale 75
+housenumber: "325"
+phone: +33 4 76 07 35 06
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charancieu/but.yml b/data/cities/charancieu/but.yml
index 3ea9f5167..c6d1e6710 100644
--- a/data/cities/charancieu/but.yml
+++ b/data/cities/charancieu/but.yml
@@ -1,11 +1,11 @@
 id: 59171799
-type: way
+type: node
 latitude: 45.5313
 longitude: 5.58712
 postcode: "38490"
 city: Charancieu
-street: "ZI Pré noir"
-housenumber: 
+street: ZI Pré noir
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/charancieu/culture-velo.yml b/data/cities/charancieu/culture-velo.yml
index 055dcb0b5..1cd7bc210 100644
--- a/data/cities/charancieu/culture-velo.yml
+++ b/data/cities/charancieu/culture-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.52991
 longitude: 5.59003
 postcode: "38490"
 city: Charancieu
-street: "Route Nationale 75"
-housenumber: 
+street: Route Nationale 75
+housenumber: ""
 phone: ""
-opening_hours: "Tu-We 9:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-We 9:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/charancieu/gamm-vert.yml b/data/cities/charancieu/gamm-vert.yml
index 5f1647634..d7cfd8daf 100644
--- a/data/cities/charancieu/gamm-vert.yml
+++ b/data/cities/charancieu/gamm-vert.yml
@@ -4,8 +4,8 @@ latitude: 45.52764
 longitude: 5.59081
 postcode: "38490"
 city: Charancieu
-street: "Route Nationale 75"
-housenumber: 
-phone: "+33 4 76 32 22 48"
+street: Route Nationale 75
+housenumber: ""
+phone: +33 4 76 32 22 48
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charancieu/la-vie-claire.yml b/data/cities/charancieu/la-vie-claire.yml
index c0cd51f3f..2c09656ff 100644
--- a/data/cities/charancieu/la-vie-claire.yml
+++ b/data/cities/charancieu/la-vie-claire.yml
@@ -1,11 +1,11 @@
 id: 1150230979
-type: way
+type: node
 latitude: 45.52902
 longitude: 5.59067
 postcode: "38490"
 city: Charancieu
-street: "Route Nationale 75"
-housenumber: 305
-phone: "+33 9 80 89 47 42"
+street: Route Nationale 75
+housenumber: "305"
+phone: +33 9 80 89 47 42
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charantonnay/garage-quemin-motrio.yml b/data/cities/charantonnay/garage-quemin-motrio.yml
index 39990bb93..33faf4f58 100644
--- a/data/cities/charantonnay/garage-quemin-motrio.yml
+++ b/data/cities/charantonnay/garage-quemin-motrio.yml
@@ -4,8 +4,8 @@ latitude: 45.53913
 longitude: 5.10325
 postcode: "38790"
 city: Charantonnay
-street: "Avenue du Dauphiné"
-housenumber: 876
-phone: "+33 4 74 59 00 20"
+street: Avenue du Dauphiné
+housenumber: "876"
+phone: +33 4 74 59 00 20
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charantonnay/gauthier.yml b/data/cities/charantonnay/gauthier.yml
index 1ceb86c0d..31f82fbd4 100644
--- a/data/cities/charantonnay/gauthier.yml
+++ b/data/cities/charantonnay/gauthier.yml
@@ -4,8 +4,8 @@ latitude: 45.53315
 longitude: 5.11693
 postcode: ""
 city: Charantonnay
-street: "Route du Charavoux"
-housenumber: 
-phone: "+33 4 74 59 01 87"
-opening_hours: "Mo-Sa 07:30-12:00,13:30-19:00"
-website: "http://etsgauthiercharant.wixsite.com/gauthier"
\ No newline at end of file
+street: Route du Charavoux
+housenumber: ""
+phone: +33 4 74 59 01 87
+opening_hours: Mo-Sa 07:30-12:00,13:30-19:00
+website: http://etsgauthiercharant.wixsite.com/gauthier
diff --git a/data/cities/charantonnay/les-jardins-delise.yml b/data/cities/charantonnay/les-jardins-delise.yml
index fc97e4211..278b947f4 100644
--- a/data/cities/charantonnay/les-jardins-delise.yml
+++ b/data/cities/charantonnay/les-jardins-delise.yml
@@ -1,11 +1,11 @@
 id: 1284829246
-type: way
+type: node
 latitude: 45.53452
 longitude: 5.12749
 postcode: "38790"
 city: Charantonnay
-street: "Avenue du Dauphiné"
-housenumber: 2994
-phone: "+33 4 74 59 09 82"
-opening_hours: "Tu-Sa 08:30-12:00,14:30-19:30; Su 09:00-12:00"
-website: "https://www.lesjardinsdelise-charantonnay.fr/"
\ No newline at end of file
+street: Avenue du Dauphiné
+housenumber: "2994"
+phone: +33 4 74 59 09 82
+opening_hours: Tu-Sa 08:30-12:00,14:30-19:30; Su 09:00-12:00
+website: https://www.lesjardinsdelise-charantonnay.fr/
diff --git a/data/cities/charantonnay/maison-bayle-boulangerie-patisserie.yml b/data/cities/charantonnay/maison-bayle-boulangerie-patisserie.yml
index 79f7710a7..24945c7c8 100644
--- a/data/cities/charantonnay/maison-bayle-boulangerie-patisserie.yml
+++ b/data/cities/charantonnay/maison-bayle-boulangerie-patisserie.yml
@@ -4,8 +4,8 @@ latitude: 45.53683
 longitude: 5.10934
 postcode: "38790"
 city: Charantonnay
-street: "Rue de la Verchère"
-housenumber: 65
-phone: "+33 9 84 45 97 59"
+street: Rue de la Verchère
+housenumber: "65"
+phone: +33 9 84 45 97 59
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charantonnay/pivato-sport.yml b/data/cities/charantonnay/pivato-sport.yml
index 32a400352..73ce6259c 100644
--- a/data/cities/charantonnay/pivato-sport.yml
+++ b/data/cities/charantonnay/pivato-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.54188
 longitude: 5.09943
 postcode: "38790"
 city: Charantonnay
-street: "Route de l'Amballon"
-housenumber: 217
+street: Route de l'Amballon
+housenumber: "217"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charantonnay/proxi.yml b/data/cities/charantonnay/proxi.yml
index 5d1822d3d..459d0061a 100644
--- a/data/cities/charantonnay/proxi.yml
+++ b/data/cities/charantonnay/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.53668
 longitude: 5.10831
 postcode: "38790"
 city: Charantonnay
-street: "Avenue du Dauphiné"
-housenumber: 1367
+street: Avenue du Dauphiné
+housenumber: "1367"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:15, 16:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:15, 16:00-19:30
+website: ""
diff --git a/data/cities/charantonnay/tendanc-hair.yml b/data/cities/charantonnay/tendanc-hair.yml
index 6f304fa7b..3922ba652 100644
--- a/data/cities/charantonnay/tendanc-hair.yml
+++ b/data/cities/charantonnay/tendanc-hair.yml
@@ -4,8 +4,8 @@ latitude: 45.53831
 longitude: 5.10407
 postcode: "38790"
 city: Charantonnay
-street: "Avenue du Dauphiné"
-housenumber: 994
-phone: "+33 4 74 59 07 79"
+street: Avenue du Dauphiné
+housenumber: "994"
+phone: +33 4 74 59 07 79
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charavines/natura-velo.yml b/data/cities/charavines/natura-velo.yml
index 566ea67c9..46dc5b1da 100644
--- a/data/cities/charavines/natura-velo.yml
+++ b/data/cities/charavines/natura-velo.yml
@@ -1,11 +1,11 @@
 id: 421642103
-type: way
+type: node
 latitude: 45.43358
 longitude: 5.51635
 postcode: "38850"
 city: Charavines
-street: "Rue des Plages"
-housenumber: 245
+street: Rue des Plages
+housenumber: "245"
 phone: ""
-opening_hours: "Tu-Su,PH 09:00-12:00, Tu-Sa 14:00-19:00, Su,PH 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su,PH 09:00-12:00, Tu-Sa 14:00-19:00, Su,PH 14:00-18:00
+website: ""
diff --git a/data/cities/charbonnieres-les-bains/eni-charbonnieres-dir-lyon.yml b/data/cities/charbonnieres-les-bains/eni-charbonnieres-dir-lyon.yml
index aad60e018..a9884bfaf 100644
--- a/data/cities/charbonnieres-les-bains/eni-charbonnieres-dir-lyon.yml
+++ b/data/cities/charbonnieres-les-bains/eni-charbonnieres-dir-lyon.yml
@@ -4,8 +4,8 @@ latitude: 45.77904
 longitude: 4.75077
 postcode: "69260"
 city: Charbonnières-les-Bains
-street: "Route de Paris"
-housenumber: 80
+street: Route de Paris
+housenumber: "80"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/charbonnieres-les-bains/eni-charbonnieres-est.yml b/data/cities/charbonnieres-les-bains/eni-charbonnieres-est.yml
index 557f86b0e..00ff9e2d2 100644
--- a/data/cities/charbonnieres-les-bains/eni-charbonnieres-est.yml
+++ b/data/cities/charbonnieres-les-bains/eni-charbonnieres-est.yml
@@ -4,8 +4,8 @@ latitude: 45.7843
 longitude: 4.74968
 postcode: "69260"
 city: Charbonnieres-les-bains
-street: "Route de Paris"
+street: Route de Paris
 housenumber: 50-51
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/charbonnieres-les-bains/le-chalet.yml b/data/cities/charbonnieres-les-bains/le-chalet.yml
index b311c6513..0650d0dab 100644
--- a/data/cities/charbonnieres-les-bains/le-chalet.yml
+++ b/data/cities/charbonnieres-les-bains/le-chalet.yml
@@ -4,8 +4,8 @@ latitude: 45.78327
 longitude: 4.73606
 postcode: "69260"
 city: Charbonnières-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 31
+street: Avenue du Général de Gaulle
+housenumber: "31"
 phone: ""
-opening_hours: "Mo-Fr 06:30-19:00; Sa 07:00-19:00; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-19:00; Sa 07:00-19:00; Su 07:00-13:00
+website: ""
diff --git a/data/cities/charette/les-delices-de-rosalys.yml b/data/cities/charette/les-delices-de-rosalys.yml
index cdfe26929..d6a47b6dd 100644
--- a/data/cities/charette/les-delices-de-rosalys.yml
+++ b/data/cities/charette/les-delices-de-rosalys.yml
@@ -4,8 +4,8 @@ latitude: 45.80899
 longitude: 5.36922
 postcode: "38390"
 city: Charette
-street: "Route d'Optevoz"
-housenumber: 418
-phone: "+33 7 49 01 69 37"
-opening_hours: "Mo,Tu,Fr,Sa 09:00-18:00; Th,Su 09:00-12:30; PH 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Route d'Optevoz
+housenumber: "418"
+phone: +33 7 49 01 69 37
+opening_hours: Mo,Tu,Fr,Sa 09:00-18:00; Th,Su 09:00-12:30; PH 09:00-12:00
+website: ""
diff --git a/data/cities/charix/essential-diving.yml b/data/cities/charix/essential-diving.yml
index 64c899b6f..eb2bdf432 100644
--- a/data/cities/charix/essential-diving.yml
+++ b/data/cities/charix/essential-diving.yml
@@ -4,8 +4,8 @@ latitude: 46.18199
 longitude: 5.68089
 postcode: "01130"
 city: Charix
-street: "Rue des Combes"
+street: Rue des Combes
 housenumber: 1bis
-phone: "+33 7 60 50 08 73"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://essentialdiving.fr/"
\ No newline at end of file
+phone: +33 7 60 50 08 73
+opening_hours: Mo-Sa 10:00-19:00
+website: https://essentialdiving.fr/
diff --git a/data/cities/charly/janoi.yml b/data/cities/charly/janoi.yml
index 08ee28609..452df2faf 100644
--- a/data/cities/charly/janoi.yml
+++ b/data/cities/charly/janoi.yml
@@ -4,8 +4,8 @@ latitude: 45.65123
 longitude: 4.79626
 postcode: "69390"
 city: Charly
-street: "Rue du Maréchal Leclerc"
-housenumber: 189
-phone: "+33 4 78 46 33 77"
+street: Rue du Maréchal Leclerc
+housenumber: "189"
+phone: +33 4 78 46 33 77
 opening_hours: ""
-website: "http://janoi.fr/"
\ No newline at end of file
+website: http://janoi.fr/
diff --git a/data/cities/charnay/epicerie-des-pierres-dorees.yml b/data/cities/charnay/epicerie-des-pierres-dorees.yml
index 187372b53..3768a4cfc 100644
--- a/data/cities/charnay/epicerie-des-pierres-dorees.yml
+++ b/data/cities/charnay/epicerie-des-pierres-dorees.yml
@@ -1,11 +1,11 @@
 id: 134582371
-type: way
+type: node
 latitude: 45.89095
 longitude: 4.66768
 postcode: "69380"
 city: Charnay
-street: "Place du Château"
-housenumber: 10
+street: Place du Château
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charvieu-chavagneux/boucherie-traiteur-sciandra.yml b/data/cities/charvieu-chavagneux/boucherie-traiteur-sciandra.yml
index 44de08eed..74c657021 100644
--- a/data/cities/charvieu-chavagneux/boucherie-traiteur-sciandra.yml
+++ b/data/cities/charvieu-chavagneux/boucherie-traiteur-sciandra.yml
@@ -4,8 +4,8 @@ latitude: 45.74551
 longitude: 5.16745
 postcode: "38230"
 city: Charvieu-Chavagneux
-street: "Route de Vienne"
-housenumber: 16
-phone: "+33 4 78 32 11 49"
+street: Route de Vienne
+housenumber: "16"
+phone: +33 4 78 32 11 49
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/charvieu-chavagneux/coccinelle.yml b/data/cities/charvieu-chavagneux/coccinelle.yml
index 212ff8afc..bb6b65cb7 100644
--- a/data/cities/charvieu-chavagneux/coccinelle.yml
+++ b/data/cities/charvieu-chavagneux/coccinelle.yml
@@ -4,8 +4,8 @@ latitude: 45.74061
 longitude: 5.16032
 postcode: "38230"
 city: Charvieu-Chavagneux
-street: "Rue des Allobroges"
-housenumber: 
+street: Rue des Allobroges
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-12:30"
-website: "https://www.coccinelle.fr/Trouver_Un_Magasin/Details/coccinelle-supermarche/charvieu-chavagneux/c-cial-les-allobroges"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-12:30
+website: https://www.coccinelle.fr/Trouver_Un_Magasin/Details/coccinelle-supermarche/charvieu-chavagneux/c-cial-les-allobroges
diff --git a/data/cities/chassagny/naturhouse-chassagny.yml b/data/cities/chassagny/naturhouse-chassagny.yml
index cb57d8293..c726d0211 100644
--- a/data/cities/chassagny/naturhouse-chassagny.yml
+++ b/data/cities/chassagny/naturhouse-chassagny.yml
@@ -4,8 +4,9 @@ latitude: 45.6191
 longitude: 4.71155
 postcode: "69700"
 city: Chassagny
-street: "Zone Industrielle Richard Bloch"
-housenumber: 
+street: Zone Industrielle Richard Bloch
+housenumber: ""
 phone: ""
-opening_hours: "Tu 09:00-13:00, 14:00-18:00; We 10:00-13:00, 14:00-19:00; Th 09:00-13:00, 14:00-17:00; Fr 10:00-13:00, 14:00-19:00; Sa 09:00-13:00"
-website: "https://www.naturhouse.fr/liste-centres/579-chassagny"
\ No newline at end of file
+opening_hours: Tu 09:00-13:00, 14:00-18:00; We 10:00-13:00, 14:00-19:00; Th 09:00-13:00,
+    14:00-17:00; Fr 10:00-13:00, 14:00-19:00; Sa 09:00-13:00
+website: https://www.naturhouse.fr/liste-centres/579-chassagny
diff --git a/data/cities/chasse-sur-rhone/aubert.yml b/data/cities/chasse-sur-rhone/aubert.yml
index 0763e9025..1486bbfff 100644
--- a/data/cities/chasse-sur-rhone/aubert.yml
+++ b/data/cities/chasse-sur-rhone/aubert.yml
@@ -4,8 +4,8 @@ latitude: 45.57275
 longitude: 4.81383
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1833
-phone: "+33 4 78 51 26 61"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.aubert.com/"
\ No newline at end of file
+street: Avenue Frédéric Mistral
+housenumber: "1833"
+phone: +33 4 78 51 26 61
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.aubert.com/
diff --git a/data/cities/chasse-sur-rhone/bricomarche.yml b/data/cities/chasse-sur-rhone/bricomarche.yml
index de3b0ef65..207bd2094 100644
--- a/data/cities/chasse-sur-rhone/bricomarche.yml
+++ b/data/cities/chasse-sur-rhone/bricomarche.yml
@@ -4,8 +4,8 @@ latitude: 45.57249
 longitude: 4.81408
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 2011
-phone: "+33 4 37 20 14 02"
+street: Avenue Frédéric Mistral
+housenumber: "2011"
+phone: +33 4 37 20 14 02
 opening_hours: ""
-website: "https://www.bricomarche.com/"
\ No newline at end of file
+website: https://www.bricomarche.com/
diff --git a/data/cities/chasse-sur-rhone/carlance.yml b/data/cities/chasse-sur-rhone/carlance.yml
index 1941559f4..ddda6f32d 100644
--- a/data/cities/chasse-sur-rhone/carlance.yml
+++ b/data/cities/chasse-sur-rhone/carlance.yml
@@ -1,11 +1,11 @@
 id: 120912819
-type: way
+type: node
 latitude: 45.57384
 longitude: 4.80931
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Avenue Frederic Mistral"
-housenumber: 1654
-phone: "+33 4 72 24 65 06"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.carlance.fr/carlance-institut-de-beaute-CHASSE-SUR-RHONE.html"
\ No newline at end of file
+street: Avenue Frederic Mistral
+housenumber: "1654"
+phone: +33 4 72 24 65 06
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.carlance.fr/carlance-institut-de-beaute-CHASSE-SUR-RHONE.html
diff --git a/data/cities/chasse-sur-rhone/ceta.yml b/data/cities/chasse-sur-rhone/ceta.yml
index 56ad6b1d9..5b5503d5a 100644
--- a/data/cities/chasse-sur-rhone/ceta.yml
+++ b/data/cities/chasse-sur-rhone/ceta.yml
@@ -4,8 +4,8 @@ latitude: 45.57329
 longitude: 4.81324
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1895
-phone: "+33 8 11 87 29 72"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.c-and-a.com/fr/fr/shop/index.html"
\ No newline at end of file
+street: Avenue Frédéric Mistral
+housenumber: "1895"
+phone: +33 8 11 87 29 72
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.c-and-a.com/fr/fr/shop/index.html
diff --git a/data/cities/chasse-sur-rhone/chaussea.yml b/data/cities/chasse-sur-rhone/chaussea.yml
index 1ae5582f6..797681dcb 100644
--- a/data/cities/chasse-sur-rhone/chaussea.yml
+++ b/data/cities/chasse-sur-rhone/chaussea.yml
@@ -4,8 +4,8 @@ latitude: 45.57373
 longitude: 4.81272
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1871
-phone: "+33 4 78 50 96 35"
+street: Avenue Frédéric Mistral
+housenumber: "1871"
+phone: +33 4 78 50 96 35
 opening_hours: ""
-website: "https://www.chaussea.com/fr/"
\ No newline at end of file
+website: https://www.chaussea.com/fr/
diff --git a/data/cities/chasse-sur-rhone/chocolats-roland-reaute.yml b/data/cities/chasse-sur-rhone/chocolats-roland-reaute.yml
index 1d79af104..1bbc74817 100644
--- a/data/cities/chasse-sur-rhone/chocolats-roland-reaute.yml
+++ b/data/cities/chasse-sur-rhone/chocolats-roland-reaute.yml
@@ -4,8 +4,8 @@ latitude: 45.57289
 longitude: 4.81375
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1959
-phone: "+33 4 78 56 81 52"
+street: Avenue Frédéric Mistral
+housenumber: "1959"
+phone: +33 4 78 56 81 52
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chasse-sur-rhone/cuisinella.yml b/data/cities/chasse-sur-rhone/cuisinella.yml
index ea581debc..d5b9da738 100644
--- a/data/cities/chasse-sur-rhone/cuisinella.yml
+++ b/data/cities/chasse-sur-rhone/cuisinella.yml
@@ -1,11 +1,11 @@
 id: 120912814
-type: way
+type: node
 latitude: 45.57443
 longitude: 4.80861
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1623
-phone: "+33 4 81 13 35 50"
-opening_hours: "Mo 15:00-19:00; Tu-We 10:00-12:00,14:00-19:00; Sa 10:00-19:00"
-website: "https://www.ma.cuisinella/fr-fr/magasins/isere/chasse-sur-rhone"
\ No newline at end of file
+street: Avenue Frédéric Mistral
+housenumber: "1623"
+phone: +33 4 81 13 35 50
+opening_hours: Mo 15:00-19:00; Tu-We 10:00-12:00,14:00-19:00; Sa 10:00-19:00
+website: https://www.ma.cuisinella/fr-fr/magasins/isere/chasse-sur-rhone
diff --git a/data/cities/chasse-sur-rhone/decathlon-chasse-sur-rhone.yml b/data/cities/chasse-sur-rhone/decathlon-chasse-sur-rhone.yml
index eb2f27a61..795149df2 100644
--- a/data/cities/chasse-sur-rhone/decathlon-chasse-sur-rhone.yml
+++ b/data/cities/chasse-sur-rhone/decathlon-chasse-sur-rhone.yml
@@ -1,11 +1,11 @@
 id: 368824800
-type: way
+type: node
 latitude: 45.57262
 longitude: 4.81285
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1963
+street: Avenue Frédéric Mistral
+housenumber: "1963"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/chasse-sur-rhone/gemo.yml b/data/cities/chasse-sur-rhone/gemo.yml
index 53ce755e4..8a41040b0 100644
--- a/data/cities/chasse-sur-rhone/gemo.yml
+++ b/data/cities/chasse-sur-rhone/gemo.yml
@@ -4,8 +4,8 @@ latitude: 45.57309
 longitude: 4.81345
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1515
-phone: "+33 4 78 51 12 53"
+street: Avenue Frédéric Mistral
+housenumber: "1515"
+phone: +33 4 78 51 12 53
 opening_hours: ""
-website: "https://www.gemo.fr/"
\ No newline at end of file
+website: https://www.gemo.fr/
diff --git a/data/cities/chasse-sur-rhone/la-foirfouille.yml b/data/cities/chasse-sur-rhone/la-foirfouille.yml
index 22f3d3187..0800bd66f 100644
--- a/data/cities/chasse-sur-rhone/la-foirfouille.yml
+++ b/data/cities/chasse-sur-rhone/la-foirfouille.yml
@@ -4,8 +4,8 @@ latitude: 45.57295
 longitude: 4.81365
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 2011
-phone: "+33 4 72 49 02 49"
+street: Avenue Frédéric Mistral
+housenumber: "2011"
+phone: +33 4 72 49 02 49
 opening_hours: ""
-website: "https://www.lafoirfouille.fr/"
\ No newline at end of file
+website: https://www.lafoirfouille.fr/
diff --git a/data/cities/chasse-sur-rhone/la-halle-au-sommeil.yml b/data/cities/chasse-sur-rhone/la-halle-au-sommeil.yml
index 5189ccda3..b1ec073c5 100644
--- a/data/cities/chasse-sur-rhone/la-halle-au-sommeil.yml
+++ b/data/cities/chasse-sur-rhone/la-halle-au-sommeil.yml
@@ -1,11 +1,11 @@
 id: 120912816
-type: way
+type: node
 latitude: 45.57431
 longitude: 4.80843
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1620
-phone: "+33 4 78 73 35 79"
-opening_hours: "Mo-Sa 09:30-12:00,14:00-19:00"
-website: "https://www.halleausommeil.fr/magasin/chasse-matelas-canape"
\ No newline at end of file
+street: Avenue Frédéric Mistral
+housenumber: "1620"
+phone: +33 4 78 73 35 79
+opening_hours: Mo-Sa 09:30-12:00,14:00-19:00
+website: https://www.halleausommeil.fr/magasin/chasse-matelas-canape
diff --git a/data/cities/chasse-sur-rhone/le-crochet-de-mamily.yml b/data/cities/chasse-sur-rhone/le-crochet-de-mamily.yml
index e35159a4d..bef571e5a 100644
--- a/data/cities/chasse-sur-rhone/le-crochet-de-mamily.yml
+++ b/data/cities/chasse-sur-rhone/le-crochet-de-mamily.yml
@@ -4,8 +4,8 @@ latitude: 45.58236
 longitude: 4.7927
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Rue Pasteur"
-housenumber: 795
-phone: "+33 6 99 87 23 59"
+street: Rue Pasteur
+housenumber: "795"
+phone: +33 6 99 87 23 59
 opening_hours: ""
-website: "https://lecrochetdemamily.fr"
\ No newline at end of file
+website: https://lecrochetdemamily.fr
diff --git a/data/cities/chasse-sur-rhone/les-caves-bataillon.yml b/data/cities/chasse-sur-rhone/les-caves-bataillon.yml
index 5727109fd..0103aea87 100644
--- a/data/cities/chasse-sur-rhone/les-caves-bataillon.yml
+++ b/data/cities/chasse-sur-rhone/les-caves-bataillon.yml
@@ -1,11 +1,11 @@
 id: 1290494814
-type: way
+type: node
 latitude: 45.57504
 longitude: 4.80973
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1515
-phone: "+33 4 37 41 71 89"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+street: Avenue Frédéric Mistral
+housenumber: "1515"
+phone: +33 4 37 41 71 89
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/chasse-sur-rhone/les-pti-opticiens-lyon-sud.yml b/data/cities/chasse-sur-rhone/les-pti-opticiens-lyon-sud.yml
index 5532fcf5a..ae5a741e4 100644
--- a/data/cities/chasse-sur-rhone/les-pti-opticiens-lyon-sud.yml
+++ b/data/cities/chasse-sur-rhone/les-pti-opticiens-lyon-sud.yml
@@ -4,8 +4,8 @@ latitude: 45.57343
 longitude: 4.81314
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1833
-phone: "+33 4 78 07 23 50"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.lesptiopticiens.fr/"
\ No newline at end of file
+street: Avenue Frédéric Mistral
+housenumber: "1833"
+phone: +33 4 78 07 23 50
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.lesptiopticiens.fr/
diff --git a/data/cities/chasse-sur-rhone/orchestra.yml b/data/cities/chasse-sur-rhone/orchestra.yml
index 9206bd9f3..7743c25a7 100644
--- a/data/cities/chasse-sur-rhone/orchestra.yml
+++ b/data/cities/chasse-sur-rhone/orchestra.yml
@@ -4,8 +4,8 @@ latitude: 45.5736
 longitude: 4.81292
 postcode: "38670"
 city: Chasse-Sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 833
-phone: "+33 4 72 30 85 77"
+street: Avenue Frédéric Mistral
+housenumber: "833"
+phone: +33 4 72 30 85 77
 opening_hours: ""
-website: "https://fr.shop-orchestra.com/"
\ No newline at end of file
+website: https://fr.shop-orchestra.com/
diff --git a/data/cities/chasse-sur-rhone/tom-et-co.yml b/data/cities/chasse-sur-rhone/tom-et-co.yml
index 128935855..eee29524a 100644
--- a/data/cities/chasse-sur-rhone/tom-et-co.yml
+++ b/data/cities/chasse-sur-rhone/tom-et-co.yml
@@ -1,11 +1,11 @@
 id: 120912815
-type: way
+type: node
 latitude: 45.57456
 longitude: 4.80842
 postcode: "38670"
 city: Chasse-sur-Rhône
-street: "Avenue Frédéric Mistral"
-housenumber: 1620
-phone: "+33 4 78 87 19 83"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.tomandco.com/fr/"
\ No newline at end of file
+street: Avenue Frédéric Mistral
+housenumber: "1620"
+phone: +33 4 78 87 19 83
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.tomandco.com/fr/
diff --git a/data/cities/chasselay/le-pain-du-promenoir.yml b/data/cities/chasselay/le-pain-du-promenoir.yml
index 5f40a5a6c..3d24a67f4 100644
--- a/data/cities/chasselay/le-pain-du-promenoir.yml
+++ b/data/cities/chasselay/le-pain-du-promenoir.yml
@@ -1,11 +1,11 @@
 id: 137125342
-type: way
+type: node
 latitude: 45.87387
 longitude: 4.7719
 postcode: "69380"
 city: Chasselay
-street: "Rue du Promenoir"
-housenumber: 8
+street: Rue du Promenoir
+housenumber: "8"
 phone: "+33478438481"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chassieu/bonjour.yml b/data/cities/chassieu/bonjour.yml
index 01160151b..4545e49f4 100644
--- a/data/cities/chassieu/bonjour.yml
+++ b/data/cities/chassieu/bonjour.yml
@@ -1,11 +1,11 @@
 id: 84221685
-type: way
+type: node
 latitude: 45.72319
 longitude: 4.9703
 postcode: "69680"
 city: Chassieu
-street: "Rue Blaise Pascal"
-housenumber: 2
+street: Rue Blaise Pascal
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: "https://www.as24.com/"
\ No newline at end of file
+website: https://www.as24.com/
diff --git a/data/cities/chateauneuf/gaec-les-pigeonneaux-de-chateauneuf.yml b/data/cities/chateauneuf/gaec-les-pigeonneaux-de-chateauneuf.yml
index 270612f48..72a3d3c0c 100644
--- a/data/cities/chateauneuf/gaec-les-pigeonneaux-de-chateauneuf.yml
+++ b/data/cities/chateauneuf/gaec-les-pigeonneaux-de-chateauneuf.yml
@@ -4,8 +4,8 @@ latitude: 45.49912
 longitude: 4.61007
 postcode: "42800"
 city: Châteauneuf
-street: "Route du Bajard"
-housenumber: 1084
+street: Route du Bajard
+housenumber: "1084"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/casino-shop.yml b/data/cities/chatel/casino-shop.yml
index 042b5ddc7..cbd930e7f 100644
--- a/data/cities/chatel/casino-shop.yml
+++ b/data/cities/chatel/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 46.26566
 longitude: 6.84174
 postcode: "74390"
 city: Châtel
-street: "Route de Vonnes"
-housenumber: 161
+street: Route de Vonnes
+housenumber: "161"
 phone: ""
-opening_hours: "Mo-Su 08:00-13:00, 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-13:00, 15:30-19:30
+website: ""
diff --git a/data/cities/chatel/couleur-menthe-a-leau.yml b/data/cities/chatel/couleur-menthe-a-leau.yml
index b22b6ac1f..acc9975aa 100644
--- a/data/cities/chatel/couleur-menthe-a-leau.yml
+++ b/data/cities/chatel/couleur-menthe-a-leau.yml
@@ -4,8 +4,8 @@ latitude: 46.26506
 longitude: 6.84081
 postcode: "74390"
 city: Châtel
-street: "Route du Linga"
-housenumber: 209
+street: Route du Linga
+housenumber: "209"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/intersport-chemin-de-sous-le-cret.yml b/data/cities/chatel/intersport-chemin-de-sous-le-cret.yml
new file mode 100644
index 000000000..6560732ed
--- /dev/null
+++ b/data/cities/chatel/intersport-chemin-de-sous-le-cret.yml
@@ -0,0 +1,11 @@
+id: 3170166357
+type: node
+latitude: 46.2669
+longitude: 6.84214
+postcode: "74390"
+city: Châtel
+street: Chemin de Sous le Crêt
+housenumber: "167"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/chatel/intersport-route-du-centre.yml b/data/cities/chatel/intersport-route-du-centre.yml
index 6bdcdd47d..b3276e3b7 100644
--- a/data/cities/chatel/intersport-route-du-centre.yml
+++ b/data/cities/chatel/intersport-route-du-centre.yml
@@ -4,8 +4,8 @@ latitude: 46.26754
 longitude: 6.84136
 postcode: "74390"
 city: Châtel
-street: "Route du Centre"
-housenumber: 154
+street: Route du Centre
+housenumber: "154"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/intersport-route-du-linga.yml b/data/cities/chatel/intersport-route-du-linga.yml
index d3680bd59..9336fb085 100644
--- a/data/cities/chatel/intersport-route-du-linga.yml
+++ b/data/cities/chatel/intersport-route-du-linga.yml
@@ -4,8 +4,8 @@ latitude: 46.26665
 longitude: 6.84074
 postcode: "74390"
 city: Châtel
-street: "Route du Linga"
-housenumber: 66
+street: Route du Linga
+housenumber: "66"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/intersport-route-du-petit-chatel.yml b/data/cities/chatel/intersport-route-du-petit-chatel.yml
deleted file mode 100644
index 8498e5777..000000000
--- a/data/cities/chatel/intersport-route-du-petit-chatel.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3170152869
-type: node
-latitude: 46.27714
-longitude: 6.83613
-postcode: "74390"
-city: Châtel
-street: "Route du Petit Châtel"
-housenumber: 115
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/chatel/intersport.yml b/data/cities/chatel/intersport.yml
index 6ae4e6f05..fb2792d1f 100644
--- a/data/cities/chatel/intersport.yml
+++ b/data/cities/chatel/intersport.yml
@@ -1,11 +1,11 @@
-id: 3170166357
+id: 3170152869
 type: node
-latitude: 46.2669
-longitude: 6.84214
+latitude: 46.27714
+longitude: 6.83613
 postcode: "74390"
 city: Châtel
-street: "Chemin de Sous le Crêt"
-housenumber: 167
+street: Route du Petit Châtel
+housenumber: "115"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/le-grenier-de-chatel.yml b/data/cities/chatel/le-grenier-de-chatel.yml
index 215f30ac7..65ea53897 100644
--- a/data/cities/chatel/le-grenier-de-chatel.yml
+++ b/data/cities/chatel/le-grenier-de-chatel.yml
@@ -1,11 +1,11 @@
 id: 693878817
-type: way
+type: node
 latitude: 46.26525
 longitude: 6.84102
 postcode: "74390"
 city: Châtel
-street: "Route du Linga"
-housenumber: 207
+street: Route du Linga
+housenumber: "207"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/les-delices-de-chatel.yml b/data/cities/chatel/les-delices-de-chatel.yml
index 755a23f75..f671c835f 100644
--- a/data/cities/chatel/les-delices-de-chatel.yml
+++ b/data/cities/chatel/les-delices-de-chatel.yml
@@ -4,8 +4,8 @@ latitude: 46.26522
 longitude: 6.84089
 postcode: "74390"
 city: Châtel
-street: "Route du Linga"
-housenumber: 207
+street: Route du Linga
+housenumber: "207"
 phone: ""
-opening_hours: "Mo-Su 09:30-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:30-12:30, 15:00-19:00
+website: ""
diff --git a/data/cities/chatel/richard-sports.yml b/data/cities/chatel/richard-sports.yml
index 52ea0122d..f698304df 100644
--- a/data/cities/chatel/richard-sports.yml
+++ b/data/cities/chatel/richard-sports.yml
@@ -1,11 +1,11 @@
 id: 66891825
-type: way
+type: node
 latitude: 46.26625
 longitude: 6.84055
 postcode: "74390"
 city: Châtel
-street: "Route du Linga"
-housenumber: 98
+street: Route du Linga
+housenumber: "98"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/sherpa.yml b/data/cities/chatel/sherpa.yml
index ac255c92b..741b9153d 100644
--- a/data/cities/chatel/sherpa.yml
+++ b/data/cities/chatel/sherpa.yml
@@ -4,8 +4,9 @@ latitude: 46.26369
 longitude: 6.84034
 postcode: "74390"
 city: Châtel
-street: "Chemin de l'Étringa"
-housenumber: 125
+street: Chemin de l'Étringa
+housenumber: "125"
 phone: ""
-opening_hours: "Oct 01-May 31 Mo-Su 07:30-12:30, 15:00-19:15; Jun 01-Sep 30 Mo-Su 07:30-12:15, 15:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Oct 01-May 31 Mo-Su 07:30-12:30, 15:00-19:15; Jun 01-Sep 30 Mo-Su 07:30-12:15,
+    15:30-19:00
+website: ""
diff --git a/data/cities/chatel/ski-republic-route-de-thonon.yml b/data/cities/chatel/ski-republic-route-de-thonon.yml
index 2e6f9fe5e..db8b4cafd 100644
--- a/data/cities/chatel/ski-republic-route-de-thonon.yml
+++ b/data/cities/chatel/ski-republic-route-de-thonon.yml
@@ -4,8 +4,8 @@ latitude: 46.27232
 longitude: 6.83869
 postcode: "74390"
 city: Châtel
-street: "Route de Thonon"
-housenumber: 608
+street: Route de Thonon
+housenumber: "608"
 phone: ""
-opening_hours: "Dec-Apr: Mo-Sa 08:30-19:00; May-Nov: off"
-website: ""
\ No newline at end of file
+opening_hours: 'Dec-Apr: Mo-Sa 08:30-19:00; May-Nov: off'
+website: ""
diff --git a/data/cities/chatel/ski-republic.yml b/data/cities/chatel/ski-republic.yml
index ee6e60e9c..de60f6e33 100644
--- a/data/cities/chatel/ski-republic.yml
+++ b/data/cities/chatel/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 46.25731
 longitude: 6.82752
 postcode: "74390"
 city: Châtel
-street: "Route des Freinets"
-housenumber: 1616
+street: Route des Freinets
+housenumber: "1616"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/sport-2000.yml b/data/cities/chatel/sport-2000.yml
index c8de6944d..b68ec796b 100644
--- a/data/cities/chatel/sport-2000.yml
+++ b/data/cities/chatel/sport-2000.yml
@@ -5,7 +5,7 @@ longitude: 6.82322
 postcode: ""
 city: Châtel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatel/vincent-sport.yml b/data/cities/chatel/vincent-sport.yml
index f326543a1..22ed09a49 100644
--- a/data/cities/chatel/vincent-sport.yml
+++ b/data/cities/chatel/vincent-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.26806
 longitude: 6.84097
 postcode: "74390"
 city: Châtel
-street: "Route de Thonon"
-housenumber: 110
+street: Route de Thonon
+housenumber: "110"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:30
+website: ""
diff --git a/data/cities/chatillon-dazergues/aubade.yml b/data/cities/chatillon-dazergues/aubade.yml
index 8a7d7f45e..1ad8dc0f3 100644
--- a/data/cities/chatillon-dazergues/aubade.yml
+++ b/data/cities/chatillon-dazergues/aubade.yml
@@ -4,8 +4,8 @@ latitude: 45.87453
 longitude: 4.64576
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Route de l'Arbresle"
-housenumber: 
-phone: "+33 4 74 01 27 29"
+street: Route de l'Arbresle
+housenumber: ""
+phone: +33 4 74 01 27 29
 opening_hours: ""
-website: "https://www.espace-aubade.fr/"
\ No newline at end of file
+website: https://www.espace-aubade.fr/
diff --git a/data/cities/chatillon-dazergues/bureau-de-tabac.yml b/data/cities/chatillon-dazergues/bureau-de-tabac.yml
index a977a2ea7..206438c2b 100644
--- a/data/cities/chatillon-dazergues/bureau-de-tabac.yml
+++ b/data/cities/chatillon-dazergues/bureau-de-tabac.yml
@@ -4,8 +4,9 @@ latitude: 45.87728
 longitude: 4.64543
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Place de la Mairie"
-housenumber: 25
+street: Place de la Mairie
+housenumber: "25"
 phone: ""
-opening_hours: "Mo 06:15-12:30,14:30-19:00; Tu 06:15-12:30,14:30-19:00; We 06:15-12:30,14:30-19:00; Th 06:15-12:30; Fr 06:15-12:30,14:30-19:00; Sa 07:00-12:30,14:30-19:00; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 06:15-12:30,14:30-19:00; Tu 06:15-12:30,14:30-19:00; We 06:15-12:30,14:30-19:00;
+    Th 06:15-12:30; Fr 06:15-12:30,14:30-19:00; Sa 07:00-12:30,14:30-19:00; Su 07:30-12:30
+website: ""
diff --git a/data/cities/chatillon-dazergues/coiffeur.yml b/data/cities/chatillon-dazergues/coiffeur.yml
index 6995401b0..95ba5ceb2 100644
--- a/data/cities/chatillon-dazergues/coiffeur.yml
+++ b/data/cities/chatillon-dazergues/coiffeur.yml
@@ -4,8 +4,8 @@ latitude: 45.87704
 longitude: 4.64451
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Route de la Vallée"
-housenumber: 
+street: Route de la Vallée
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatillon-dazergues/elixir-des-pierres-dorees.yml b/data/cities/chatillon-dazergues/elixir-des-pierres-dorees.yml
index 150e5931a..5e15fbdd7 100644
--- a/data/cities/chatillon-dazergues/elixir-des-pierres-dorees.yml
+++ b/data/cities/chatillon-dazergues/elixir-des-pierres-dorees.yml
@@ -4,8 +4,8 @@ latitude: 45.87727
 longitude: 4.64443
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Route de la Vallée"
-housenumber: 1059
+street: Route de la Vallée
+housenumber: "1059"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatillon-dazergues/krystele-coiffure.yml b/data/cities/chatillon-dazergues/krystele-coiffure.yml
index 4e5779817..210b9f63d 100644
--- a/data/cities/chatillon-dazergues/krystele-coiffure.yml
+++ b/data/cities/chatillon-dazergues/krystele-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.87534
 longitude: 4.64443
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Zone d'aménagement concerté de la Gare"
-housenumber: 
+street: Zone d'aménagement concerté de la Gare
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatillon-dazergues/la-maison-nicolas.yml b/data/cities/chatillon-dazergues/la-maison-nicolas.yml
index 8476495af..3132e7d52 100644
--- a/data/cities/chatillon-dazergues/la-maison-nicolas.yml
+++ b/data/cities/chatillon-dazergues/la-maison-nicolas.yml
@@ -4,8 +4,8 @@ latitude: 45.88216
 longitude: 4.63193
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Chemin le Sandar"
-housenumber: 
+street: Chemin le Sandar
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatillon-dazergues/le-puits-damour.yml b/data/cities/chatillon-dazergues/le-puits-damour.yml
index 17e6ab00e..5ab25d938 100644
--- a/data/cities/chatillon-dazergues/le-puits-damour.yml
+++ b/data/cities/chatillon-dazergues/le-puits-damour.yml
@@ -4,8 +4,8 @@ latitude: 45.87678
 longitude: 4.64487
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Route de la Vallée"
-housenumber: 1568
+street: Route de la Vallée
+housenumber: "1568"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatillon-dazergues/les-fleurs-de-clarisse.yml b/data/cities/chatillon-dazergues/les-fleurs-de-clarisse.yml
index 0c225be70..58ca2d7cb 100644
--- a/data/cities/chatillon-dazergues/les-fleurs-de-clarisse.yml
+++ b/data/cities/chatillon-dazergues/les-fleurs-de-clarisse.yml
@@ -4,8 +4,8 @@ latitude: 45.87694
 longitude: 4.64466
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Route de la Vallée"
-housenumber: 1542
+street: Route de la Vallée
+housenumber: "1542"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 09:30-12:30,15:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 09:30-12:30,15:00-19:00; Su off
+website: ""
diff --git a/data/cities/chatillon-dazergues/mathelin.yml b/data/cities/chatillon-dazergues/mathelin.yml
index 78a95674b..132fbec89 100644
--- a/data/cities/chatillon-dazergues/mathelin.yml
+++ b/data/cities/chatillon-dazergues/mathelin.yml
@@ -4,8 +4,8 @@ latitude: 45.88226
 longitude: 4.63128
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Chamin de Sandar"
-housenumber: 385
+street: Chamin de Sandar
+housenumber: "385"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatillon-dazergues/superette-panier-sympa.yml b/data/cities/chatillon-dazergues/superette-panier-sympa.yml
index 00e064379..731960812 100644
--- a/data/cities/chatillon-dazergues/superette-panier-sympa.yml
+++ b/data/cities/chatillon-dazergues/superette-panier-sympa.yml
@@ -4,8 +4,8 @@ latitude: 45.87734
 longitude: 4.64516
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Place du 11 Novembre"
-housenumber: 59
+street: Place du 11 Novembre
+housenumber: "59"
 phone: "0478477121"
-opening_hours: "Mo-Fr 08:00-12:30,15:30-19:30; Sa 07:00-12:30,15:30-19:30; Su 08:00-12:30"
-website: "https://www.facebook.com/Panier.Sympa.Chatillon/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:30,15:30-19:30; Sa 07:00-12:30,15:30-19:30; Su 08:00-12:30
+website: https://www.facebook.com/Panier.Sympa.Chatillon/
diff --git a/data/cities/chatillon-dazergues/terres-lyonnaises-chatillon.yml b/data/cities/chatillon-dazergues/terres-lyonnaises-chatillon.yml
index 3c6986d8c..f3eb75f21 100644
--- a/data/cities/chatillon-dazergues/terres-lyonnaises-chatillon.yml
+++ b/data/cities/chatillon-dazergues/terres-lyonnaises-chatillon.yml
@@ -4,8 +4,8 @@ latitude: 45.88221
 longitude: 4.63166
 postcode: "69380"
 city: Châtillon-d'Azergues
-street: "Chemin de Sandar"
-housenumber: 39
+street: Chemin de Sandar
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatillon-sur-chalaronne/carrefour-market.yml b/data/cities/chatillon-sur-chalaronne/carrefour-market.yml
index 6d4881112..d8e8c9240 100644
--- a/data/cities/chatillon-sur-chalaronne/carrefour-market.yml
+++ b/data/cities/chatillon-sur-chalaronne/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 189523567
-type: way
+type: node
 latitude: 46.12177
 longitude: 4.95286
 postcode: ""
 city: Châtillon-sur-Chalaronne
 street: ""
-housenumber: 
-phone: "+33 4 74 55 00 32"
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:30"
-website: "https://www.carrefour.fr/magasin/market-chatillon-sur-chalaronne"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 55 00 32
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:30
+website: https://www.carrefour.fr/magasin/market-chatillon-sur-chalaronne
diff --git a/data/cities/chatillon-sur-chalaronne/mr-bricolage.yml b/data/cities/chatillon-sur-chalaronne/mr-bricolage.yml
index f4114603c..af0a8c8dc 100644
--- a/data/cities/chatillon-sur-chalaronne/mr-bricolage.yml
+++ b/data/cities/chatillon-sur-chalaronne/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 189526921
-type: way
+type: node
 latitude: 46.11639
 longitude: 4.96381
 postcode: "01400"
 city: Châtillon-sur-Chalaronne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatonnay/proxi.yml b/data/cities/chatonnay/proxi.yml
index 8d38cde0f..5a9dde3f4 100644
--- a/data/cities/chatonnay/proxi.yml
+++ b/data/cities/chatonnay/proxi.yml
@@ -4,8 +4,9 @@ latitude: 45.48654
 longitude: 5.2097
 postcode: "38440"
 city: Châtonnay
-street: "Rue des Tisserands"
+street: Rue des Tisserands
 housenumber: 2-4
 phone: ""
-opening_hours: "Mo-Tu,Th-Sa 06:30-12:30,15:00-19:00; We 07:30-12:00; Su 06:30-12:30; PH off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Sa 06:30-12:30,15:00-19:00; We 07:30-12:00; Su 06:30-12:30;
+    PH off
+website: ""
diff --git a/data/cities/chatte/aprecial.yml b/data/cities/chatte/aprecial.yml
index fa8f72f40..97517f00a 100644
--- a/data/cities/chatte/aprecial.yml
+++ b/data/cities/chatte/aprecial.yml
@@ -4,8 +4,8 @@ latitude: 45.14533
 longitude: 5.30456
 postcode: "38160"
 city: Chatte
-street: "Z.I Les Gameux"
-housenumber: 
+street: Z.I Les Gameux
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/chatte/atol.yml b/data/cities/chatte/atol.yml
index 09794b2a5..8b88e9d51 100644
--- a/data/cities/chatte/atol.yml
+++ b/data/cities/chatte/atol.yml
@@ -4,8 +4,8 @@ latitude: 45.14547
 longitude: 5.30504
 postcode: "38160"
 city: Chatte
-street: "Z.I Les Gameux"
-housenumber: 
+street: Z.I Les Gameux
+housenumber: ""
 phone: ""
-opening_hours: "Tu,We,Fr,Sa 09:00-13:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,We,Fr,Sa 09:00-13:00,14:00-19:00
+website: ""
diff --git a/data/cities/chatte/au-palais-fermier.yml b/data/cities/chatte/au-palais-fermier.yml
index 7d1063e9c..fdee1cd1f 100644
--- a/data/cities/chatte/au-palais-fermier.yml
+++ b/data/cities/chatte/au-palais-fermier.yml
@@ -4,8 +4,8 @@ latitude: 45.14266
 longitude: 5.30234
 postcode: "38160"
 city: Chatte
-street: "ZI la Gloriette"
-housenumber: 1005
+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
+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/
diff --git a/data/cities/chatte/blackstore.yml b/data/cities/chatte/blackstore.yml
index 21681429d..d076542f2 100644
--- a/data/cities/chatte/blackstore.yml
+++ b/data/cities/chatte/blackstore.yml
@@ -1,11 +1,11 @@
 id: 129740187
-type: way
+type: node
 latitude: 45.1448
 longitude: 5.30331
 postcode: "38160"
 city: Chatte
 street: ""
-housenumber: 92
+housenumber: "92"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/chatte/capvital.yml b/data/cities/chatte/capvital.yml
index b185e563b..3aa01dbcd 100644
--- a/data/cities/chatte/capvital.yml
+++ b/data/cities/chatte/capvital.yml
@@ -4,8 +4,8 @@ latitude: 45.14546
 longitude: 5.30672
 postcode: "38160"
 city: Chatte
-street: "Chemin des Gameux"
-housenumber: 
+street: Chemin des Gameux
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-18:30; Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:30; Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/chatte/centre-commercial-e-leclerc.yml b/data/cities/chatte/centre-commercial-e-leclerc.yml
index 1eb16a9a6..eeb883721 100644
--- a/data/cities/chatte/centre-commercial-e-leclerc.yml
+++ b/data/cities/chatte/centre-commercial-e-leclerc.yml
@@ -1,11 +1,11 @@
 id: 129741321
-type: way
+type: node
 latitude: 45.14538
 longitude: 5.30526
 postcode: "38160"
 city: Chatte
-street: "ZI Les Gameux"
-housenumber: 
-phone: "+33 4 76 38 31 58"
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+street: ZI Les Gameux
+housenumber: ""
+phone: +33 4 76 38 31 58
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/chatte/d-depanne-velo.yml b/data/cities/chatte/d-depanne-velo.yml
index f22d7560d..9572994a9 100644
--- a/data/cities/chatte/d-depanne-velo.yml
+++ b/data/cities/chatte/d-depanne-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.14557
 longitude: 5.2508
 postcode: "38160"
 city: Chatte
-street: "Chemin des Molles"
-housenumber: 990
-phone: "+33 6 98 98 68 04"
+street: Chemin des Molles
+housenumber: "990"
+phone: +33 6 98 98 68 04
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatte/maison-de-la-presse.yml b/data/cities/chatte/maison-de-la-presse.yml
index 4cc4467a1..d13646bce 100644
--- a/data/cities/chatte/maison-de-la-presse.yml
+++ b/data/cities/chatte/maison-de-la-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.1456
 longitude: 5.30545
 postcode: "38160"
 city: Chatte
-street: "Z.I Les Gameux"
-housenumber: 
-phone: "+33 4 76 36 58 49"
-opening_hours: "Mo-We 8:30-19:15 Th-Sa 8:30-19:45 Su 8:30-12:15"
-website: ""
\ No newline at end of file
+street: Z.I Les Gameux
+housenumber: ""
+phone: +33 4 76 36 58 49
+opening_hours: Mo-We 8:30-19:15 Th-Sa 8:30-19:45 Su 8:30-12:15
+website: ""
diff --git a/data/cities/chatte/passion-beaute.yml b/data/cities/chatte/passion-beaute.yml
index 86f90fc9c..6e659ac9a 100644
--- a/data/cities/chatte/passion-beaute.yml
+++ b/data/cities/chatte/passion-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.14557
 longitude: 5.30537
 postcode: "38160"
 city: Chatte
-street: "Z.I Les Gameux"
-housenumber: 
+street: Z.I Les Gameux
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/chatte/pilvite.yml b/data/cities/chatte/pilvite.yml
index 7108857f3..94e4543b1 100644
--- a/data/cities/chatte/pilvite.yml
+++ b/data/cities/chatte/pilvite.yml
@@ -4,8 +4,8 @@ latitude: 45.14551
 longitude: 5.30517
 postcode: "38160"
 city: Chatte
-street: "Z.I Les Gameux"
-housenumber: 
+street: Z.I Les Gameux
+housenumber: ""
 phone: "+33476641316"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/chatte/plus-de-fleurs.yml b/data/cities/chatte/plus-de-fleurs.yml
index c79e260fb..7052808d7 100644
--- a/data/cities/chatte/plus-de-fleurs.yml
+++ b/data/cities/chatte/plus-de-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.14538
 longitude: 5.3047
 postcode: "38160"
 city: Chatte
-street: "Z.I Les Gameux"
-housenumber: 
+street: Z.I Les Gameux
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/chatte/selectour.yml b/data/cities/chatte/selectour.yml
index 4d5c65552..77fcce88e 100644
--- a/data/cities/chatte/selectour.yml
+++ b/data/cities/chatte/selectour.yml
@@ -4,8 +4,8 @@ latitude: 45.14544
 longitude: 5.3049
 postcode: "38160"
 city: Chatte
-street: "Z.I Les Gameux"
-housenumber: 
+street: Z.I Les Gameux
+housenumber: ""
 phone: "+33476365750"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chatte/yves-rocher.yml b/data/cities/chatte/yves-rocher.yml
index 7e91c62f4..a211a1aa1 100644
--- a/data/cities/chatte/yves-rocher.yml
+++ b/data/cities/chatte/yves-rocher.yml
@@ -5,7 +5,7 @@ longitude: 5.30528
 postcode: "38160"
 city: Chatte
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/chatte/chatte-cc/S-FRYROC633"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/chatte/chatte-cc/S-FRYROC633
diff --git a/data/cities/chaussan/la-taniere.yml b/data/cities/chaussan/la-taniere.yml
index 70a375e5e..c8ea8d6ff 100644
--- a/data/cities/chaussan/la-taniere.yml
+++ b/data/cities/chaussan/la-taniere.yml
@@ -4,8 +4,8 @@ latitude: 45.62195
 longitude: 4.62008
 postcode: ""
 city: Chaussan
-street: "Chavagneux"
-housenumber: 
-phone: "+33 6 82 26 82 79"
-opening_hours: "Fr 16:00-20100"
-website: "https://labieredesloups.fr/la-taniere.html"
\ No newline at end of file
+street: Chavagneux
+housenumber: ""
+phone: +33 6 82 26 82 79
+opening_hours: Fr 16:00-20100
+website: https://labieredesloups.fr/la-taniere.html
diff --git a/data/cities/chaussan/le-chant-des-vergers-bio.yml b/data/cities/chaussan/le-chant-des-vergers-bio.yml
index 7311d7ae4..38cc43b28 100644
--- a/data/cities/chaussan/le-chant-des-vergers-bio.yml
+++ b/data/cities/chaussan/le-chant-des-vergers-bio.yml
@@ -4,8 +4,8 @@ latitude: 45.63072
 longitude: 4.62208
 postcode: "69440"
 city: Chaussan
-street: "Chemin du Baudoy"
-housenumber: 
-phone: "+33 6 62 73 00 54"
-opening_hours: "We,Sa 09:00-12:30"
-website: "https://www.lechantdesvergersbio.com/"
\ No newline at end of file
+street: Chemin du Baudoy
+housenumber: ""
+phone: +33 6 62 73 00 54
+opening_hours: We,Sa 09:00-12:30
+website: https://www.lechantdesvergersbio.com/
diff --git a/data/cities/chaussan/rlys-coiffure.yml b/data/cities/chaussan/rlys-coiffure.yml
index bf6f83749..8c4e85e9a 100644
--- a/data/cities/chaussan/rlys-coiffure.yml
+++ b/data/cities/chaussan/rlys-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.63372
 longitude: 4.63979
 postcode: "69440"
 city: Chaussan
-street: "Route du Richoud"
-housenumber: 26
-phone: "+33 4 78 44 08 85"
-opening_hours: "Tu-Fr 08:30-12:00,14:00-18:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+street: Route du Richoud
+housenumber: "26"
+phone: +33 4 78 44 08 85
+opening_hours: Tu-Fr 08:30-12:00,14:00-18:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/chavanoz/agpl-motos.yml b/data/cities/chavanoz/agpl-motos.yml
index 8213b8669..5314bba8a 100644
--- a/data/cities/chavanoz/agpl-motos.yml
+++ b/data/cities/chavanoz/agpl-motos.yml
@@ -4,8 +4,8 @@ latitude: 45.76646
 longitude: 5.1874
 postcode: "38230"
 city: Chavanoz
-street: "Route de Belmont"
-housenumber: 12
-phone: "+33 4 78 94 08 08"
+street: Route de Belmont
+housenumber: "12"
+phone: +33 4 78 94 08 08
 opening_hours: ""
-website: "https://www.agpl.net/"
\ No newline at end of file
+website: https://www.agpl.net/
diff --git a/data/cities/chavanoz/banette.yml b/data/cities/chavanoz/banette.yml
index c18d640ac..5e9770f95 100644
--- a/data/cities/chavanoz/banette.yml
+++ b/data/cities/chavanoz/banette.yml
@@ -4,8 +4,8 @@ latitude: 45.76705
 longitude: 5.19568
 postcode: "38230"
 city: Chavanoz
-street: "Rue de la Bourbre"
-housenumber: 1
+street: Rue de la Bourbre
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chavanoz/bar-tabac-le-prieure.yml b/data/cities/chavanoz/bar-tabac-le-prieure.yml
index 9d5652527..d3795e285 100644
--- a/data/cities/chavanoz/bar-tabac-le-prieure.yml
+++ b/data/cities/chavanoz/bar-tabac-le-prieure.yml
@@ -4,8 +4,8 @@ latitude: 45.77691
 longitude: 5.17118
 postcode: "38230"
 city: Chavanoz
-street: "Place Charles de Gaulle"
-housenumber: 
-phone: "+33 4 78 32 10 55"
+street: Place Charles de Gaulle
+housenumber: ""
+phone: +33 4 78 32 10 55
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chavanoz/cheveux-danges.yml b/data/cities/chavanoz/cheveux-danges.yml
index 1073aedd5..5e2a4b903 100644
--- a/data/cities/chavanoz/cheveux-danges.yml
+++ b/data/cities/chavanoz/cheveux-danges.yml
@@ -4,8 +4,8 @@ latitude: 45.76571
 longitude: 5.17779
 postcode: "38230"
 city: Chavanoz
-street: "Place de Belmont"
-housenumber: 4
-phone: "+33 4 78 32 40 71"
+street: Place de Belmont
+housenumber: "4"
+phone: +33 4 78 32 40 71
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chavanoz/christelle-barbin.yml b/data/cities/chavanoz/christelle-barbin.yml
index 13103ecaf..d50a01271 100644
--- a/data/cities/chavanoz/christelle-barbin.yml
+++ b/data/cities/chavanoz/christelle-barbin.yml
@@ -4,8 +4,8 @@ latitude: 45.76533
 longitude: 5.17858
 postcode: "38230"
 city: Chavanoz
-street: "Rue de la Poste"
-housenumber: 
-phone: "+33 4 72 02 74 86"
+street: Rue de la Poste
+housenumber: ""
+phone: +33 4 72 02 74 86
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chavanoz/le-chavanoze.yml b/data/cities/chavanoz/le-chavanoze.yml
index 259930a63..fb07053cd 100644
--- a/data/cities/chavanoz/le-chavanoze.yml
+++ b/data/cities/chavanoz/le-chavanoze.yml
@@ -4,8 +4,8 @@ latitude: 45.7658
 longitude: 5.1788
 postcode: "38230"
 city: Chavanoz
-street: "Rue du Ronget"
-housenumber: 1
+street: Rue du Ronget
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chavanoz/thierry-jas.yml b/data/cities/chavanoz/thierry-jas.yml
index aff914a5d..f6193726c 100644
--- a/data/cities/chavanoz/thierry-jas.yml
+++ b/data/cities/chavanoz/thierry-jas.yml
@@ -4,8 +4,8 @@ latitude: 45.76602
 longitude: 5.17859
 postcode: "38230"
 city: Chavanoz
-street: "Rue du Ronget"
-housenumber: 4
-phone: "+33 4 78 32 48 54"
+street: Rue du Ronget
+housenumber: "4"
+phone: +33 4 78 32 48 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chavanoz/vival-by-casino.yml b/data/cities/chavanoz/vival-by-casino.yml
index 132ecdfb1..e61b3f2b2 100644
--- a/data/cities/chavanoz/vival-by-casino.yml
+++ b/data/cities/chavanoz/vival-by-casino.yml
@@ -1,11 +1,11 @@
 id: 696888359
-type: way
+type: node
 latitude: 45.76746
 longitude: 5.19653
 postcode: "38230"
 city: Chavanoz
-street: "Route de Loyettes"
-housenumber: 
-phone: "+33 9 87 03 49 32"
-opening_hours: "Mo-Sa 08:30-12:30,15:30-20:00; Su 08:30-12:30"
-website: "https://magasins.vival.fr/fr/vival-chavanoz"
\ No newline at end of file
+street: Route de Loyettes
+housenumber: ""
+phone: +33 9 87 03 49 32
+opening_hours: Mo-Sa 08:30-12:30,15:30-20:00; Su 08:30-12:30
+website: https://magasins.vival.fr/fr/vival-chavanoz
diff --git a/data/cities/chazay-dazergues/gourmandises-des-pierres-dorees.yml b/data/cities/chazay-dazergues/gourmandises-des-pierres-dorees.yml
index 6fe967418..ab7b1e47b 100644
--- a/data/cities/chazay-dazergues/gourmandises-des-pierres-dorees.yml
+++ b/data/cities/chazay-dazergues/gourmandises-des-pierres-dorees.yml
@@ -4,8 +4,8 @@ latitude: 45.87428
 longitude: 4.71162
 postcode: "69380"
 city: Chazay-d'Azergues
-street: "Grande Rue"
-housenumber: 38
+street: Grande Rue
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/11-11-tattoo-shop.yml b/data/cities/chazelles-sur-lyon/11-11-tattoo-shop.yml
index e3bd78d9b..86c20a507 100644
--- a/data/cities/chazelles-sur-lyon/11-11-tattoo-shop.yml
+++ b/data/cities/chazelles-sur-lyon/11-11-tattoo-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.63771
 longitude: 4.39043
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue de l'Église"
-housenumber: 11
+street: Rue de l'Église
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/acoustique-wernert.yml b/data/cities/chazelles-sur-lyon/acoustique-wernert.yml
index 5d55c26d2..4d42ec9c0 100644
--- a/data/cities/chazelles-sur-lyon/acoustique-wernert.yml
+++ b/data/cities/chazelles-sur-lyon/acoustique-wernert.yml
@@ -4,8 +4,8 @@ latitude: 45.63829
 longitude: 4.39212
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Lafont"
-housenumber: 9
+street: Rue Lafont
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/affirmatif.yml b/data/cities/chazelles-sur-lyon/affirmatif.yml
index db1cc147c..cbaa2cad7 100644
--- a/data/cities/chazelles-sur-lyon/affirmatif.yml
+++ b/data/cities/chazelles-sur-lyon/affirmatif.yml
@@ -4,8 +4,8 @@ latitude: 45.63831
 longitude: 4.39117
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 15
+street: Rue Alexandre Séon
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/art-et-senteurs.yml b/data/cities/chazelles-sur-lyon/art-et-senteurs.yml
index 15e1b9659..1684015db 100644
--- a/data/cities/chazelles-sur-lyon/art-et-senteurs.yml
+++ b/data/cities/chazelles-sur-lyon/art-et-senteurs.yml
@@ -4,8 +4,8 @@ latitude: 45.63835
 longitude: 4.39126
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 11
+street: Rue Alexandre Séon
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/au-chien-coquet.yml b/data/cities/chazelles-sur-lyon/au-chien-coquet.yml
index 46c8a3374..015d839d1 100644
--- a/data/cities/chazelles-sur-lyon/au-chien-coquet.yml
+++ b/data/cities/chazelles-sur-lyon/au-chien-coquet.yml
@@ -4,8 +4,8 @@ latitude: 45.63781
 longitude: 4.39273
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Place de la Poterne"
-housenumber: 8
+street: Place de la Poterne
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/au-fournil-dherve-et-sophie.yml b/data/cities/chazelles-sur-lyon/au-fournil-dherve-et-sophie.yml
index 60f35b436..f492197a9 100644
--- a/data/cities/chazelles-sur-lyon/au-fournil-dherve-et-sophie.yml
+++ b/data/cities/chazelles-sur-lyon/au-fournil-dherve-et-sophie.yml
@@ -4,8 +4,8 @@ latitude: 45.63745
 longitude: 4.39208
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Boulevard Étienne Peronnet"
-housenumber: 4
+street: Boulevard Étienne Peronnet
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/au-jardin-secret.yml b/data/cities/chazelles-sur-lyon/au-jardin-secret.yml
index b3019e39d..c6144b1bd 100644
--- a/data/cities/chazelles-sur-lyon/au-jardin-secret.yml
+++ b/data/cities/chazelles-sur-lyon/au-jardin-secret.yml
@@ -4,8 +4,8 @@ latitude: 45.63733
 longitude: 4.38956
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Max Fléchet"
-housenumber: 17
+street: Rue Max Fléchet
+housenumber: "17"
 phone: "+33477542375"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/boucherie-les-bouchers-doubles.yml b/data/cities/chazelles-sur-lyon/boucherie-les-bouchers-doubles.yml
index e66113222..94c030355 100644
--- a/data/cities/chazelles-sur-lyon/boucherie-les-bouchers-doubles.yml
+++ b/data/cities/chazelles-sur-lyon/boucherie-les-bouchers-doubles.yml
@@ -4,8 +4,8 @@ latitude: 45.63745
 longitude: 4.3895
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Max Fléchet"
-housenumber: 22
+street: Rue Max Fléchet
+housenumber: "22"
 phone: "+33477549862"
-opening_hours: "Tu-Sa 07:00-13:00; Fr 07:00-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:00-13:00; Fr 07:00-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/boucherie-rey-herve-et-lapeze-mandy.yml b/data/cities/chazelles-sur-lyon/boucherie-rey-herve-et-lapeze-mandy.yml
index a7d3095d8..3de70b0f0 100644
--- a/data/cities/chazelles-sur-lyon/boucherie-rey-herve-et-lapeze-mandy.yml
+++ b/data/cities/chazelles-sur-lyon/boucherie-rey-herve-et-lapeze-mandy.yml
@@ -4,8 +4,8 @@ latitude: 45.63851
 longitude: 4.39134
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 10
+street: Rue Alexandre Séon
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/boulangerie-du-petit-fanou.yml b/data/cities/chazelles-sur-lyon/boulangerie-du-petit-fanou.yml
index 7da1c2e83..7abce4a28 100644
--- a/data/cities/chazelles-sur-lyon/boulangerie-du-petit-fanou.yml
+++ b/data/cities/chazelles-sur-lyon/boulangerie-du-petit-fanou.yml
@@ -4,8 +4,8 @@ latitude: 45.6385
 longitude: 4.39225
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Saint-Roch"
-housenumber: 8
+street: Rue Saint-Roch
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/boulangerie-vericel-guyot.yml b/data/cities/chazelles-sur-lyon/boulangerie-vericel-guyot.yml
index d02d1ef0f..57b419199 100644
--- a/data/cities/chazelles-sur-lyon/boulangerie-vericel-guyot.yml
+++ b/data/cities/chazelles-sur-lyon/boulangerie-vericel-guyot.yml
@@ -4,8 +4,8 @@ latitude: 45.63753
 longitude: 4.38962
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Max Fléchet"
-housenumber: 16
+street: Rue Max Fléchet
+housenumber: "16"
 phone: "+33477542554"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/bureau-de-tabac-colly.yml b/data/cities/chazelles-sur-lyon/bureau-de-tabac-colly.yml
index c41d292ba..906c7c732 100644
--- a/data/cities/chazelles-sur-lyon/bureau-de-tabac-colly.yml
+++ b/data/cities/chazelles-sur-lyon/bureau-de-tabac-colly.yml
@@ -4,8 +4,8 @@ latitude: 45.63686
 longitude: 4.38845
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Max Fléchet"
-housenumber: 48
+street: Rue Max Fléchet
+housenumber: "48"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/cafe-librairie-la-maison-bleue.yml b/data/cities/chazelles-sur-lyon/cafe-librairie-la-maison-bleue.yml
index 85ff84f6a..3b5ee78b6 100644
--- a/data/cities/chazelles-sur-lyon/cafe-librairie-la-maison-bleue.yml
+++ b/data/cities/chazelles-sur-lyon/cafe-librairie-la-maison-bleue.yml
@@ -1,11 +1,11 @@
 id: 313004593
-type: way
+type: node
 latitude: 45.63581
 longitude: 4.38335
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Allée de la Châtelaine"
-housenumber: 3
+street: Allée de la Châtelaine
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/chaussures-martine.yml b/data/cities/chazelles-sur-lyon/chaussures-martine.yml
index cda8c2b9d..9773bb523 100644
--- a/data/cities/chazelles-sur-lyon/chaussures-martine.yml
+++ b/data/cities/chazelles-sur-lyon/chaussures-martine.yml
@@ -4,8 +4,8 @@ latitude: 45.63767
 longitude: 4.39034
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue de l'Église"
-housenumber: 13
+street: Rue de l'Église
+housenumber: "13"
 phone: "+33477543104"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/chrystyl.yml b/data/cities/chazelles-sur-lyon/chrystyl.yml
index 9156c3931..4f7444321 100644
--- a/data/cities/chazelles-sur-lyon/chrystyl.yml
+++ b/data/cities/chazelles-sur-lyon/chrystyl.yml
@@ -4,8 +4,8 @@ latitude: 45.63849
 longitude: 4.39217
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Saint-Roch"
-housenumber: 6
+street: Rue Saint-Roch
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/clean-micro.yml b/data/cities/chazelles-sur-lyon/clean-micro.yml
index d563f579b..211313aea 100644
--- a/data/cities/chazelles-sur-lyon/clean-micro.yml
+++ b/data/cities/chazelles-sur-lyon/clean-micro.yml
@@ -4,8 +4,8 @@ latitude: 45.63859
 longitude: 4.39163
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 2
+street: Rue Alexandre Séon
+housenumber: "2"
 phone: "+33477547993"
 opening_hours: ""
-website: "https://www.clean-micro.fr"
\ No newline at end of file
+website: https://www.clean-micro.fr
diff --git a/data/cities/chazelles-sur-lyon/coiffure-creation.yml b/data/cities/chazelles-sur-lyon/coiffure-creation.yml
index cc3f3ffbd..dfec7e9ed 100644
--- a/data/cities/chazelles-sur-lyon/coiffure-creation.yml
+++ b/data/cities/chazelles-sur-lyon/coiffure-creation.yml
@@ -4,8 +4,8 @@ latitude: 45.63777
 longitude: 4.39014
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Max Fléchet"
-housenumber: 4
+street: Rue Max Fléchet
+housenumber: "4"
 phone: "+33477542316"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/couaff-moi.yml b/data/cities/chazelles-sur-lyon/couaff-moi.yml
index 2af76a9fc..fcaf53798 100644
--- a/data/cities/chazelles-sur-lyon/couaff-moi.yml
+++ b/data/cities/chazelles-sur-lyon/couaff-moi.yml
@@ -4,8 +4,8 @@ latitude: 45.63831
 longitude: 4.39186
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Lafont"
-housenumber: 10
+street: Rue Lafont
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/crapouillette.yml b/data/cities/chazelles-sur-lyon/crapouillette.yml
index 2b91ff75a..79115d786 100644
--- a/data/cities/chazelles-sur-lyon/crapouillette.yml
+++ b/data/cities/chazelles-sur-lyon/crapouillette.yml
@@ -4,8 +4,8 @@ latitude: 45.63836
 longitude: 4.39465
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Marguerite Gonon"
-housenumber: 10
+street: Rue Marguerite Gonon
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: "https://www.crapouillette.com"
\ No newline at end of file
+website: https://www.crapouillette.com
diff --git a/data/cities/chazelles-sur-lyon/espace-38.yml b/data/cities/chazelles-sur-lyon/espace-38.yml
index cfb03a279..1623f75ae 100644
--- a/data/cities/chazelles-sur-lyon/espace-38.yml
+++ b/data/cities/chazelles-sur-lyon/espace-38.yml
@@ -4,8 +4,8 @@ latitude: 45.63815
 longitude: 4.39044
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 38
+street: Rue Alexandre Séon
+housenumber: "38"
 phone: "+33477542143"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/geraldine-colly.yml b/data/cities/chazelles-sur-lyon/geraldine-colly.yml
index 2544aa650..3b6d86d99 100644
--- a/data/cities/chazelles-sur-lyon/geraldine-colly.yml
+++ b/data/cities/chazelles-sur-lyon/geraldine-colly.yml
@@ -4,8 +4,8 @@ latitude: 45.638
 longitude: 4.39063
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 25
+street: Rue Alexandre Séon
+housenumber: "25"
 phone: "+33477542369"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/gifi.yml b/data/cities/chazelles-sur-lyon/gifi.yml
index 6fafcd1af..83b2045d6 100644
--- a/data/cities/chazelles-sur-lyon/gifi.yml
+++ b/data/cities/chazelles-sur-lyon/gifi.yml
@@ -4,8 +4,8 @@ latitude: 45.63488
 longitude: 4.38051
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Lamartine"
-housenumber: 24
+street: Rue Lamartine
+housenumber: "24"
 phone: "+33477545235"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/institut-coralie.yml b/data/cities/chazelles-sur-lyon/institut-coralie.yml
index cf7e95482..16efdba00 100644
--- a/data/cities/chazelles-sur-lyon/institut-coralie.yml
+++ b/data/cities/chazelles-sur-lyon/institut-coralie.yml
@@ -4,8 +4,8 @@ latitude: 45.63781
 longitude: 4.39163
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Place de la Poterne"
-housenumber: 16
+street: Place de la Poterne
+housenumber: "16"
 phone: "+33477542418"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/intermarche.yml b/data/cities/chazelles-sur-lyon/intermarche.yml
index 389940537..c9fc7300f 100644
--- a/data/cities/chazelles-sur-lyon/intermarche.yml
+++ b/data/cities/chazelles-sur-lyon/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.63377
 longitude: 4.38114
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Lamartine"
-housenumber: 25
+street: Rue Lamartine
+housenumber: "25"
 phone: "+33477206200"
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/justun-regard.yml b/data/cities/chazelles-sur-lyon/justun-regard.yml
index 15932a75d..f995f9a43 100644
--- a/data/cities/chazelles-sur-lyon/justun-regard.yml
+++ b/data/cities/chazelles-sur-lyon/justun-regard.yml
@@ -4,8 +4,8 @@ latitude: 45.63825
 longitude: 4.39103
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 19
+street: Rue Alexandre Séon
+housenumber: "19"
 phone: "+33477542207"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00"
-website: "https://justunregard.com/magasins/opticien-chazelles-sur-lyon/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00
+website: https://justunregard.com/magasins/opticien-chazelles-sur-lyon/
diff --git a/data/cities/chazelles-sur-lyon/la-cave-des-chapeliers.yml b/data/cities/chazelles-sur-lyon/la-cave-des-chapeliers.yml
index 6a013ef10..c0a74c818 100644
--- a/data/cities/chazelles-sur-lyon/la-cave-des-chapeliers.yml
+++ b/data/cities/chazelles-sur-lyon/la-cave-des-chapeliers.yml
@@ -4,8 +4,8 @@ latitude: 45.63744
 longitude: 4.38819
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue de Versailles"
-housenumber: 10
+street: Rue de Versailles
+housenumber: "10"
 phone: "+33477542575"
-opening_hours: "Tu-Fr 08:30-12:00,15:00-19:00; Sa 08:30-12:00,15:00-18:30"
-website: "https://la-cave-des-chapeliers.business.site"
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-12:00,15:00-19:00; Sa 08:30-12:00,15:00-18:30
+website: https://la-cave-des-chapeliers.business.site
diff --git a/data/cities/chazelles-sur-lyon/les-gourmandises.yml b/data/cities/chazelles-sur-lyon/les-gourmandises.yml
index 3427c76e2..969a2d716 100644
--- a/data/cities/chazelles-sur-lyon/les-gourmandises.yml
+++ b/data/cities/chazelles-sur-lyon/les-gourmandises.yml
@@ -4,8 +4,8 @@ latitude: 45.63742
 longitude: 4.38943
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Max Fléchet"
-housenumber: 24
+street: Rue Max Fléchet
+housenumber: "24"
 phone: "+33477542471"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/ma-folie-relook.yml b/data/cities/chazelles-sur-lyon/ma-folie-relook.yml
index ada587286..3d141b6b0 100644
--- a/data/cities/chazelles-sur-lyon/ma-folie-relook.yml
+++ b/data/cities/chazelles-sur-lyon/ma-folie-relook.yml
@@ -4,8 +4,8 @@ latitude: 45.63793
 longitude: 4.39023
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 48
+street: Rue Alexandre Séon
+housenumber: "48"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/petit-casino.yml b/data/cities/chazelles-sur-lyon/petit-casino.yml
index 8d692ae35..60e3a6ccd 100644
--- a/data/cities/chazelles-sur-lyon/petit-casino.yml
+++ b/data/cities/chazelles-sur-lyon/petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.63825
 longitude: 4.39063
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Alexandre Séon"
-housenumber: 32
+street: Rue Alexandre Séon
+housenumber: "32"
 phone: "+33477542015"
-opening_hours: "Tu-Sa 07:30-12:30,14:30-19:30; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,14:30-19:30; Su 07:30-12:30
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/primeur-fatisson.yml b/data/cities/chazelles-sur-lyon/primeur-fatisson.yml
index 1993f78f8..07f67b018 100644
--- a/data/cities/chazelles-sur-lyon/primeur-fatisson.yml
+++ b/data/cities/chazelles-sur-lyon/primeur-fatisson.yml
@@ -4,8 +4,8 @@ latitude: 45.63739
 longitude: 4.38965
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Rue Max Fléchet"
-housenumber: 15
+street: Rue Max Fléchet
+housenumber: "15"
 phone: "+33477542205"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazelles-sur-lyon/sajou.yml b/data/cities/chazelles-sur-lyon/sajou.yml
index e8451cb88..c6165eb41 100644
--- a/data/cities/chazelles-sur-lyon/sajou.yml
+++ b/data/cities/chazelles-sur-lyon/sajou.yml
@@ -4,8 +4,8 @@ latitude: 45.6387
 longitude: 4.39203
 postcode: "42140"
 city: Chazelles-sur-Lyon
-street: "Carrefour Saint-Roch"
-housenumber: 3
+street: Carrefour Saint-Roch
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chazey-sur-ain/le-pain-de-chazey.yml b/data/cities/chazey-sur-ain/le-pain-de-chazey.yml
index 50c307685..8da31b0b2 100644
--- a/data/cities/chazey-sur-ain/le-pain-de-chazey.yml
+++ b/data/cities/chazey-sur-ain/le-pain-de-chazey.yml
@@ -4,8 +4,8 @@ latitude: 45.89326
 longitude: 5.25503
 postcode: "01150"
 city: Chazey-sur-Ain
-street: "Grande Rue"
-housenumber: 39
+street: Grande Rue
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chene-en-semine/savoie-volailles.yml b/data/cities/chene-en-semine/savoie-volailles.yml
index 6aee2ff25..d786ab782 100644
--- a/data/cities/chene-en-semine/savoie-volailles.yml
+++ b/data/cities/chene-en-semine/savoie-volailles.yml
@@ -1,11 +1,11 @@
 id: 62982931
-type: way
+type: node
 latitude: 46.06244
 longitude: 5.86809
 postcode: "74270"
 city: Chêne-en-Semine
-street: "La Croisée"
-housenumber: 
+street: La Croisée
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chenex/mini-ruche-du-vuache-la-ruche-qui-dit-oui.yml b/data/cities/chenex/mini-ruche-du-vuache-la-ruche-qui-dit-oui.yml
index 58c64dbdc..c7e418d14 100644
--- a/data/cities/chenex/mini-ruche-du-vuache-la-ruche-qui-dit-oui.yml
+++ b/data/cities/chenex/mini-ruche-du-vuache-la-ruche-qui-dit-oui.yml
@@ -4,8 +4,8 @@ latitude: 46.10312
 longitude: 5.99415
 postcode: "74520"
 city: Chênex
-street: "Route de la Mesalière"
-housenumber: 194
+street: Route de la Mesalière
+housenumber: "194"
 phone: ""
-opening_hours: "Fr 18:15-19:15"
-website: ""
\ No newline at end of file
+opening_hours: Fr 18:15-19:15
+website: ""
diff --git a/data/cities/chevinay/atelier-velo-de-chevinay.yml b/data/cities/chevinay/atelier-velo-de-chevinay.yml
index 1af90f891..e675202e6 100644
--- a/data/cities/chevinay/atelier-velo-de-chevinay.yml
+++ b/data/cities/chevinay/atelier-velo-de-chevinay.yml
@@ -4,8 +4,8 @@ latitude: 45.77003
 longitude: 4.60685
 postcode: "69210"
 city: Chevinay
-street: "Route de la Croix de Crécy"
-housenumber: 75
-phone: "+33 4 28 29 82 57"
-opening_hours: "Mo-Fr 11:00-19:00, Sat 9:00-18:00"
-website: "https://ateliervelochevinay.fr"
\ No newline at end of file
+street: Route de la Croix de Crécy
+housenumber: "75"
+phone: +33 4 28 29 82 57
+opening_hours: Mo-Fr 11:00-19:00, Sat 9:00-18:00
+website: https://ateliervelochevinay.fr
diff --git a/data/cities/chezery-forens/fromagerie-de-chezery.yml b/data/cities/chezery-forens/fromagerie-de-chezery.yml
index 2d131bb80..f31fb6f26 100644
--- a/data/cities/chezery-forens/fromagerie-de-chezery.yml
+++ b/data/cities/chezery-forens/fromagerie-de-chezery.yml
@@ -1,11 +1,11 @@
 id: 177907858
-type: way
+type: node
 latitude: 46.21998
 longitude: 5.86584
 postcode: "01410"
 city: Chézery-Forens
-street: "Rue de la Fromagerie"
-housenumber: 
-phone: "+33 4 50 56 91 67"
-opening_hours: "We-Fr 08:30-12:00,14:00-18:30; Sa,Su 08:30-12:00,14:00-18:00"
-website: "http://fruitiere.comte.com/fromagerie-de-chezery/chezery-forens.html"
\ No newline at end of file
+street: Rue de la Fromagerie
+housenumber: ""
+phone: +33 4 50 56 91 67
+opening_hours: We-Fr 08:30-12:00,14:00-18:30; Sa,Su 08:30-12:00,14:00-18:00
+website: http://fruitiere.comte.com/fromagerie-de-chezery/chezery-forens.html
diff --git a/data/cities/chimilin/le-jardin-du-village.yml b/data/cities/chimilin/le-jardin-du-village.yml
index 69360efa1..3c6493d54 100644
--- a/data/cities/chimilin/le-jardin-du-village.yml
+++ b/data/cities/chimilin/le-jardin-du-village.yml
@@ -1,11 +1,11 @@
 id: 218197863
-type: way
+type: node
 latitude: 45.57692
 longitude: 5.60145
 postcode: "38490"
 city: chimilin
-street: "Place  de l'Église,"
-housenumber: 2
+street: Place  de l'Église,
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chimmilin/ferme.yml b/data/cities/chimmilin/ferme.yml
index 8f963edd1..9644608a2 100644
--- a/data/cities/chimmilin/ferme.yml
+++ b/data/cities/chimmilin/ferme.yml
@@ -5,7 +5,7 @@ longitude: 5.59767
 postcode: "38490"
 city: chimmilin
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chirens/garage-du-bourg.yml b/data/cities/chirens/garage-du-bourg.yml
index f274368de..b5fa71256 100644
--- a/data/cities/chirens/garage-du-bourg.yml
+++ b/data/cities/chirens/garage-du-bourg.yml
@@ -1,11 +1,11 @@
 id: 1084494826
-type: way
+type: node
 latitude: 45.41499
 longitude: 5.55499
 postcode: "38850"
 city: Chirens
-street: "Route du Bourg"
-housenumber: 345
+street: Route du Bourg
+housenumber: "345"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chirens/naturea.yml b/data/cities/chirens/naturea.yml
index 3774e40aa..08bc2d05a 100644
--- a/data/cities/chirens/naturea.yml
+++ b/data/cities/chirens/naturea.yml
@@ -1,11 +1,11 @@
 id: 511913534
-type: way
+type: node
 latitude: 45.40616
 longitude: 5.56328
 postcode: "38850"
 city: Chirens
-street: "Route de Chartreuse"
-housenumber: 886
+street: Route de Chartreuse
+housenumber: "886"
 phone: "+33986507407"
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/chuzelles/boulangerie-demont.yml b/data/cities/chuzelles/boulangerie-demont.yml
index b7c679bf1..56827f188 100644
--- a/data/cities/chuzelles/boulangerie-demont.yml
+++ b/data/cities/chuzelles/boulangerie-demont.yml
@@ -5,7 +5,7 @@ longitude: 4.87788
 postcode: "38200"
 city: Chuzelles
 street: ""
-housenumber: 1
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/chuzelles/latelier-du-vegetal.yml b/data/cities/chuzelles/latelier-du-vegetal.yml
index d8936d41d..b670f3e94 100644
--- a/data/cities/chuzelles/latelier-du-vegetal.yml
+++ b/data/cities/chuzelles/latelier-du-vegetal.yml
@@ -5,7 +5,8 @@ longitude: 4.87797
 postcode: "38200"
 city: Chuzelles
 street: ""
-housenumber: 9
-phone: "+33 9 85 16 01 21"
-opening_hours: "Mo 15:00-19:00; Tu 14:00-19:00; We-Fr 09:30-12:30,15:00-19:00; Sa 09:00-13:00, 14:00-19:30; Su 09:00-13:00"
-website: "https://latelierduvegetaldedilan.business.site/"
\ No newline at end of file
+housenumber: "9"
+phone: +33 9 85 16 01 21
+opening_hours: Mo 15:00-19:00; Tu 14:00-19:00; We-Fr 09:30-12:30,15:00-19:00; Sa 09:00-13:00,
+    14:00-19:30; Su 09:00-13:00
+website: https://latelierduvegetaldedilan.business.site/
diff --git a/data/cities/chuzelles/salon-kel-coiffure.yml b/data/cities/chuzelles/salon-kel-coiffure.yml
index 7560e1268..502c6313c 100644
--- a/data/cities/chuzelles/salon-kel-coiffure.yml
+++ b/data/cities/chuzelles/salon-kel-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.87844
 postcode: "38200"
 city: Chuzelles
 street: ""
-housenumber: 45
+housenumber: "45"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/civens/intermarche.yml b/data/cities/civens/intermarche.yml
index 99e16ccc7..08652a622 100644
--- a/data/cities/civens/intermarche.yml
+++ b/data/cities/civens/intermarche.yml
@@ -1,11 +1,11 @@
 id: 732129300
-type: way
+type: node
 latitude: 45.75412
 longitude: 4.21843
 postcode: "42110"
 city: Civens
-street: "Rn 82"
-housenumber: 
+street: Rn 82
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Tu 08:30-19:30; Fr-Sa 08:30-19:30; Su 09:00-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu 08:30-19:30; Fr-Sa 08:30-19:30; Su 09:00-12:15
+website: ""
diff --git a/data/cities/civrieux/magasin-a-la-ferme.yml b/data/cities/civrieux/magasin-a-la-ferme.yml
index af2c7860c..8f7fe9436 100644
--- a/data/cities/civrieux/magasin-a-la-ferme.yml
+++ b/data/cities/civrieux/magasin-a-la-ferme.yml
@@ -5,7 +5,8 @@ longitude: 4.87963
 postcode: ""
 city: Civrieux
 street: ""
-housenumber: 
-phone: "+33 4 78 98 31 75"
-opening_hours: "We-Th 14:00-19:00; Fr 09:00-12:00,14:00-19:00, Sa 09:00-12:30,14:00-18:00, Su 09:00-12:30"
-website: "https://www.lebergerdesdombes.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 78 98 31 75
+opening_hours: We-Th 14:00-19:00; Fr 09:00-12:00,14:00-19:00, Sa 09:00-12:30,14:00-18:00,
+    Su 09:00-12:30
+website: https://www.lebergerdesdombes.fr/
diff --git a/data/cities/claix/coiffure-new-age.yml b/data/cities/claix/coiffure-new-age.yml
index 9fa8a1cb3..3992e505f 100644
--- a/data/cities/claix/coiffure-new-age.yml
+++ b/data/cities/claix/coiffure-new-age.yml
@@ -4,8 +4,8 @@ latitude: 45.11962
 longitude: 5.67176
 postcode: ""
 city: Claix
-street: "Place des Alpes"
-housenumber: 1
+street: Place des Alpes
+housenumber: "1"
 phone: "+33476407215"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/claix/de-chenille-a-papillon.yml b/data/cities/claix/de-chenille-a-papillon.yml
index 325247fc3..c979bfff5 100644
--- a/data/cities/claix/de-chenille-a-papillon.yml
+++ b/data/cities/claix/de-chenille-a-papillon.yml
@@ -8,4 +8,4 @@ street: ""
 housenumber: 2 ter
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/claix/iveco-martenat-davi38.yml b/data/cities/claix/iveco-martenat-davi38.yml
index 256f18450..a6cf7e052 100644
--- a/data/cities/claix/iveco-martenat-davi38.yml
+++ b/data/cities/claix/iveco-martenat-davi38.yml
@@ -4,8 +4,8 @@ latitude: 45.11237
 longitude: 5.68985
 postcode: "38640"
 city: Claix
-street: "Avenue de la Libération"
-housenumber: 69
+street: Avenue de la Libération
+housenumber: "69"
 phone: ""
 opening_hours: ""
-website: "http://www.martenat.fr/"
\ No newline at end of file
+website: http://www.martenat.fr/
diff --git a/data/cities/claix/le-fournil-de-claix.yml b/data/cities/claix/le-fournil-de-claix.yml
index 6e99826d4..7d959ec62 100644
--- a/data/cities/claix/le-fournil-de-claix.yml
+++ b/data/cities/claix/le-fournil-de-claix.yml
@@ -4,8 +4,8 @@ latitude: 45.11951
 longitude: 5.67281
 postcode: "38640"
 city: Claix
-street: "Place Hector Berlioz"
-housenumber: 12
+street: Place Hector Berlioz
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/claix/maison-du-vin.yml b/data/cities/claix/maison-du-vin.yml
index 15233421c..e0e6ed8fe 100644
--- a/data/cities/claix/maison-du-vin.yml
+++ b/data/cities/claix/maison-du-vin.yml
@@ -4,8 +4,9 @@ latitude: 45.12019
 longitude: 5.69056
 postcode: "38640"
 city: Claix
-street: "Allée de L'Atrium"
-housenumber: 8
-phone: "+33 4 76 98 60 14"
-opening_hours: "Tu,Fr 09:00-12:15,14:30-19:30; We,Th 09:00-12:15,15:00-19:30; Sa 09:00-12:15,14:30-19:00; Su off"
-website: "http://www.lamaisonduvin38.com/"
\ No newline at end of file
+street: Allée de L'Atrium
+housenumber: "8"
+phone: +33 4 76 98 60 14
+opening_hours: Tu,Fr 09:00-12:15,14:30-19:30; We,Th 09:00-12:15,15:00-19:30; Sa 09:00-12:15,14:30-19:00;
+    Su off
+website: http://www.lamaisonduvin38.com/
diff --git a/data/cities/claix/tabac-presse-le-palladium.yml b/data/cities/claix/tabac-presse-le-palladium.yml
index e41632fcc..9182d2f3f 100644
--- a/data/cities/claix/tabac-presse-le-palladium.yml
+++ b/data/cities/claix/tabac-presse-le-palladium.yml
@@ -4,8 +4,8 @@ latitude: 45.11957
 longitude: 5.69225
 postcode: "38640"
 city: Claix
-street: "Place Jean Monnet"
-housenumber: 9
+street: Place Jean Monnet
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/claix/thiriet-distribution.yml b/data/cities/claix/thiriet-distribution.yml
index 19d9a3acb..bcc9b4e07 100644
--- a/data/cities/claix/thiriet-distribution.yml
+++ b/data/cities/claix/thiriet-distribution.yml
@@ -4,8 +4,8 @@ latitude: 45.11166
 longitude: 5.68074
 postcode: "38640"
 city: Claix
-street: "Rue de l'Industrie"
-housenumber: 17
+street: Rue de l'Industrie
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: "https://www.thiriet.com/"
\ No newline at end of file
+website: https://www.thiriet.com/
diff --git a/data/cities/claix/un-bout-de-campagne.yml b/data/cities/claix/un-bout-de-campagne.yml
index cbcb11eb1..774c17860 100644
--- a/data/cities/claix/un-bout-de-campagne.yml
+++ b/data/cities/claix/un-bout-de-campagne.yml
@@ -4,8 +4,8 @@ latitude: 45.1122
 longitude: 5.68134
 postcode: "38640"
 city: Claix
-street: "Rue de l'Industrie"
-housenumber: 16
+street: Rue de l'Industrie
+housenumber: "16"
 phone: ""
-opening_hours: "We,Th,Fr 09:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: We,Th,Fr 09:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/cluses/bureau-vallee.yml b/data/cities/cluses/bureau-vallee.yml
index 2a8bd9bad..b3c0529fe 100644
--- a/data/cities/cluses/bureau-vallee.yml
+++ b/data/cities/cluses/bureau-vallee.yml
@@ -4,8 +4,8 @@ latitude: 46.07413
 longitude: 6.5655
 postcode: "74300"
 city: Cluses
-street: "Rue du Docteur Gallet"
-housenumber: 1
-phone: "+33 4 50 18 36 65"
+street: Rue du Docteur Gallet
+housenumber: "1"
+phone: +33 4 50 18 36 65
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/carrefour.yml b/data/cities/cluses/carrefour.yml
index f1af183de..2ce9606af 100644
--- a/data/cities/cluses/carrefour.yml
+++ b/data/cities/cluses/carrefour.yml
@@ -4,8 +4,8 @@ latitude: 46.06825
 longitude: 6.56805
 postcode: "74300"
 city: Cluses
-street: "Avenue Georges Clemenceau"
-housenumber: 913
+street: Avenue Georges Clemenceau
+housenumber: "913"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml b/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml
index 218f0a170..1cd4c6cab 100644
--- a/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml
+++ b/data/cities/cluses/cooperative-fruitiere-en-val-darly-savoie-mont-blanc.yml
@@ -1,11 +1,11 @@
 id: 105790376
-type: way
+type: node
 latitude: 46.06818
 longitude: 6.58245
 postcode: "74300"
 city: Cluses
-street: "Avenue de Châtillon"
-housenumber: 14
+street: Avenue de Châtillon
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 08:30-13:00, 15:00-19:00; Su 08:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-13:00, 15:00-19:00; Su 08:30-13:00
+website: ""
diff --git a/data/cities/cluses/cote-parc.yml b/data/cities/cluses/cote-parc.yml
index 45131b9fc..bce6876f5 100644
--- a/data/cities/cluses/cote-parc.yml
+++ b/data/cities/cluses/cote-parc.yml
@@ -4,8 +4,8 @@ latitude: 46.0697
 longitude: 6.5612
 postcode: "74300"
 city: Cluses
-street: "Rue Pierre Trappier"
-housenumber: 11
+street: Rue Pierre Trappier
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/creatif-coiffure.yml b/data/cities/cluses/creatif-coiffure.yml
index 18fd4d321..36c75dfd0 100644
--- a/data/cities/cluses/creatif-coiffure.yml
+++ b/data/cities/cluses/creatif-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.05893
 longitude: 6.57966
 postcode: ""
 city: Cluses
-street: "Rue Achille Benoît"
-housenumber: 110
+street: Rue Achille Benoît
+housenumber: "110"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/culture-velo-cluses.yml b/data/cities/cluses/culture-velo-cluses.yml
index 4880b4b98..a44360409 100644
--- a/data/cities/cluses/culture-velo-cluses.yml
+++ b/data/cities/cluses/culture-velo-cluses.yml
@@ -4,8 +4,8 @@ latitude: 46.07114
 longitude: 6.57032
 postcode: "74300"
 city: Cluses
-street: "Avenue des Glières"
-housenumber: 870
+street: Avenue des Glières
+housenumber: "870"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/fourrier-thierry.yml b/data/cities/cluses/fourrier-thierry.yml
index 0f0c3b9d0..f11a8afa0 100644
--- a/data/cities/cluses/fourrier-thierry.yml
+++ b/data/cities/cluses/fourrier-thierry.yml
@@ -4,8 +4,8 @@ latitude: 46.06964
 longitude: 6.56331
 postcode: "74300"
 city: Cluses
-street: "Avenue de la Sardagne"
-housenumber: 25
+street: Avenue de la Sardagne
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/gemo.yml b/data/cities/cluses/gemo.yml
index 9744ead34..2bbdb6694 100644
--- a/data/cities/cluses/gemo.yml
+++ b/data/cities/cluses/gemo.yml
@@ -1,11 +1,11 @@
 id: 105790118
-type: way
+type: node
 latitude: 46.06728
 longitude: 6.57153
 postcode: "74300"
 city: Cluses
-street: "Rue du Maréchal de Lattre de Tassigny"
-housenumber: 17
+street: Rue du Maréchal de Lattre de Tassigny
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/jules-et-jim.yml b/data/cities/cluses/jules-et-jim.yml
index 71c4cc5ef..1f1b9ef60 100644
--- a/data/cities/cluses/jules-et-jim.yml
+++ b/data/cities/cluses/jules-et-jim.yml
@@ -4,8 +4,8 @@ latitude: 46.06112
 longitude: 6.57972
 postcode: "74300"
 city: Cluses
-street: "Impasse Firmin Guy"
-housenumber: 2
-phone: "+33 4 50 18 21 70"
-opening_hours: "Mo-Th 09:00-12:00, 14:00-19:00; Fr 09:00-19:00; Sa 09:00-12:00, 14:00-18:30"
-website: ""
\ No newline at end of file
+street: Impasse Firmin Guy
+housenumber: "2"
+phone: +33 4 50 18 21 70
+opening_hours: Mo-Th 09:00-12:00, 14:00-19:00; Fr 09:00-19:00; Sa 09:00-12:00, 14:00-18:30
+website: ""
diff --git a/data/cities/cluses/les-opticiens-mutualistes.yml b/data/cities/cluses/les-opticiens-mutualistes.yml
index 6a13f10d0..987e81899 100644
--- a/data/cities/cluses/les-opticiens-mutualistes.yml
+++ b/data/cities/cluses/les-opticiens-mutualistes.yml
@@ -4,8 +4,8 @@ latitude: 46.06945
 longitude: 6.56095
 postcode: "74300"
 city: Cluses
-street: "Avenue des Lacs"
-housenumber: 2
+street: Avenue des Lacs
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/lidl.yml b/data/cities/cluses/lidl.yml
index ac42edf16..886c4c01e 100644
--- a/data/cities/cluses/lidl.yml
+++ b/data/cities/cluses/lidl.yml
@@ -1,11 +1,11 @@
 id: 623799710
-type: way
+type: node
 latitude: 46.068
 longitude: 6.58315
 postcode: "74300"
 city: Cluses
-street: "avenue de Châtillon"
-housenumber: 350
+street: avenue de Châtillon
+housenumber: "350"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/cluses/noz.yml b/data/cities/cluses/noz.yml
index c9630399f..2b5b6f18f 100644
--- a/data/cities/cluses/noz.yml
+++ b/data/cities/cluses/noz.yml
@@ -1,11 +1,11 @@
 id: 105789849
-type: way
+type: node
 latitude: 46.06735
 longitude: 6.57162
 postcode: "74300"
 city: Cluses
-street: "rue Maréchal de Lattre de Tassigny"
-housenumber: 19
+street: rue Maréchal de Lattre de Tassigny
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: "https://www.nozarrivages.com/magasin/cluses/"
\ No newline at end of file
+website: https://www.nozarrivages.com/magasin/cluses/
diff --git a/data/cities/cluses/optique-soylu.yml b/data/cities/cluses/optique-soylu.yml
index 308b45a17..782283c9a 100644
--- a/data/cities/cluses/optique-soylu.yml
+++ b/data/cities/cluses/optique-soylu.yml
@@ -4,8 +4,8 @@ latitude: 46.07022
 longitude: 6.56283
 postcode: "74300"
 city: Cluses
-street: "Avenue Georges Clemenceau"
-housenumber: 104
+street: Avenue Georges Clemenceau
+housenumber: "104"
 phone: "+33457443892"
-opening_hours: "Tu-Sa 10:00-12:30, 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30, 14:30-19:00
+website: ""
diff --git a/data/cities/cluses/sfr.yml b/data/cities/cluses/sfr.yml
index 7b56c41fd..cd4740978 100644
--- a/data/cities/cluses/sfr.yml
+++ b/data/cities/cluses/sfr.yml
@@ -4,8 +4,8 @@ latitude: 46.05947
 longitude: 6.58053
 postcode: "74300"
 city: Cluses
-street: "Grande Rue"
-housenumber: 14
-phone: "+33 4 57 19 10 25"
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00"
-website: "https://boutique.sfr.fr/auvergne-rhone-alpes/haute-savoie/cluses/14-grand-rue"
\ No newline at end of file
+street: Grande Rue
+housenumber: "14"
+phone: +33 4 57 19 10 25
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00
+website: https://boutique.sfr.fr/auvergne-rhone-alpes/haute-savoie/cluses/14-grand-rue
diff --git a/data/cities/cluses/spar-avenue-de-la-sardagne.yml b/data/cities/cluses/spar-avenue-de-la-sardagne.yml
index 2912671cf..58ae3a625 100644
--- a/data/cities/cluses/spar-avenue-de-la-sardagne.yml
+++ b/data/cities/cluses/spar-avenue-de-la-sardagne.yml
@@ -1,11 +1,11 @@
 id: 815248804
-type: way
+type: node
 latitude: 46.07033
 longitude: 6.5617
 postcode: "74300"
 city: Cluses
-street: "Avenue de la Sardagne"
-housenumber: 33
+street: Avenue de la Sardagne
+housenumber: "33"
 phone: ""
-opening_hours: "Mo-We,Fr-Sa 08:00-12:30, 15:00-19:00; Th off; Su 08:30-12:30, 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr-Sa 08:00-12:30, 15:00-19:00; Th off; Su 08:30-12:30, 16:00-19:00
+website: ""
diff --git a/data/cities/cluses/spar.yml b/data/cities/cluses/spar.yml
index 1afeb3d6d..1eb615161 100644
--- a/data/cities/cluses/spar.yml
+++ b/data/cities/cluses/spar.yml
@@ -4,8 +4,8 @@ latitude: 46.0592
 longitude: 6.58062
 postcode: "74300"
 city: Cluses
-street: "Grande Rue"
-housenumber: 12
+street: Grande Rue
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Sa 07:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-19:30; Su off
+website: ""
diff --git a/data/cities/cluses/stella-coiffure.yml b/data/cities/cluses/stella-coiffure.yml
index f45bdd0c6..9eefc9b52 100644
--- a/data/cities/cluses/stella-coiffure.yml
+++ b/data/cities/cluses/stella-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.07021
 longitude: 6.56228
 postcode: "74300"
 city: Cluses
-street: "Avenue de la Sardagne"
-housenumber: 29
+street: Avenue de la Sardagne
+housenumber: "29"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/vouriots.yml b/data/cities/cluses/vouriots.yml
index b0e1aa710..dad62dcdc 100644
--- a/data/cities/cluses/vouriots.yml
+++ b/data/cities/cluses/vouriots.yml
@@ -4,8 +4,8 @@ latitude: 46.06936
 longitude: 6.56085
 postcode: "74300"
 city: Cluses
-street: "Avenue des Lacs"
-housenumber: 2
+street: Avenue des Lacs
+housenumber: "2"
 phone: "+33450980670"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cluses/yves-rocher.yml b/data/cities/cluses/yves-rocher.yml
index d58183bcb..65eb10734 100644
--- a/data/cities/cluses/yves-rocher.yml
+++ b/data/cities/cluses/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 46.05842
 longitude: 6.58037
 postcode: "74300"
 city: Cluses
-street: "Grande Rue"
-housenumber: 5
+street: Grande Rue
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/cluses/cluses/S-FRYROC123"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/cluses/cluses/S-FRYROC123
diff --git a/data/cities/cognin/boucherie-ferrante.yml b/data/cities/cognin/boucherie-ferrante.yml
index 792a47d2b..f684bc67f 100644
--- a/data/cities/cognin/boucherie-ferrante.yml
+++ b/data/cities/cognin/boucherie-ferrante.yml
@@ -4,8 +4,8 @@ latitude: 45.56104
 longitude: 5.89791
 postcode: "73160"
 city: Cognin
-street: "Rue de l'Épine"
-housenumber: 3
+street: Rue de l'Épine
+housenumber: "3"
 phone: "+33479724399"
-opening_hours: "Tu-Sa 06:00-13:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:00-13:30
+website: ""
diff --git a/data/cities/cognin/le-moulin-a-mots.yml b/data/cities/cognin/le-moulin-a-mots.yml
index 9f2140227..242039325 100644
--- a/data/cities/cognin/le-moulin-a-mots.yml
+++ b/data/cities/cognin/le-moulin-a-mots.yml
@@ -4,8 +4,8 @@ latitude: 45.56158
 longitude: 5.89996
 postcode: "73160"
 city: Cognin
-street: "Rue de la Paix"
-housenumber: 2
+street: Rue de la Paix
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:30,13:30-19:00; Sa 10:00-12:30,13:30-18:30"
-website: "https://le-moulin-a-mots.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30,13:30-19:00; Sa 10:00-12:30,13:30-18:30
+website: https://le-moulin-a-mots.fr/
diff --git a/data/cities/cognin/super-u.yml b/data/cities/cognin/super-u.yml
index 57361c153..f7a594b91 100644
--- a/data/cities/cognin/super-u.yml
+++ b/data/cities/cognin/super-u.yml
@@ -1,11 +1,11 @@
 id: 162576629
-type: way
+type: node
 latitude: 45.56033
 longitude: 5.89571
 postcode: "73160"
 city: Cognin
-street: "Super U Cognin"
-housenumber: 
+street: Super U Cognin
+housenumber: ""
 phone: "+33479440600"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: "https://www.magasins-u.com/magasin/superu-cognin"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: https://www.magasins-u.com/magasin/superu-cognin
diff --git a/data/cities/cogny/lepicerie.yml b/data/cities/cogny/lepicerie.yml
index fe6c13261..6f2e4642f 100644
--- a/data/cities/cogny/lepicerie.yml
+++ b/data/cities/cogny/lepicerie.yml
@@ -4,8 +4,8 @@ latitude: 45.98745
 longitude: 4.62505
 postcode: ""
 city: Cogny
-street: "Route des Pierres Dorées"
-housenumber: 10
+street: Route des Pierres Dorées
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cohennoz/edelweiss-boutique.yml b/data/cities/cohennoz/edelweiss-boutique.yml
index fac752396..b32f8604d 100644
--- a/data/cities/cohennoz/edelweiss-boutique.yml
+++ b/data/cities/cohennoz/edelweiss-boutique.yml
@@ -4,8 +4,9 @@ latitude: 45.78322
 longitude: 6.49903
 postcode: "73590"
 city: Cohennoz
-street: "Place du Cernix"
-housenumber: 103
+street: Place du Cernix
+housenumber: "103"
 phone: ""
-opening_hours: "Dec-Apr 07:45-12:30,16:00-19:15; Jul-Aug Mo-Sa 07:45-12:30,17:00-19:15; Jul-Aug Su 07:45-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Dec-Apr 07:45-12:30,16:00-19:15; Jul-Aug Mo-Sa 07:45-12:30,17:00-19:15;
+    Jul-Aug Su 07:45-12:30
+website: ""
diff --git a/data/cities/cointrin/5asec.yml b/data/cities/cointrin/5asec.yml
index 0ead47e8e..7a7a4871f 100644
--- a/data/cities/cointrin/5asec.yml
+++ b/data/cities/cointrin/5asec.yml
@@ -5,7 +5,7 @@ longitude: 6.11226
 postcode: ""
 city: Cointrin
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cointrin/wine-universe.yml b/data/cities/cointrin/wine-universe.yml
index 280bfefd6..66ce5d165 100644
--- a/data/cities/cointrin/wine-universe.yml
+++ b/data/cities/cointrin/wine-universe.yml
@@ -5,7 +5,7 @@ longitude: 6.11234
 postcode: ""
 city: Cointrin
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/collonges-au-mont-dor/pops-du-champ-des-saveurs.yml b/data/cities/collonges-au-mont-dor/pops-du-champ-des-saveurs.yml
index 07c0a84a6..d858346c6 100644
--- a/data/cities/collonges-au-mont-dor/pops-du-champ-des-saveurs.yml
+++ b/data/cities/collonges-au-mont-dor/pops-du-champ-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 45.82961
 longitude: 4.8378
 postcode: "69660"
 city: Collonges-au-Mont-d'Or
-street: "Chemin de Moyrand"
-housenumber: 12
+street: Chemin de Moyrand
+housenumber: "12"
 phone: "+33611180603"
-opening_hours: "Mo 16:00-19:00; Th 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 16:00-19:00; Th 16:00-19:00
+website: ""
diff --git a/data/cities/collonges-sous-saleve/le-petit-casino.yml b/data/cities/collonges-sous-saleve/le-petit-casino.yml
index 5b70625b7..f89f6e95f 100644
--- a/data/cities/collonges-sous-saleve/le-petit-casino.yml
+++ b/data/cities/collonges-sous-saleve/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.1405
 longitude: 6.14605
 postcode: "74160"
 city: Collonges-sous-Salève
-street: "Place de Savoie"
-housenumber: 62
+street: Place de Savoie
+housenumber: "62"
 phone: ""
-opening_hours: "Mo-Sa 07:00-13:00,14:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-13:00,14:00-19:30; Su off
+website: ""
diff --git a/data/cities/collonges-sous-saleve/o-champs-paysans.yml b/data/cities/collonges-sous-saleve/o-champs-paysans.yml
index 2fbe95abe..5d987c096 100644
--- a/data/cities/collonges-sous-saleve/o-champs-paysans.yml
+++ b/data/cities/collonges-sous-saleve/o-champs-paysans.yml
@@ -1,11 +1,11 @@
 id: 77854558
-type: way
+type: node
 latitude: 46.14415
 longitude: 6.13907
 postcode: "74160"
 city: Collonges-sous-Salève
-street: "Route de Rozon"
-housenumber: 350
-phone: "+33 450350597"
-opening_hours: "We-Fr 14:30-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+street: Route de Rozon
+housenumber: "350"
+phone: +33 450350597
+opening_hours: We-Fr 14:30-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/collonges/kangou2roues.yml b/data/cities/collonges/kangou2roues.yml
index f5dd8f836..df8443fd0 100644
--- a/data/cities/collonges/kangou2roues.yml
+++ b/data/cities/collonges/kangou2roues.yml
@@ -1,11 +1,11 @@
 id: 483328625
-type: way
+type: node
 latitude: 46.14576
 longitude: 5.91603
 postcode: "01550"
 city: Collonges
 street: ""
-housenumber: 
-phone: "+33 6 11 26 28 09"
+housenumber: ""
+phone: +33 6 11 26 28 09
 opening_hours: ""
-website: "https://www.kangou2roues.com"
\ No newline at end of file
+website: https://www.kangou2roues.com
diff --git a/data/cities/colombe/bievre-cycle-motocycle-motoculture.yml b/data/cities/colombe/bievre-cycle-motocycle-motoculture.yml
index fcefc9b72..b63c36291 100644
--- a/data/cities/colombe/bievre-cycle-motocycle-motoculture.yml
+++ b/data/cities/colombe/bievre-cycle-motocycle-motoculture.yml
@@ -4,8 +4,8 @@ latitude: 45.39874
 longitude: 5.45353
 postcode: "38690"
 city: Colombe
-street: "Route du Tram"
-housenumber: 1710
+street: Route du Tram
+housenumber: "1710"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/colombe/flo-info-38.yml b/data/cities/colombe/flo-info-38.yml
index cecc8f07d..87204fea8 100644
--- a/data/cities/colombe/flo-info-38.yml
+++ b/data/cities/colombe/flo-info-38.yml
@@ -4,8 +4,8 @@ latitude: 45.39673
 longitude: 5.44819
 postcode: "38690"
 city: Colombe
-street: "Allée du Drevon"
-housenumber: 131
-phone: "+33 6 62 59 27 69"
-opening_hours: "Mo-Fr 09:00-17:00; PH off"
-website: "https://www.floinfo38.fr/"
\ No newline at end of file
+street: Allée du Drevon
+housenumber: "131"
+phone: +33 6 62 59 27 69
+opening_hours: Mo-Fr 09:00-17:00; PH off
+website: https://www.floinfo38.fr/
diff --git a/data/cities/colombier/la-ferme-du-prince.yml b/data/cities/colombier/la-ferme-du-prince.yml
index 30e6e0493..778131c7b 100644
--- a/data/cities/colombier/la-ferme-du-prince.yml
+++ b/data/cities/colombier/la-ferme-du-prince.yml
@@ -5,7 +5,7 @@ longitude: 4.58896
 postcode: "42220"
 city: COLOMBIER
 street: ""
-housenumber: 
-phone: "+33 4 77 51 52 45"
+housenumber: ""
+phone: +33 4 77 51 52 45
 opening_hours: ""
-website: "http://www.ferme-du-prince.fr/"
\ No newline at end of file
+website: http://www.ferme-du-prince.fr/
diff --git a/data/cities/combloux/le-petit-casino.yml b/data/cities/combloux/le-petit-casino.yml
index 23fac6743..2595393c0 100644
--- a/data/cities/combloux/le-petit-casino.yml
+++ b/data/cities/combloux/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.89569
 longitude: 6.64482
 postcode: "74920"
 city: Combloux
-street: "Route de Sallanches"
-housenumber: 62
+street: Route de Sallanches
+housenumber: "62"
 phone: ""
-opening_hours: "Mo-Su 08:00-13:00, 15:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-13:00, 15:00-20:00
+website: ""
diff --git a/data/cities/combloux/skiset-ski-and-bike.yml b/data/cities/combloux/skiset-ski-and-bike.yml
index ce5850e72..93b75fcba 100644
--- a/data/cities/combloux/skiset-ski-and-bike.yml
+++ b/data/cities/combloux/skiset-ski-and-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.89587
 longitude: 6.64442
 postcode: "74920"
 city: Combloux
-street: "Route de Sallanches"
-housenumber: 64
+street: Route de Sallanches
+housenumber: "64"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/combloux/sport-2000.yml b/data/cities/combloux/sport-2000.yml
index 9507e9144..30fa6022f 100644
--- a/data/cities/combloux/sport-2000.yml
+++ b/data/cities/combloux/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.89175
 longitude: 6.62572
 postcode: "74920"
 city: Combloux
-street: "Route de la Cry-Cuchet"
-housenumber: 
+street: Route de la Cry-Cuchet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/condamine/alb-automobiles-carrosserie.yml b/data/cities/condamine/alb-automobiles-carrosserie.yml
index 26387c919..7004e2c16 100644
--- a/data/cities/condamine/alb-automobiles-carrosserie.yml
+++ b/data/cities/condamine/alb-automobiles-carrosserie.yml
@@ -1,11 +1,11 @@
 id: 82649739
-type: way
+type: node
 latitude: 46.11038
 longitude: 5.5508
 postcode: "01430"
 city: Condamine
-street: "Rue de la Doye"
-housenumber: 7
+street: Rue de la Doye
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/condrieu/7e-sens.yml b/data/cities/condrieu/7e-sens.yml
index 3e1c37ac7..9de6fef2d 100644
--- a/data/cities/condrieu/7e-sens.yml
+++ b/data/cities/condrieu/7e-sens.yml
@@ -5,7 +5,7 @@ longitude: 4.76734
 postcode: "69420"
 city: Condrieu
 street: ""
-housenumber: 20
+housenumber: "20"
 phone: "+33474480599"
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-17:00"
-website: "https://www.planity.com/7eme-sens-69420-condrieu"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-17:00
+website: https://www.planity.com/7eme-sens-69420-condrieu
diff --git a/data/cities/condrieu/cote-a-cote.yml b/data/cities/condrieu/cote-a-cote.yml
index 2bb65646e..533a640df 100644
--- a/data/cities/condrieu/cote-a-cote.yml
+++ b/data/cities/condrieu/cote-a-cote.yml
@@ -4,8 +4,8 @@ latitude: 45.46435
 longitude: 4.77073
 postcode: "69420"
 city: Condrieu
-street: "Rue Nationale"
-housenumber: 10
-phone: "+33 4 74 31 59 06"
-opening_hours: "Mo off; Tu-Fr 6:30-12:00,15:00-19:00; Sa 7:30-18:00"
-website: "https://cote-a-cote.edan.io/"
\ No newline at end of file
+street: Rue Nationale
+housenumber: "10"
+phone: +33 4 74 31 59 06
+opening_hours: Mo off; Tu-Fr 6:30-12:00,15:00-19:00; Sa 7:30-18:00
+website: https://cote-a-cote.edan.io/
diff --git a/data/cities/condrieu/la-bouteillerie.yml b/data/cities/condrieu/la-bouteillerie.yml
index 44b77d73e..9ce545926 100644
--- a/data/cities/condrieu/la-bouteillerie.yml
+++ b/data/cities/condrieu/la-bouteillerie.yml
@@ -4,8 +4,8 @@ latitude: 45.46204
 longitude: 4.76856
 postcode: "69420"
 city: Condrieu
-street: "Route Départementale 386"
-housenumber: 43
-phone: "+33 4 74 59 84 96"
-opening_hours: "Mo off; Tu-Sa 9:00-19:00; Su off"
-website: "https://www.labouteillerie.com/"
\ No newline at end of file
+street: Route Départementale 386
+housenumber: "43"
+phone: +33 4 74 59 84 96
+opening_hours: Mo off; Tu-Sa 9:00-19:00; Su off
+website: https://www.labouteillerie.com/
diff --git a/data/cities/condrieu/le-gaulois.yml b/data/cities/condrieu/le-gaulois.yml
index 96f160b00..0d215a643 100644
--- a/data/cities/condrieu/le-gaulois.yml
+++ b/data/cities/condrieu/le-gaulois.yml
@@ -5,7 +5,7 @@ longitude: 4.76723
 postcode: "69420"
 city: Condrieu
 street: ""
-housenumber: 5
+housenumber: "5"
 phone: "+33474595848"
-opening_hours: "Mo,Tu,We,Fr 07:00-12:00,14:00-19:00; Th 07:00-12:00; Sa 07:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,We,Fr 07:00-12:00,14:00-19:00; Th 07:00-12:00; Sa 07:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/condrieu/lepi-centre.yml b/data/cities/condrieu/lepi-centre.yml
index 47311231c..1414036b4 100644
--- a/data/cities/condrieu/lepi-centre.yml
+++ b/data/cities/condrieu/lepi-centre.yml
@@ -4,8 +4,8 @@ latitude: 45.46197
 longitude: 4.76793
 postcode: "69420"
 city: Condrieu
-street: "Rue de la Liberté"
+street: Rue de la Liberté
 housenumber: 14 bis
 phone: "+3347485325"
-opening_hours: "Mo 08:30-12:30,Tu-Sa 08:30-19:00,Su 08:30-12:30,"
-website: ""
\ No newline at end of file
+opening_hours: Mo 08:30-12:30,Tu-Sa 08:30-19:00,Su 08:30-12:30,
+website: ""
diff --git a/data/cities/condrieu/spectrum-ink.yml b/data/cities/condrieu/spectrum-ink.yml
index cfe0413ce..e40f8ca39 100644
--- a/data/cities/condrieu/spectrum-ink.yml
+++ b/data/cities/condrieu/spectrum-ink.yml
@@ -5,7 +5,7 @@ longitude: 4.76759
 postcode: "69420"
 city: Condrieu
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: "+33426056482"
 opening_hours: ""
-website: "https://www.spectrum-ink.fr/salon-tatouage-tatoueur/condrieu/70"
\ No newline at end of file
+website: https://www.spectrum-ink.fr/salon-tatouage-tatoueur/condrieu/70
diff --git a/data/cities/condrieu/yankoff-andree.yml b/data/cities/condrieu/yankoff-andree.yml
index 7ced2423a..60fd1e2e3 100644
--- a/data/cities/condrieu/yankoff-andree.yml
+++ b/data/cities/condrieu/yankoff-andree.yml
@@ -5,7 +5,7 @@ longitude: 4.76702
 postcode: "69420"
 city: Condrieu
 street: ""
-housenumber: 33
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/confrancon/netto.yml b/data/cities/confrancon/netto.yml
index ac1b2a5e1..7c0ab6d06 100644
--- a/data/cities/confrancon/netto.yml
+++ b/data/cities/confrancon/netto.yml
@@ -1,11 +1,11 @@
 id: 363482367
-type: way
+type: node
 latitude: 46.2551
 longitude: 5.05869
 postcode: "01310"
 city: Confrançon
-street: "Route de Vandeins"
-housenumber: 105
-phone: "+33 4 74 42 08 20"
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:30"
-website: "https://magasin.netto.fr/523-netto-confrancon"
\ No newline at end of file
+street: Route de Vandeins
+housenumber: "105"
+phone: +33 4 74 42 08 20
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:30
+website: https://magasin.netto.fr/523-netto-confrancon
diff --git a/data/cities/contamine-sur-arve/atol.yml b/data/cities/contamine-sur-arve/atol.yml
index bfa38ce42..b59f04e76 100644
--- a/data/cities/contamine-sur-arve/atol.yml
+++ b/data/cities/contamine-sur-arve/atol.yml
@@ -1,11 +1,11 @@
 id: 744298103
-type: way
+type: node
 latitude: 46.14474
 longitude: 6.31973
 postcode: "74130"
 city: Contamine-sur-Arve
-street: "Rue des Aulnes"
-housenumber: 
+street: Rue des Aulnes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/contamine-sur-arve/barrisol.yml b/data/cities/contamine-sur-arve/barrisol.yml
index 6a8923055..233f9cf5b 100644
--- a/data/cities/contamine-sur-arve/barrisol.yml
+++ b/data/cities/contamine-sur-arve/barrisol.yml
@@ -1,11 +1,11 @@
 id: 151976335
-type: way
+type: node
 latitude: 46.14534
 longitude: 6.31955
 postcode: "74130"
 city: Contamine-sur-Arve
-street: "Route de Findrol"
-housenumber: 30
+street: Route de Findrol
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/contamine-sur-arve/boucherie-charcuterie-raibon-denis.yml b/data/cities/contamine-sur-arve/boucherie-charcuterie-raibon-denis.yml
index 0f4766a2f..2b76c7f62 100644
--- a/data/cities/contamine-sur-arve/boucherie-charcuterie-raibon-denis.yml
+++ b/data/cities/contamine-sur-arve/boucherie-charcuterie-raibon-denis.yml
@@ -4,8 +4,8 @@ latitude: 46.12781
 longitude: 6.33911
 postcode: "74130"
 city: Contamine-sur-Arve
-street: "Route d'Annemasse"
-housenumber: 123
-phone: "+33 4 50 03 67 90"
-opening_hours: "Tu-Sa 08:30-19:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+street: Route d'Annemasse
+housenumber: "123"
+phone: +33 4 50 03 67 90
+opening_hours: Tu-Sa 08:30-19:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/contamine-sur-arve/gaspard-est-dans-le-petrin.yml b/data/cities/contamine-sur-arve/gaspard-est-dans-le-petrin.yml
index c6d7f816f..ef5f0a802 100644
--- a/data/cities/contamine-sur-arve/gaspard-est-dans-le-petrin.yml
+++ b/data/cities/contamine-sur-arve/gaspard-est-dans-le-petrin.yml
@@ -4,8 +4,8 @@ latitude: 46.1363
 longitude: 6.3366
 postcode: "74130"
 city: Contamine-sur-Arve
-street: "Route des Granges"
-housenumber: 337
+street: Route des Granges
+housenumber: "337"
 phone: "+33678423850"
-opening_hours: "Mo-Fr 15:00-19:00"
-website: "https://www.gaspardestdanslepetrin.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 15:00-19:00
+website: https://www.gaspardestdanslepetrin.fr/
diff --git a/data/cities/contamine-sur-arve/goy-emile.yml b/data/cities/contamine-sur-arve/goy-emile.yml
index 231fabba7..10b8e8a98 100644
--- a/data/cities/contamine-sur-arve/goy-emile.yml
+++ b/data/cities/contamine-sur-arve/goy-emile.yml
@@ -4,8 +4,8 @@ latitude: 46.1428
 longitude: 6.32857
 postcode: "74130"
 city: Contamine-sur-Arve
-street: "Route de Pouilly"
-housenumber: 539
-phone: "+33 4 50 14 14 14;+33 6 09 46 60 93"
+street: Route de Pouilly
+housenumber: "539"
+phone: +33 4 50 14 14 14;+33 6 09 46 60 93
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/contamine-sur-arve/la-2-cv-rouge.yml b/data/cities/contamine-sur-arve/la-2-cv-rouge.yml
index f6619c690..391e1d342 100644
--- a/data/cities/contamine-sur-arve/la-2-cv-rouge.yml
+++ b/data/cities/contamine-sur-arve/la-2-cv-rouge.yml
@@ -4,8 +4,8 @@ latitude: 46.14813
 longitude: 6.32031
 postcode: "74130"
 city: Contamine-sur-Arve
-street: "Route de Findrol"
-housenumber: 257
+street: Route de Findrol
+housenumber: "257"
 phone: ""
-opening_hours: "Mo off; Tu-Fr 09:00-18:00; Sa 08:00-18:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Fr 09:00-18:00; Sa 08:00-18:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/contrevoz/boulangerie-patisserie-des-freres-bardoulet.yml b/data/cities/contrevoz/boulangerie-patisserie-des-freres-bardoulet.yml
index 1d3e5c37b..8e8cdf0e7 100644
--- a/data/cities/contrevoz/boulangerie-patisserie-des-freres-bardoulet.yml
+++ b/data/cities/contrevoz/boulangerie-patisserie-des-freres-bardoulet.yml
@@ -4,8 +4,8 @@ latitude: 45.803
 longitude: 5.62869
 postcode: "01300"
 city: Contrevoz
-street: "Place de Mefon"
-housenumber: 
-phone: "+33 4 79 81 85 56"
+street: Place de Mefon
+housenumber: ""
+phone: +33 4 79 81 85 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/corbas/supeco.yml b/data/cities/corbas/supeco.yml
index 016b31872..d0fe1004d 100644
--- a/data/cities/corbas/supeco.yml
+++ b/data/cities/corbas/supeco.yml
@@ -4,8 +4,8 @@ latitude: 45.66458
 longitude: 4.89562
 postcode: "69960"
 city: Corbas
-street: "Avenue de Corbetta"
-housenumber: 32
+street: Avenue de Corbetta
+housenumber: "32"
 phone: "+33472901294"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/corbonod/vival.yml b/data/cities/corbonod/vival.yml
index 528cf4c86..a1ffb2e92 100644
--- a/data/cities/corbonod/vival.yml
+++ b/data/cities/corbonod/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.96857
 longitude: 5.8098
 postcode: "01420"
 city: Corbonod
-street: "Route Principale Gignez"
-housenumber: 
-phone: "+33 4 50 56 19 50"
-opening_hours: "Tu-Su 06:00-13:00,15:00-20:00"
-website: "https://magasins.vival.fr/fr/s/vival-corbonod"
\ No newline at end of file
+street: Route Principale Gignez
+housenumber: ""
+phone: +33 4 50 56 19 50
+opening_hours: Tu-Su 06:00-13:00,15:00-20:00
+website: https://magasins.vival.fr/fr/s/vival-corbonod
diff --git a/data/cities/cordon/boulangerie-demange.yml b/data/cities/cordon/boulangerie-demange.yml
index bb3d188d6..977954711 100644
--- a/data/cities/cordon/boulangerie-demange.yml
+++ b/data/cities/cordon/boulangerie-demange.yml
@@ -4,8 +4,8 @@ latitude: 45.92314
 longitude: 6.6119
 postcode: "74700"
 city: Cordon
-street: "Route de Cordon"
-housenumber: 2900
-phone: "+33 6 86 55 16 37"
+street: Route de Cordon
+housenumber: "2900"
+phone: +33 6 86 55 16 37
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cordon/le-temps-des-rzules.yml b/data/cities/cordon/le-temps-des-rzules.yml
index 8b080682a..e433eda33 100644
--- a/data/cities/cordon/le-temps-des-rzules.yml
+++ b/data/cities/cordon/le-temps-des-rzules.yml
@@ -4,8 +4,8 @@ latitude: 45.92295
 longitude: 6.61174
 postcode: "74700"
 city: Cordon
-street: "Route de Cordon"
-housenumber: 2950
-phone: "+33 4 50 91 73 27"
+street: Route de Cordon
+housenumber: "2950"
+phone: +33 4 50 91 73 27
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cordon/sherpa.yml b/data/cities/cordon/sherpa.yml
index cebec2878..d226a892f 100644
--- a/data/cities/cordon/sherpa.yml
+++ b/data/cities/cordon/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 45.92193
 longitude: 6.60986
 postcode: "74700"
 city: Cordon
-street: "Route de Cordon"
-housenumber: 3160
-phone: "+33 4 56 37 23 18"
+street: Route de Cordon
+housenumber: "3160"
+phone: +33 4 56 37 23 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/corenc/vival.yml b/data/cities/corenc/vival.yml
index bc5016cb0..ab8f4b651 100644
--- a/data/cities/corenc/vival.yml
+++ b/data/cities/corenc/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.21208
 longitude: 5.75767
 postcode: "38700"
 city: Corenc
-street: "Avenue de l'Eygala"
-housenumber: 105
-phone: "+33 4 76 57 18 97"
-opening_hours: "Mo-Sa 07:30-12:30, 15:30-19:00"
-website: "https://magasins.vival.fr/fr/s/vival-corenc"
\ No newline at end of file
+street: Avenue de l'Eygala
+housenumber: "105"
+phone: +33 4 76 57 18 97
+opening_hours: Mo-Sa 07:30-12:30, 15:30-19:00
+website: https://magasins.vival.fr/fr/s/vival-corenc
diff --git a/data/cities/cornier/vival.yml b/data/cities/cornier/vival.yml
index 19d759e58..f9adc7c73 100644
--- a/data/cities/cornier/vival.yml
+++ b/data/cities/cornier/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.09338
 longitude: 6.2997
 postcode: "74800"
 city: Cornier
-street: "Route du Châtelet"
-housenumber: 2
+street: Route du Châtelet
+housenumber: "2"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 07:30-12:30, 15:00-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 07:30-12:30, 15:00-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/corps/les-legumes-du-potaju.yml b/data/cities/corps/les-legumes-du-potaju.yml
index e3be16efc..c7abb5c56 100644
--- a/data/cities/corps/les-legumes-du-potaju.yml
+++ b/data/cities/corps/les-legumes-du-potaju.yml
@@ -4,8 +4,8 @@ latitude: 44.81832
 longitude: 5.9476
 postcode: "38970"
 city: Corps
-street: "Montée des Fosses"
-housenumber: 225
+street: Montée des Fosses
+housenumber: "225"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/correncon-en-vercors/spar.yml b/data/cities/correncon-en-vercors/spar.yml
index 6c7785bd6..94b73c0d0 100644
--- a/data/cities/correncon-en-vercors/spar.yml
+++ b/data/cities/correncon-en-vercors/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.03182
 longitude: 5.52749
 postcode: "38250"
 city: Corrençon-en-Vercors
-street: "Les Ravauds"
-housenumber: 
-phone: "+33 4 76 95 84 42"
-opening_hours: "Tu-Sa 07:30-12:15,16:00-19:00; Su 07:30-12:15"
-website: "https://magasins.spar.fr/fr/s/spar-correncon-en-vercors"
\ No newline at end of file
+street: Les Ravauds
+housenumber: ""
+phone: +33 4 76 95 84 42
+opening_hours: Tu-Sa 07:30-12:15,16:00-19:00; Su 07:30-12:15
+website: https://magasins.spar.fr/fr/s/spar-correncon-en-vercors
diff --git a/data/cities/coublevie/automobiles-toran.yml b/data/cities/coublevie/automobiles-toran.yml
index d980c148d..648bf0d9f 100644
--- a/data/cities/coublevie/automobiles-toran.yml
+++ b/data/cities/coublevie/automobiles-toran.yml
@@ -4,8 +4,8 @@ latitude: 45.35899
 longitude: 5.60059
 postcode: "38500"
 city: Coublevie
-street: "Route de Grenoble"
-housenumber: 1159
-phone: "+33 476050909"
+street: Route de Grenoble
+housenumber: "1159"
+phone: +33 476050909
 opening_hours: ""
-website: "https://automobilestoran.fr/"
\ No newline at end of file
+website: https://automobilestoran.fr/
diff --git a/data/cities/coublevie/fee-pour-toi.yml b/data/cities/coublevie/fee-pour-toi.yml
index f1ebf633d..1813f2170 100644
--- a/data/cities/coublevie/fee-pour-toi.yml
+++ b/data/cities/coublevie/fee-pour-toi.yml
@@ -4,8 +4,8 @@ latitude: 45.35433
 longitude: 5.60824
 postcode: "38500"
 city: Coublevie
-street: "Route de Saint-Jean"
-housenumber: 285
-phone: "+33 4 76 37 63 15"
-opening_hours: "Tu 08:00-18:00; We 08:30-18:30; Th,Fr 08:00-18:30; Sa 08:30-16:00"
-website: "https://www.feepourtoi.fr/"
\ No newline at end of file
+street: Route de Saint-Jean
+housenumber: "285"
+phone: +33 4 76 37 63 15
+opening_hours: Tu 08:00-18:00; We 08:30-18:30; Th,Fr 08:00-18:30; Sa 08:30-16:00
+website: https://www.feepourtoi.fr/
diff --git a/data/cities/coublevie/la-vie-claire.yml b/data/cities/coublevie/la-vie-claire.yml
index b84076066..fb8786cd0 100644
--- a/data/cities/coublevie/la-vie-claire.yml
+++ b/data/cities/coublevie/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 45.35112
 longitude: 5.59593
 postcode: "38500"
 city: Coublevie
-street: "Route de Grenoble"
-housenumber: 131
+street: Route de Grenoble
+housenumber: "131"
 phone: "+33476661160"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://magasins.lavieclaire.com"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://magasins.lavieclaire.com
diff --git a/data/cities/coublevie/un-ptit-bout-de-chartreuse.yml b/data/cities/coublevie/un-ptit-bout-de-chartreuse.yml
index 52babd9b6..0c690c6a5 100644
--- a/data/cities/coublevie/un-ptit-bout-de-chartreuse.yml
+++ b/data/cities/coublevie/un-ptit-bout-de-chartreuse.yml
@@ -4,8 +4,8 @@ latitude: 45.35062
 longitude: 5.60181
 postcode: "38500"
 city: Coublevie
-street: "Route de Saint-Jean"
-housenumber: 1020
-phone: "+33 4 76 37 98 10"
-opening_hours: "We-Fr 09:00-19:00; Sa 09:00-18:00"
-website: "https://www.unpetitboutdechartreuse.com"
\ No newline at end of file
+street: Route de Saint-Jean
+housenumber: "1020"
+phone: +33 4 76 37 98 10
+opening_hours: We-Fr 09:00-19:00; Sa 09:00-18:00
+website: https://www.unpetitboutdechartreuse.com
diff --git a/data/cities/courchevel/chanel.yml b/data/cities/courchevel/chanel.yml
index 41d762a88..429e944fb 100644
--- a/data/cities/courchevel/chanel.yml
+++ b/data/cities/courchevel/chanel.yml
@@ -4,8 +4,8 @@ latitude: 45.41537
 longitude: 6.63566
 postcode: "73120"
 city: Courchevel
-street: "Place du Rocher"
-housenumber: 
+street: Place du Rocher
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/esf-courchevel-1850.yml b/data/cities/courchevel/esf-courchevel-1850.yml
index 880f65336..9eeb789a5 100644
--- a/data/cities/courchevel/esf-courchevel-1850.yml
+++ b/data/cities/courchevel/esf-courchevel-1850.yml
@@ -4,8 +4,8 @@ latitude: 45.41499
 longitude: 6.63526
 postcode: "73120"
 city: Courchevel
-street: "Rue de la Croisette"
-housenumber: 110
+street: ""
+housenumber: "110"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/intersport-2.yml b/data/cities/courchevel/intersport-2.yml
index 17ff1060c..f6bb10649 100644
--- a/data/cities/courchevel/intersport-2.yml
+++ b/data/cities/courchevel/intersport-2.yml
@@ -1,11 +1,11 @@
-id: 3169003061
+id: 3170101773
 type: node
-latitude: 45.41781
-longitude: 6.65177
+latitude: 45.41561
+longitude: 6.63108
 postcode: "73120"
 city: Courchevel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/intersport-rue-des-tovets.yml b/data/cities/courchevel/intersport-rue-des-tovets.yml
deleted file mode 100644
index 4dc6dac56..000000000
--- a/data/cities/courchevel/intersport-rue-des-tovets.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3170127501
-type: node
-latitude: 45.42129
-longitude: 6.64365
-postcode: ""
-city: Courchevel
-street: "Rue des Tovets"
-housenumber: 
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/courchevel/intersport.yml b/data/cities/courchevel/intersport.yml
index 17401ff9c..41c7102a0 100644
--- a/data/cities/courchevel/intersport.yml
+++ b/data/cities/courchevel/intersport.yml
@@ -1,11 +1,11 @@
-id: 3170101773
+id: 3169003061
 type: node
-latitude: 45.41561
-longitude: 6.63108
+latitude: 45.41781
+longitude: 6.65177
 postcode: "73120"
 city: Courchevel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/le-camp-de-base.yml b/data/cities/courchevel/le-camp-de-base.yml
index bacbb525d..dc92ff108 100644
--- a/data/cities/courchevel/le-camp-de-base.yml
+++ b/data/cities/courchevel/le-camp-de-base.yml
@@ -5,7 +5,7 @@ longitude: 6.63246
 postcode: "73120"
 city: Courchevel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/serge-sport-skiset.yml b/data/cities/courchevel/serge-sport-skiset.yml
index a4ce77fc4..52d775595 100644
--- a/data/cities/courchevel/serge-sport-skiset.yml
+++ b/data/cities/courchevel/serge-sport-skiset.yml
@@ -5,7 +5,7 @@ longitude: 6.65086
 postcode: "73120"
 city: Courchevel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/sherpa.yml b/data/cities/courchevel/sherpa.yml
index 92df4e6d4..50081a8c1 100644
--- a/data/cities/courchevel/sherpa.yml
+++ b/data/cities/courchevel/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 45.41571
 longitude: 6.63244
 postcode: "73120"
 city: Courchevel
-street: "Place du Forum"
-housenumber: 
-phone: "+33 4 79 08 40 39"
+street: Place du Forum
+housenumber: ""
+phone: +33 4 79 08 40 39
 opening_hours: ""
-website: "https://www.sherpa.net/magasins/courchevel-1850"
\ No newline at end of file
+website: https://www.sherpa.net/magasins/courchevel-1850
diff --git a/data/cities/courchevel/ski-republic.yml b/data/cities/courchevel/ski-republic.yml
index 41993e6ee..780b51591 100644
--- a/data/cities/courchevel/ski-republic.yml
+++ b/data/cities/courchevel/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 45.41591
 longitude: 6.63623
 postcode: "73120"
 city: Courchevel
-street: "Rue des Tovets"
-housenumber: 
+street: Rue des Tovets
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/sport-2000-place-du-marquis.yml b/data/cities/courchevel/sport-2000-place-du-marquis.yml
deleted file mode 100644
index 837eac49d..000000000
--- a/data/cities/courchevel/sport-2000-place-du-marquis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4709451666
-type: node
-latitude: 45.41917
-longitude: 6.65185
-postcode: "73120"
-city: Courchevel
-street: "Place du Marquis"
-housenumber: 
-phone: "+33 4 79 08 16 46"
-opening_hours: "08:30-19:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/courchevel/sport-2000.yml b/data/cities/courchevel/sport-2000.yml
index 90ac9a013..c7b3bb61e 100644
--- a/data/cities/courchevel/sport-2000.yml
+++ b/data/cities/courchevel/sport-2000.yml
@@ -5,7 +5,7 @@ longitude: 6.62351
 postcode: "73120"
 city: Courchevel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/courchevel/village-des-enfants.yml b/data/cities/courchevel/village-des-enfants.yml
index 60f12ea4f..6f01340b0 100644
--- a/data/cities/courchevel/village-des-enfants.yml
+++ b/data/cities/courchevel/village-des-enfants.yml
@@ -4,8 +4,8 @@ latitude: 45.41638
 longitude: 6.63223
 postcode: "73120"
 city: Courchevel
-street: "Rue de Plantret"
-housenumber: 
+street: Rue de Plantret
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/couzon-au-mont-dor/epis-tete.yml b/data/cities/couzon-au-mont-dor/epis-tete.yml
index a47c53fdf..ec9bef6dd 100644
--- a/data/cities/couzon-au-mont-dor/epis-tete.yml
+++ b/data/cities/couzon-au-mont-dor/epis-tete.yml
@@ -4,8 +4,8 @@ latitude: 45.8453
 longitude: 4.83109
 postcode: "69270"
 city: Couzon-au-Mont-d'Or
-street: "Rue Pierre Dupont"
-housenumber: 7
-phone: "+33 4 78 22 05 77"
-opening_hours: "Tu-Th 09:00-12:00,14:00-19:00; Fr 09:00-19:00; Sa 08:00-15:00"
-website: ""
\ No newline at end of file
+street: Rue Pierre Dupont
+housenumber: "7"
+phone: +33 4 78 22 05 77
+opening_hours: Tu-Th 09:00-12:00,14:00-19:00; Fr 09:00-19:00; Sa 08:00-15:00
+website: ""
diff --git a/data/cities/couzon-au-mont-dor/fournil-des-monts-dor.yml b/data/cities/couzon-au-mont-dor/fournil-des-monts-dor.yml
index f57f972be..b4411f505 100644
--- a/data/cities/couzon-au-mont-dor/fournil-des-monts-dor.yml
+++ b/data/cities/couzon-au-mont-dor/fournil-des-monts-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.84506
 longitude: 4.82901
 postcode: "69270"
 city: Couzon-au-Mont-d'Or
-street: "Place Ampère"
-housenumber: 4
-phone: "+33 4 78 22 21 82"
+street: Place Ampère
+housenumber: "4"
+phone: +33 4 78 22 21 82
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/couzon-au-mont-dor/le-moulin-de-couzon.yml b/data/cities/couzon-au-mont-dor/le-moulin-de-couzon.yml
index 530e5ef92..54300992f 100644
--- a/data/cities/couzon-au-mont-dor/le-moulin-de-couzon.yml
+++ b/data/cities/couzon-au-mont-dor/le-moulin-de-couzon.yml
@@ -4,8 +4,8 @@ latitude: 45.84584
 longitude: 4.83169
 postcode: "69270"
 city: Couzon-au-Mont-d'Or
-street: "Avenue Général de Gaulle"
-housenumber: 89
-phone: "+33 4 78 22 21 19"
-opening_hours: "Mo-Fr 06:00-19:30; We off; Sa 07:00-13:00,15:30-19:30; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+street: Avenue Général de Gaulle
+housenumber: "89"
+phone: +33 4 78 22 21 19
+opening_hours: Mo-Fr 06:00-19:30; We off; Sa 07:00-13:00,15:30-19:30; Su 07:00-13:00
+website: ""
diff --git a/data/cities/cran-gevrier/cran-cycles.yml b/data/cities/cran-gevrier/cran-cycles.yml
index ab62acdec..d591a0d61 100644
--- a/data/cities/cran-gevrier/cran-cycles.yml
+++ b/data/cities/cran-gevrier/cran-cycles.yml
@@ -4,8 +4,8 @@ latitude: 45.90674
 longitude: 6.11118
 postcode: "74960"
 city: Cran-Gevrier
-street: "Avenue de la République"
-housenumber: 7
-phone: "+33 4 50 57 21 73"
-opening_hours: "Tu-Fr 09:00-12:00, 15:00-19:30; Sa 09:00-12:00"
-website: "http://www.crancycles.com/"
\ No newline at end of file
+street: Avenue de la République
+housenumber: "7"
+phone: +33 4 50 57 21 73
+opening_hours: Tu-Fr 09:00-12:00, 15:00-19:30; Sa 09:00-12:00
+website: http://www.crancycles.com/
diff --git a/data/cities/cran-gevrier/garage-pothain-bosch.yml b/data/cities/cran-gevrier/garage-pothain-bosch.yml
index 1dde97453..c949c9807 100644
--- a/data/cities/cran-gevrier/garage-pothain-bosch.yml
+++ b/data/cities/cran-gevrier/garage-pothain-bosch.yml
@@ -1,11 +1,11 @@
 id: 62654454
-type: way
+type: node
 latitude: 45.90917
 longitude: 6.1067
 postcode: "74960"
 city: Cran-Gevrier
-street: "Rue de la Crête"
+street: Rue de la Crête
 housenumber: 9 Bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cran-gevrier/media-concept.yml b/data/cities/cran-gevrier/media-concept.yml
index fd35fbadc..9f57964e3 100644
--- a/data/cities/cran-gevrier/media-concept.yml
+++ b/data/cities/cran-gevrier/media-concept.yml
@@ -4,8 +4,8 @@ latitude: 45.90681
 longitude: 6.11076
 postcode: "74960"
 city: Cran-Gevrier
-street: "Avenue de la République"
+street: Avenue de la République
 housenumber: 7 bis
 phone: ""
 opening_hours: ""
-website: "http://mediaconcept74.com"
\ No newline at end of file
+website: http://mediaconcept74.com
diff --git a/data/cities/cran-gevrier/nautilus.yml b/data/cities/cran-gevrier/nautilus.yml
index cb7ab6c16..662ce7c9e 100644
--- a/data/cities/cran-gevrier/nautilus.yml
+++ b/data/cities/cran-gevrier/nautilus.yml
@@ -4,8 +4,8 @@ latitude: 45.90708
 longitude: 6.10836
 postcode: "74960"
 city: Cran-Gevrier
-street: "Avenue de la République"
-housenumber: 11
+street: Avenue de la République
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cran-gevrier/techni-nails.yml b/data/cities/cran-gevrier/techni-nails.yml
index 896e15f8a..09c253ad8 100644
--- a/data/cities/cran-gevrier/techni-nails.yml
+++ b/data/cities/cran-gevrier/techni-nails.yml
@@ -4,8 +4,8 @@ latitude: 45.8955
 longitude: 6.10954
 postcode: "74960"
 city: Cran-Gevrier
-street: "Route des Creuses"
+street: Route des Creuses
 housenumber: 8 Bis
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-14:00"
-website: "www.techni-nails74.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-14:00
+website: www.techni-nails74.com/
diff --git a/data/cities/cranves-sales/a-vue-doeil.yml b/data/cities/cranves-sales/a-vue-doeil.yml
index 426888430..26dfb0ec5 100644
--- a/data/cities/cranves-sales/a-vue-doeil.yml
+++ b/data/cities/cranves-sales/a-vue-doeil.yml
@@ -4,8 +4,8 @@ latitude: 46.18695
 longitude: 6.29206
 postcode: "74380"
 city: Cranves-Sales
-street: "Rue de la Mairie"
-housenumber: 102
+street: Rue de la Mairie
+housenumber: "102"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/annemasse-pneus.yml b/data/cities/cranves-sales/annemasse-pneus.yml
index cfcd8eb25..48a9fb79b 100644
--- a/data/cities/cranves-sales/annemasse-pneus.yml
+++ b/data/cities/cranves-sales/annemasse-pneus.yml
@@ -1,11 +1,11 @@
 id: 166182658
-type: way
+type: node
 latitude: 46.18086
 longitude: 6.28117
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 348
+street: Route des Tattes de Borly
+housenumber: "348"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/au-petrin-des-saveurs.yml b/data/cities/cranves-sales/au-petrin-des-saveurs.yml
index a4ae089bf..6714a6056 100644
--- a/data/cities/cranves-sales/au-petrin-des-saveurs.yml
+++ b/data/cities/cranves-sales/au-petrin-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 46.18618
 longitude: 6.29091
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Fontaines"
-housenumber: 
+street: Route des Fontaines
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:30; Su 06:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:30; Su 06:00-12:30
+website: ""
diff --git a/data/cities/cranves-sales/beaute-canine.yml b/data/cities/cranves-sales/beaute-canine.yml
index 789621726..df88d83a2 100644
--- a/data/cities/cranves-sales/beaute-canine.yml
+++ b/data/cities/cranves-sales/beaute-canine.yml
@@ -1,11 +1,11 @@
 id: 610259422
-type: way
+type: node
 latitude: 46.18742
 longitude: 6.28472
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Fontaines"
-housenumber: 
+street: Route des Fontaines
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/best-auto.yml b/data/cities/cranves-sales/best-auto.yml
index a69257978..f39ba8d5a 100644
--- a/data/cities/cranves-sales/best-auto.yml
+++ b/data/cities/cranves-sales/best-auto.yml
@@ -1,11 +1,11 @@
 id: 604895640
-type: way
+type: node
 latitude: 46.18166
 longitude: 6.27668
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 747
+street: Route des Tattes de Borly
+housenumber: "747"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/bochet-recyclage.yml b/data/cities/cranves-sales/bochet-recyclage.yml
index b2b84d7d5..e23053f69 100644
--- a/data/cities/cranves-sales/bochet-recyclage.yml
+++ b/data/cities/cranves-sales/bochet-recyclage.yml
@@ -1,11 +1,11 @@
 id: 166776280
-type: way
+type: node
 latitude: 46.17983
 longitude: 6.27776
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 635
-phone: "+33 4 50 39 30 64"
+street: Route des Tattes de Borly
+housenumber: "635"
+phone: +33 4 50 39 30 64
 opening_hours: ""
-website: "http://www.bochet.com"
\ No newline at end of file
+website: http://www.bochet.com
diff --git a/data/cities/cranves-sales/centre-auto-de-borly.yml b/data/cities/cranves-sales/centre-auto-de-borly.yml
index 4bf28558f..7a6f0f624 100644
--- a/data/cities/cranves-sales/centre-auto-de-borly.yml
+++ b/data/cities/cranves-sales/centre-auto-de-borly.yml
@@ -1,11 +1,11 @@
 id: 514815897
-type: way
+type: node
 latitude: 46.18407
 longitude: 6.27883
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 1071
+street: Route des Tattes de Borly
+housenumber: "1071"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00; Su off
+website: ""
diff --git a/data/cities/cranves-sales/chez-lpere-brunier.yml b/data/cities/cranves-sales/chez-lpere-brunier.yml
index 476feeaa5..0247cf6c4 100644
--- a/data/cities/cranves-sales/chez-lpere-brunier.yml
+++ b/data/cities/cranves-sales/chez-lpere-brunier.yml
@@ -1,11 +1,11 @@
 id: 98302399
-type: way
+type: node
 latitude: 46.18808
 longitude: 6.29077
 postcode: "74380"
 city: Cranves-Sales
-street: "Rue de la Poste"
-housenumber: 
+street: Rue de la Poste
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/chronodrive.yml b/data/cities/cranves-sales/chronodrive.yml
index 70ea9d31b..db7f9310f 100644
--- a/data/cities/cranves-sales/chronodrive.yml
+++ b/data/cities/cranves-sales/chronodrive.yml
@@ -1,11 +1,11 @@
 id: 166770316
-type: way
+type: node
 latitude: 46.18324
 longitude: 6.28002
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 1080
+street: Route des Tattes de Borly
+housenumber: "1080"
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/cranves-sales/chrysalide-coiffure.yml b/data/cities/cranves-sales/chrysalide-coiffure.yml
index 0db0b49e7..544b8d2a0 100644
--- a/data/cities/cranves-sales/chrysalide-coiffure.yml
+++ b/data/cities/cranves-sales/chrysalide-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.18691
 longitude: 6.29204
 postcode: "74380"
 city: Cranves-Sales
-street: "Rue de la Mairie"
-housenumber: 
+street: Rue de la Mairie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/cranves-auto-74.yml b/data/cities/cranves-sales/cranves-auto-74.yml
index e85053388..7277d3198 100644
--- a/data/cities/cranves-sales/cranves-auto-74.yml
+++ b/data/cities/cranves-sales/cranves-auto-74.yml
@@ -1,11 +1,11 @@
 id: 166776285
-type: way
+type: node
 latitude: 46.18226
 longitude: 6.27882
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 942
+street: Route des Tattes de Borly
+housenumber: "942"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/e-leclerc-drive.yml b/data/cities/cranves-sales/e-leclerc-drive.yml
index 8fb471bdf..8e948ed34 100644
--- a/data/cities/cranves-sales/e-leclerc-drive.yml
+++ b/data/cities/cranves-sales/e-leclerc-drive.yml
@@ -4,8 +4,8 @@ latitude: 46.18271
 longitude: 6.28174
 postcode: "74380"
 city: Cranves-Sales
-street: "Route de Taninges"
-housenumber: 
+street: Route de Taninges
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/electronaute.yml b/data/cities/cranves-sales/electronaute.yml
index 7af42a237..a42bb38ac 100644
--- a/data/cities/cranves-sales/electronaute.yml
+++ b/data/cities/cranves-sales/electronaute.yml
@@ -4,8 +4,8 @@ latitude: 46.18598
 longitude: 6.2907
 postcode: "74380"
 city: Cranves-Sales
-street: "Rue du Clos des Mésanges"
-housenumber: 
+street: Rue du Clos des Mésanges
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-2.yml b/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-2.yml
index 303189a1a..53ce03646 100644
--- a/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-2.yml
+++ b/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-2.yml
@@ -1,11 +1,11 @@
 id: 166776253
-type: way
+type: node
 latitude: 46.17999
 longitude: 6.27841
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 
+street: Route des Tattes de Borly
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-3.yml b/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-3.yml
index 73e0fa0fc..cb6817b99 100644
--- a/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-3.yml
+++ b/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly-3.yml
@@ -1,11 +1,11 @@
 id: 166776255
-type: way
+type: node
 latitude: 46.18052
 longitude: 6.27892
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 631
+street: Route des Tattes de Borly
+housenumber: "631"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly.yml b/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly.yml
index 037aee896..d8ce9bf96 100644
--- a/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly.yml
+++ b/data/cities/cranves-sales/emmaus-route-des-tattes-de-borly.yml
@@ -1,11 +1,11 @@
 id: 166770007
-type: way
+type: node
 latitude: 46.18131
 longitude: 6.27883
 postcode: ""
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 
+street: Route des Tattes de Borly
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/emmaus.yml b/data/cities/cranves-sales/emmaus.yml
index f6652e47d..2435413f5 100644
--- a/data/cities/cranves-sales/emmaus.yml
+++ b/data/cities/cranves-sales/emmaus.yml
@@ -1,11 +1,11 @@
 id: 166770001
-type: way
+type: node
 latitude: 46.18128
 longitude: 6.27907
 postcode: ""
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 
+street: Route des Tattes de Borly
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/garage-staehle.yml b/data/cities/cranves-sales/garage-staehle.yml
index ae9d86b0c..f39287da1 100644
--- a/data/cities/cranves-sales/garage-staehle.yml
+++ b/data/cities/cranves-sales/garage-staehle.yml
@@ -1,11 +1,11 @@
 id: 166182649
-type: way
+type: node
 latitude: 46.18218
 longitude: 6.28343
 postcode: "74380"
 city: Cranves-Sales
-street: "Chemin de la Noue"
-housenumber: 
+street: Chemin de la Noue
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/greentrack.yml b/data/cities/cranves-sales/greentrack.yml
index fab046949..13776c2c7 100644
--- a/data/cities/cranves-sales/greentrack.yml
+++ b/data/cities/cranves-sales/greentrack.yml
@@ -1,11 +1,11 @@
 id: 158463889
-type: way
+type: node
 latitude: 46.1832
 longitude: 6.27955
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 
+street: Route des Tattes de Borly
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/jour-de-fleuraison.yml b/data/cities/cranves-sales/jour-de-fleuraison.yml
index 16fe880c5..abfd85e3c 100644
--- a/data/cities/cranves-sales/jour-de-fleuraison.yml
+++ b/data/cities/cranves-sales/jour-de-fleuraison.yml
@@ -4,8 +4,8 @@ latitude: 46.18373
 longitude: 6.27957
 postcode: "74380"
 city: Cranves-Sales
-street: "Route de Taninges"
-housenumber: 1075
+street: Route de Taninges
+housenumber: "1075"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00
+website: ""
diff --git a/data/cities/cranves-sales/lionel-maurice.yml b/data/cities/cranves-sales/lionel-maurice.yml
index 5f9fce615..088db522d 100644
--- a/data/cities/cranves-sales/lionel-maurice.yml
+++ b/data/cities/cranves-sales/lionel-maurice.yml
@@ -4,8 +4,8 @@ latitude: 46.1801
 longitude: 6.28968
 postcode: "74380"
 city: Cranves-Sales
-street: "Route de la Bergue"
-housenumber: 977
+street: Route de la Bergue
+housenumber: "977"
 phone: "+33450957059"
-opening_hours: "Tu-Sa 10:00-12:30, 15:00-19:30"
-website: "https://www.lionelmauricechocolatier.com/"
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30, 15:00-19:30
+website: https://www.lionelmauricechocolatier.com/
diff --git a/data/cities/cranves-sales/marche-pernoud.yml b/data/cities/cranves-sales/marche-pernoud.yml
index 6e0333aee..84a6e1497 100644
--- a/data/cities/cranves-sales/marche-pernoud.yml
+++ b/data/cities/cranves-sales/marche-pernoud.yml
@@ -4,8 +4,8 @@ latitude: 46.18606
 longitude: 6.29041
 postcode: "74380"
 city: Cranves-Sales
-street: "Place du Commerce"
-housenumber: 
+street: Place du Commerce
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:30, 14:00-19:00; Sa 08:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:30, 14:00-19:00; Sa 08:30-19:00; Su off
+website: ""
diff --git a/data/cities/cranves-sales/nokian-tyres.yml b/data/cities/cranves-sales/nokian-tyres.yml
index f4b47dee0..1e8b7073d 100644
--- a/data/cities/cranves-sales/nokian-tyres.yml
+++ b/data/cities/cranves-sales/nokian-tyres.yml
@@ -1,11 +1,11 @@
 id: 1011040935
-type: way
+type: node
 latitude: 46.18153
 longitude: 6.27784
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 780
+street: Route des Tattes de Borly
+housenumber: "780"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/pixhall.yml b/data/cities/cranves-sales/pixhall.yml
index a2bc671bd..d77ebac35 100644
--- a/data/cities/cranves-sales/pixhall.yml
+++ b/data/cities/cranves-sales/pixhall.yml
@@ -1,11 +1,11 @@
 id: 166776279
-type: way
+type: node
 latitude: 46.18232
 longitude: 6.27762
 postcode: "74380"
 city: Cranves-Sales
-street: "Route des Tattes de Borly"
-housenumber: 
+street: Route des Tattes de Borly
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cranves-sales/sivemat.yml b/data/cities/cranves-sales/sivemat.yml
index 24d953a71..e48653398 100644
--- a/data/cities/cranves-sales/sivemat.yml
+++ b/data/cities/cranves-sales/sivemat.yml
@@ -1,11 +1,11 @@
 id: 1259168373
-type: way
+type: node
 latitude: 46.18256
 longitude: 6.28231
 postcode: "74380"
 city: Cranves-Sales
-street: "Route de Taninges"
-housenumber: 360
+street: Route de Taninges
+housenumber: "360"
 phone: "+33450431171"
 opening_hours: ""
-website: "https://www.sivemat.fr/index.php"
\ No newline at end of file
+website: https://www.sivemat.fr/index.php
diff --git a/data/cities/craponne/blackstore.yml b/data/cities/craponne/blackstore.yml
index b2c5d8969..9ff1df18e 100644
--- a/data/cities/craponne/blackstore.yml
+++ b/data/cities/craponne/blackstore.yml
@@ -4,8 +4,8 @@ latitude: 45.74747
 longitude: 4.739
 postcode: "69290"
 city: Craponne
-street: "Avenue Édouard Millaud"
-housenumber: 28
+street: Avenue Édouard Millaud
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/crassier/au-coeur-des-saveurs.yml b/data/cities/crassier/au-coeur-des-saveurs.yml
index ba3416118..e404ebc99 100644
--- a/data/cities/crassier/au-coeur-des-saveurs.yml
+++ b/data/cities/crassier/au-coeur-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 46.37316
 longitude: 6.16556
 postcode: "1263"
 city: Crassier
-street: "Route de Nyon"
+street: Route de Nyon
 housenumber: 1a
-phone: "+4122 367 08 97"
-opening_hours: "Tu-Fr06:00-18:30; Sa 06:30-12:30; Su 07:00-12:00"
-website: "http://www.au-coeur-des-saveurs.ch"
\ No newline at end of file
+phone: +4122 367 08 97
+opening_hours: Tu-Fr06:00-18:30; Sa 06:30-12:30; Su 07:00-12:00
+website: http://www.au-coeur-des-saveurs.ch
diff --git a/data/cities/crassier/cycles-d-girard-pro-shop.yml b/data/cities/crassier/cycles-d-girard-pro-shop.yml
index 2920360e9..823103976 100644
--- a/data/cities/crassier/cycles-d-girard-pro-shop.yml
+++ b/data/cities/crassier/cycles-d-girard-pro-shop.yml
@@ -4,8 +4,8 @@ latitude: 46.37327
 longitude: 6.16575
 postcode: "1263"
 city: Crassier
-street: "Route de Nyon"
-housenumber: 3
-phone: "+41 22 734 40 40"
-opening_hours: "Tu-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-17:00"
-website: "https://cycles-girard.ch/pro-shop/"
\ No newline at end of file
+street: Route de Nyon
+housenumber: "3"
+phone: +41 22 734 40 40
+opening_hours: Tu-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-17:00
+website: https://cycles-girard.ch/pro-shop/
diff --git a/data/cities/cremieu/atelier-automobile.yml b/data/cities/cremieu/atelier-automobile.yml
index 8da5e527c..7eab4089c 100644
--- a/data/cities/cremieu/atelier-automobile.yml
+++ b/data/cities/cremieu/atelier-automobile.yml
@@ -4,8 +4,8 @@ latitude: 45.72613
 longitude: 5.23259
 postcode: "38460"
 city: Crémieu
-street: "Chemin de la Création"
-housenumber: 
+street: Chemin de la Création
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/cremieu/duclos-gonet.yml b/data/cities/cremieu/duclos-gonet.yml
index dd06a9fff..01413e6c3 100644
--- a/data/cities/cremieu/duclos-gonet.yml
+++ b/data/cities/cremieu/duclos-gonet.yml
@@ -4,8 +4,8 @@ latitude: 45.73119
 longitude: 5.23678
 postcode: "38460"
 city: Crémieu
-street: "Route de Lyon"
-housenumber: 14
-phone: "+33 4 37 06 61 23"
-opening_hours: "Fr 14:00-19:00; Sa 09:00-13:00; We 14:00-18:00"
-website: "https://patesalaferme.fr/"
\ No newline at end of file
+street: Route de Lyon
+housenumber: "14"
+phone: +33 4 37 06 61 23
+opening_hours: Fr 14:00-19:00; Sa 09:00-13:00; We 14:00-18:00
+website: https://patesalaferme.fr/
diff --git a/data/cities/crest-voland/berod-sports-le-cernix.yml b/data/cities/crest-voland/berod-sports-le-cernix.yml
index c050d7f62..3195f6436 100644
--- a/data/cities/crest-voland/berod-sports-le-cernix.yml
+++ b/data/cities/crest-voland/berod-sports-le-cernix.yml
@@ -4,8 +4,8 @@ latitude: 45.78306
 longitude: 6.49909
 postcode: "73590"
 city: Crest-Voland
-street: "le Cernix"
-housenumber: 
+street: le Cernix
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/crest-voland/berod-sports.yml b/data/cities/crest-voland/berod-sports.yml
index 5ef41ab7f..ec8a6b261 100644
--- a/data/cities/crest-voland/berod-sports.yml
+++ b/data/cities/crest-voland/berod-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.79353
 longitude: 6.50297
 postcode: "73590"
 city: Crest-Voland
-street: "Route d'entre Deux Villes"
-housenumber: 198
-phone: "+33 4 79 31 21 07"
+street: Route d'entre Deux Villes
+housenumber: "198"
+phone: +33 4 79 31 21 07
 opening_hours: ""
-website: "https://berod-sports.com"
\ No newline at end of file
+website: https://berod-sports.com
diff --git a/data/cities/crest-voland/intersport.yml b/data/cities/crest-voland/intersport.yml
index 032d800b9..56f0f47da 100644
--- a/data/cities/crest-voland/intersport.yml
+++ b/data/cities/crest-voland/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.501
 postcode: "73590"
 city: Crest-Voland
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/crest-voland/sport-2000.yml b/data/cities/crest-voland/sport-2000.yml
index 5108fe8d5..ad992e1c4 100644
--- a/data/cities/crest-voland/sport-2000.yml
+++ b/data/cities/crest-voland/sport-2000.yml
@@ -1,11 +1,11 @@
 id: 193151821
-type: way
+type: node
 latitude: 45.79429
 longitude: 6.50507
 postcode: "73590"
 city: Crest-Voland
-street: "che lieu"
+street: che lieu
 housenumber: 71 A
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/crest/bricotheque-la-chignole.yml b/data/cities/crest/bricotheque-la-chignole.yml
index 9a7b74f31..b6e3a6f66 100644
--- a/data/cities/crest/bricotheque-la-chignole.yml
+++ b/data/cities/crest/bricotheque-la-chignole.yml
@@ -1,11 +1,11 @@
 id: 72551795
-type: way
+type: node
 latitude: 44.72993
 longitude: 5.01058
 postcode: "26400"
 city: Crest
-street: "Chemin du Grand Saint-Jean"
+street: Chemin du Grand Saint-Jean
 housenumber: 6A
-phone: "+33 7 67 71 09 91"
-opening_hours: "We,Fr,Sa 13:30 - 18:00; Sa 10:00 - 12:30"
-website: "https://lachignole.org"
\ No newline at end of file
+phone: +33 7 67 71 09 91
+opening_hours: We,Fr,Sa 13:30 - 18:00; Sa 10:00 - 12:30
+website: https://lachignole.org
diff --git a/data/cities/crest/high-society-crest.yml b/data/cities/crest/high-society-crest.yml
index 5b2d863b7..ef1342260 100644
--- a/data/cities/crest/high-society-crest.yml
+++ b/data/cities/crest/high-society-crest.yml
@@ -4,8 +4,8 @@ latitude: 44.72794
 longitude: 5.02143
 postcode: "26400"
 city: Crest
-street: "Rue Général Berlier"
-housenumber: 1
+street: Rue Général Berlier
+housenumber: "1"
 phone: "0475844546"
 opening_hours: ""
-website: "https://www.highsociety.fr/#crest"
\ No newline at end of file
+website: https://www.highsociety.fr/#crest
diff --git a/data/cities/crest/national-pieces-auto.yml b/data/cities/crest/national-pieces-auto.yml
index 4a4a80573..33c682a24 100644
--- a/data/cities/crest/national-pieces-auto.yml
+++ b/data/cities/crest/national-pieces-auto.yml
@@ -1,11 +1,11 @@
 id: 72552009
-type: way
+type: node
 latitude: 44.73235
 longitude: 5.01006
 postcode: "26400"
 city: Crest
-street: "Rue Gustave Eiffel"
-housenumber: 6
+street: Rue Gustave Eiffel
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/crolles/art-rock-music-store.yml b/data/cities/crolles/art-rock-music-store.yml
index 844c7e414..cb813bcfc 100644
--- a/data/cities/crolles/art-rock-music-store.yml
+++ b/data/cities/crolles/art-rock-music-store.yml
@@ -4,8 +4,8 @@ latitude: 45.28389
 longitude: 5.8816
 postcode: "38920"
 city: Crolles
-street: "Rue du Brocey"
-housenumber: 117
+street: Rue du Brocey
+housenumber: "117"
 phone: "+33476972541"
-opening_hours: "Tu-Fr 09:30-12:30,15:00-19:00; Sa 09:00-12:00,14:30-18:00; Su 10:00-12:00"
-website: "https://www.artrock-music.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30,15:00-19:00; Sa 09:00-12:00,14:30-18:00; Su 10:00-12:00
+website: https://www.artrock-music.com/
diff --git a/data/cities/crolles/besson-chaussures.yml b/data/cities/crolles/besson-chaussures.yml
index 54f1f5ee8..2f5dcb2ed 100644
--- a/data/cities/crolles/besson-chaussures.yml
+++ b/data/cities/crolles/besson-chaussures.yml
@@ -1,11 +1,11 @@
 id: 1108280412
-type: way
+type: node
 latitude: 45.27405
 longitude: 5.88494
 postcode: "38920"
 city: Crolles
-street: "Avenue ambroise croizat"
-housenumber: 299
+street: Avenue Ambroise Croizat
+housenumber: "299"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su 14:00-18:00"
-website: "https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-grenoble-crolles_crolles_38920/33.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su 14:00-18:00
+website: https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-grenoble-crolles_crolles_38920/33.html
diff --git a/data/cities/crolles/bike-to-the-future.yml b/data/cities/crolles/bike-to-the-future.yml
index 4dffbdb65..47cb33b5c 100644
--- a/data/cities/crolles/bike-to-the-future.yml
+++ b/data/cities/crolles/bike-to-the-future.yml
@@ -4,8 +4,8 @@ latitude: 45.27639
 longitude: 5.8881
 postcode: "38920"
 city: Crolles
-street: "Rue Charles de Gaulle"
-housenumber: 441
+street: Rue Charles de Gaulle
+housenumber: "441"
 phone: ""
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/crolles/centre-edelweiss.yml b/data/cities/crolles/centre-edelweiss.yml
index 81312c2be..2ce9c9344 100644
--- a/data/cities/crolles/centre-edelweiss.yml
+++ b/data/cities/crolles/centre-edelweiss.yml
@@ -4,8 +4,8 @@ latitude: 45.27206
 longitude: 5.89117
 postcode: "38920"
 city: CROLLES
-street: "Rue des Grives"
-housenumber: 48
+street: Rue des Grives
+housenumber: "48"
 phone: ""
 opening_hours: ""
-website: "https://www.centre-edelweiss-crolles.com"
\ No newline at end of file
+website: https://www.centre-edelweiss-crolles.com
diff --git a/data/cities/crolles/crolles-secretariat.yml b/data/cities/crolles/crolles-secretariat.yml
index c6ce5ab1d..b11d72495 100644
--- a/data/cities/crolles/crolles-secretariat.yml
+++ b/data/cities/crolles/crolles-secretariat.yml
@@ -4,8 +4,8 @@ latitude: 45.27222
 longitude: 5.89119
 postcode: "38920"
 city: Crolles
-street: "Rue des Grives"
-housenumber: 40
-phone: "+33 4 76 08 97 40"
+street: Rue des Grives
+housenumber: "40"
+phone: +33 4 76 08 97 40
 opening_hours: ""
-website: "https://www.crolles-photocopies.com"
\ No newline at end of file
+website: https://www.crolles-photocopies.com
diff --git a/data/cities/crolles/cycles-bentoline.yml b/data/cities/crolles/cycles-bentoline.yml
index d7daccd8b..d688ec390 100644
--- a/data/cities/crolles/cycles-bentoline.yml
+++ b/data/cities/crolles/cycles-bentoline.yml
@@ -4,8 +4,8 @@ latitude: 45.27445
 longitude: 5.87993
 postcode: "38920"
 city: Crolles
-street: "Chemin des Trois Marie"
-housenumber: 50
+street: Chemin des Trois Marie
+housenumber: "50"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/crolles/divine-beaute.yml b/data/cities/crolles/divine-beaute.yml
index 8a5cf81ce..dcd24af81 100644
--- a/data/cities/crolles/divine-beaute.yml
+++ b/data/cities/crolles/divine-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.28675
 longitude: 5.8863
 postcode: "38920"
 city: Crolles
-street: "Avenue de la Résistance"
-housenumber: 328
+street: Avenue de la Résistance
+housenumber: "328"
 phone: "+33476089338"
-opening_hours: "Mo 09:30-16:00; Tu-Fr 09:30-19:00; Sa 09:00-16:00"
-website: "https://www.divinebeaute.fr/"
\ No newline at end of file
+opening_hours: Mo 09:30-16:00; Tu-Fr 09:30-19:00; Sa 09:00-16:00
+website: https://www.divinebeaute.fr/
diff --git a/data/cities/crolles/gifi.yml b/data/cities/crolles/gifi.yml
index 4a6a59bbd..e0fbfed4f 100644
--- a/data/cities/crolles/gifi.yml
+++ b/data/cities/crolles/gifi.yml
@@ -1,11 +1,11 @@
 id: 328685505
-type: way
+type: node
 latitude: 45.2745
 longitude: 5.88535
 postcode: "38920"
 city: Crolles
-street: "Avenue Amboise Croizat"
-housenumber: 299
-phone: "+33 4 76 13 40 71"
-opening_hours: "Mo-Sa 09:30-19:00; Su 14:00-18:30"
-website: "https://www.gifi.fr/?store_id=10645&utm_source=GMB&utm_medium=groupe&utm_campaign=10645"
\ No newline at end of file
+street: Avenue Amboise Croizat
+housenumber: "299"
+phone: +33 4 76 13 40 71
+opening_hours: Mo-Sa 09:30-19:00; Su 14:00-18:30
+website: https://www.gifi.fr/?store_id=10645&utm_source=GMB&utm_medium=groupe&utm_campaign=10645
diff --git a/data/cities/crolles/gresy-la-bouquinerie-solidaire.yml b/data/cities/crolles/gresy-la-bouquinerie-solidaire.yml
index 500edcd17..d369d88a4 100644
--- a/data/cities/crolles/gresy-la-bouquinerie-solidaire.yml
+++ b/data/cities/crolles/gresy-la-bouquinerie-solidaire.yml
@@ -4,8 +4,8 @@ latitude: 45.27208
 longitude: 5.89194
 postcode: "38920"
 city: Crolles
-street: "Rue des Sources"
-housenumber: 452
-phone: "+33 6 03 19 28 02"
-opening_hours: "Tu-Fr 10:00-12:00,14:00-18:00; Sa 10:00-13:00,14:00-18:00"
-website: "https://www.gresy.fr/vente/crolles-bouquinerie/"
\ No newline at end of file
+street: Rue des Sources
+housenumber: "452"
+phone: +33 6 03 19 28 02
+opening_hours: Tu-Fr 10:00-12:00,14:00-18:00; Sa 10:00-13:00,14:00-18:00
+website: https://www.gresy.fr/vente/crolles-bouquinerie/
diff --git a/data/cities/crolles/gresy.yml b/data/cities/crolles/gresy.yml
index 7303fa411..3646f6344 100644
--- a/data/cities/crolles/gresy.yml
+++ b/data/cities/crolles/gresy.yml
@@ -4,8 +4,8 @@ latitude: 45.27188
 longitude: 5.89148
 postcode: "38920"
 city: Crolles
-street: "Rue des Grives"
-housenumber: 95
-phone: "+33 6 76 00 18 88"
-opening_hours: "Mo 14:00-18:00; Tu-Sa 10:00-18:00"
-website: "https://www.gresy.fr"
\ No newline at end of file
+street: Rue des Grives
+housenumber: "95"
+phone: +33 6 76 00 18 88
+opening_hours: Mo 14:00-18:00; Tu-Sa 10:00-18:00
+website: https://www.gresy.fr
diff --git a/data/cities/crolles/hoizon-floral.yml b/data/cities/crolles/hoizon-floral.yml
index 19daf45b6..2f964d8f1 100644
--- a/data/cities/crolles/hoizon-floral.yml
+++ b/data/cities/crolles/hoizon-floral.yml
@@ -4,8 +4,8 @@ latitude: 45.28405
 longitude: 5.88445
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 83
+street: Rue du 8 Mai 1945
+housenumber: "83"
 phone: "+33476080668"
-opening_hours: "Tu-Sa 09:00-12:00,15:00-19:00; Su 10:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,15:00-19:00; Su 10:00-12:00
+website: ""
diff --git a/data/cities/crolles/ipc.yml b/data/cities/crolles/ipc.yml
index 9aafa2ebc..93b6bdadd 100644
--- a/data/cities/crolles/ipc.yml
+++ b/data/cities/crolles/ipc.yml
@@ -4,8 +4,8 @@ latitude: 45.27195
 longitude: 5.89354
 postcode: "38920"
 city: Crolles
-street: "Rue des Frères Montgolfier"
-housenumber: 2
-phone: "+33 4 76 921 938"
-opening_hours: "Mo 14:00-18:30; Tu-Fr 09:00-12:30,14:00-18:30; Sa 09:00-12:30; Su off"
-website: "http://www.ipc38.com/"
\ No newline at end of file
+street: Rue des Frères Montgolfier
+housenumber: "2"
+phone: +33 4 76 921 938
+opening_hours: Mo 14:00-18:30; Tu-Fr 09:00-12:30,14:00-18:30; Sa 09:00-12:30; Su off
+website: http://www.ipc38.com/
diff --git a/data/cities/crolles/jean-luc-demol.yml b/data/cities/crolles/jean-luc-demol.yml
index 4a6b03655..43eb1e24b 100644
--- a/data/cities/crolles/jean-luc-demol.yml
+++ b/data/cities/crolles/jean-luc-demol.yml
@@ -4,8 +4,8 @@ latitude: 45.28389
 longitude: 5.88464
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 103
+street: Rue du 8 Mai 1945
+housenumber: "103"
 phone: "+33476088555"
-opening_hours: "Tu-Fr 08:00-12:30,15:30-19:00; Sa 08:00-18:30"
-website: "http://www.boucherie-charcuterie-jldemol.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 08:00-12:30,15:30-19:00; Sa 08:00-18:30
+website: http://www.boucherie-charcuterie-jldemol.fr/
diff --git a/data/cities/crolles/joueclub.yml b/data/cities/crolles/joueclub.yml
index b485fea93..e85edad0a 100644
--- a/data/cities/crolles/joueclub.yml
+++ b/data/cities/crolles/joueclub.yml
@@ -4,8 +4,8 @@ latitude: 45.27336
 longitude: 5.88294
 postcode: "38920"
 city: Crolles
-street: "Chemin du Meunier"
-housenumber: 228
+street: Chemin du Meunier
+housenumber: "228"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/crolles/la-friandise.yml b/data/cities/crolles/la-friandise.yml
index 96a6e9b1b..5f315e91c 100644
--- a/data/cities/crolles/la-friandise.yml
+++ b/data/cities/crolles/la-friandise.yml
@@ -4,8 +4,8 @@ latitude: 45.28382
 longitude: 5.88275
 postcode: "38920"
 city: Crolles
-street: "Avenue Joliot-Curie"
-housenumber: 111
+street: Avenue Joliot-Curie
+housenumber: "111"
 phone: "+33476401610"
-opening_hours: "Tu-Sa 06:15-19:00; Su 06:15-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:15-19:00; Su 06:15-13:00
+website: ""
diff --git a/data/cities/crolles/la-petite-boutique.yml b/data/cities/crolles/la-petite-boutique.yml
index e73d282f0..d538a56e5 100644
--- a/data/cities/crolles/la-petite-boutique.yml
+++ b/data/cities/crolles/la-petite-boutique.yml
@@ -4,8 +4,8 @@ latitude: 45.28395
 longitude: 5.88454
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 103
+street: Rue du 8 Mai 1945
+housenumber: "103"
 phone: "+33476135688"
-opening_hours: "Tu-Fr 09:00-12:30,15:00-19:00; Sa 09:30-12:30,15:00-18:30; Su 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:30,15:00-19:00; Sa 09:30-12:30,15:00-18:30; Su 09:30-12:30
+website: ""
diff --git a/data/cities/crolles/latelier-vapote.yml b/data/cities/crolles/latelier-vapote.yml
index d0f674ef1..aef1f3c42 100644
--- a/data/cities/crolles/latelier-vapote.yml
+++ b/data/cities/crolles/latelier-vapote.yml
@@ -4,8 +4,8 @@ latitude: 45.28695
 longitude: 5.88657
 postcode: "38920"
 city: Crolles
-street: "Avenue de la Résistance"
-housenumber: 360
+street: Avenue de la Résistance
+housenumber: "360"
 phone: "+33476086744"
-opening_hours: "Tu-Sa 09:00-13:00,15:00-19:00"
-website: "https://www.atelier-vapote.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-13:00,15:00-19:00
+website: https://www.atelier-vapote.fr/
diff --git a/data/cities/crolles/le-kiosque-a-pizzas.yml b/data/cities/crolles/le-kiosque-a-pizzas.yml
index 5b5ef17d5..53894e0b3 100644
--- a/data/cities/crolles/le-kiosque-a-pizzas.yml
+++ b/data/cities/crolles/le-kiosque-a-pizzas.yml
@@ -1,11 +1,11 @@
 id: 1243659942
-type: way
+type: node
 latitude: 45.27042
 longitude: 5.89253
 postcode: "38920"
 city: Crolles
 street: ""
-housenumber: 
+housenumber: ""
 phone: "+33476048181"
-opening_hours: "Mo-Su 17:30-21:30; Mo-Fr 11:30-13:30"
-website: "https://www.le-kiosque-a-pizzas.com/fiche-crolles--556"
\ No newline at end of file
+opening_hours: Mo-Su 17:30-21:30; Mo-Fr 11:30-13:30
+website: https://www.le-kiosque-a-pizzas.com/fiche-crolles--556
diff --git a/data/cities/crolles/le-pain-de-saint-hugon.yml b/data/cities/crolles/le-pain-de-saint-hugon.yml
index ccf4110f4..ba69fd3f5 100644
--- a/data/cities/crolles/le-pain-de-saint-hugon.yml
+++ b/data/cities/crolles/le-pain-de-saint-hugon.yml
@@ -4,8 +4,8 @@ latitude: 45.27626
 longitude: 5.88882
 postcode: "38920"
 city: Crolles
-street: "Rue Charles de Gaulle"
-housenumber: 441
+street: Rue Charles de Gaulle
+housenumber: "441"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/crolles/le-pain-sous-la-dent.yml b/data/cities/crolles/le-pain-sous-la-dent.yml
index 0ee9177ff..30d4592ac 100644
--- a/data/cities/crolles/le-pain-sous-la-dent.yml
+++ b/data/cities/crolles/le-pain-sous-la-dent.yml
@@ -4,8 +4,8 @@ latitude: 45.27102
 longitude: 5.89167
 postcode: "38920"
 city: Crolles
-street: "Avenue Ambroise Croizat"
-housenumber: 967
+street: Avenue Ambroise Croizat
+housenumber: "967"
 phone: ""
-opening_hours: "Mo-Fr 05:00-19:30; Sa 05:00-12:30, 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 05:00-19:30; Sa 05:00-12:30, 15:30-19:30
+website: ""
diff --git a/data/cities/crolles/les-paturages.yml b/data/cities/crolles/les-paturages.yml
index 426e964f3..d18c66e62 100644
--- a/data/cities/crolles/les-paturages.yml
+++ b/data/cities/crolles/les-paturages.yml
@@ -4,8 +4,8 @@ latitude: 45.28373
 longitude: 5.88442
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 110
+street: Rue du 8 Mai 1945
+housenumber: "110"
 phone: ""
-opening_hours: "Tu-Sa 8:30-12:00,15:30-19:00; Su 8:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 8:30-12:00,15:30-19:00; Su 8:30-12:00
+website: ""
diff --git a/data/cities/crolles/les-secrets-de-clochette.yml b/data/cities/crolles/les-secrets-de-clochette.yml
index d43ec4d62..3b3b8a473 100644
--- a/data/cities/crolles/les-secrets-de-clochette.yml
+++ b/data/cities/crolles/les-secrets-de-clochette.yml
@@ -4,8 +4,8 @@ latitude: 45.2836
 longitude: 5.88424
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 112
+street: Rue du 8 Mai 1945
+housenumber: "112"
 phone: "+33685227368"
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-13:00"
-website: "https://app.flexybeauty.com/les-secrets-de-clochette"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-13:00
+website: https://app.flexybeauty.com/les-secrets-de-clochette
diff --git a/data/cities/crolles/mondovelo-crolles.yml b/data/cities/crolles/mondovelo-crolles.yml
index b7d686798..5321604b6 100644
--- a/data/cities/crolles/mondovelo-crolles.yml
+++ b/data/cities/crolles/mondovelo-crolles.yml
@@ -4,8 +4,8 @@ latitude: 45.27226
 longitude: 5.8899
 postcode: "38920"
 city: Crolles
-street: "Avenue Ambroise Croizat"
-housenumber: 755
-phone: "+334 85 87 05 50"
-opening_hours: "Tu-Sa 09:30-13:00,14:00-19:00"
-website: "https://www.madeinvelo.fr/savoir-faire/mondovelo-crolles/513"
\ No newline at end of file
+street: Avenue Ambroise Croizat
+housenumber: "755"
+phone: +334 85 87 05 50
+opening_hours: Tu-Sa 09:30-13:00,14:00-19:00
+website: https://www.madeinvelo.fr/savoir-faire/mondovelo-crolles/513
diff --git a/data/cities/crolles/mr-bricolage.yml b/data/cities/crolles/mr-bricolage.yml
index e1aff9d36..2e7965e55 100644
--- a/data/cities/crolles/mr-bricolage.yml
+++ b/data/cities/crolles/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 69106643
-type: way
+type: node
 latitude: 45.27138
 longitude: 5.89205
 postcode: "38920"
 city: Crolles
-street: "Rue des Sources"
-housenumber: 
+street: Rue des Sources
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: "https://magasin.mr-bricolage.fr/76-mr-bricolage-crolles"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: https://magasin.mr-bricolage.fr/76-mr-bricolage-crolles
diff --git a/data/cities/crolles/murielle-coiffure.yml b/data/cities/crolles/murielle-coiffure.yml
index b42d046ef..5f82f9bd8 100644
--- a/data/cities/crolles/murielle-coiffure.yml
+++ b/data/cities/crolles/murielle-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.28282
 longitude: 5.88415
 postcode: "38920"
 city: Crolles
-street: "Place des Passages"
-housenumber: 39
-phone: "+33 4 76 08 91 93"
-opening_hours: "Tu-Fr 08:30-12:00,14:00-19:00; We 08:30-12:00,14:00-18:00; Sa 08:30-16:00"
-website: "https://murielle-coiffure.business.site/"
\ No newline at end of file
+street: Place des Passages
+housenumber: "39"
+phone: +33 4 76 08 91 93
+opening_hours: Tu-Fr 08:30-12:00,14:00-19:00; We 08:30-12:00,14:00-18:00; Sa 08:30-16:00
+website: https://murielle-coiffure.business.site/
diff --git a/data/cities/crolles/mvelo-agence-crolles.yml b/data/cities/crolles/mvelo-agence-crolles.yml
index 01a651c8f..e34eb7306 100644
--- a/data/cities/crolles/mvelo-agence-crolles.yml
+++ b/data/cities/crolles/mvelo-agence-crolles.yml
@@ -4,8 +4,8 @@ latitude: 45.27416
 longitude: 5.88608
 postcode: "38920"
 city: Crolles
-street: "Avenue Amboise Croizat"
-housenumber: 431
+street: Avenue Amboise Croizat
+housenumber: "431"
 phone: ""
-opening_hours: "Mo-Fr 09:30-13:00,13:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-13:00,13:30-18:30
+website: ""
diff --git a/data/cities/crolles/natura-pressing.yml b/data/cities/crolles/natura-pressing.yml
index 3c97cc7b3..660ffdc46 100644
--- a/data/cities/crolles/natura-pressing.yml
+++ b/data/cities/crolles/natura-pressing.yml
@@ -4,8 +4,8 @@ latitude: 45.27244
 longitude: 5.89116
 postcode: "38920"
 city: Crolles
-street: "Rue des Grives"
-housenumber: 40
-phone: "+33 4 76 08 83 06"
-opening_hours: "Mo-Fr 15:00-19:00, Tu-Fr 09:00-19:00; Sa 09:00-17:00"
-website: "https://www.natura-pressing.fr"
\ No newline at end of file
+street: Rue des Grives
+housenumber: "40"
+phone: +33 4 76 08 83 06
+opening_hours: Mo-Fr 15:00-19:00, Tu-Fr 09:00-19:00; Sa 09:00-17:00
+website: https://www.natura-pressing.fr
diff --git a/data/cities/crolles/routens-electric-bike.yml b/data/cities/crolles/routens-electric-bike.yml
index 88c942329..dab92bdb1 100644
--- a/data/cities/crolles/routens-electric-bike.yml
+++ b/data/cities/crolles/routens-electric-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.27426
 longitude: 5.88615
 postcode: "38920"
 city: Crolles
-street: "Avenue Ambroise Croizat"
-housenumber: 431
+street: Avenue Ambroise Croizat
+housenumber: "431"
 phone: ""
-opening_hours: "Tu-Sa 09:45-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:45-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/crolles/tout-propre.yml b/data/cities/crolles/tout-propre.yml
index fe8cdecf3..7adf249a4 100644
--- a/data/cities/crolles/tout-propre.yml
+++ b/data/cities/crolles/tout-propre.yml
@@ -4,8 +4,8 @@ latitude: 45.28369
 longitude: 5.88434
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 110
-phone: "+33 4 76 08 10 77"
-opening_hours: "Mo-Su 07:30-19:00"
-website: "https://pressing-isere.fr/sections/view.php/12/tout-propre"
\ No newline at end of file
+street: Rue du 8 Mai 1945
+housenumber: "110"
+phone: +33 4 76 08 10 77
+opening_hours: Mo-Su 07:30-19:00
+website: https://pressing-isere.fr/sections/view.php/12/tout-propre
diff --git a/data/cities/crolles/ultimate-coiffure.yml b/data/cities/crolles/ultimate-coiffure.yml
index 4497ef267..bb40c051f 100644
--- a/data/cities/crolles/ultimate-coiffure.yml
+++ b/data/cities/crolles/ultimate-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.27229
 longitude: 5.89128
 postcode: "38920"
 city: Crolles
-street: "Rue des Grives"
-housenumber: 40
-phone: "+33 4 76 92 24 09"
-opening_hours: "Tu-Fr 09:00-19:00, Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue des Grives
+housenumber: "40"
+phone: +33 4 76 92 24 09
+opening_hours: Tu-Fr 09:00-19:00, Sa 09:00-19:00
+website: ""
diff --git a/data/cities/crolles/un-temps-pour-soa.yml b/data/cities/crolles/un-temps-pour-soa.yml
index 5ce594f47..9715a1599 100644
--- a/data/cities/crolles/un-temps-pour-soa.yml
+++ b/data/cities/crolles/un-temps-pour-soa.yml
@@ -4,8 +4,8 @@ latitude: 45.28417
 longitude: 5.88427
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 63
+street: Rue du 8 Mai 1945
+housenumber: "63"
 phone: "+33476048778"
-opening_hours: "Mo-Fr 09:00-18:00; We off; Sa 09:00-16:00"
-website: "https://un-temps-pour-soa.business.site/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-18:00; We off; Sa 09:00-16:00
+website: https://un-temps-pour-soa.business.site/
diff --git a/data/cities/crolles/violette.yml b/data/cities/crolles/violette.yml
index 92282e1a5..8ccf8c5da 100644
--- a/data/cities/crolles/violette.yml
+++ b/data/cities/crolles/violette.yml
@@ -4,8 +4,8 @@ latitude: 45.28362
 longitude: 5.88428
 postcode: "38920"
 city: Crolles
-street: "Rue du 8 Mai 1945"
-housenumber: 112
+street: Rue du 8 Mai 1945
+housenumber: "112"
 phone: "+33476081797"
-opening_hours: "Tu-Fr 10:00-12:30,15:00-19:30; Sa 10:00-12:30,15:00-19:00"
-website: "http://violette.crolles.free.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:30,15:00-19:30; Sa 10:00-12:30,15:00-19:00
+website: http://violette.crolles.free.fr/
diff --git a/data/cities/crolles/vision-sport.yml b/data/cities/crolles/vision-sport.yml
index ea05455e7..22a21b333 100644
--- a/data/cities/crolles/vision-sport.yml
+++ b/data/cities/crolles/vision-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.27247
 longitude: 5.89287
 postcode: "38920"
 city: Crolles
-street: "Rue des Sources"
-housenumber: 479
+street: Rue des Sources
+housenumber: "479"
 phone: "+33476048399"
 opening_hours: ""
-website: "https://www.visionsport-crolles.com/"
\ No newline at end of file
+website: https://www.visionsport-crolles.com/
diff --git a/data/cities/crolles/z.yml b/data/cities/crolles/z.yml
index 51492421c..3d07e123f 100644
--- a/data/cities/crolles/z.yml
+++ b/data/cities/crolles/z.yml
@@ -4,8 +4,8 @@ latitude: 45.2733
 longitude: 5.88303
 postcode: "38920"
 city: Crolles
-street: "Chemin du Meunier"
-housenumber: 228
+street: Chemin du Meunier
+housenumber: "228"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/crozet/looping-sports-crozet.yml b/data/cities/crozet/looping-sports-crozet.yml
index 4e744d293..1260792e2 100644
--- a/data/cities/crozet/looping-sports-crozet.yml
+++ b/data/cities/crozet/looping-sports-crozet.yml
@@ -4,8 +4,8 @@ latitude: 46.28257
 longitude: 6.00705
 postcode: "01170"
 city: Crozet
-street: "gare du Télécabine"
-housenumber: 
+street: gare du Télécabine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cruseilles/avia.yml b/data/cities/cruseilles/avia.yml
index be3b4937c..652ef3924 100644
--- a/data/cities/cruseilles/avia.yml
+++ b/data/cities/cruseilles/avia.yml
@@ -4,8 +4,8 @@ latitude: 46.02952
 longitude: 6.10576
 postcode: "74350"
 city: Cruseilles
-street: "Route d'Annecy"
-housenumber: 363
-phone: "+33 4 50 44 10 69"
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+street: Route d'Annecy
+housenumber: "363"
+phone: +33 4 50 44 10 69
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/cruseilles/boucherie-du-saleve.yml b/data/cities/cruseilles/boucherie-du-saleve.yml
index 4b5d6148c..607975204 100644
--- a/data/cities/cruseilles/boucherie-du-saleve.yml
+++ b/data/cities/cruseilles/boucherie-du-saleve.yml
@@ -4,8 +4,8 @@ latitude: 46.03413
 longitude: 6.1078
 postcode: "74350"
 city: Cruseilles
-street: "Grande Rue"
-housenumber: 163
-phone: "+33 4 50 44 11 30"
-opening_hours: "Tu-Fr 07:30-12:30,15:00-19:00; Sa 07:30-18:00"
-website: "https://www.boucheriedusaleve.fr/"
\ No newline at end of file
+street: Grande Rue
+housenumber: "163"
+phone: +33 4 50 44 11 30
+opening_hours: Tu-Fr 07:30-12:30,15:00-19:00; Sa 07:30-18:00
+website: https://www.boucheriedusaleve.fr/
diff --git a/data/cities/cruseilles/carrefour-market.yml b/data/cities/cruseilles/carrefour-market.yml
index f3064c71b..7d185ada5 100644
--- a/data/cities/cruseilles/carrefour-market.yml
+++ b/data/cities/cruseilles/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 178624986
-type: way
+type: node
 latitude: 46.02821
 longitude: 6.10653
 postcode: "74350"
 city: Cruseilles
-street: "Route d'Annecy"
-housenumber: 629
+street: Route d'Annecy
+housenumber: "629"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/cruseilles/festival-des-pains.yml b/data/cities/cruseilles/festival-des-pains.yml
index bc77797e9..7afa1d541 100644
--- a/data/cities/cruseilles/festival-des-pains.yml
+++ b/data/cities/cruseilles/festival-des-pains.yml
@@ -4,8 +4,8 @@ latitude: 46.0342
 longitude: 6.10786
 postcode: "74350"
 city: Cruseilles
-street: "Grande Rue"
-housenumber: 171
-phone: "+33 4 50 44 12 16"
+street: Grande Rue
+housenumber: "171"
+phone: +33 4 50 44 12 16
 opening_hours: ""
-website: "https://www.festivaldespains.com/"
\ No newline at end of file
+website: https://www.festivaldespains.com/
diff --git a/data/cities/cruseilles/le-trendy.yml b/data/cities/cruseilles/le-trendy.yml
index ff778fbe8..3d5196996 100644
--- a/data/cities/cruseilles/le-trendy.yml
+++ b/data/cities/cruseilles/le-trendy.yml
@@ -4,8 +4,8 @@ latitude: 46.03365
 longitude: 6.1088
 postcode: "74350"
 city: Cruseilles
-street: "Place de la Fontaine"
-housenumber: 62
-phone: "+33 4 50 44 10 33"
-opening_hours: "Mo-We 08:00-18:30; Th 08:30-19:00; Fr 08:00-19:00; Sa 08:00-18:00"
-website: "https://www.letrendy.net/"
\ No newline at end of file
+street: Place de la Fontaine
+housenumber: "62"
+phone: +33 4 50 44 10 33
+opening_hours: Mo-We 08:00-18:30; Th 08:30-19:00; Fr 08:00-19:00; Sa 08:00-18:00
+website: https://www.letrendy.net/
diff --git a/data/cities/cruseilles/les-bocaux-du-saleve.yml b/data/cities/cruseilles/les-bocaux-du-saleve.yml
index bbfd99e07..53662dd57 100644
--- a/data/cities/cruseilles/les-bocaux-du-saleve.yml
+++ b/data/cities/cruseilles/les-bocaux-du-saleve.yml
@@ -4,8 +4,9 @@ latitude: 46.03384
 longitude: 6.10726
 postcode: "74350"
 city: Cruseilles
-street: "Place du Monument"
-housenumber: 46
-phone: "+33 4 85 46 52 78"
-opening_hours: "Mo 14:00-15:00,16:30-18:30; Tu,Th-Sa 09:30-13:00,14:00-18:30; We,Su off"
-website: ""
\ No newline at end of file
+street: Place du Monument
+housenumber: "46"
+phone: +33 4 85 46 52 78
+opening_hours: Mo 14:00-15:00,16:30-18:30; Tu,Th-Sa 09:30-13:00,14:00-18:30; We,Su
+    off
+website: ""
diff --git a/data/cities/cruseilles/maison-de-la-presse-tabac.yml b/data/cities/cruseilles/maison-de-la-presse-tabac.yml
index 70b71f803..d8e803e2d 100644
--- a/data/cities/cruseilles/maison-de-la-presse-tabac.yml
+++ b/data/cities/cruseilles/maison-de-la-presse-tabac.yml
@@ -4,8 +4,8 @@ latitude: 46.03426
 longitude: 6.10789
 postcode: "74350"
 city: Cruseilles
-street: "Grande Rue"
-housenumber: 179
+street: Grande Rue
+housenumber: "179"
 phone: ""
-opening_hours: "Mo-Fr 05:30-19:30; Sa 06:00-19:30; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 05:30-19:30; Sa 06:00-19:30; Su 07:00-12:30
+website: ""
diff --git a/data/cities/cruseilles/pitchi-coiffure-mixte.yml b/data/cities/cruseilles/pitchi-coiffure-mixte.yml
index 71eb0d498..6736f4aea 100644
--- a/data/cities/cruseilles/pitchi-coiffure-mixte.yml
+++ b/data/cities/cruseilles/pitchi-coiffure-mixte.yml
@@ -4,8 +4,8 @@ latitude: 46.03378
 longitude: 6.10737
 postcode: "74350"
 city: Cruseilles
-street: "Place du Monument"
-housenumber: 
-phone: "+33 4 50 44 01 00"
-opening_hours: "Tu-Fr 07:00-12:00,14:00-19:00; Sa 07:30-17:00"
-website: ""
\ No newline at end of file
+street: Place du Monument
+housenumber: ""
+phone: +33 4 50 44 01 00
+opening_hours: Tu-Fr 07:00-12:00,14:00-19:00; Sa 07:30-17:00
+website: ""
diff --git a/data/cities/cruseilles/ressource-et-vous.yml b/data/cities/cruseilles/ressource-et-vous.yml
index 11f6a0d05..903cb85ab 100644
--- a/data/cities/cruseilles/ressource-et-vous.yml
+++ b/data/cities/cruseilles/ressource-et-vous.yml
@@ -4,8 +4,8 @@ latitude: 46.03463
 longitude: 6.10869
 postcode: "74350"
 city: Cruseilles
-street: "Grande Rue"
-housenumber: 250
-phone: "+33 4 50 44 98 41"
+street: Grande Rue
+housenumber: "250"
+phone: +33 4 50 44 98 41
 opening_hours: ""
-website: "https://www.ressource-et-vous.fr/"
\ No newline at end of file
+website: https://www.ressource-et-vous.fr/
diff --git a/data/cities/cruseilles/terre-ferme.yml b/data/cities/cruseilles/terre-ferme.yml
index 6d96d824e..77f538ecb 100644
--- a/data/cities/cruseilles/terre-ferme.yml
+++ b/data/cities/cruseilles/terre-ferme.yml
@@ -4,8 +4,8 @@ latitude: 46.03381
 longitude: 6.10831
 postcode: "74350"
 city: Cruseilles
-street: "Place de la Fontaine"
-housenumber: 32
-phone: "+33 4 50 32 34 91;+33 6 52 85 75 54"
-opening_hours: "We-Fr 09:00-12:30,15:30-19:00; Sa 09:00-12:30"
-website: "https://terre-ferme-cruseilles.fr"
\ No newline at end of file
+street: Place de la Fontaine
+housenumber: "32"
+phone: +33 4 50 32 34 91;+33 6 52 85 75 54
+opening_hours: We-Fr 09:00-12:30,15:30-19:00; Sa 09:00-12:30
+website: https://terre-ferme-cruseilles.fr
diff --git a/data/cities/cublize/boulangerie-du-lac-des-sapins.yml b/data/cities/cublize/boulangerie-du-lac-des-sapins.yml
index 89d148081..fc8b1ae76 100644
--- a/data/cities/cublize/boulangerie-du-lac-des-sapins.yml
+++ b/data/cities/cublize/boulangerie-du-lac-des-sapins.yml
@@ -1,11 +1,11 @@
 id: 161429997
-type: way
+type: node
 latitude: 46.01828
 longitude: 4.37804
 postcode: "69550"
 city: CUBLIZE
-street: "Rue Saint-Martin"
-housenumber: 4
+street: Rue Saint-Martin
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cublize/boulangerie-patisserie-la-mendigote.yml b/data/cities/cublize/boulangerie-patisserie-la-mendigote.yml
index d02d17a12..d598b878f 100644
--- a/data/cities/cublize/boulangerie-patisserie-la-mendigote.yml
+++ b/data/cities/cublize/boulangerie-patisserie-la-mendigote.yml
@@ -1,11 +1,11 @@
 id: 368015688
-type: way
+type: node
 latitude: 46.01905
 longitude: 4.37806
 postcode: "69550"
 city: Cublize
-street: "Rue de l'Hôtel de Ville"
-housenumber: 34
-phone: "+33 4 74 89 57 13"
+street: Rue de l'Hôtel de Ville
+housenumber: "34"
+phone: +33 4 74 89 57 13
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cublize/no-limits-moto.yml b/data/cities/cublize/no-limits-moto.yml
index 52dbf8070..3fdadd93f 100644
--- a/data/cities/cublize/no-limits-moto.yml
+++ b/data/cities/cublize/no-limits-moto.yml
@@ -4,8 +4,8 @@ latitude: 46.01606
 longitude: 4.37708
 postcode: "69550"
 city: Cublize
-street: "Rue du Lac"
-housenumber: 
+street: Rue du Lac
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cublize/rozo-lac.yml b/data/cities/cublize/rozo-lac.yml
index eb7291df8..10c0c6e46 100644
--- a/data/cities/cublize/rozo-lac.yml
+++ b/data/cities/cublize/rozo-lac.yml
@@ -4,8 +4,8 @@ latitude: 46.01916
 longitude: 4.37817
 postcode: "69550"
 city: Cublize
-street: "Rue de l'Hôtel de Ville"
-housenumber: 36
+street: Rue de l'Hôtel de Ville
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cusy/casino-shop.yml b/data/cities/cusy/casino-shop.yml
index 04c3282a6..717844629 100644
--- a/data/cities/cusy/casino-shop.yml
+++ b/data/cities/cusy/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.76432
 longitude: 6.02897
 postcode: "74540"
 city: Cusy
-street: "Route d'Aix-les-Bains"
-housenumber: 110
+street: Route d'Aix-les-Bains
+housenumber: "110"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 07:30-12:30, 14:45-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 07:30-12:30, 14:45-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/cusy/la-cremerie-des-savoies.yml b/data/cities/cusy/la-cremerie-des-savoies.yml
index dc3dddf7f..6d59897f1 100644
--- a/data/cities/cusy/la-cremerie-des-savoies.yml
+++ b/data/cities/cusy/la-cremerie-des-savoies.yml
@@ -4,8 +4,8 @@ latitude: 45.76492
 longitude: 6.03191
 postcode: "74540"
 city: Cusy
-street: "Route des Bauges"
-housenumber: 
+street: Route des Bauges
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/cuzieu/lepi-service.yml b/data/cities/cuzieu/lepi-service.yml
index 9ba5ca97a..6fd35ba14 100644
--- a/data/cities/cuzieu/lepi-service.yml
+++ b/data/cities/cuzieu/lepi-service.yml
@@ -4,8 +4,8 @@ latitude: 45.60934
 longitude: 4.26085
 postcode: "42330"
 city: Cuzieu
-street: "Rue de la Coise"
-housenumber: 38
+street: Rue de la Coise
+housenumber: "38"
 phone: "+33477945675"
-opening_hours: "Mo,We 06:30-13:00; Tu,Th,Fr 06:30-19:00; Sa 07:00-19:00; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,We 06:30-13:00; Tu,Th,Fr 06:30-19:00; Sa 07:00-19:00; Su 07:00-13:00
+website: ""
diff --git a/data/cities/dardilly/honda-moto-lyon.yml b/data/cities/dardilly/honda-moto-lyon.yml
index 0914d5f16..ef19bf7d3 100644
--- a/data/cities/dardilly/honda-moto-lyon.yml
+++ b/data/cities/dardilly/honda-moto-lyon.yml
@@ -1,11 +1,12 @@
 id: 439477421
-type: way
+type: node
 latitude: 45.80725
 longitude: 4.76983
 postcode: "69570"
 city: Dardilly
-street: "Chemin de la Bruyère"
-housenumber: 58
-phone: "+33 4 78 43 85 43"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-19:00; Su,Mo,PH off"
-website: "https://www.honda-moto.fr/"
\ No newline at end of file
+street: Chemin de la Bruyère
+housenumber: "58"
+phone: +33 4 78 43 85 43
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-19:00; Su,Mo,PH
+    off
+website: https://www.honda-moto.fr/
diff --git a/data/cities/davezieux/noz.yml b/data/cities/davezieux/noz.yml
index cdb03ff87..22ddd08a4 100644
--- a/data/cities/davezieux/noz.yml
+++ b/data/cities/davezieux/noz.yml
@@ -4,8 +4,8 @@ latitude: 45.25921
 longitude: 4.70049
 postcode: "07430"
 city: Davézieux
-street: "Route de Lyon"
-housenumber: 
+street: Route de Lyon
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/davezieux/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/davezieux/
diff --git a/data/cities/decines-charpieu/aramisauto-lyon.yml b/data/cities/decines-charpieu/aramisauto-lyon.yml
index 6af51096a..e75b91985 100644
--- a/data/cities/decines-charpieu/aramisauto-lyon.yml
+++ b/data/cities/decines-charpieu/aramisauto-lyon.yml
@@ -1,11 +1,11 @@
 id: 117220970
-type: way
+type: node
 latitude: 45.77362
 longitude: 4.98096
 postcode: "69150"
 city: Décines-Charpieu
-street: "Route de Jonage"
-housenumber: 33
+street: Route de Jonage
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/decines-charpieu/bric-a-brac-decines-charpieu.yml b/data/cities/decines-charpieu/bric-a-brac-decines-charpieu.yml
index 701a3e8d8..1a9dfc8ef 100644
--- a/data/cities/decines-charpieu/bric-a-brac-decines-charpieu.yml
+++ b/data/cities/decines-charpieu/bric-a-brac-decines-charpieu.yml
@@ -4,8 +4,9 @@ latitude: 45.76262
 longitude: 4.93858
 postcode: "69150"
 city: Décines-Charpieu
-street: "Rue Émile Zola"
-housenumber: 12
-phone: "+33 9 70 71 11 95"
-opening_hours: "lundi, mercredi et jeudi de 14h30 à 17h30 et le premier samedi du mois de 9h30 à 12h30. Vérifiez les fermetures exeptionnelles sur www.fndsa.org"
-website: "https://www.fndsa.org/bric-a-brac/bric-a-brac-decines.html"
\ No newline at end of file
+street: Rue Émile Zola
+housenumber: "12"
+phone: +33 9 70 71 11 95
+opening_hours: lundi, mercredi et jeudi de 14h30 à 17h30 et le premier samedi du mois
+    de 9h30 à 12h30. Vérifiez les fermetures exeptionnelles sur www.fndsa.org
+website: https://www.fndsa.org/bric-a-brac/bric-a-brac-decines.html
diff --git a/data/cities/decines-charpieu/d-boulangerie.yml b/data/cities/decines-charpieu/d-boulangerie.yml
index eb90f0fd2..aae24fc16 100644
--- a/data/cities/decines-charpieu/d-boulangerie.yml
+++ b/data/cities/decines-charpieu/d-boulangerie.yml
@@ -4,8 +4,8 @@ latitude: 45.76322
 longitude: 4.93739
 postcode: "69150"
 city: Décines-Charpieu
-street: "Rue Émile Zola"
-housenumber: 
+street: Rue Émile Zola
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-18:00
+website: ""
diff --git a/data/cities/decines-charpieu/glenan-concept-cars.yml b/data/cities/decines-charpieu/glenan-concept-cars.yml
index f78a7ba4f..69c37f716 100644
--- a/data/cities/decines-charpieu/glenan-concept-cars.yml
+++ b/data/cities/decines-charpieu/glenan-concept-cars.yml
@@ -4,8 +4,8 @@ latitude: 45.75038
 longitude: 4.93448
 postcode: "69150"
 city: Décines-Charpieu
-street: "Avenue Franklin Roosevelt"
-housenumber: 185
+street: Avenue Franklin Roosevelt
+housenumber: "185"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/decines-charpieu/le-gaulois-jeans.yml b/data/cities/decines-charpieu/le-gaulois-jeans.yml
index d6db8cb41..2c2b6e5c0 100644
--- a/data/cities/decines-charpieu/le-gaulois-jeans.yml
+++ b/data/cities/decines-charpieu/le-gaulois-jeans.yml
@@ -4,8 +4,8 @@ latitude: 45.77426
 longitude: 4.95368
 postcode: "69150"
 city: Décines-Charpieu
-street: "Rue Géo Chavez"
-housenumber: 49
-phone: "+33 9 73 55 40 98"
-opening_hours: "Mo-Th 08:30-17:00; Fr 08:30-11:30"
-website: ""
\ No newline at end of file
+street: Rue Géo Chavez
+housenumber: "49"
+phone: +33 9 73 55 40 98
+opening_hours: Mo-Th 08:30-17:00; Fr 08:30-11:30
+website: ""
diff --git a/data/cities/decines-charpieu/medor-et-compagnie.yml b/data/cities/decines-charpieu/medor-et-compagnie.yml
index 09a80dd7c..6f8e9c292 100644
--- a/data/cities/decines-charpieu/medor-et-compagnie.yml
+++ b/data/cities/decines-charpieu/medor-et-compagnie.yml
@@ -4,8 +4,8 @@ latitude: 45.77221
 longitude: 4.97782
 postcode: "69150"
 city: Décines-Charpieu
-street: "Route de Jonage"
-housenumber: 4
+street: Route de Jonage
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/decines-charpieu/ol-store.yml b/data/cities/decines-charpieu/ol-store.yml
index c25d6d867..b0550d2b6 100644
--- a/data/cities/decines-charpieu/ol-store.yml
+++ b/data/cities/decines-charpieu/ol-store.yml
@@ -1,11 +1,11 @@
 id: 356957380
-type: way
+type: node
 latitude: 45.76695
 longitude: 4.98244
 postcode: "69150"
 city: Décines-Charpieu
-street: "Avenue Simone Veil"
-housenumber: 10
+street: Avenue Simone Veil
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/decines-charpieu/parizot-gilles-coiffure.yml b/data/cities/decines-charpieu/parizot-gilles-coiffure.yml
index a1f9bce2c..f6cf86ff8 100644
--- a/data/cities/decines-charpieu/parizot-gilles-coiffure.yml
+++ b/data/cities/decines-charpieu/parizot-gilles-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.76308
 longitude: 4.96255
 postcode: "69150"
 city: Décines-Charpieu
-street: "Avenue Louise Michel"
-housenumber: 2
+street: Avenue Louise Michel
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Th 08:30-12:00,14:00-19:00; Fr 08:00-19:00; Sa 07:30-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 08:30-12:00,14:00-19:00; Fr 08:00-19:00; Sa 07:30-16:00
+website: ""
diff --git a/data/cities/decines-charpieu/vital-coiffure.yml b/data/cities/decines-charpieu/vital-coiffure.yml
index 8899ae915..de997df1a 100644
--- a/data/cities/decines-charpieu/vital-coiffure.yml
+++ b/data/cities/decines-charpieu/vital-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.77006
 longitude: 4.95945
 postcode: "69150"
 city: Décines-Charpieu
-street: "Rue de la République"
-housenumber: 13
+street: Rue de la République
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: "https://www.planity.com/vital-coiffure-69150-decines-charpieu-4yq"
\ No newline at end of file
+website: https://www.planity.com/vital-coiffure-69150-decines-charpieu-4yq
diff --git a/data/cities/decines/boulangerie-goupil.yml b/data/cities/decines/boulangerie-goupil.yml
index de6b2cf07..6fb5b8447 100644
--- a/data/cities/decines/boulangerie-goupil.yml
+++ b/data/cities/decines/boulangerie-goupil.yml
@@ -4,8 +4,8 @@ latitude: 45.76318
 longitude: 4.96259
 postcode: "69150"
 city: Décines
-street: "Avenue Louise Michel"
-housenumber: 2
+street: Avenue Louise Michel
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/denice/garage-longere.yml b/data/cities/denice/garage-longere.yml
index c9b235cf1..5c4d5b8e2 100644
--- a/data/cities/denice/garage-longere.yml
+++ b/data/cities/denice/garage-longere.yml
@@ -4,8 +4,8 @@ latitude: 45.99886
 longitude: 4.64352
 postcode: "69640"
 city: Denicé
-street: "Route de RIVOLET"
-housenumber: 2859
-phone: "+33 4 74 67 46 13"
+street: Route de RIVOLET
+housenumber: "2859"
+phone: +33 4 74 67 46 13
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/denice/proximarche.yml b/data/cities/denice/proximarche.yml
index b7a755719..1d00994cc 100644
--- a/data/cities/denice/proximarche.yml
+++ b/data/cities/denice/proximarche.yml
@@ -1,11 +1,11 @@
 id: 99871697
-type: way
+type: node
 latitude: 46.00175
 longitude: 4.64425
 postcode: "69640"
 city: Denicé
-street: "Place de la Poste"
-housenumber: 
-phone: "+33 4 74 66 54 73"
+street: Place de la Poste
+housenumber: ""
+phone: +33 4 74 66 54 73
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/die/association-intermediaire-pour-la-reinsertion-et-lemploi.yml b/data/cities/die/association-intermediaire-pour-la-reinsertion-et-lemploi.yml
index a7df9c13c..511065146 100644
--- a/data/cities/die/association-intermediaire-pour-la-reinsertion-et-lemploi.yml
+++ b/data/cities/die/association-intermediaire-pour-la-reinsertion-et-lemploi.yml
@@ -4,8 +4,8 @@ latitude: 44.7577
 longitude: 5.35944
 postcode: "26150"
 city: Die
-street: "1042 Chemin de Chandillon"
-housenumber: 
+street: 1042 Chemin de Chandillon
+housenumber: ""
 phone: ""
-opening_hours: "Tu 13:30-17:00; We,Fr 09:00-12:00,13:30-17:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 13:30-17:00; We,Fr 09:00-12:00,13:30-17:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/diemoz/boulangerie-lafayette.yml b/data/cities/diemoz/boulangerie-lafayette.yml
index ee0f6a905..93aad70dc 100644
--- a/data/cities/diemoz/boulangerie-lafayette.yml
+++ b/data/cities/diemoz/boulangerie-lafayette.yml
@@ -1,11 +1,11 @@
 id: 129611903
-type: way
+type: node
 latitude: 45.58502
 longitude: 5.06197
 postcode: "38790"
 city: Diémoz
-street: "Route de Vienne"
-housenumber: 37
-phone: "+33 9 72 83 54 80"
-opening_hours: "Mo-Fr 05:00-19:30; Sa 07:00-19:00"
-website: "https://fr-fr.facebook.com/Boulangeriedelafayette/"
\ No newline at end of file
+street: Route de Vienne
+housenumber: "37"
+phone: +33 9 72 83 54 80
+opening_hours: Mo-Fr 05:00-19:30; Sa 07:00-19:00
+website: https://fr-fr.facebook.com/Boulangeriedelafayette/
diff --git a/data/cities/divonne-les-bains/carrefour-market-divonne.yml b/data/cities/divonne-les-bains/carrefour-market-divonne.yml
index 206328584..9c40291a4 100644
--- a/data/cities/divonne-les-bains/carrefour-market-divonne.yml
+++ b/data/cities/divonne-les-bains/carrefour-market-divonne.yml
@@ -4,8 +4,8 @@ latitude: 46.34357
 longitude: 6.14144
 postcode: "01220"
 city: Divonne-les-Bains
-street: "Avenue du Crêt d'Eau"
-housenumber: 691
-phone: "+33 4 50 99 36 40"
-opening_hours: "Mo-Sa 08:00-21:00; Su 08:30-12:30"
-website: "https://traiteur.carrefour.fr/"
\ No newline at end of file
+street: Avenue du Crêt d'Eau
+housenumber: "691"
+phone: +33 4 50 99 36 40
+opening_hours: Mo-Sa 08:00-21:00; Su 08:30-12:30
+website: https://traiteur.carrefour.fr/
diff --git a/data/cities/divonne-les-bains/carrefour.yml b/data/cities/divonne-les-bains/carrefour.yml
index b76b4dc8e..0468bc77e 100644
--- a/data/cities/divonne-les-bains/carrefour.yml
+++ b/data/cities/divonne-les-bains/carrefour.yml
@@ -4,8 +4,8 @@ latitude: 46.34285
 longitude: 6.14146
 postcode: "01220"
 city: Divonne-les-Bains
-street: "Avenue du Crêt d'Eau"
-housenumber: 691
+street: Avenue du Crêt d'Eau
+housenumber: "691"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/divonne-les-bains/espace-tendance.yml b/data/cities/divonne-les-bains/espace-tendance.yml
index 9dc0c60b1..6aef34b1b 100644
--- a/data/cities/divonne-les-bains/espace-tendance.yml
+++ b/data/cities/divonne-les-bains/espace-tendance.yml
@@ -4,8 +4,8 @@ latitude: 46.35855
 longitude: 6.14373
 postcode: "01220"
 city: Divonne-les-Bains
-street: "Rue de Lausanne"
-housenumber: 80
+street: Rue de Lausanne
+housenumber: "80"
 phone: ""
-opening_hours: "Tu-Fr 08:30-19:00; Sa 08:00-16:00"
-website: "https://www.espacetendance.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-19:00; Sa 08:00-16:00
+website: https://www.espacetendance.fr/
diff --git a/data/cities/divonne-les-bains/ramona.yml b/data/cities/divonne-les-bains/ramona.yml
index f3eec43a5..68f2840bd 100644
--- a/data/cities/divonne-les-bains/ramona.yml
+++ b/data/cities/divonne-les-bains/ramona.yml
@@ -4,8 +4,8 @@ latitude: 46.357
 longitude: 6.14242
 postcode: "01220"
 city: Divonne-les-Bains
-street: "Grande Rue"
-housenumber: 
+street: Grande Rue
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Tu, Th-Sa 09:00-13:00, 15:00-19:00; Su 09:00-13:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu, Th-Sa 09:00-13:00, 15:00-19:00; Su 09:00-13:30
+website: ""
diff --git a/data/cities/domancy/intermarche.yml b/data/cities/domancy/intermarche.yml
index 94c25af2b..553035961 100644
--- a/data/cities/domancy/intermarche.yml
+++ b/data/cities/domancy/intermarche.yml
@@ -1,11 +1,11 @@
 id: 823070553
-type: way
+type: node
 latitude: 45.90495
 longitude: 6.68176
 postcode: "74700"
 city: Domancy
-street: "Boulevard de la Pallud"
-housenumber: 119
+street: Boulevard de la Pallud
+housenumber: "119"
 phone: ""
-opening_hours: "Mo-Th 08:30-19:30; Fr-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-19:30; Fr-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/domancy/le-grand-panier-bio.yml b/data/cities/domancy/le-grand-panier-bio.yml
index c65deec87..9c22ddcae 100644
--- a/data/cities/domancy/le-grand-panier-bio.yml
+++ b/data/cities/domancy/le-grand-panier-bio.yml
@@ -5,7 +5,7 @@ longitude: 6.68473
 postcode: "74700"
 city: Domancy
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "http://www.grandpanierbio.bio/magasin/grand-panier-bio-domancy/"
\ No newline at end of file
+website: http://www.grandpanierbio.bio/magasin/grand-panier-bio-domancy/
diff --git a/data/cities/domarin/station-intermache.yml b/data/cities/domarin/station-intermache.yml
index b51762e66..70c818de4 100644
--- a/data/cities/domarin/station-intermache.yml
+++ b/data/cities/domarin/station-intermache.yml
@@ -1,11 +1,11 @@
 id: 64982532
-type: way
+type: node
 latitude: 45.59047
 longitude: 5.24172
 postcode: "38300"
 city: Domarin
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/domene/boulangerie-danna.yml b/data/cities/domene/boulangerie-danna.yml
index ba4f8a5f4..80817d5f3 100644
--- a/data/cities/domene/boulangerie-danna.yml
+++ b/data/cities/domene/boulangerie-danna.yml
@@ -4,8 +4,8 @@ latitude: 45.19687
 longitude: 5.83023
 postcode: "38420"
 city: Domène
-street: "Route de Grenoble"
-housenumber: 
+street: Route de Grenoble
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/domene/tabac-presse.yml b/data/cities/domene/tabac-presse.yml
index 3c85c9c03..8c287d80b 100644
--- a/data/cities/domene/tabac-presse.yml
+++ b/data/cities/domene/tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.20094
 longitude: 5.83872
 postcode: "38420"
 city: Domène
-street: "Rue Jean Jaurès"
-housenumber: 31
+street: Rue Jean Jaurès
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/doussard/au-regal-de-savoie.yml b/data/cities/doussard/au-regal-de-savoie.yml
index c1678a363..c9b2b0c73 100644
--- a/data/cities/doussard/au-regal-de-savoie.yml
+++ b/data/cities/doussard/au-regal-de-savoie.yml
@@ -4,8 +4,8 @@ latitude: 45.77551
 longitude: 6.2206
 postcode: "74210"
 city: Doussard
-street: "Rue de Macherine"
-housenumber: 21
+street: Rue de Macherine
+housenumber: "21"
 phone: ""
-opening_hours: "Tu,We,Fr-Su 08:30-12:30, Tu,We,Fr,Sa 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,We,Fr-Su 08:30-12:30, Tu,We,Fr,Sa 15:00-19:00
+website: ""
diff --git a/data/cities/doussard/carrefour-contact.yml b/data/cities/doussard/carrefour-contact.yml
index ecebb4eb2..1cf4b94e8 100644
--- a/data/cities/doussard/carrefour-contact.yml
+++ b/data/cities/doussard/carrefour-contact.yml
@@ -4,8 +4,8 @@ latitude: 45.77443
 longitude: 6.2201
 postcode: "74210"
 city: Doussard
-street: "Rue des Fontaines"
-housenumber: 38
+street: Rue des Fontaines
+housenumber: "38"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/doussard/k2-outdoor-annecy.yml b/data/cities/doussard/k2-outdoor-annecy.yml
index e985e116e..d9ba9cedd 100644
--- a/data/cities/doussard/k2-outdoor-annecy.yml
+++ b/data/cities/doussard/k2-outdoor-annecy.yml
@@ -4,8 +4,8 @@ latitude: 45.7835
 longitude: 6.22648
 postcode: "74210"
 city: Doussard
-street: "Route de la Vieille Église"
-housenumber: 455
-phone: "+33 4 50 32 62 52"
+street: Route de la Vieille Église
+housenumber: "455"
+phone: +33 4 50 32 62 52
 opening_hours: ""
-website: "https://www.k2outdoor-annecy.com/"
\ No newline at end of file
+website: https://www.k2outdoor-annecy.com/
diff --git a/data/cities/douvaine/auto-losange-74.yml b/data/cities/douvaine/auto-losange-74.yml
index 39a51500d..3c85e0ab5 100644
--- a/data/cities/douvaine/auto-losange-74.yml
+++ b/data/cities/douvaine/auto-losange-74.yml
@@ -1,11 +1,11 @@
 id: 813396539
-type: way
+type: node
 latitude: 46.30962
 longitude: 6.3121
 postcode: "74140"
 city: Douvaine
-street: "Rue des Vignes de Bachelard"
-housenumber: 4
+street: Rue des Vignes de Bachelard
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/douvaine/biocoop.yml b/data/cities/douvaine/biocoop.yml
index 2ec9ab2ab..eebb5856a 100644
--- a/data/cities/douvaine/biocoop.yml
+++ b/data/cities/douvaine/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 46.29637
 longitude: 6.30536
 postcode: "74140"
 city: Douvaine
-street: "Rue des Niollets"
-housenumber: 6
+street: Rue des Niollets
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/douvaine/brechotte.yml b/data/cities/douvaine/brechotte.yml
index 560dcc945..da61b60bf 100644
--- a/data/cities/douvaine/brechotte.yml
+++ b/data/cities/douvaine/brechotte.yml
@@ -4,8 +4,8 @@ latitude: 46.30596
 longitude: 6.30151
 postcode: "74140"
 city: Douvaine
-street: "Rue du Centre"
-housenumber: 5
+street: Rue du Centre
+housenumber: "5"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:00-12:00, 16:00-18:30; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:00-12:00, 16:00-18:30; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/douvaine/carrefour-market.yml b/data/cities/douvaine/carrefour-market.yml
index c06a57e0c..fe36334e5 100644
--- a/data/cities/douvaine/carrefour-market.yml
+++ b/data/cities/douvaine/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 813396518
-type: way
+type: node
 latitude: 46.31066
 longitude: 6.31246
 postcode: "74140"
 city: Douvaine
-street: "Rue des Vignes de Bachelard"
-housenumber: 8
+street: Rue des Vignes de Bachelard
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/douvaine/chablais-piscine.yml b/data/cities/douvaine/chablais-piscine.yml
index 8194cd21f..28201401b 100644
--- a/data/cities/douvaine/chablais-piscine.yml
+++ b/data/cities/douvaine/chablais-piscine.yml
@@ -4,8 +4,8 @@ latitude: 46.30866
 longitude: 6.31151
 postcode: "74140"
 city: Douvaine
-street: "Avenue de Thonon"
-housenumber: 26
+street: Avenue de Thonon
+housenumber: "26"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/douvaine/chez-valerie-fromages-et-cie.yml b/data/cities/douvaine/chez-valerie-fromages-et-cie.yml
index b27adceb6..9a511f206 100644
--- a/data/cities/douvaine/chez-valerie-fromages-et-cie.yml
+++ b/data/cities/douvaine/chez-valerie-fromages-et-cie.yml
@@ -4,8 +4,8 @@ latitude: 46.30924
 longitude: 6.31174
 postcode: "74140"
 city: Douvaine
-street: "Rue des Vignes de Bachelard"
-housenumber: 2
+street: Rue des Vignes de Bachelard
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/douvaine/entre-parentheses.yml b/data/cities/douvaine/entre-parentheses.yml
index d92c6d7d0..6e37ec62b 100644
--- a/data/cities/douvaine/entre-parentheses.yml
+++ b/data/cities/douvaine/entre-parentheses.yml
@@ -4,8 +4,9 @@ latitude: 46.30651
 longitude: 6.30995
 postcode: "74140"
 city: Douvaine
-street: "Rue Domino"
-housenumber: 
+street: Rue Domino
+housenumber: ""
 phone: ""
-opening_hours: "Mo 15:30-19:00; Tu-Fr 09:00-12:00, 15:30-19:00; Sa 09:00-12:30, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 15:30-19:00; Tu-Fr 09:00-12:00, 15:30-19:00; Sa 09:00-12:30, 14:00-18:00;
+    Su off
+website: ""
diff --git a/data/cities/douvaine/intermarche.yml b/data/cities/douvaine/intermarche.yml
index 58b76541e..2c384a4fd 100644
--- a/data/cities/douvaine/intermarche.yml
+++ b/data/cities/douvaine/intermarche.yml
@@ -1,11 +1,11 @@
 id: 197258168
-type: way
+type: node
 latitude: 46.29716
 longitude: 6.30716
 postcode: "74140"
 city: Douvaine
-street: "Route des Esserts"
-housenumber: 
+street: Route des Esserts
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/douvaine/la-paniere.yml b/data/cities/douvaine/la-paniere.yml
index fc1543098..9233e0d41 100644
--- a/data/cities/douvaine/la-paniere.yml
+++ b/data/cities/douvaine/la-paniere.yml
@@ -4,8 +4,8 @@ latitude: 46.3092
 longitude: 6.31164
 postcode: "74140"
 city: Douvaine
-street: "Rue des Vignes de Bachelard"
-housenumber: 2
+street: Rue des Vignes de Bachelard
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/douvaine/les-vignes-de-paradis.yml b/data/cities/douvaine/les-vignes-de-paradis.yml
index 0f5d6de74..6319696ee 100644
--- a/data/cities/douvaine/les-vignes-de-paradis.yml
+++ b/data/cities/douvaine/les-vignes-de-paradis.yml
@@ -1,11 +1,11 @@
 id: 1144794470
-type: way
+type: node
 latitude: 46.29483
 longitude: 6.30917
 postcode: "74140"
 city: Douvaine
-street: "Route des Gravannes"
-housenumber: 2
+street: Route des Gravannes
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-18:00; Sa 10:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-18:00; Sa 10:00-12:00; Su off
+website: ""
diff --git a/data/cities/douvaine/lovelyr-by-emietju-and-the-gang.yml b/data/cities/douvaine/lovelyr-by-emietju-and-the-gang.yml
index 5001277fc..819f4b4be 100644
--- a/data/cities/douvaine/lovelyr-by-emietju-and-the-gang.yml
+++ b/data/cities/douvaine/lovelyr-by-emietju-and-the-gang.yml
@@ -1,11 +1,11 @@
 id: 1124415212
-type: way
+type: node
 latitude: 46.30584
 longitude: 6.30049
 postcode: "74140"
 city: Douvaine
-street: "Avenue du Lac"
+street: Avenue du Lac
 housenumber: 5 bis
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00; Sa 08:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa 08:00-17:00; Su off
+website: ""
diff --git a/data/cities/douvaine/ma-planete-bio.yml b/data/cities/douvaine/ma-planete-bio.yml
index 039f54f3c..93c5b3438 100644
--- a/data/cities/douvaine/ma-planete-bio.yml
+++ b/data/cities/douvaine/ma-planete-bio.yml
@@ -1,11 +1,11 @@
 id: 197259975
-type: way
+type: node
 latitude: 46.30018
 longitude: 6.3091
 postcode: "74140"
 city: Douvaine
-street: "Rue de l'Artisanat"
-housenumber: 6
+street: Rue de l'Artisanat
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: "https://www.ma-planete-bio.com/"
\ No newline at end of file
+website: https://www.ma-planete-bio.com/
diff --git a/data/cities/douvaine/mademoiselle-k.yml b/data/cities/douvaine/mademoiselle-k.yml
index cf504bb0c..17c20c93f 100644
--- a/data/cities/douvaine/mademoiselle-k.yml
+++ b/data/cities/douvaine/mademoiselle-k.yml
@@ -1,11 +1,11 @@
 id: 1124415211
-type: way
+type: node
 latitude: 46.30583
 longitude: 6.30056
 postcode: "74140"
 city: Douvaine
-street: "Avenue du Lac"
-housenumber: 3
+street: Avenue du Lac
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00; Su-Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00; Su-Mo off
+website: ""
diff --git a/data/cities/douvaine/mondovelo.yml b/data/cities/douvaine/mondovelo.yml
index 1cdc33cb9..84bc538ae 100644
--- a/data/cities/douvaine/mondovelo.yml
+++ b/data/cities/douvaine/mondovelo.yml
@@ -4,8 +4,8 @@ latitude: 46.29588
 longitude: 6.30624
 postcode: "74140"
 city: Douvaine
-street: "Rue des Niollets"
-housenumber: 1
+street: Rue des Niollets
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://www.mondovelo.fr/"
\ No newline at end of file
+website: https://www.mondovelo.fr/
diff --git a/data/cities/drumettaz-clarafond/brasserie-les-rois-malts.yml b/data/cities/drumettaz-clarafond/brasserie-les-rois-malts.yml
index 2e0893972..9192a415d 100644
--- a/data/cities/drumettaz-clarafond/brasserie-les-rois-malts.yml
+++ b/data/cities/drumettaz-clarafond/brasserie-les-rois-malts.yml
@@ -4,8 +4,8 @@ latitude: 45.65781
 longitude: 5.91196
 postcode: "73420"
 city: Drumettaz-Clarafond
-street: "Allée des Érables"
-housenumber: 242
-phone: "+33 4 79 35 62 55"
+street: Allée des Érables
+housenumber: "242"
+phone: +33 4 79 35 62 55
 opening_hours: ""
-website: "https://www.lesroismalts.fr/"
\ No newline at end of file
+website: https://www.lesroismalts.fr/
diff --git a/data/cities/drumettaz-clarafond/la-maison-dursule.yml b/data/cities/drumettaz-clarafond/la-maison-dursule.yml
index a3bc401f8..af50344db 100644
--- a/data/cities/drumettaz-clarafond/la-maison-dursule.yml
+++ b/data/cities/drumettaz-clarafond/la-maison-dursule.yml
@@ -4,8 +4,8 @@ latitude: 45.65711
 longitude: 5.91359
 postcode: "73420"
 city: Drumettaz-Clarafond
-street: "Route des Vernes"
-housenumber: 668
-phone: "+33 4 79 35 48 40"
+street: Route des Vernes
+housenumber: "668"
+phone: +33 4 79 35 48 40
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/drumettaz-clarafond/la-recyclerie-de-drumettaz.yml b/data/cities/drumettaz-clarafond/la-recyclerie-de-drumettaz.yml
index 4eef3b764..26dc87071 100644
--- a/data/cities/drumettaz-clarafond/la-recyclerie-de-drumettaz.yml
+++ b/data/cities/drumettaz-clarafond/la-recyclerie-de-drumettaz.yml
@@ -1,11 +1,11 @@
 id: 166861563
-type: way
+type: node
 latitude: 45.66291
 longitude: 5.91193
 postcode: "73420"
 city: Drumettaz-Clarafond
-street: "Route de Drumettaz"
-housenumber: 778
+street: Route de Drumettaz
+housenumber: "778"
 phone: ""
-opening_hours: "Tu-Sa 13:00-18:00; Sa 09:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 13:00-18:00; Sa 09:30-12:00
+website: ""
diff --git a/data/cities/drumettaz-clarafond/lentrepot-du-bricolage.yml b/data/cities/drumettaz-clarafond/lentrepot-du-bricolage.yml
index 10071ea07..f3f8d41ed 100644
--- a/data/cities/drumettaz-clarafond/lentrepot-du-bricolage.yml
+++ b/data/cities/drumettaz-clarafond/lentrepot-du-bricolage.yml
@@ -4,8 +4,8 @@ latitude: 45.65756
 longitude: 5.91352
 postcode: "73420"
 city: Drumettaz-Clarafond
-street: "Route des Vernes"
-housenumber: 650
-phone: "+33 4 79 34 79 80"
+street: Route des Vernes
+housenumber: "650"
+phone: +33 4 79 34 79 80
 opening_hours: ""
-website: "https://www.entrepot-du-bricolage.fr/mon-magasin/drumettaz"
\ No newline at end of file
+website: https://www.entrepot-du-bricolage.fr/mon-magasin/drumettaz
diff --git a/data/cities/duingt/boulangerie-du-lac.yml b/data/cities/duingt/boulangerie-du-lac.yml
index 8c12f492c..4f1c4f180 100644
--- a/data/cities/duingt/boulangerie-du-lac.yml
+++ b/data/cities/duingt/boulangerie-du-lac.yml
@@ -4,8 +4,8 @@ latitude: 45.82851
 longitude: 6.20416
 postcode: "74410"
 city: Duingt
-street: "Route d'Annecy"
-housenumber: 251
+street: Route d'Annecy
+housenumber: "251"
 phone: ""
-opening_hours: "Th-Tu 06:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Th-Tu 06:00-19:30
+website: ""
diff --git a/data/cities/duingt/spar.yml b/data/cities/duingt/spar.yml
index 9abf44b9c..a7fb97567 100644
--- a/data/cities/duingt/spar.yml
+++ b/data/cities/duingt/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.827
 longitude: 6.20258
 postcode: "74410"
 city: Duingt
-street: "Passage Grenette"
-housenumber: 25
+street: Passage Grenette
+housenumber: "25"
 phone: ""
-opening_hours: "Mo off; Tu-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Su 08:00-20:00
+website: ""
diff --git a/data/cities/dullin/g-fred-73.yml b/data/cities/dullin/g-fred-73.yml
index 2fb6d0f2d..068133940 100644
--- a/data/cities/dullin/g-fred-73.yml
+++ b/data/cities/dullin/g-fred-73.yml
@@ -1,11 +1,11 @@
 id: 62748212
-type: way
+type: node
 latitude: 45.55416
 longitude: 5.75487
 postcode: "73610"
 city: Dullin
-street: "Route du Rondelet"
-housenumber: 
-phone: "+33 6 35 56 16 68"
+street: Route du Rondelet
+housenumber: ""
+phone: +33 6 35 56 16 68
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echallon/proxy.yml b/data/cities/echallon/proxy.yml
index 7140801e9..d757f2c18 100644
--- a/data/cities/echallon/proxy.yml
+++ b/data/cities/echallon/proxy.yml
@@ -1,11 +1,11 @@
 id: 806974596
-type: way
+type: node
 latitude: 46.20952
 longitude: 5.74022
 postcode: "01130"
 city: Échallon
-street: "Place Charles Blétel"
-housenumber: 50
-phone: "+33 4 74 77 30 63"
-opening_hours: "Tu-Sa 06:00-12:30,15:30-19:45; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+street: Place Charles Blétel
+housenumber: "50"
+phone: +33 4 74 77 30 63
+opening_hours: Tu-Sa 06:00-12:30,15:30-19:45; Su 07:00-12:30
+website: ""
diff --git a/data/cities/echirolles/4-murs.yml b/data/cities/echirolles/4-murs.yml
index dbb9800d2..66fc6f9c3 100644
--- a/data/cities/echirolles/4-murs.yml
+++ b/data/cities/echirolles/4-murs.yml
@@ -1,11 +1,11 @@
 id: 81099485
-type: way
+type: node
 latitude: 45.15208
 longitude: 5.6939
 postcode: "38130"
 city: Échirolles
-street: "Place de la Grande Moucherolle"
-housenumber: 2
+street: Place de la Grande Moucherolle
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 10:00-12:30, 12:30-19:00; Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 10:00-12:30, 12:30-19:00; Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/echirolles/action.yml b/data/cities/echirolles/action.yml
index d1ff25344..241982b5b 100644
--- a/data/cities/echirolles/action.yml
+++ b/data/cities/echirolles/action.yml
@@ -1,11 +1,11 @@
 id: 80993119
-type: way
+type: node
 latitude: 45.1539
 longitude: 5.70999
 postcode: "38130"
 city: Échirolles
-street: "Avenue Victor Hugo"
-housenumber: 8
+street: Avenue Victor Hugo
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.action.com/fr-fr/points-de-vente/echirolles-8-avenue-victor-hugo/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.action.com/fr-fr/points-de-vente/echirolles-8-avenue-victor-hugo/
diff --git a/data/cities/echirolles/alpconfort.yml b/data/cities/echirolles/alpconfort.yml
index 544ea6553..c7c6ff92f 100644
--- a/data/cities/echirolles/alpconfort.yml
+++ b/data/cities/echirolles/alpconfort.yml
@@ -4,8 +4,8 @@ latitude: 45.14534
 longitude: 5.69284
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 20
+street: Rue de Comboire
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/appliphoto.yml b/data/cities/echirolles/appliphoto.yml
index bdd7dd17c..3fa8131d4 100644
--- a/data/cities/echirolles/appliphoto.yml
+++ b/data/cities/echirolles/appliphoto.yml
@@ -4,8 +4,8 @@ latitude: 45.14352
 longitude: 5.69056
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 32
+street: Rue de Comboire
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/au-coeur-du-gout.yml b/data/cities/echirolles/au-coeur-du-gout.yml
index 3963e26a6..b9fe7d436 100644
--- a/data/cities/echirolles/au-coeur-du-gout.yml
+++ b/data/cities/echirolles/au-coeur-du-gout.yml
@@ -4,8 +4,8 @@ latitude: 45.14741
 longitude: 5.72039
 postcode: "38130"
 city: Échirolles
-street: "Rue Albert Londres"
-housenumber: 12
-phone: "+33 4 56 85 46 93"
-opening_hours: "Tu-Sa 06:00-20:00"
-website: ""
\ No newline at end of file
+street: Rue Albert Londres
+housenumber: "12"
+phone: +33 4 56 85 46 93
+opening_hours: Tu-Sa 06:00-20:00
+website: ""
diff --git a/data/cities/echirolles/besson-chaussures.yml b/data/cities/echirolles/besson-chaussures.yml
index 3536b6394..c23e6f9fb 100644
--- a/data/cities/echirolles/besson-chaussures.yml
+++ b/data/cities/echirolles/besson-chaussures.yml
@@ -1,11 +1,11 @@
 id: 1184584824
-type: way
+type: node
 latitude: 45.15184
 longitude: 5.70848
 postcode: "38130"
 city: Échirolles
-street: "Avenue grugliasco"
-housenumber: 1
-phone: "+33 8 25 35 11 34"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-13:00, 14:00-17:45"
-website: "https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-grenoble-echirolles_echirolles_38130/164.html"
\ No newline at end of file
+street: Avenue Grugliasco
+housenumber: "1"
+phone: +33 8 25 35 11 34
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-13:00, 14:00-17:45
+website: https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-grenoble-echirolles_echirolles_38130/164.html
diff --git a/data/cities/echirolles/betm.yml b/data/cities/echirolles/betm.yml
index cbf673df9..08e0ccba6 100644
--- a/data/cities/echirolles/betm.yml
+++ b/data/cities/echirolles/betm.yml
@@ -1,11 +1,11 @@
 id: 80993371
-type: way
+type: node
 latitude: 45.1525
 longitude: 5.70869
 postcode: "38130"
 city: Echirolles
-street: "rue Grugiliasco"
-housenumber: 1
+street: Rue Grugiliasco
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 09:30-19:00; Sa 09:30-19:30; Su 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-19:00; Sa 09:30-19:30; Su 10:00-19:00
+website: ""
diff --git a/data/cities/echirolles/boulangerie-marie-blachere.yml b/data/cities/echirolles/boulangerie-marie-blachere.yml
index de78e4492..4fb9f0e1f 100644
--- a/data/cities/echirolles/boulangerie-marie-blachere.yml
+++ b/data/cities/echirolles/boulangerie-marie-blachere.yml
@@ -1,11 +1,11 @@
 id: 81099321
-type: way
+type: node
 latitude: 45.14503
 longitude: 5.69091
 postcode: "38130"
 city: Échirolles
-street: "Rue du Drac"
-housenumber: 7
+street: Rue du Drac
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30"
-website: "https://boulangeries.marieblachere.com/Echirolles"
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30
+website: https://boulangeries.marieblachere.com/Echirolles
diff --git a/data/cities/echirolles/bouvier-electric-auto.yml b/data/cities/echirolles/bouvier-electric-auto.yml
index c5c508c56..7822df087 100644
--- a/data/cities/echirolles/bouvier-electric-auto.yml
+++ b/data/cities/echirolles/bouvier-electric-auto.yml
@@ -1,11 +1,11 @@
 id: 81060057
-type: way
+type: node
 latitude: 45.14091
 longitude: 5.70396
 postcode: "38130"
 city: Échirolles
-street: "Cours Jean Jaurès"
-housenumber: 173
+street: Cours Jean Jaurès
+housenumber: "173"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/calabro.yml b/data/cities/echirolles/calabro.yml
index 1daf5aac5..2c3c9a663 100644
--- a/data/cities/echirolles/calabro.yml
+++ b/data/cities/echirolles/calabro.yml
@@ -4,8 +4,8 @@ latitude: 45.14755
 longitude: 5.7134
 postcode: "38130"
 city: Échirolles
-street: "Rue Paul Héroult"
-housenumber: 33
+street: Rue Paul Héroult
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/canemotion.yml b/data/cities/echirolles/canemotion.yml
index 0c67a3657..56030e900 100644
--- a/data/cities/echirolles/canemotion.yml
+++ b/data/cities/echirolles/canemotion.yml
@@ -4,8 +4,8 @@ latitude: 45.14303
 longitude: 5.69031
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 32
+street: Rue de Comboire
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: "https://www.canemotion.fr/"
\ No newline at end of file
+website: https://www.canemotion.fr/
diff --git a/data/cities/echirolles/centre-minceur-comboire.yml b/data/cities/echirolles/centre-minceur-comboire.yml
index 7fcf16509..4bf996d6c 100644
--- a/data/cities/echirolles/centre-minceur-comboire.yml
+++ b/data/cities/echirolles/centre-minceur-comboire.yml
@@ -4,8 +4,8 @@ latitude: 45.15129
 longitude: 5.69611
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 13
+street: Rue des Montagnes de Lans
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/chaussea.yml b/data/cities/echirolles/chaussea.yml
index f669b5f2c..b0d346c28 100644
--- a/data/cities/echirolles/chaussea.yml
+++ b/data/cities/echirolles/chaussea.yml
@@ -1,11 +1,11 @@
 id: 1186322405
-type: way
+type: node
 latitude: 45.15031
 longitude: 5.69465
 postcode: "38130"
 city: Échirolles
-street: "Place de la Grande Moucherolle"
-housenumber: 5
+street: Place de la Grande Moucherolle
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/echirolles/cocoon.yml b/data/cities/echirolles/cocoon.yml
index 517ad036d..bf6c0b10a 100644
--- a/data/cities/echirolles/cocoon.yml
+++ b/data/cities/echirolles/cocoon.yml
@@ -4,8 +4,8 @@ latitude: 45.14284
 longitude: 5.69028
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 32
+street: Rue de Comboire
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/concept-a-soi.yml b/data/cities/echirolles/concept-a-soi.yml
index 27092e848..80dec502a 100644
--- a/data/cities/echirolles/concept-a-soi.yml
+++ b/data/cities/echirolles/concept-a-soi.yml
@@ -4,8 +4,8 @@ latitude: 45.15079
 longitude: 5.7056
 postcode: "38130"
 city: Échirolles
-street: "Cours Jean Jaurès"
-housenumber: 46
+street: Cours Jean Jaurès
+housenumber: "46"
 phone: ""
-opening_hours: "Mo 09:30-19:00; Tu 09:30-18:00; Th-Fr 09:30-19:00; Sa 09:30-17:00"
-website: "https://app.flexybeauty.com/concept-a-soi"
\ No newline at end of file
+opening_hours: Mo 09:30-19:00; Tu 09:30-18:00; Th-Fr 09:30-19:00; Sa 09:30-17:00
+website: https://app.flexybeauty.com/concept-a-soi
diff --git a/data/cities/echirolles/darty.yml b/data/cities/echirolles/darty.yml
index c0a2040df..098fb27a1 100644
--- a/data/cities/echirolles/darty.yml
+++ b/data/cities/echirolles/darty.yml
@@ -1,11 +1,11 @@
 id: 1257150541
-type: way
+type: node
 latitude: 45.14819
 longitude: 5.69146
 postcode: "38130"
 city: Échirolles
-street: "Impasse du Rocher"
-housenumber: 2
+street: Impasse du Rocher
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/echirolles/decathlon.yml b/data/cities/echirolles/decathlon.yml
index 720995e58..7125d119d 100644
--- a/data/cities/echirolles/decathlon.yml
+++ b/data/cities/echirolles/decathlon.yml
@@ -1,11 +1,11 @@
 id: 81099530
-type: way
+type: node
 latitude: 45.14614
 longitude: 5.69092
 postcode: "38130"
 city: Échirolles
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: ""
diff --git a/data/cities/echirolles/divertyland.yml b/data/cities/echirolles/divertyland.yml
index 08eb25188..5963ba437 100644
--- a/data/cities/echirolles/divertyland.yml
+++ b/data/cities/echirolles/divertyland.yml
@@ -4,8 +4,8 @@ latitude: 45.15139
 longitude: 5.69636
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 13
+street: Rue des Montagnes de Lans
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/e-leclerc.yml b/data/cities/echirolles/e-leclerc.yml
index c052490a1..7bf6e38e1 100644
--- a/data/cities/echirolles/e-leclerc.yml
+++ b/data/cities/echirolles/e-leclerc.yml
@@ -1,11 +1,11 @@
 id: 1234038503
-type: way
+type: node
 latitude: 45.15077
 longitude: 5.6925
 postcode: "38130"
 city: Échirolles
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/epicuria.yml b/data/cities/echirolles/epicuria.yml
index 571676c35..58750ea55 100644
--- a/data/cities/echirolles/epicuria.yml
+++ b/data/cities/echirolles/epicuria.yml
@@ -4,8 +4,8 @@ latitude: 45.14265
 longitude: 5.72107
 postcode: "38130"
 city: Échirolles
-street: "Rue Gabriel Didier"
-housenumber: 19
+street: Rue Gabriel Didier
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/feu-vert-echirolles.yml b/data/cities/echirolles/feu-vert-echirolles.yml
index 31acaeaef..6438550ce 100644
--- a/data/cities/echirolles/feu-vert-echirolles.yml
+++ b/data/cities/echirolles/feu-vert-echirolles.yml
@@ -1,11 +1,11 @@
 id: 81099411
-type: way
+type: node
 latitude: 45.14688
 longitude: 5.69304
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 12
+street: Rue de Comboire
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-18:00
+website: ""
diff --git a/data/cities/echirolles/frans-bonhomme.yml b/data/cities/echirolles/frans-bonhomme.yml
index 3b588ca59..e5cc75249 100644
--- a/data/cities/echirolles/frans-bonhomme.yml
+++ b/data/cities/echirolles/frans-bonhomme.yml
@@ -4,8 +4,8 @@ latitude: 45.13997
 longitude: 5.70439
 postcode: "38130"
 city: Échirolles
-street: "Rue Léon Fournier Sud"
-housenumber: 12
-phone: "+33 476992180"
+street: Rue Léon Fournier Sud
+housenumber: "12"
+phone: +33 476992180
 opening_hours: ""
-website: "https://www.fransbonhomme.fr/"
\ No newline at end of file
+website: https://www.fransbonhomme.fr/
diff --git a/data/cities/echirolles/gerard-et-peysson.yml b/data/cities/echirolles/gerard-et-peysson.yml
index 94c7469ee..93357eb27 100644
--- a/data/cities/echirolles/gerard-et-peysson.yml
+++ b/data/cities/echirolles/gerard-et-peysson.yml
@@ -1,11 +1,11 @@
 id: 81099295
-type: way
+type: node
 latitude: 45.15303
 longitude: 5.69739
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 4
+street: Rue des Montagnes de Lans
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 07:30-12:00,Mo-Fr 13:15-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:00,Mo-Fr 13:15-17:00
+website: ""
diff --git a/data/cities/echirolles/gifi.yml b/data/cities/echirolles/gifi.yml
index 9c38236fb..103aa0d89 100644
--- a/data/cities/echirolles/gifi.yml
+++ b/data/cities/echirolles/gifi.yml
@@ -1,11 +1,11 @@
 id: 81099336
-type: way
+type: node
 latitude: 45.14832
 longitude: 5.69412
 postcode: "38130"
 city: Echirolles
-street: "Rue Comboire"
-housenumber: 9
+street: Rue Comboire
+housenumber: "9"
 phone: "+33476098620"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-12:30,14:00-18:30"
-website: "https://www.gifi.fr/?store_id=11156&utm_source=GMB&utm_medium=groupe&utm_campaign=11156"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-12:30,14:00-18:30
+website: https://www.gifi.fr/?store_id=11156&utm_source=GMB&utm_medium=groupe&utm_campaign=11156
diff --git a/data/cities/echirolles/intersport.yml b/data/cities/echirolles/intersport.yml
index 5ec2ae1b3..fc9da05a6 100644
--- a/data/cities/echirolles/intersport.yml
+++ b/data/cities/echirolles/intersport.yml
@@ -1,11 +1,11 @@
 id: 81099502
-type: way
+type: node
 latitude: 45.15246
 longitude: 5.69479
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 12
+street: Rue des Montagnes de Lans
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/echirolles/jefco.yml b/data/cities/echirolles/jefco.yml
index 4e5121d1e..1eac77ec7 100644
--- a/data/cities/echirolles/jefco.yml
+++ b/data/cities/echirolles/jefco.yml
@@ -4,8 +4,8 @@ latitude: 45.15189
 longitude: 5.69624
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 13
+street: Rue des Montagnes de Lans
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/jour-de-fete.yml b/data/cities/echirolles/jour-de-fete.yml
index d5f89edf1..9fcdcf4da 100644
--- a/data/cities/echirolles/jour-de-fete.yml
+++ b/data/cities/echirolles/jour-de-fete.yml
@@ -1,11 +1,11 @@
 id: 81099314
-type: way
+type: node
 latitude: 45.15197
 longitude: 5.69358
 postcode: "38130"
 city: Échirolles
-street: "Place de la Grande Moucherolle"
-housenumber: 4
+street: Place de la Grande Moucherolle
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/echirolles/kodak-express.yml b/data/cities/echirolles/kodak-express.yml
index 011d1f35b..eecb76d24 100644
--- a/data/cities/echirolles/kodak-express.yml
+++ b/data/cities/echirolles/kodak-express.yml
@@ -4,8 +4,8 @@ latitude: 45.14354
 longitude: 5.69065
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 32
+street: Rue de Comboire
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/la-bourse-aux-skis.yml b/data/cities/echirolles/la-bourse-aux-skis.yml
index 200c36d25..8ccf7d417 100644
--- a/data/cities/echirolles/la-bourse-aux-skis.yml
+++ b/data/cities/echirolles/la-bourse-aux-skis.yml
@@ -1,11 +1,11 @@
 id: 1253176363
-type: way
+type: node
 latitude: 45.1531
 longitude: 5.69735
 postcode: "38130"
 city: Echirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 2
+street: Rue des Montagnes de Lans
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-19:00
+website: ""
diff --git a/data/cities/echirolles/la-foirfouille.yml b/data/cities/echirolles/la-foirfouille.yml
index e072a5926..6d08b316a 100644
--- a/data/cities/echirolles/la-foirfouille.yml
+++ b/data/cities/echirolles/la-foirfouille.yml
@@ -1,11 +1,11 @@
 id: 81099470
-type: way
+type: node
 latitude: 45.14553
 longitude: 5.69184
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 29
+street: Rue de Comboire
+housenumber: "29"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/echirolles/la-halle.yml b/data/cities/echirolles/la-halle.yml
index f1bbbe55f..f5af75cac 100644
--- a/data/cities/echirolles/la-halle.yml
+++ b/data/cities/echirolles/la-halle.yml
@@ -1,11 +1,11 @@
 id: 1186322402
-type: way
+type: node
 latitude: 45.14988
 longitude: 5.69431
 postcode: "38130"
 city: Échirolles
-street: "Place de la Grande Moucherolle"
-housenumber: 5
+street: Place de la Grande Moucherolle
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/echirolles/la-tentation.yml b/data/cities/echirolles/la-tentation.yml
index 0c4fd7e64..549ce1694 100644
--- a/data/cities/echirolles/la-tentation.yml
+++ b/data/cities/echirolles/la-tentation.yml
@@ -4,8 +4,8 @@ latitude: 45.14518
 longitude: 5.70426
 postcode: "38130"
 city: Échirolles
-street: "Cours Jean Jaurès"
-housenumber: 84
+street: Cours Jean Jaurès
+housenumber: "84"
 phone: ""
-opening_hours: "06:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: 06:00-19:30
+website: ""
diff --git a/data/cities/echirolles/laverie-echirolles.yml b/data/cities/echirolles/laverie-echirolles.yml
index c84f22843..f73974feb 100644
--- a/data/cities/echirolles/laverie-echirolles.yml
+++ b/data/cities/echirolles/laverie-echirolles.yml
@@ -4,8 +4,8 @@ latitude: 45.14546
 longitude: 5.71659
 postcode: "38130"
 city: Échirolles
-street: "Avenue du 8 Mai 1945"
-housenumber: 24
-phone: "+33 6 11 95 30 30"
-opening_hours: "Mo-Su 07:00-20:00"
-website: "http://www.laverie-grenoble.fr/laverie-d-echirolles"
\ No newline at end of file
+street: Avenue du 8 Mai 1945
+housenumber: "24"
+phone: +33 6 11 95 30 30
+opening_hours: Mo-Su 07:00-20:00
+website: http://www.laverie-grenoble.fr/laverie-d-echirolles
diff --git a/data/cities/echirolles/legallais.yml b/data/cities/echirolles/legallais.yml
index 1b4864f2a..5f8791040 100644
--- a/data/cities/echirolles/legallais.yml
+++ b/data/cities/echirolles/legallais.yml
@@ -1,11 +1,11 @@
 id: 81099386
-type: way
+type: node
 latitude: 45.15321
 longitude: 5.69705
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 4
+street: Rue des Montagnes de Lans
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/les-rois-malts.yml b/data/cities/echirolles/les-rois-malts.yml
index b664bb2fe..6baa35469 100644
--- a/data/cities/echirolles/les-rois-malts.yml
+++ b/data/cities/echirolles/les-rois-malts.yml
@@ -1,11 +1,11 @@
 id: 1186322394
-type: way
+type: node
 latitude: 45.14653
 longitude: 5.69285
 postcode: "38130"
 city: Échirolles
-street: "Rue du Grand Veymont"
-housenumber: 5
+street: Rue du Grand Veymont
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Fr 10:00-13:00,14:30-20:00, Sa 10:00-13:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-13:00,14:30-20:00, Sa 10:00-13:00,14:30-19:00
+website: ""
diff --git a/data/cities/echirolles/maison-de-la-presse.yml b/data/cities/echirolles/maison-de-la-presse.yml
index a30fc8d29..f74adcb37 100644
--- a/data/cities/echirolles/maison-de-la-presse.yml
+++ b/data/cities/echirolles/maison-de-la-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.14696
 longitude: 5.72325
 postcode: "38130"
 city: Échirolles
-street: "Rue Albert Londres"
-housenumber: 26
+street: Rue Albert Londres
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/maisons-du-monde.yml b/data/cities/echirolles/maisons-du-monde.yml
index f3f432072..eeef6fd40 100644
--- a/data/cities/echirolles/maisons-du-monde.yml
+++ b/data/cities/echirolles/maisons-du-monde.yml
@@ -1,11 +1,11 @@
 id: 1185580900
-type: way
+type: node
 latitude: 45.15202
 longitude: 5.69509
 postcode: "38130"
 city: Échirolles
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/michel-coiffure.yml b/data/cities/echirolles/michel-coiffure.yml
index 996bc2ccd..1e7e04064 100644
--- a/data/cities/echirolles/michel-coiffure.yml
+++ b/data/cities/echirolles/michel-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.14486
 longitude: 5.73329
 postcode: "38130"
 city: Échirolles
-street: "Avenue Henri Wallon"
-housenumber: 19
+street: Avenue Henri Wallon
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/mondial-tissu.yml b/data/cities/echirolles/mondial-tissu.yml
index 96eaa8b0a..8c528131a 100644
--- a/data/cities/echirolles/mondial-tissu.yml
+++ b/data/cities/echirolles/mondial-tissu.yml
@@ -1,11 +1,11 @@
 id: 81099260
-type: way
+type: node
 latitude: 45.14884
 longitude: 5.69433
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 9
+street: Rue de Comboire
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/echirolles/monsieur-store.yml b/data/cities/echirolles/monsieur-store.yml
index 482dec28f..adfdaeb0e 100644
--- a/data/cities/echirolles/monsieur-store.yml
+++ b/data/cities/echirolles/monsieur-store.yml
@@ -1,11 +1,11 @@
 id: 1186322395
-type: way
+type: node
 latitude: 45.14662
 longitude: 5.69268
 postcode: "38130"
 city: Échirolles
-street: "Rue du Grand Veymont"
-housenumber: 5
+street: Rue du Grand Veymont
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 13:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 13:00-18:00
+website: ""
diff --git a/data/cities/echirolles/motolabo.yml b/data/cities/echirolles/motolabo.yml
index 96582866a..7dc990379 100644
--- a/data/cities/echirolles/motolabo.yml
+++ b/data/cities/echirolles/motolabo.yml
@@ -1,11 +1,12 @@
 id: 80985764
-type: way
+type: node
 latitude: 45.15839
 longitude: 5.71363
 postcode: "38130"
 city: Échirolles
-street: "Rue de Bretagne"
-housenumber: 
-phone: "+33 4 76 09 31 83"
-opening_hours: "Nov-Feb Tu-Sa 09:30-12:00,14:00-18:00; Mar-Oct Tu-Fr 09:00-12:00,14:00-19:00; Mar-Oct Sa 09:00-12:00,14:00-18:00; Su,Mo,PH off"
-website: "http://www.motolabo.fr/"
\ No newline at end of file
+street: Rue de Bretagne
+housenumber: ""
+phone: +33 4 76 09 31 83
+opening_hours: Nov-Feb Tu-Sa 09:30-12:00,14:00-18:00; Mar-Oct Tu-Fr 09:00-12:00,14:00-19:00;
+    Mar-Oct Sa 09:00-12:00,14:00-18:00; Su,Mo,PH off
+website: http://www.motolabo.fr/
diff --git a/data/cities/echirolles/natache-tissus.yml b/data/cities/echirolles/natache-tissus.yml
index 240fd6b53..78586f863 100644
--- a/data/cities/echirolles/natache-tissus.yml
+++ b/data/cities/echirolles/natache-tissus.yml
@@ -4,8 +4,8 @@ latitude: 45.15142
 longitude: 5.69652
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 13
+street: Rue des Montagnes de Lans
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/neoz-solutions.yml b/data/cities/echirolles/neoz-solutions.yml
index cd2065be3..9ccd6a88c 100644
--- a/data/cities/echirolles/neoz-solutions.yml
+++ b/data/cities/echirolles/neoz-solutions.yml
@@ -4,8 +4,8 @@ latitude: 45.14371
 longitude: 5.68984
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 32
+street: Rue de Comboire
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Fr 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-17:00
+website: ""
diff --git a/data/cities/echirolles/neway-38.yml b/data/cities/echirolles/neway-38.yml
index a5449a181..2fefb7f6a 100644
--- a/data/cities/echirolles/neway-38.yml
+++ b/data/cities/echirolles/neway-38.yml
@@ -1,11 +1,11 @@
 id: 81099518
-type: way
+type: node
 latitude: 45.14356
 longitude: 5.69
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 32
+street: Rue de Comboire
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/echirolles/optic2000.yml b/data/cities/echirolles/optic2000.yml
index b6ac8f5d4..ff02a5649 100644
--- a/data/cities/echirolles/optic2000.yml
+++ b/data/cities/echirolles/optic2000.yml
@@ -1,11 +1,11 @@
 id: 81099475
-type: way
+type: node
 latitude: 45.14964
 longitude: 5.69449
 postcode: "38130"
 city: Échirolles
-street: "Place de la Grande Moucherolle"
-housenumber: 7
+street: Place de la Grande Moucherolle
+housenumber: "7"
 phone: ""
-opening_hours: "Mo 10:00-19:00; Tu-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 10:00-19:00; Tu-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/echirolles/padd.yml b/data/cities/echirolles/padd.yml
index bfa101d4c..392adc244 100644
--- a/data/cities/echirolles/padd.yml
+++ b/data/cities/echirolles/padd.yml
@@ -4,8 +4,8 @@ latitude: 45.14567
 longitude: 5.69271
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 20
+street: Rue de Comboire
+housenumber: "20"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-12:30, 14:00-19:00; Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-12:30, 14:00-19:00; Sa 10:00-19:00
+website: ""
diff --git a/data/cities/echirolles/picard-surgeles.yml b/data/cities/echirolles/picard-surgeles.yml
index a5a548d7b..a7432b3ae 100644
--- a/data/cities/echirolles/picard-surgeles.yml
+++ b/data/cities/echirolles/picard-surgeles.yml
@@ -1,11 +1,11 @@
 id: 81099257
-type: way
+type: node
 latitude: 45.14735
 longitude: 5.6926
 postcode: "38130"
 city: Échirolles
-street: "Rue du Drac"
-housenumber: 5
-phone: "+33 4 76 33 17 65"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://magasins.picard.fr/379-picard-grenoble"
\ No newline at end of file
+street: Rue du Drac
+housenumber: "5"
+phone: +33 4 76 33 17 65
+opening_hours: Mo-Sa 09:00-19:30
+website: https://magasins.picard.fr/379-picard-grenoble
diff --git a/data/cities/echirolles/pro-electro-pieces.yml b/data/cities/echirolles/pro-electro-pieces.yml
index 10aa06b78..b92d59bf6 100644
--- a/data/cities/echirolles/pro-electro-pieces.yml
+++ b/data/cities/echirolles/pro-electro-pieces.yml
@@ -4,8 +4,8 @@ latitude: 45.15272
 longitude: 5.71469
 postcode: "38130"
 city: Échirolles
-street: "Rue Fernand Pelloutier"
-housenumber: 10
-phone: "+33 4 76 09 67 83"
-opening_hours: "Mo-Fr 08:30-12:00,14:00-19:00; Sa 08:30-12:00"
-website: ""
\ No newline at end of file
+street: Rue Fernand Pelloutier
+housenumber: "10"
+phone: +33 4 76 09 67 83
+opening_hours: Mo-Fr 08:30-12:00,14:00-19:00; Sa 08:30-12:00
+website: ""
diff --git a/data/cities/echirolles/qiwi.yml b/data/cities/echirolles/qiwi.yml
index 2aa55ce3d..0c8e1773c 100644
--- a/data/cities/echirolles/qiwi.yml
+++ b/data/cities/echirolles/qiwi.yml
@@ -1,11 +1,11 @@
 id: 81099372
-type: way
+type: node
 latitude: 45.14647
 longitude: 5.69344
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 16
+street: Rue de Comboire
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/renault-auto-dauphine-echirolles.yml b/data/cities/echirolles/renault-auto-dauphine-echirolles.yml
index 36f9f7333..19fd92644 100644
--- a/data/cities/echirolles/renault-auto-dauphine-echirolles.yml
+++ b/data/cities/echirolles/renault-auto-dauphine-echirolles.yml
@@ -1,11 +1,11 @@
 id: 81060067
-type: way
+type: node
 latitude: 45.14095
 longitude: 5.7098
 postcode: "38130"
 city: Échirolles
 street: ""
-housenumber: 9
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/satoriz-echirolles.yml b/data/cities/echirolles/satoriz-echirolles.yml
index cbf8c6f29..b079c6915 100644
--- a/data/cities/echirolles/satoriz-echirolles.yml
+++ b/data/cities/echirolles/satoriz-echirolles.yml
@@ -1,11 +1,11 @@
 id: 1185580901
-type: way
+type: node
 latitude: 45.15209
 longitude: 5.69536
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 12
+street: Rue des Montagnes de Lans
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/ski-clean-service.yml b/data/cities/echirolles/ski-clean-service.yml
index e1e7ef0b8..ede933f02 100644
--- a/data/cities/echirolles/ski-clean-service.yml
+++ b/data/cities/echirolles/ski-clean-service.yml
@@ -1,11 +1,11 @@
 id: 1253176362
-type: way
+type: node
 latitude: 45.15316
 longitude: 5.69752
 postcode: "38130"
 city: Echirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 2
+street: Rue des Montagnes de Lans
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/stokomani.yml b/data/cities/echirolles/stokomani.yml
index 4323fed52..14773f724 100644
--- a/data/cities/echirolles/stokomani.yml
+++ b/data/cities/echirolles/stokomani.yml
@@ -1,11 +1,11 @@
 id: 81099437
-type: way
+type: node
 latitude: 45.14402
 longitude: 5.69326
 postcode: "38130"
 city: Echirolles
-street: "rue De Comboire"
-housenumber: 23
+street: Rue De Comboire
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.stokomani.fr/echirolles.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.stokomani.fr/echirolles.html
diff --git a/data/cities/echirolles/tape-a-loeil.yml b/data/cities/echirolles/tape-a-loeil.yml
index 437c1a624..7b6df4da7 100644
--- a/data/cities/echirolles/tape-a-loeil.yml
+++ b/data/cities/echirolles/tape-a-loeil.yml
@@ -1,11 +1,11 @@
 id: 1185877551
-type: way
+type: node
 latitude: 45.15062
 longitude: 5.69486
 postcode: "38130"
 city: Échirolles
-street: "Place de la Grande Moucherolle"
-housenumber: 3
+street: Place de la Grande Moucherolle
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/echirolles/top-office.yml b/data/cities/echirolles/top-office.yml
index eedf3e0e6..a73183d36 100644
--- a/data/cities/echirolles/top-office.yml
+++ b/data/cities/echirolles/top-office.yml
@@ -1,11 +1,11 @@
 id: 81099322
-type: way
+type: node
 latitude: 45.15055
 longitude: 5.69591
 postcode: "38130"
 city: Échirolles
-street: "Rue de Comboire"
-housenumber: 3
+street: Rue de Comboire
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/turbofonte.yml b/data/cities/echirolles/turbofonte.yml
index 801ef0f65..e3691de8f 100644
--- a/data/cities/echirolles/turbofonte.yml
+++ b/data/cities/echirolles/turbofonte.yml
@@ -1,11 +1,11 @@
 id: 1257154557
-type: way
+type: node
 latitude: 45.15129
 longitude: 5.69568
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 13
+street: Rue des Montagnes de Lans
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/v-and-b.yml b/data/cities/echirolles/v-and-b.yml
index ba5ac70bc..c792e8117 100644
--- a/data/cities/echirolles/v-and-b.yml
+++ b/data/cities/echirolles/v-and-b.yml
@@ -1,11 +1,11 @@
 id: 81099413
-type: way
+type: node
 latitude: 45.15007
 longitude: 5.69482
 postcode: "38130"
 city: Échirolles
-street: "Place de la Grande Moucherolle"
-housenumber: 5
+street: Place de la Grande Moucherolle
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/echirolles/villaverde.yml b/data/cities/echirolles/villaverde.yml
index c899fefc7..c5a31926f 100644
--- a/data/cities/echirolles/villaverde.yml
+++ b/data/cities/echirolles/villaverde.yml
@@ -1,11 +1,11 @@
 id: 81099393
-type: way
+type: node
 latitude: 45.15261
 longitude: 5.69596
 postcode: "38130"
 city: Échirolles
-street: "Rue des Montagnes de Lans"
-housenumber: 10
+street: Rue des Montagnes de Lans
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 09:30-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/ecully/centre-commercial-ecully-grand-ouest.yml b/data/cities/ecully/centre-commercial-ecully-grand-ouest.yml
index 53cf5e103..3a84ea4dd 100644
--- a/data/cities/ecully/centre-commercial-ecully-grand-ouest.yml
+++ b/data/cities/ecully/centre-commercial-ecully-grand-ouest.yml
@@ -1,11 +1,11 @@
 id: 17971206
-type: way
+type: node
 latitude: 45.78753
 longitude: 4.77577
 postcode: "69130"
 city: Écully
-street: "Chemin Jean-Marie Vianney"
-housenumber: 
+street: Chemin Jean-Marie Vianney
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ecully/decathlon-ecully.yml b/data/cities/ecully/decathlon-ecully.yml
index 40e22258a..d35950ce7 100644
--- a/data/cities/ecully/decathlon-ecully.yml
+++ b/data/cities/ecully/decathlon-ecully.yml
@@ -1,11 +1,11 @@
 id: 61925515
-type: way
+type: node
 latitude: 45.79059
 longitude: 4.77791
 postcode: "69130"
 city: Écully
-street: "Carrefour Le Perrollier Rue Jean Marie Vianney"
-housenumber: 
+street: Carrefour Le Perrollier Rue Jean Marie Vianney
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "http://www.decathlon.fr/fr/store?store_id=PS_10#"
\ No newline at end of file
+website: http://www.decathlon.fr/fr/store?store_id=PS_10#
diff --git a/data/cities/ecully/velonaute-ecully-tassin.yml b/data/cities/ecully/velonaute-ecully-tassin.yml
index 9040d18f0..e2d5d69b3 100644
--- a/data/cities/ecully/velonaute-ecully-tassin.yml
+++ b/data/cities/ecully/velonaute-ecully-tassin.yml
@@ -4,8 +4,8 @@ latitude: 45.76398
 longitude: 4.7726
 postcode: ""
 city: Écully
-street: "Place des Trois Renards"
-housenumber: 6
+street: Place des Trois Renards
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 10:00-13:00, 14:30-19:00"
-website: "https://www.velonaute.com/content/88-velonaute-tassin-ecully-magasin-velo-electrique"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-13:00, 14:30-19:00
+website: https://www.velonaute.com/content/88-velonaute-tassin-ecully-magasin-velo-electrique
diff --git a/data/cities/empurany/proxi.yml b/data/cities/empurany/proxi.yml
index 5b9e55fa6..eb5e4e016 100644
--- a/data/cities/empurany/proxi.yml
+++ b/data/cities/empurany/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.02393
 longitude: 4.60936
 postcode: "07270"
 city: Empurany
-street: "25 rue centrale"
-housenumber: 25
-phone: "+33 4 75 06 70 73"
-opening_hours: "Tu-Su 08:15-12:15"
-website: ""
\ No newline at end of file
+street: 25 rue centrale
+housenumber: "25"
+phone: +33 4 75 06 70 73
+opening_hours: Tu-Su 08:15-12:15
+website: ""
diff --git a/data/cities/entraigues/boulangerie-du-vet.yml b/data/cities/entraigues/boulangerie-du-vet.yml
index db29f14a4..32b799f41 100644
--- a/data/cities/entraigues/boulangerie-du-vet.yml
+++ b/data/cities/entraigues/boulangerie-du-vet.yml
@@ -4,8 +4,8 @@ latitude: 44.90187
 longitude: 5.9487
 postcode: "38740"
 city: Entraigues
-street: "Rue de l'Étillier"
-housenumber: 37
-phone: "+33 4 76 30 28 96"
+street: Rue de l'Étillier
+housenumber: "37"
+phone: +33 4 76 30 28 96
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/entrelacs/quincaillerie-philippe.yml b/data/cities/entrelacs/quincaillerie-philippe.yml
index b70d754ae..e0e2ae4d6 100644
--- a/data/cities/entrelacs/quincaillerie-philippe.yml
+++ b/data/cities/entrelacs/quincaillerie-philippe.yml
@@ -1,11 +1,11 @@
 id: 185089502
-type: way
+type: node
 latitude: 45.78938
 longitude: 5.9468
 postcode: "73410"
 city: entrelacs
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/epagny-metz-tessy/aubert.yml b/data/cities/epagny-metz-tessy/aubert.yml
index bddc4b1c8..3b58ec027 100644
--- a/data/cities/epagny-metz-tessy/aubert.yml
+++ b/data/cities/epagny-metz-tessy/aubert.yml
@@ -4,8 +4,8 @@ latitude: 45.93797
 longitude: 6.07885
 postcode: "74330"
 city: Epagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 626
-phone: "+33 4 50 22 59 26"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.aubert.com/magasin/M42/aubert-annecy"
\ No newline at end of file
+street: Avenue du Centre
+housenumber: "626"
+phone: +33 4 50 22 59 26
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.aubert.com/magasin/M42/aubert-annecy
diff --git a/data/cities/epagny-metz-tessy/boconcept.yml b/data/cities/epagny-metz-tessy/boconcept.yml
index 22fd83d2e..cc433fc81 100644
--- a/data/cities/epagny-metz-tessy/boconcept.yml
+++ b/data/cities/epagny-metz-tessy/boconcept.yml
@@ -1,11 +1,11 @@
 id: 62549837
-type: way
+type: node
 latitude: 45.93748
 longitude: 6.07855
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 540
+street: Avenue du Centre
+housenumber: "540"
 phone: ""
 opening_hours: ""
-website: "https://www.boconcept.com/fr-fr/stores/find-your-local-store/france/province/boconcept-annecy"
\ No newline at end of file
+website: https://www.boconcept.com/fr-fr/stores/find-your-local-store/france/province/boconcept-annecy
diff --git a/data/cities/epagny-metz-tessy/bonobo.yml b/data/cities/epagny-metz-tessy/bonobo.yml
index 3cf5dcec1..912d1dc6a 100644
--- a/data/cities/epagny-metz-tessy/bonobo.yml
+++ b/data/cities/epagny-metz-tessy/bonobo.yml
@@ -4,8 +4,8 @@ latitude: 45.93442
 longitude: 6.08239
 postcode: "74330"
 city: Epagny Metz-Tessy
-street: "Rue des Peupliers"
-housenumber: 
-phone: "+33 4 50 22 26 79"
+street: Rue des Peupliers
+housenumber: ""
+phone: +33 4 50 22 26 79
 opening_hours: ""
-website: "https://www.bonoboplanet.com/magasins-haute-savoie-74-annecy-epagny-4639.html"
\ No newline at end of file
+website: https://www.bonoboplanet.com/magasins-haute-savoie-74-annecy-epagny-4639.html
diff --git a/data/cities/epagny-metz-tessy/chateau-dax.yml b/data/cities/epagny-metz-tessy/chateau-dax.yml
index ee81004a2..1a42e78be 100644
--- a/data/cities/epagny-metz-tessy/chateau-dax.yml
+++ b/data/cities/epagny-metz-tessy/chateau-dax.yml
@@ -1,11 +1,11 @@
 id: 677890496
-type: way
+type: node
 latitude: 45.93714
 longitude: 6.07844
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 525
+street: Avenue du Centre
+housenumber: "525"
 phone: ""
 opening_hours: ""
-website: "https://www.chateau-dax.fr/magasins/chateau-dax-annecy-epagny/"
\ No newline at end of file
+website: https://www.chateau-dax.fr/magasins/chateau-dax-annecy-epagny/
diff --git a/data/cities/epagny-metz-tessy/cocoa-valley-epagny.yml b/data/cities/epagny-metz-tessy/cocoa-valley-epagny.yml
index 0849ce6e9..16fe2cfc9 100644
--- a/data/cities/epagny-metz-tessy/cocoa-valley-epagny.yml
+++ b/data/cities/epagny-metz-tessy/cocoa-valley-epagny.yml
@@ -1,11 +1,11 @@
 id: 935462917
-type: way
+type: node
 latitude: 45.93982
 longitude: 6.07907
 postcode: "74330"
 city: Epagny Metz-Tessy
-street: "Rue de la Mandallaz"
-housenumber: 79
+street: Rue de la Mandallaz
+housenumber: "79"
 phone: ""
 opening_hours: ""
-website: "https://www.cocoavalley.fr/"
\ No newline at end of file
+website: https://www.cocoavalley.fr/
diff --git a/data/cities/epagny-metz-tessy/conforama.yml b/data/cities/epagny-metz-tessy/conforama.yml
index bacc0b769..1da78c6a7 100644
--- a/data/cities/epagny-metz-tessy/conforama.yml
+++ b/data/cities/epagny-metz-tessy/conforama.yml
@@ -4,8 +4,8 @@ latitude: 45.93838
 longitude: 6.0783
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 623
+street: Avenue du Centre
+housenumber: "623"
 phone: ""
 opening_hours: ""
-website: "https://www.conforama.fr/magasins-conforama/annecy?lat=0&long=0&name=ANNECY"
\ No newline at end of file
+website: https://www.conforama.fr/magasins-conforama/annecy?lat=0&long=0&name=ANNECY
diff --git a/data/cities/epagny-metz-tessy/feu-vert-epagny.yml b/data/cities/epagny-metz-tessy/feu-vert-epagny.yml
index 696dd6a84..98265d247 100644
--- a/data/cities/epagny-metz-tessy/feu-vert-epagny.yml
+++ b/data/cities/epagny-metz-tessy/feu-vert-epagny.yml
@@ -4,8 +4,8 @@ latitude: 45.93411
 longitude: 6.08316
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
+street: Avenue du Centre
 housenumber: 25 bis
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-16:00"
-website: "https://www.feuvert.fr/centres-auto/epagny/feu-vert-annecy-epagny/66.html"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-16:00
+website: https://www.feuvert.fr/centres-auto/epagny/feu-vert-annecy-epagny/66.html
diff --git a/data/cities/epagny-metz-tessy/go-sport.yml b/data/cities/epagny-metz-tessy/go-sport.yml
index 657182613..38f678342 100644
--- a/data/cities/epagny-metz-tessy/go-sport.yml
+++ b/data/cities/epagny-metz-tessy/go-sport.yml
@@ -1,11 +1,11 @@
 id: 62546085
-type: way
+type: node
 latitude: 45.93552
 longitude: 6.08326
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 92
+street: Avenue du Centre
+housenumber: "92"
 phone: ""
-opening_hours: "Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/epagny-metz-tessy/homesalons-epagny.yml b/data/cities/epagny-metz-tessy/homesalons-epagny.yml
index 9d0fd6b9b..0d038032c 100644
--- a/data/cities/epagny-metz-tessy/homesalons-epagny.yml
+++ b/data/cities/epagny-metz-tessy/homesalons-epagny.yml
@@ -1,11 +1,11 @@
 id: 677890497
-type: way
+type: node
 latitude: 45.93704
 longitude: 6.07836
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 525
+street: Avenue du Centre
+housenumber: "525"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/epagny-metz-tessy/king-jouet.yml b/data/cities/epagny-metz-tessy/king-jouet.yml
index cd0f1738d..def3dd614 100644
--- a/data/cities/epagny-metz-tessy/king-jouet.yml
+++ b/data/cities/epagny-metz-tessy/king-jouet.yml
@@ -1,11 +1,11 @@
 id: 1008916205
-type: way
+type: node
 latitude: 45.93521
 longitude: 6.08082
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 249
+street: Avenue du Centre
+housenumber: "249"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30, Su 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30, Su 09:30-19:00
+website: ""
diff --git a/data/cities/epagny-metz-tessy/ldlc.yml b/data/cities/epagny-metz-tessy/ldlc.yml
index 048c65799..805b2ae0b 100644
--- a/data/cities/epagny-metz-tessy/ldlc.yml
+++ b/data/cities/epagny-metz-tessy/ldlc.yml
@@ -4,8 +4,8 @@ latitude: 45.94095
 longitude: 6.07734
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Rue des Roseaux"
+street: Rue des Roseaux
 housenumber: 83 bis
 phone: ""
-opening_hours: "Tu-Fr 09:30-19:00; Sa 09:30-12:30, 14:00-19:00"
-website: "https://www.ldlc.com/magasins-ldlc/magasin-470067/74-ldlc-annecy-epagny/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-19:00; Sa 09:30-12:30, 14:00-19:00
+website: https://www.ldlc.com/magasins-ldlc/magasin-470067/74-ldlc-annecy-epagny/
diff --git a/data/cities/epagny-metz-tessy/maliterie.yml b/data/cities/epagny-metz-tessy/maliterie.yml
index 33cfc45e2..369c40c7e 100644
--- a/data/cities/epagny-metz-tessy/maliterie.yml
+++ b/data/cities/epagny-metz-tessy/maliterie.yml
@@ -4,8 +4,8 @@ latitude: 45.93607
 longitude: 6.08201
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 220
+street: Avenue du Centre
+housenumber: "220"
 phone: ""
-opening_hours: "Mo-Sa 10:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/epagny-metz-tessy/mondovelo.yml b/data/cities/epagny-metz-tessy/mondovelo.yml
index a3b784796..c6c17c2e4 100644
--- a/data/cities/epagny-metz-tessy/mondovelo.yml
+++ b/data/cities/epagny-metz-tessy/mondovelo.yml
@@ -4,8 +4,8 @@ latitude: 45.94056
 longitude: 6.07706
 postcode: "74330"
 city: Epagny Metz-Tessy
-street: "Rue des Roseaux"
-housenumber: 53
+street: Rue des Roseaux
+housenumber: "53"
 phone: ""
 opening_hours: ""
-website: "https://www.mondovelo.fr/magasins/143-mondovelo-epagny"
\ No newline at end of file
+website: https://www.mondovelo.fr/magasins/143-mondovelo-epagny
diff --git a/data/cities/epagny-metz-tessy/monsieur-meuble.yml b/data/cities/epagny-metz-tessy/monsieur-meuble.yml
index acff16866..88dcae189 100644
--- a/data/cities/epagny-metz-tessy/monsieur-meuble.yml
+++ b/data/cities/epagny-metz-tessy/monsieur-meuble.yml
@@ -4,8 +4,8 @@ latitude: 45.9359
 longitude: 6.08249
 postcode: "74330"
 city: Épagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 182
+street: Avenue du Centre
+housenumber: "182"
 phone: "+33450225192"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00"
-website: "https://www.monsieur-meuble.fr/magasin-annecy.html"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00
+website: https://www.monsieur-meuble.fr/magasin-annecy.html
diff --git a/data/cities/epagny-metz-tessy/savoie-volailles-pernoud.yml b/data/cities/epagny-metz-tessy/savoie-volailles-pernoud.yml
index 3a8ace430..81b1f0b17 100644
--- a/data/cities/epagny-metz-tessy/savoie-volailles-pernoud.yml
+++ b/data/cities/epagny-metz-tessy/savoie-volailles-pernoud.yml
@@ -4,8 +4,8 @@ latitude: 45.93813
 longitude: 6.07915
 postcode: "74330"
 city: Epagny Metz-Tessy
-street: "Avenue du Centre"
-housenumber: 652
+street: Avenue du Centre
+housenumber: "652"
 phone: ""
 opening_hours: ""
-website: "https://www.facebook.com/savoie.volailles/"
\ No newline at end of file
+website: https://www.facebook.com/savoie.volailles/
diff --git a/data/cities/epagny-metz/otera.yml b/data/cities/epagny-metz/otera.yml
index 3c20d6d03..6401a441b 100644
--- a/data/cities/epagny-metz/otera.yml
+++ b/data/cities/epagny-metz/otera.yml
@@ -1,11 +1,11 @@
 id: 1051816875
-type: way
+type: node
 latitude: 45.92346
 longitude: 6.0843
 postcode: "74330"
 city: Epagny - Metz
-street: "Rue des Savoies"
-housenumber: 202
+street: Rue des Savoies
+housenumber: "202"
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/epagny/belhome.yml b/data/cities/epagny/belhome.yml
index 0477cbcfc..8b178b097 100644
--- a/data/cities/epagny/belhome.yml
+++ b/data/cities/epagny/belhome.yml
@@ -1,11 +1,11 @@
 id: 62547160
-type: way
+type: node
 latitude: 45.93719
 longitude: 6.07664
 postcode: "74330"
 city: Epagny
-street: "Avenue des Alpes"
-housenumber: 76
-phone: "+334 50 24 86 83"
+street: Avenue des Alpes
+housenumber: "76"
+phone: +334 50 24 86 83
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/epagny/besson-chaussures.yml b/data/cities/epagny/besson-chaussures.yml
index bca9029a3..5cc1043c3 100644
--- a/data/cities/epagny/besson-chaussures.yml
+++ b/data/cities/epagny/besson-chaussures.yml
@@ -1,11 +1,11 @@
 id: 62547531
-type: way
+type: node
 latitude: 45.93981
 longitude: 6.07411
 postcode: "74330"
 city: Épagny
-street: "ZAC Grand Epagny"
-housenumber: 
-phone: "+33 8 25351134"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.besson-chaussures.com/fr/BESSON_CHAUSSURES_Magasin_ANNECY-p2362"
\ No newline at end of file
+street: ZAC Grand Epagny
+housenumber: ""
+phone: +33 8 25351134
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.besson-chaussures.com/fr/BESSON_CHAUSSURES_Magasin_ANNECY-p2362
diff --git a/data/cities/epagny/cyclable-annecy-epagny.yml b/data/cities/epagny/cyclable-annecy-epagny.yml
index 07756657b..6eaaca2a1 100644
--- a/data/cities/epagny/cyclable-annecy-epagny.yml
+++ b/data/cities/epagny/cyclable-annecy-epagny.yml
@@ -1,11 +1,11 @@
 id: 62548901
-type: way
+type: node
 latitude: 45.93955
 longitude: 6.07961
 postcode: "74330"
 city: Épagny
-street: "Rue de la Mandallaz"
-housenumber: 79
+street: Rue de la Mandallaz
+housenumber: "79"
 phone: "+33457410611"
 opening_hours: ""
-website: "https://annecy-epagny.cyclable.com/"
\ No newline at end of file
+website: https://annecy-epagny.cyclable.com/
diff --git a/data/cities/epagny/decathlon.yml b/data/cities/epagny/decathlon.yml
index 443d1912e..48ea5b3dd 100644
--- a/data/cities/epagny/decathlon.yml
+++ b/data/cities/epagny/decathlon.yml
@@ -1,11 +1,11 @@
 id: 815631843
-type: way
+type: node
 latitude: 45.94009
 longitude: 6.06797
 postcode: "74330"
 city: Épagny
-street: "Chemin des Perdrix"
-housenumber: 
+street: Chemin des Perdrix
+housenumber: ""
 phone: ""
-opening_hours: "Apr-Oct: Mo-Sa 09:00-20:00; Apr-Oct: Su off; Nov-Mar: Mo-Sa 09:00-19:30"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-epagny-0070005100051"
\ No newline at end of file
+opening_hours: 'Apr-Oct: Mo-Sa 09:00-20:00; Apr-Oct: Su off; Nov-Mar: Mo-Sa 09:00-19:30'
+website: https://www.decathlon.fr/store-view/magasin-de-sports-epagny-0070005100051
diff --git a/data/cities/epagny/larmoire-de-bebe.yml b/data/cities/epagny/larmoire-de-bebe.yml
index db17c7843..294b0a720 100644
--- a/data/cities/epagny/larmoire-de-bebe.yml
+++ b/data/cities/epagny/larmoire-de-bebe.yml
@@ -4,8 +4,8 @@ latitude: 45.94088
 longitude: 6.07824
 postcode: "74330"
 city: Épagny
-street: "Rue des Roseaux"
-housenumber: 84
+street: Rue des Roseaux
+housenumber: "84"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/epagny/leroy-merlin.yml b/data/cities/epagny/leroy-merlin.yml
index c94f06521..5b13c744f 100644
--- a/data/cities/epagny/leroy-merlin.yml
+++ b/data/cities/epagny/leroy-merlin.yml
@@ -1,11 +1,11 @@
 id: 315389813
-type: way
+type: node
 latitude: 45.9232
 longitude: 6.08553
 postcode: "74330"
 city: Epagny
-street: "route de Closon"
-housenumber: 358
-phone: "+33 4 50 24 67 67"
-opening_hours: "Mo-Sa 09:00-20:00"
-website: "https://www.leroymerlin.fr/magasins/epagny-annecy.html"
\ No newline at end of file
+street: route de Closon
+housenumber: "358"
+phone: +33 4 50 24 67 67
+opening_hours: Mo-Sa 09:00-20:00
+website: https://www.leroymerlin.fr/magasins/epagny-annecy.html
diff --git a/data/cities/epagny/olyreve-literie-epagny.yml b/data/cities/epagny/olyreve-literie-epagny.yml
index e20eaad74..9804ab89a 100644
--- a/data/cities/epagny/olyreve-literie-epagny.yml
+++ b/data/cities/epagny/olyreve-literie-epagny.yml
@@ -1,11 +1,11 @@
 id: 62549970
-type: way
+type: node
 latitude: 45.93693
 longitude: 6.07816
 postcode: "74330"
 city: Epagny
-street: "Avenue du Centre"
-housenumber: 543
+street: Avenue du Centre
+housenumber: "543"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/epagny/picard.yml b/data/cities/epagny/picard.yml
index db00ca30e..1197ce16f 100644
--- a/data/cities/epagny/picard.yml
+++ b/data/cities/epagny/picard.yml
@@ -4,8 +4,8 @@ latitude: 45.93849
 longitude: 6.07933
 postcode: "74330"
 city: Épagny
-street: "Avenue du Centre"
-housenumber: 690
-phone: "+33 4 50 24 19 82"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://magasins.picard.fr/312-picard-epagny"
\ No newline at end of file
+street: Avenue du Centre
+housenumber: "690"
+phone: +33 4 50 24 19 82
+opening_hours: Mo-Sa 09:00-19:30
+website: https://magasins.picard.fr/312-picard-epagny
diff --git a/data/cities/epagny/salsa.yml b/data/cities/epagny/salsa.yml
index 1afcc9e1a..6fe63c6aa 100644
--- a/data/cities/epagny/salsa.yml
+++ b/data/cities/epagny/salsa.yml
@@ -1,11 +1,11 @@
 id: 62546962
-type: way
+type: node
 latitude: 45.93942
 longitude: 6.07882
 postcode: "74330"
 city: Épagny
-street: "Rue de la Mandallaz"
-housenumber: 51
+street: Rue de la Mandallaz
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: "https://www.salsajeans.com/fr/"
\ No newline at end of file
+website: https://www.salsajeans.com/fr/
diff --git a/data/cities/epagny/schmidt.yml b/data/cities/epagny/schmidt.yml
index f8cbaa11c..1d749c60c 100644
--- a/data/cities/epagny/schmidt.yml
+++ b/data/cities/epagny/schmidt.yml
@@ -1,11 +1,11 @@
 id: 62548216
-type: way
+type: node
 latitude: 45.93669
 longitude: 6.07935
 postcode: "74330"
 city: Epagny
-street: "Avenue du Centre"
-housenumber: 461
+street: Avenue du Centre
+housenumber: "461"
 phone: ""
-opening_hours: "Mo-Th 09:30-12:00,14:00-18:30; Tu,Fr 10:00-12:00,14:00-18:30; Sa 10:00-18:00"
-website: "https://www.home-design.schmidt/fr-fr/magasins/haute-savoie/annecy-epagny"
\ No newline at end of file
+opening_hours: Mo-Th 09:30-12:00,14:00-18:30; Tu,Fr 10:00-12:00,14:00-18:30; Sa 10:00-18:00
+website: https://www.home-design.schmidt/fr-fr/magasins/haute-savoie/annecy-epagny
diff --git a/data/cities/epagny/trail-running-store.yml b/data/cities/epagny/trail-running-store.yml
index 22f404c72..40c413fe8 100644
--- a/data/cities/epagny/trail-running-store.yml
+++ b/data/cities/epagny/trail-running-store.yml
@@ -4,8 +4,8 @@ latitude: 45.9409
 longitude: 6.06808
 postcode: "74330"
 city: Épagny
-street: "Route des Perdrix"
-housenumber: 177
+street: Route des Perdrix
+housenumber: "177"
 phone: ""
 opening_hours: ""
-website: "https://trailrunningstore.fr/"
\ No newline at end of file
+website: https://trailrunningstore.fr/
diff --git a/data/cities/estrablin/fleuriste-les-jardins-dalthea.yml b/data/cities/estrablin/fleuriste-les-jardins-dalthea.yml
index 98d9daddc..bb5df7f5c 100644
--- a/data/cities/estrablin/fleuriste-les-jardins-dalthea.yml
+++ b/data/cities/estrablin/fleuriste-les-jardins-dalthea.yml
@@ -5,7 +5,7 @@ longitude: 4.96473
 postcode: "38780"
 city: Estrablin
 street: ""
-housenumber: 40
-phone: "+33 4 37 04 65 25"
+housenumber: "40"
+phone: +33 4 37 04 65 25
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/estrablin/pepiniere-christophe-delay.yml b/data/cities/estrablin/pepiniere-christophe-delay.yml
index 5466e7754..ee3ee43d6 100644
--- a/data/cities/estrablin/pepiniere-christophe-delay.yml
+++ b/data/cities/estrablin/pepiniere-christophe-delay.yml
@@ -4,8 +4,8 @@ latitude: 45.50063
 longitude: 4.94276
 postcode: "38780"
 city: Estrablin
-street: "Impasse des Combes"
-housenumber: 
-phone: "+33 0474571442 en soirée"
-opening_hours: "Sur rendez-vous"
-website: ""
\ No newline at end of file
+street: Impasse des Combes
+housenumber: ""
+phone: +33 0474571442 en soirée
+opening_hours: '"Sur rendez-vous"'
+website: ""
diff --git a/data/cities/etaux/airxtrem.yml b/data/cities/etaux/airxtrem.yml
index 1f83e267c..4952fbd49 100644
--- a/data/cities/etaux/airxtrem.yml
+++ b/data/cities/etaux/airxtrem.yml
@@ -4,8 +4,8 @@ latitude: 46.06283
 longitude: 6.27637
 postcode: "74800"
 city: Etaux
-street: "Route de la Chapelle Rambaud"
-housenumber: 2080
+street: Route de la Chapelle Rambaud
+housenumber: "2080"
 phone: ""
 opening_hours: ""
-website: "https://boutique.airxtrem.com"
\ No newline at end of file
+website: https://boutique.airxtrem.com
diff --git a/data/cities/etrembieres/armand-thiery.yml b/data/cities/etrembieres/armand-thiery.yml
index b6a227bec..472619862 100644
--- a/data/cities/etrembieres/armand-thiery.yml
+++ b/data/cities/etrembieres/armand-thiery.yml
@@ -4,8 +4,8 @@ latitude: 46.18149
 longitude: 6.23125
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/aubert.yml b/data/cities/etrembieres/aubert.yml
index 1ed5d48d4..3ff85a92a 100644
--- a/data/cities/etrembieres/aubert.yml
+++ b/data/cities/etrembieres/aubert.yml
@@ -4,8 +4,8 @@ latitude: 46.18128
 longitude: 6.23125
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/body-minute.yml b/data/cities/etrembieres/body-minute.yml
index 09431c985..edda3f4c6 100644
--- a/data/cities/etrembieres/body-minute.yml
+++ b/data/cities/etrembieres/body-minute.yml
@@ -4,8 +4,8 @@ latitude: 46.18178
 longitude: 6.23163
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-18:30; Sa 09:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-18:30; Sa 09:00-18:30; Su off
+website: ""
diff --git a/data/cities/etrembieres/boutique-sfr.yml b/data/cities/etrembieres/boutique-sfr.yml
index 860928f1e..63c4dab16 100644
--- a/data/cities/etrembieres/boutique-sfr.yml
+++ b/data/cities/etrembieres/boutique-sfr.yml
@@ -4,8 +4,8 @@ latitude: 46.18117
 longitude: 6.23178
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/etrembieres/briant.yml b/data/cities/etrembieres/briant.yml
index 85e93e2ba..4406a1c02 100644
--- a/data/cities/etrembieres/briant.yml
+++ b/data/cities/etrembieres/briant.yml
@@ -4,8 +4,8 @@ latitude: 46.18112
 longitude: 6.23188
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/brioche-doree.yml b/data/cities/etrembieres/brioche-doree.yml
index bae94a727..6590259e4 100644
--- a/data/cities/etrembieres/brioche-doree.yml
+++ b/data/cities/etrembieres/brioche-doree.yml
@@ -4,8 +4,8 @@ latitude: 46.18166
 longitude: 6.23168
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00"
-website: "https://www.briochedoree.fr/restaurants/126-etrembieres-c.cial-shopping"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00
+website: https://www.briochedoree.fr/restaurants/126-etrembieres-c.cial-shopping
diff --git a/data/cities/etrembieres/celio.yml b/data/cities/etrembieres/celio.yml
index 64f53a955..c5546abcd 100644
--- a/data/cities/etrembieres/celio.yml
+++ b/data/cities/etrembieres/celio.yml
@@ -4,8 +4,8 @@ latitude: 46.1816
 longitude: 6.23189
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/claires.yml b/data/cities/etrembieres/claires.yml
index 3f1dea31b..6028495a7 100644
--- a/data/cities/etrembieres/claires.yml
+++ b/data/cities/etrembieres/claires.yml
@@ -4,8 +4,8 @@ latitude: 46.18165
 longitude: 6.23177
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/courir.yml b/data/cities/etrembieres/courir.yml
index 903a84188..ec7881ffe 100644
--- a/data/cities/etrembieres/courir.yml
+++ b/data/cities/etrembieres/courir.yml
@@ -4,8 +4,8 @@ latitude: 46.18122
 longitude: 6.23169
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/darjeeling.yml b/data/cities/etrembieres/darjeeling.yml
index aa0f9debb..7692f7984 100644
--- a/data/cities/etrembieres/darjeeling.yml
+++ b/data/cities/etrembieres/darjeeling.yml
@@ -4,8 +4,8 @@ latitude: 46.18166
 longitude: 6.23206
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/eram.yml b/data/cities/etrembieres/eram.yml
index 66f825380..0b7678fff 100644
--- a/data/cities/etrembieres/eram.yml
+++ b/data/cities/etrembieres/eram.yml
@@ -4,8 +4,8 @@ latitude: 46.18123
 longitude: 6.23166
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/etrembieres/etam.yml b/data/cities/etrembieres/etam.yml
index 264c60d1d..c4c867a95 100644
--- a/data/cities/etrembieres/etam.yml
+++ b/data/cities/etrembieres/etam.yml
@@ -4,8 +4,8 @@ latitude: 46.18174
 longitude: 6.2319
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/first-stop.yml b/data/cities/etrembieres/first-stop.yml
index 0631fabcc..ab45fee9d 100644
--- a/data/cities/etrembieres/first-stop.yml
+++ b/data/cities/etrembieres/first-stop.yml
@@ -4,8 +4,8 @@ latitude: 46.18295
 longitude: 6.22924
 postcode: "74100"
 city: Étrembières
-street: "Chemin de la Digue"
-housenumber: 99
+street: Chemin de la Digue
+housenumber: "99"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:30; Sa 09:00-12:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:30; Sa 09:00-12:30; Su off
+website: ""
diff --git a/data/cities/etrembieres/free.yml b/data/cities/etrembieres/free.yml
index 0aa151183..04f5d5353 100644
--- a/data/cities/etrembieres/free.yml
+++ b/data/cities/etrembieres/free.yml
@@ -4,8 +4,8 @@ latitude: 46.18113
 longitude: 6.23166
 postcode: ""
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/giant.yml b/data/cities/etrembieres/giant.yml
index 0604a2542..98cfb5f7d 100644
--- a/data/cities/etrembieres/giant.yml
+++ b/data/cities/etrembieres/giant.yml
@@ -4,8 +4,8 @@ latitude: 46.18283
 longitude: 6.22924
 postcode: "74100"
 city: Étrembières
-street: "Chemin de la Digue"
-housenumber: 99
+street: Chemin de la Digue
+housenumber: "99"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:30-12:30, 14:30-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:30-12:30, 14:30-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/etrembieres/grandoptical.yml b/data/cities/etrembieres/grandoptical.yml
index 5af326538..3e41e934a 100644
--- a/data/cities/etrembieres/grandoptical.yml
+++ b/data/cities/etrembieres/grandoptical.yml
@@ -4,8 +4,8 @@ latitude: 46.18134
 longitude: 6.23139
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-19:00; Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-19:00; Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/etrembieres/hetm.yml b/data/cities/etrembieres/hetm.yml
index eb99a2f15..28b81371e 100644
--- a/data/cities/etrembieres/hetm.yml
+++ b/data/cities/etrembieres/hetm.yml
@@ -4,8 +4,8 @@ latitude: 46.18175
 longitude: 6.2317
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 10:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 10:00-19:30; Su off
+website: ""
diff --git a/data/cities/etrembieres/histoire-dor.yml b/data/cities/etrembieres/histoire-dor.yml
index ad8be8f59..e7584aa2b 100644
--- a/data/cities/etrembieres/histoire-dor.yml
+++ b/data/cities/etrembieres/histoire-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.18103
 longitude: 6.23186
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/intersport.yml b/data/cities/etrembieres/intersport.yml
index 60f211705..a4c83bea1 100644
--- a/data/cities/etrembieres/intersport.yml
+++ b/data/cities/etrembieres/intersport.yml
@@ -4,8 +4,8 @@ latitude: 46.18129
 longitude: 6.23135
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/jeff-de-bruges.yml b/data/cities/etrembieres/jeff-de-bruges.yml
index b6dc8127d..11c67309c 100644
--- a/data/cities/etrembieres/jeff-de-bruges.yml
+++ b/data/cities/etrembieres/jeff-de-bruges.yml
@@ -4,8 +4,8 @@ latitude: 46.1815
 longitude: 6.23143
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:00; Sa-Su off
+website: ""
diff --git a/data/cities/etrembieres/la-boutique-du-coiffeur.yml b/data/cities/etrembieres/la-boutique-du-coiffeur.yml
index b923da3ed..78c4e31b3 100644
--- a/data/cities/etrembieres/la-boutique-du-coiffeur.yml
+++ b/data/cities/etrembieres/la-boutique-du-coiffeur.yml
@@ -4,8 +4,8 @@ latitude: 46.18145
 longitude: 6.23223
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/le-comptoir-de-mathilde.yml b/data/cities/etrembieres/le-comptoir-de-mathilde.yml
index 8e80955cf..7d9cee217 100644
--- a/data/cities/etrembieres/le-comptoir-de-mathilde.yml
+++ b/data/cities/etrembieres/le-comptoir-de-mathilde.yml
@@ -4,8 +4,8 @@ latitude: 46.18133
 longitude: 6.23131
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/lidl.yml b/data/cities/etrembieres/lidl.yml
index c00635a9d..e57421bc6 100644
--- a/data/cities/etrembieres/lidl.yml
+++ b/data/cities/etrembieres/lidl.yml
@@ -1,11 +1,11 @@
 id: 79295360
-type: way
+type: node
 latitude: 46.18193
 longitude: 6.22892
 postcode: "74100"
 city: Étrembières
-street: "Chemin de la Digue"
-housenumber: 99
+street: Chemin de la Digue
+housenumber: "99"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su off
+website: ""
diff --git a/data/cities/etrembieres/maison-123.yml b/data/cities/etrembieres/maison-123.yml
index 7389713a0..55c8d3603 100644
--- a/data/cities/etrembieres/maison-123.yml
+++ b/data/cities/etrembieres/maison-123.yml
@@ -4,8 +4,8 @@ latitude: 46.1817
 longitude: 6.23197
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo,Tu,Th 09:30-20:00; Sa 09:00-20:00; Su off; We,Fr 09:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th 09:30-20:00; Sa 09:00-20:00; Su off; We,Fr 09:30-20:00
+website: ""
diff --git a/data/cities/etrembieres/micromania.yml b/data/cities/etrembieres/micromania.yml
index d90e73990..81586108b 100644
--- a/data/cities/etrembieres/micromania.yml
+++ b/data/cities/etrembieres/micromania.yml
@@ -4,8 +4,8 @@ latitude: 46.1811
 longitude: 6.23172
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/migros.yml b/data/cities/etrembieres/migros.yml
index 35a4f4775..a0c6d9c6c 100644
--- a/data/cities/etrembieres/migros.yml
+++ b/data/cities/etrembieres/migros.yml
@@ -4,8 +4,8 @@ latitude: 46.18096
 longitude: 6.23245
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/etrembieres/moi-je.yml b/data/cities/etrembieres/moi-je.yml
index 56d5a9b5e..7aaeea14a 100644
--- a/data/cities/etrembieres/moi-je.yml
+++ b/data/cities/etrembieres/moi-je.yml
@@ -4,8 +4,8 @@ latitude: 46.18153
 longitude: 6.23225
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/morgan.yml b/data/cities/etrembieres/morgan.yml
index bc25ea1c8..f705113f4 100644
--- a/data/cities/etrembieres/morgan.yml
+++ b/data/cities/etrembieres/morgan.yml
@@ -4,8 +4,8 @@ latitude: 46.18162
 longitude: 6.23215
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/naf-naf.yml b/data/cities/etrembieres/naf-naf.yml
index a96013c3b..7d100971b 100644
--- a/data/cities/etrembieres/naf-naf.yml
+++ b/data/cities/etrembieres/naf-naf.yml
@@ -4,8 +4,8 @@ latitude: 46.18155
 longitude: 6.23202
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/nocibe.yml b/data/cities/etrembieres/nocibe.yml
index 4575de26a..8fb8c8e33 100644
--- a/data/cities/etrembieres/nocibe.yml
+++ b/data/cities/etrembieres/nocibe.yml
@@ -4,8 +4,8 @@ latitude: 46.18128
 longitude: 6.23205
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/ollygan.yml b/data/cities/etrembieres/ollygan.yml
index ffa1341d5..ba8941f81 100644
--- a/data/cities/etrembieres/ollygan.yml
+++ b/data/cities/etrembieres/ollygan.yml
@@ -4,8 +4,8 @@ latitude: 46.18143
 longitude: 6.23147
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/etrembieres/orange.yml b/data/cities/etrembieres/orange.yml
index 9b54fe786..7e077554c 100644
--- a/data/cities/etrembieres/orange.yml
+++ b/data/cities/etrembieres/orange.yml
@@ -4,8 +4,8 @@ latitude: 46.18132
 longitude: 6.23155
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/palais-des-thes.yml b/data/cities/etrembieres/palais-des-thes.yml
index a480c7f56..3184330d6 100644
--- a/data/cities/etrembieres/palais-des-thes.yml
+++ b/data/cities/etrembieres/palais-des-thes.yml
@@ -5,7 +5,7 @@ longitude: 6.23163
 postcode: ""
 city: Étrembières
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/etrembieres/pandora.yml b/data/cities/etrembieres/pandora.yml
index 4888fa056..8a2527cfe 100644
--- a/data/cities/etrembieres/pandora.yml
+++ b/data/cities/etrembieres/pandora.yml
@@ -4,8 +4,8 @@ latitude: 46.18139
 longitude: 6.23216
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/petit-bateau.yml b/data/cities/etrembieres/petit-bateau.yml
index cd31659df..f599a7f8d 100644
--- a/data/cities/etrembieres/petit-bateau.yml
+++ b/data/cities/etrembieres/petit-bateau.yml
@@ -4,8 +4,8 @@ latitude: 46.18122
 longitude: 6.23199
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su 10:00-19:00
+website: ""
diff --git a/data/cities/etrembieres/pilvite.yml b/data/cities/etrembieres/pilvite.yml
index f7ab91f8b..c3e1a2d3a 100644
--- a/data/cities/etrembieres/pilvite.yml
+++ b/data/cities/etrembieres/pilvite.yml
@@ -4,8 +4,8 @@ latitude: 46.18121
 longitude: 6.23148
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/promod.yml b/data/cities/etrembieres/promod.yml
index 655270a46..717ed339b 100644
--- a/data/cities/etrembieres/promod.yml
+++ b/data/cities/etrembieres/promod.yml
@@ -4,8 +4,8 @@ latitude: 46.18159
 longitude: 6.23151
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/quiksilver.yml b/data/cities/etrembieres/quiksilver.yml
index bea7db4c2..3b1ff7999 100644
--- a/data/cities/etrembieres/quiksilver.yml
+++ b/data/cities/etrembieres/quiksilver.yml
@@ -4,8 +4,8 @@ latitude: 46.18143
 longitude: 6.23133
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/etrembieres/shampoo.yml b/data/cities/etrembieres/shampoo.yml
index a4b3f6a7f..b456ff336 100644
--- a/data/cities/etrembieres/shampoo.yml
+++ b/data/cities/etrembieres/shampoo.yml
@@ -4,8 +4,8 @@ latitude: 46.18175
 longitude: 6.23157
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/shopping-etrembieres.yml b/data/cities/etrembieres/shopping-etrembieres.yml
index c20d281ae..b9e6c84a6 100644
--- a/data/cities/etrembieres/shopping-etrembieres.yml
+++ b/data/cities/etrembieres/shopping-etrembieres.yml
@@ -1,11 +1,11 @@
 id: 79295143
-type: way
+type: node
 latitude: 46.18019
 longitude: 6.23303
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/etrembieres/stilbag.yml b/data/cities/etrembieres/stilbag.yml
index 41380d6b1..2c0a7215c 100644
--- a/data/cities/etrembieres/stilbag.yml
+++ b/data/cities/etrembieres/stilbag.yml
@@ -4,8 +4,8 @@ latitude: 46.18126
 longitude: 6.23159
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/undiz.yml b/data/cities/etrembieres/undiz.yml
index 6711ecff4..ee22008b0 100644
--- a/data/cities/etrembieres/undiz.yml
+++ b/data/cities/etrembieres/undiz.yml
@@ -4,8 +4,8 @@ latitude: 46.18117
 longitude: 6.23193
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 10:00-13:30, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-13:30, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/etrembieres/yves-rocher.yml b/data/cities/etrembieres/yves-rocher.yml
index 760ffeff9..fbfbf8f6d 100644
--- a/data/cities/etrembieres/yves-rocher.yml
+++ b/data/cities/etrembieres/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 46.18164
 longitude: 6.23181
 postcode: "74100"
 city: Étrembières
-street: "Rue de l'Industrie"
-housenumber: 21
+street: Rue de l'Industrie
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/eveux/epicerie-des-moines.yml b/data/cities/eveux/epicerie-des-moines.yml
index 97ccc2547..dc4ed7e33 100644
--- a/data/cities/eveux/epicerie-des-moines.yml
+++ b/data/cities/eveux/epicerie-des-moines.yml
@@ -4,8 +4,8 @@ latitude: 45.82683
 longitude: 4.6223
 postcode: "69210"
 city: Éveux
-street: "Rue de l’Église"
-housenumber: 8
+street: Rue de l’Église
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Sa 08:00-13:00, Tu,Th-Sa 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-13:00, Tu,Th-Sa 15:00-19:00
+website: ""
diff --git a/data/cities/evian-les-bains/benoit-benet.yml b/data/cities/evian-les-bains/benoit-benet.yml
index d1c25a5f9..1225a08bd 100644
--- a/data/cities/evian-les-bains/benoit-benet.yml
+++ b/data/cities/evian-les-bains/benoit-benet.yml
@@ -4,8 +4,8 @@ latitude: 46.40062
 longitude: 6.58757
 postcode: "74500"
 city: Évian-les-Bains
-street: "Rue de la Monnaie"
-housenumber: 6
-phone: "+33 4 50 75 12 94"
-opening_hours: "Tu-Sa 08:00-12:30,15:00-19:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue de la Monnaie
+housenumber: "6"
+phone: +33 4 50 75 12 94
+opening_hours: Tu-Sa 08:00-12:30,15:00-19:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/evian-les-bains/carrefour-market.yml b/data/cities/evian-les-bains/carrefour-market.yml
index e5fb4efad..2aa2db991 100644
--- a/data/cities/evian-les-bains/carrefour-market.yml
+++ b/data/cities/evian-les-bains/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 66978180
-type: way
+type: node
 latitude: 46.39642
 longitude: 6.57262
 postcode: "74500"
 city: Évian-les-Bains
-street: "Avenue des Bocquies"
-housenumber: 7
+street: Avenue des Bocquies
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/evian-les-bains/eni.yml b/data/cities/evian-les-bains/eni.yml
index e1158d1eb..3675f3247 100644
--- a/data/cities/evian-les-bains/eni.yml
+++ b/data/cities/evian-les-bains/eni.yml
@@ -4,8 +4,8 @@ latitude: 46.39905
 longitude: 6.57964
 postcode: "74500"
 city: Évian-les-Bains
-street: "Avenue Anna de Noailles"
-housenumber: 9
+street: Avenue Anna de Noailles
+housenumber: "9"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/evian-les-bains/epi-dor.yml b/data/cities/evian-les-bains/epi-dor.yml
index ea81659fd..a9966ee90 100644
--- a/data/cities/evian-les-bains/epi-dor.yml
+++ b/data/cities/evian-les-bains/epi-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.39376
 longitude: 6.58057
 postcode: "74500"
 city: Évian-les-Bains
-street: "Avenue de Thony"
-housenumber: 3
+street: Avenue de Thony
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/evian-les-bains/franprix.yml b/data/cities/evian-les-bains/franprix.yml
index 1c097e456..dc7a487e5 100644
--- a/data/cities/evian-les-bains/franprix.yml
+++ b/data/cities/evian-les-bains/franprix.yml
@@ -4,8 +4,8 @@ latitude: 46.40079
 longitude: 6.59286
 postcode: "74500"
 city: Évian-les-Bains
-street: "Rue de la Touvière"
-housenumber: 9
+street: Rue de la Touvière
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 07:30-21:00; Su 09:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-21:00; Su 09:00-20:00
+website: ""
diff --git a/data/cities/evian-les-bains/intermarche.yml b/data/cities/evian-les-bains/intermarche.yml
index 921c08223..67ae0e5d5 100644
--- a/data/cities/evian-les-bains/intermarche.yml
+++ b/data/cities/evian-les-bains/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 46.40011
 longitude: 6.58545
 postcode: "74500"
 city: Évian-les-Bains
-street: "Avenue Marc Francina"
-housenumber: 10
+street: Avenue Marc Francina
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/evian-les-bains/la-dame-en-bois.yml b/data/cities/evian-les-bains/la-dame-en-bois.yml
index d1eea6e80..c1a46c663 100644
--- a/data/cities/evian-les-bains/la-dame-en-bois.yml
+++ b/data/cities/evian-les-bains/la-dame-en-bois.yml
@@ -4,8 +4,8 @@ latitude: 46.40042
 longitude: 6.59353
 postcode: "74500"
 city: Évian-les-Bains
-street: "Rue Nationale"
-housenumber: 2
+street: Rue Nationale
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "https://ladameenbois.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:00
+website: https://ladameenbois.fr/
diff --git a/data/cities/evian-les-bains/marionnaud.yml b/data/cities/evian-les-bains/marionnaud.yml
index 8da38d939..c9662db83 100644
--- a/data/cities/evian-les-bains/marionnaud.yml
+++ b/data/cities/evian-les-bains/marionnaud.yml
@@ -4,8 +4,8 @@ latitude: 46.40047
 longitude: 6.59093
 postcode: "74500"
 city: Évian-les-Bains
-street: "Rue Nationale"
-housenumber: 42
+street: Rue Nationale
+housenumber: "42"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/evian-les-bains/nouvelle-ere.yml b/data/cities/evian-les-bains/nouvelle-ere.yml
index b333cea65..c9d9400b6 100644
--- a/data/cities/evian-les-bains/nouvelle-ere.yml
+++ b/data/cities/evian-les-bains/nouvelle-ere.yml
@@ -4,8 +4,8 @@ latitude: 46.40045
 longitude: 6.58965
 postcode: "74500"
 city: Évian-les-Bains
-street: "Rue Nationale"
-housenumber: 53
+street: Rue Nationale
+housenumber: "53"
 phone: ""
-opening_hours: "9:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: 9:30-19:00
+website: ""
diff --git a/data/cities/excenevex/vival.yml b/data/cities/excenevex/vival.yml
index 27ac8476f..e633ae29d 100644
--- a/data/cities/excenevex/vival.yml
+++ b/data/cities/excenevex/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.34578
 longitude: 6.3584
 postcode: "74140"
 city: Excenevex
-street: "Avenue de la Plage"
-housenumber: 10
+street: Avenue de la Plage
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Su 08:00-13:00, 16:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-13:00, 16:00-20:00
+website: ""
diff --git a/data/cities/eybens/autobernard.yml b/data/cities/eybens/autobernard.yml
index 3bad57436..fa7f6bc58 100644
--- a/data/cities/eybens/autobernard.yml
+++ b/data/cities/eybens/autobernard.yml
@@ -1,11 +1,11 @@
 id: 70888966
-type: way
+type: node
 latitude: 45.16211
 longitude: 5.74354
 postcode: "38320"
 city: Eybens
-street: "Avenue Jean Jaurès"
-housenumber: 38
-phone: "+33 4 76 24 20 63"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: "https://reseau.citroen.fr/grenoble-eybens"
\ No newline at end of file
+street: Avenue Jean Jaurès
+housenumber: "38"
+phone: +33 4 76 24 20 63
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: https://reseau.citroen.fr/grenoble-eybens
diff --git a/data/cities/eybens/champiloop.yml b/data/cities/eybens/champiloop.yml
index 970d0653e..ae4438105 100644
--- a/data/cities/eybens/champiloop.yml
+++ b/data/cities/eybens/champiloop.yml
@@ -4,8 +4,8 @@ latitude: 45.14645
 longitude: 5.75047
 postcode: "38320"
 city: Eybens
-street: "29 Rue des Arraults"
-housenumber: 29
+street: 29 Rue des Arraults
+housenumber: "29"
 phone: ""
-opening_hours: "Fr 16:00-18:30"
-website: "https://www.champiloop.com"
\ No newline at end of file
+opening_hours: Fr 16:00-18:30
+website: https://www.champiloop.com
diff --git a/data/cities/eybens/garage-zanesi.yml b/data/cities/eybens/garage-zanesi.yml
index 17e8f93c2..3338a6415 100644
--- a/data/cities/eybens/garage-zanesi.yml
+++ b/data/cities/eybens/garage-zanesi.yml
@@ -4,8 +4,8 @@ latitude: 45.15937
 longitude: 5.74248
 postcode: "38320"
 city: Eybens
-street: "Rue du 19 Mars 1962"
-housenumber: 2
+street: Rue du 19 Mars 1962
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/eybens/le-fournil-du-gastelier.yml b/data/cities/eybens/le-fournil-du-gastelier.yml
index 662994d34..95b9b9d53 100644
--- a/data/cities/eybens/le-fournil-du-gastelier.yml
+++ b/data/cities/eybens/le-fournil-du-gastelier.yml
@@ -4,8 +4,8 @@ latitude: 45.15877
 longitude: 5.7456
 postcode: "38320"
 city: Eybens
-street: "Avenue Jean Jaurès"
-housenumber: 70
+street: Avenue Jean Jaurès
+housenumber: "70"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30; Su 06:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30; Su 06:30-18:30
+website: ""
diff --git a/data/cities/eybens/salon-linstant.yml b/data/cities/eybens/salon-linstant.yml
index d18e5cf23..b0539b6dc 100644
--- a/data/cities/eybens/salon-linstant.yml
+++ b/data/cities/eybens/salon-linstant.yml
@@ -4,8 +4,8 @@ latitude: 45.16469
 longitude: 5.74332
 postcode: "38320"
 city: Eybens
-street: "Square des Maisons Neuves"
-housenumber: 4
+street: Square des Maisons Neuves
+housenumber: "4"
 phone: ""
-opening_hours: "Mo 09:00-17:00; We-Fr 08:30-18:00; Sa 08:30-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 09:00-17:00; We-Fr 08:30-18:00; Sa 08:30-17:00
+website: ""
diff --git a/data/cities/eybens/tabac-presse.yml b/data/cities/eybens/tabac-presse.yml
index 15a3d209a..ae390c801 100644
--- a/data/cities/eybens/tabac-presse.yml
+++ b/data/cities/eybens/tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.14714
 longitude: 5.75125
 postcode: "38320"
 city: Eybens
-street: "Place de Verdun"
-housenumber: 9
+street: Place de Verdun
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/eyzin-pinet/garage-de-la-prairie.yml b/data/cities/eyzin-pinet/garage-de-la-prairie.yml
index 433c2448a..75ccb0eb0 100644
--- a/data/cities/eyzin-pinet/garage-de-la-prairie.yml
+++ b/data/cities/eyzin-pinet/garage-de-la-prairie.yml
@@ -1,11 +1,11 @@
 id: 112321712
-type: way
+type: node
 latitude: 45.47579
 longitude: 4.99868
 postcode: "38780"
 city: Eyzin Pinet
 street: ""
-housenumber: 234
+housenumber: "234"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/eyzin-pinet/institut-corporl.yml b/data/cities/eyzin-pinet/institut-corporl.yml
index c4f5ad29c..c754b33c8 100644
--- a/data/cities/eyzin-pinet/institut-corporl.yml
+++ b/data/cities/eyzin-pinet/institut-corporl.yml
@@ -4,8 +4,8 @@ latitude: 45.47378
 longitude: 4.99933
 postcode: "38780"
 city: Eyzin-Pinet
-street: "Place du village"
-housenumber: 9
+street: Place du village
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fareins/ls-coiffure.yml b/data/cities/fareins/ls-coiffure.yml
index cf05f0217..6cd28eba5 100644
--- a/data/cities/fareins/ls-coiffure.yml
+++ b/data/cities/fareins/ls-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.02045
 longitude: 4.76101
 postcode: "01480"
 city: Fareins
-street: "Route de Fléchères"
-housenumber: 340
+street: Route de Fléchères
+housenumber: "340"
 phone: "+33474678441"
-opening_hours: "Tu-Fr 09:00-18:30; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-18:30; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/fareins/val-hair-ie.yml b/data/cities/fareins/val-hair-ie.yml
index 04a3a0af5..a77597816 100644
--- a/data/cities/fareins/val-hair-ie.yml
+++ b/data/cities/fareins/val-hair-ie.yml
@@ -4,8 +4,8 @@ latitude: 46.02014
 longitude: 4.76127
 postcode: "01480"
 city: Fareins
-street: "Chemin des Musiciens"
-housenumber: 15
-phone: "+33 4 37 55 33 84"
-opening_hours: "Tu 09:00-18:00; We-Fr 09:00-18:30; Sa 08:00-16:30"
-website: ""
\ No newline at end of file
+street: Chemin des Musiciens
+housenumber: "15"
+phone: +33 4 37 55 33 84
+opening_hours: Tu 09:00-18:00; We-Fr 09:00-18:30; Sa 08:00-16:30
+website: ""
diff --git a/data/cities/faverges-seythenex/carrefour-express.yml b/data/cities/faverges-seythenex/carrefour-express.yml
index c1b160d0d..0a255910a 100644
--- a/data/cities/faverges-seythenex/carrefour-express.yml
+++ b/data/cities/faverges-seythenex/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.74594
 longitude: 6.2946
 postcode: "74210"
 city: Faverges-Seythenex
-street: "Place Charles de Gaulle"
-housenumber: 
+street: Place Charles de Gaulle
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:30-20:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-20:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/faverges-seythenex/carrefour-market.yml b/data/cities/faverges-seythenex/carrefour-market.yml
index 52a700677..d29c9c979 100644
--- a/data/cities/faverges-seythenex/carrefour-market.yml
+++ b/data/cities/faverges-seythenex/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 822454917
-type: way
+type: node
 latitude: 45.74878
 longitude: 6.28754
 postcode: "74210"
 city: Faverges-Seythenex
-street: "Route d'Annecy"
-housenumber: 195
+street: Route d'Annecy
+housenumber: "195"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/faverges/intermarche.yml b/data/cities/faverges/intermarche.yml
index 42492d4df..5b4139b2e 100644
--- a/data/cities/faverges/intermarche.yml
+++ b/data/cities/faverges/intermarche.yml
@@ -1,11 +1,11 @@
 id: 679437506
-type: way
+type: node
 latitude: 45.75438
 longitude: 6.27696
 postcode: "74210"
 city: Faverges
-street: "Chemin des Perouses"
-housenumber: 
+street: Chemin des Perouses
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:00
+website: ""
diff --git a/data/cities/faverges/le-petit-mazot.yml b/data/cities/faverges/le-petit-mazot.yml
index 5a46b6eb2..d0792427a 100644
--- a/data/cities/faverges/le-petit-mazot.yml
+++ b/data/cities/faverges/le-petit-mazot.yml
@@ -1,11 +1,11 @@
 id: 1229715302
-type: way
+type: node
 latitude: 45.75158
 longitude: 6.28118
 postcode: "74210"
 city: Faverges
-street: "Route d'Annecy"
-housenumber: 787
+street: Route d'Annecy
+housenumber: "787"
 phone: "0975704250"
-opening_hours: "Mardi au dimanche : 05h30 - 19h30"
-website: "https://le-petit-mazot.fr"
\ No newline at end of file
+opening_hours: 'Mardi au dimanche : 05h30 - 19h30'
+website: https://le-petit-mazot.fr
diff --git a/data/cities/faverges/technicien-du-sport.yml b/data/cities/faverges/technicien-du-sport.yml
index 091d57c57..e9864b29d 100644
--- a/data/cities/faverges/technicien-du-sport.yml
+++ b/data/cities/faverges/technicien-du-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.74668
 longitude: 6.29559
 postcode: "74210"
 city: Faverges
-street: "Rue Carnot"
-housenumber: 74
+street: Rue Carnot
+housenumber: "74"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/feillens/id-conseils.yml b/data/cities/feillens/id-conseils.yml
index e33a50fa6..d711cdcb2 100644
--- a/data/cities/feillens/id-conseils.yml
+++ b/data/cities/feillens/id-conseils.yml
@@ -4,8 +4,8 @@ latitude: 46.33545
 longitude: 4.88861
 postcode: "01570"
 city: Feillens
-street: "Rue de l'Église"
-housenumber: 55
+street: Rue de l'Église
+housenumber: "55"
 phone: ""
 opening_hours: ""
-website: "https://www.idconseils.fr/"
\ No newline at end of file
+website: https://www.idconseils.fr/
diff --git a/data/cities/ferney-voltaire/blondeau-serrurerie.yml b/data/cities/ferney-voltaire/blondeau-serrurerie.yml
index 700edb64b..d57baaf3a 100644
--- a/data/cities/ferney-voltaire/blondeau-serrurerie.yml
+++ b/data/cities/ferney-voltaire/blondeau-serrurerie.yml
@@ -4,8 +4,8 @@ latitude: 46.26077
 longitude: 6.1141
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Chemin du Levant"
+street: Chemin du Levant
 housenumber: 13B
-phone: "+33 6 76 77 82 86"
-opening_hours: "24/7"
-website: "https://www.blondeau-serrurerie-ferney.fr/"
\ No newline at end of file
+phone: +33 6 76 77 82 86
+opening_hours: 24/7
+website: https://www.blondeau-serrurerie-ferney.fr/
diff --git a/data/cities/ferney-voltaire/carrefour-hypermarche.yml b/data/cities/ferney-voltaire/carrefour-hypermarche.yml
index 5c0177f6e..f190fc12b 100644
--- a/data/cities/ferney-voltaire/carrefour-hypermarche.yml
+++ b/data/cities/ferney-voltaire/carrefour-hypermarche.yml
@@ -1,11 +1,11 @@
 id: 107470165
-type: way
+type: node
 latitude: 46.25451
 longitude: 6.11917
 postcode: ""
 city: Ferney-Voltaire
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-21:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-21:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/ferney-voltaire/coiffure-amazone.yml b/data/cities/ferney-voltaire/coiffure-amazone.yml
index 844389a9f..1602d329b 100644
--- a/data/cities/ferney-voltaire/coiffure-amazone.yml
+++ b/data/cities/ferney-voltaire/coiffure-amazone.yml
@@ -4,8 +4,8 @@ latitude: 46.25686
 longitude: 6.10959
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Grand'Rue"
-housenumber: 24
-phone: "+33 450 405 495"
-opening_hours: "Mo-Tu 08:30-18:30; Sa 08:00-15:00"
-website: "https://www.amazonecoiffure.com/"
\ No newline at end of file
+street: Grand'Rue
+housenumber: "24"
+phone: +33 450 405 495
+opening_hours: Mo-Tu 08:30-18:30; Sa 08:00-15:00
+website: https://www.amazonecoiffure.com/
diff --git a/data/cities/ferney-voltaire/grand-frais.yml b/data/cities/ferney-voltaire/grand-frais.yml
index dc66210eb..0ed086bf2 100644
--- a/data/cities/ferney-voltaire/grand-frais.yml
+++ b/data/cities/ferney-voltaire/grand-frais.yml
@@ -1,11 +1,11 @@
 id: 479855469
-type: way
+type: node
 latitude: 46.24465
 longitude: 6.09387
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Route de Meyrin"
-housenumber: 
-phone: "+33 4 50 28 72 02"
-opening_hours: "Mo-Sa 08:30-20:30, Su 09:00-12:30"
-website: "https://www.grandfrais.com/ferney-voltaire/magasin-211.html"
\ No newline at end of file
+street: Route de Meyrin
+housenumber: ""
+phone: +33 4 50 28 72 02
+opening_hours: Mo-Sa 08:30-20:30, Su 09:00-12:30
+website: https://www.grandfrais.com/ferney-voltaire/magasin-211.html
diff --git a/data/cities/ferney-voltaire/jr-institut.yml b/data/cities/ferney-voltaire/jr-institut.yml
index 315e16cc3..6469d0043 100644
--- a/data/cities/ferney-voltaire/jr-institut.yml
+++ b/data/cities/ferney-voltaire/jr-institut.yml
@@ -4,8 +4,8 @@ latitude: 46.25488
 longitude: 6.11018
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Rue de Meyrin"
-housenumber: 15
+street: Rue de Meyrin
+housenumber: "15"
 phone: ""
-opening_hours: "Mo,Tu,We,Fr 09:00-19:00; Th 09:00-21:00; Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,We,Fr 09:00-19:00; Th 09:00-21:00; Sa 08:00-17:00
+website: ""
diff --git a/data/cities/ferney-voltaire/les-arts-frontieres-grandrue.yml b/data/cities/ferney-voltaire/les-arts-frontieres-grandrue.yml
index 71c0ab728..48313441b 100644
--- a/data/cities/ferney-voltaire/les-arts-frontieres-grandrue.yml
+++ b/data/cities/ferney-voltaire/les-arts-frontieres-grandrue.yml
@@ -4,8 +4,8 @@ latitude: 46.25753
 longitude: 6.10887
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Grand'Rue"
-housenumber: 34
+street: Grand'Rue
+housenumber: "34"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30,14:00-18:30"
-website: "http://www.lesartsfrontieres.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30,14:00-18:30
+website: http://www.lesartsfrontieres.fr/
diff --git a/data/cities/ferney-voltaire/les-arts-frontieres.yml b/data/cities/ferney-voltaire/les-arts-frontieres.yml
index 6b1fcf91e..0305a9ee8 100644
--- a/data/cities/ferney-voltaire/les-arts-frontieres.yml
+++ b/data/cities/ferney-voltaire/les-arts-frontieres.yml
@@ -4,8 +4,8 @@ latitude: 46.25756
 longitude: 6.10883
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Grand'Rue"
-housenumber: 34
-phone: "+33 4 50 40 21 83"
-opening_hours: "Tu-Sa 10:00-12:30,14:00-18:30"
-website: "http://www.lesartsfrontieres.fr/"
\ No newline at end of file
+street: Grand'Rue
+housenumber: "34"
+phone: +33 4 50 40 21 83
+opening_hours: Tu-Sa 10:00-12:30,14:00-18:30
+website: http://www.lesartsfrontieres.fr/
diff --git a/data/cities/ferney-voltaire/paravital-parapharmacies.yml b/data/cities/ferney-voltaire/paravital-parapharmacies.yml
index a1deaaa5b..cf140b9dd 100644
--- a/data/cities/ferney-voltaire/paravital-parapharmacies.yml
+++ b/data/cities/ferney-voltaire/paravital-parapharmacies.yml
@@ -4,8 +4,8 @@ latitude: 46.25736
 longitude: 6.11041
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Avenue Voltaire"
-housenumber: 31
-phone: "+33 450 409 616"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:00-12:30, 14:00-19:00; Sa 09:00-19:00"
-website: "https://paravital.fr/"
\ No newline at end of file
+street: Avenue Voltaire
+housenumber: "31"
+phone: +33 450 409 616
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:00-12:30, 14:00-19:00; Sa 09:00-19:00
+website: https://paravital.fr/
diff --git a/data/cities/ferney-voltaire/silhouette-harmonie-et-beaute.yml b/data/cities/ferney-voltaire/silhouette-harmonie-et-beaute.yml
index 97e13c08f..cf8a85fb5 100644
--- a/data/cities/ferney-voltaire/silhouette-harmonie-et-beaute.yml
+++ b/data/cities/ferney-voltaire/silhouette-harmonie-et-beaute.yml
@@ -4,8 +4,8 @@ latitude: 46.25765
 longitude: 6.10873
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Grand'Rue"
-housenumber: 34
-phone: "+33 4 50 40 55 09"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Grand'Rue
+housenumber: "34"
+phone: +33 4 50 40 55 09
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/ferney-voltaire/univairmer.yml b/data/cities/ferney-voltaire/univairmer.yml
index f1b9bb3d6..5d5b71678 100644
--- a/data/cities/ferney-voltaire/univairmer.yml
+++ b/data/cities/ferney-voltaire/univairmer.yml
@@ -4,8 +4,8 @@ latitude: 46.25726
 longitude: 6.1102
 postcode: "01210"
 city: Ferney-Voltaire
-street: "Avenue Voltaire"
-housenumber: 25
-phone: "+33 4 50 40 76 22"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:30; Sa 10:00-13:00"
-website: "https://voyages.univairmer.com/rechercheAgence.cfm"
\ No newline at end of file
+street: Avenue Voltaire
+housenumber: "25"
+phone: +33 4 50 40 76 22
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:30; Sa 10:00-13:00
+website: https://voyages.univairmer.com/rechercheAgence.cfm
diff --git a/data/cities/fessy/confiture-bellamy.yml b/data/cities/fessy/confiture-bellamy.yml
index d3061455e..5d12905a5 100644
--- a/data/cities/fessy/confiture-bellamy.yml
+++ b/data/cities/fessy/confiture-bellamy.yml
@@ -1,11 +1,11 @@
 id: 316733398
-type: way
+type: node
 latitude: 46.27985
 longitude: 6.40825
 postcode: "74890"
 city: Fessy
-street: "Route des Crêts Marteneaux"
-housenumber: 532
+street: Route des Crêts Marteneaux
+housenumber: "532"
 phone: ""
-opening_hours: "Mo-Th 07:30-12:00,13:30-17:30; Fr 07:30-12:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:30-12:00,13:30-17:30; Fr 07:30-12:00; Sa-Su off
+website: ""
diff --git a/data/cities/feurs/centrakor.yml b/data/cities/feurs/centrakor.yml
index d01e844bf..f32c1f978 100644
--- a/data/cities/feurs/centrakor.yml
+++ b/data/cities/feurs/centrakor.yml
@@ -4,8 +4,8 @@ latitude: 45.72369
 longitude: 4.22517
 postcode: "42110"
 city: Feurs
-street: "Rue du Colisée"
-housenumber: 2
+street: Rue du Colisée
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/feurs/eyraud-fleurs.yml b/data/cities/feurs/eyraud-fleurs.yml
index 14e33bbd4..3847608cf 100644
--- a/data/cities/feurs/eyraud-fleurs.yml
+++ b/data/cities/feurs/eyraud-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.7437
 longitude: 4.22258
 postcode: "42110"
 city: Feurs
-street: "Place Carnot"
-housenumber: 5
+street: Place Carnot
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/feurs/ferme-du-vivier.yml b/data/cities/feurs/ferme-du-vivier.yml
index eccba9b2b..aad51a704 100644
--- a/data/cities/feurs/ferme-du-vivier.yml
+++ b/data/cities/feurs/ferme-du-vivier.yml
@@ -4,8 +4,8 @@ latitude: 45.74387
 longitude: 4.22811
 postcode: "42110"
 city: Feurs
-street: "Avenue Jean Jaurès"
+street: Avenue Jean Jaurès
 housenumber: 16 ter
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/feurs/garage-cheminal.yml b/data/cities/feurs/garage-cheminal.yml
index 9b5b2aae5..ab687055e 100644
--- a/data/cities/feurs/garage-cheminal.yml
+++ b/data/cities/feurs/garage-cheminal.yml
@@ -4,8 +4,8 @@ latitude: 45.72759
 longitude: 4.22501
 postcode: "42110"
 city: Feurs
-street: "Route de Saint-Étienne"
-housenumber: 
+street: Route de Saint-Étienne
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00"
-website: "https://www.garage-cheminal.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00
+website: https://www.garage-cheminal.fr/
diff --git a/data/cities/feurs/hair-coiffure-bis.yml b/data/cities/feurs/hair-coiffure-bis.yml
index 16720c8a0..47fb19a67 100644
--- a/data/cities/feurs/hair-coiffure-bis.yml
+++ b/data/cities/feurs/hair-coiffure-bis.yml
@@ -1,11 +1,11 @@
 id: 53142446
-type: way
+type: node
 latitude: 45.74402
 longitude: 4.22426
 postcode: "42110"
 city: Feurs
-street: "place de la boaterie"
-housenumber: 10
+street: place de la boaterie
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/feurs/king-jouet.yml b/data/cities/feurs/king-jouet.yml
index 1a1efd104..41cb5e355 100644
--- a/data/cities/feurs/king-jouet.yml
+++ b/data/cities/feurs/king-jouet.yml
@@ -4,8 +4,8 @@ latitude: 45.7236
 longitude: 4.22434
 postcode: "42110"
 city: Feurs
-street: "Rue du Capitole"
-housenumber: 1
+street: Rue du Capitole
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/feurs/librairie-papeterie-du-lycee.yml b/data/cities/feurs/librairie-papeterie-du-lycee.yml
index 4a31283d5..4a034ac55 100644
--- a/data/cities/feurs/librairie-papeterie-du-lycee.yml
+++ b/data/cities/feurs/librairie-papeterie-du-lycee.yml
@@ -4,8 +4,8 @@ latitude: 45.74301
 longitude: 4.22443
 postcode: "42110"
 city: Feurs
-street: "Place Geoffroy-Guichard"
-housenumber: 6
+street: Place Geoffroy-Guichard
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/feurs/noz.yml b/data/cities/feurs/noz.yml
index b93bad008..9b6f894fd 100644
--- a/data/cities/feurs/noz.yml
+++ b/data/cities/feurs/noz.yml
@@ -4,8 +4,8 @@ latitude: 45.72482
 longitude: 4.22463
 postcode: "42110"
 city: Feurs
-street: "Rue du Capitole"
-housenumber: 
+street: Rue du Capitole
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/feurs/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/feurs/
diff --git a/data/cities/feurs/optical-center.yml b/data/cities/feurs/optical-center.yml
index 2a5004b23..e5bfc0e53 100644
--- a/data/cities/feurs/optical-center.yml
+++ b/data/cities/feurs/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.72309
 longitude: 4.22531
 postcode: "42110"
 city: Feurs
-street: "Route de Saint-Étienne"
-housenumber: 
+street: Route de Saint-Étienne
+housenumber: ""
 phone: "+33477280280"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/182-opticien-feurs-optical-center"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/182-opticien-feurs-optical-center
diff --git a/data/cities/feurs/yves-rocher.yml b/data/cities/feurs/yves-rocher.yml
index 69625e1bc..75ab4cb98 100644
--- a/data/cities/feurs/yves-rocher.yml
+++ b/data/cities/feurs/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.74373
 longitude: 4.22301
 postcode: "42110"
 city: Feurs
-street: "Place Carnot"
-housenumber: 1
+street: Place Carnot
+housenumber: "1"
 phone: ""
-opening_hours: "Tu-We 09:00-12:00, 14:00-19:00; Th-Sa 09:00-19:00"
-website: "http://yves-rocher.fr/feurs"
\ No newline at end of file
+opening_hours: Tu-We 09:00-12:00, 14:00-19:00; Th-Sa 09:00-19:00
+website: http://yves-rocher.fr/feurs
diff --git a/data/cities/filliere/carrosserie-lezziero.yml b/data/cities/filliere/carrosserie-lezziero.yml
index e8f3278fe..4d35b6d34 100644
--- a/data/cities/filliere/carrosserie-lezziero.yml
+++ b/data/cities/filliere/carrosserie-lezziero.yml
@@ -4,8 +4,8 @@ latitude: 45.96203
 longitude: 6.16609
 postcode: "74370"
 city: Fillière
-street: "Route des Sauts"
-housenumber: 52
+street: Route des Sauts
+housenumber: "52"
 phone: ""
 opening_hours: ""
-website: "https://www.lezziero.fr/"
\ No newline at end of file
+website: https://www.lezziero.fr/
diff --git a/data/cities/filliere/nos-halles-de-saint-martin.yml b/data/cities/filliere/nos-halles-de-saint-martin.yml
index 5aef6047a..ce0b22fa7 100644
--- a/data/cities/filliere/nos-halles-de-saint-martin.yml
+++ b/data/cities/filliere/nos-halles-de-saint-martin.yml
@@ -1,11 +1,11 @@
 id: 1044501879
-type: way
+type: node
 latitude: 45.96088
 longitude: 6.16617
 postcode: "74370"
 city: Fillière
-street: "Route des Sauts"
-housenumber: 60
+street: Route des Sauts
+housenumber: "60"
 phone: ""
 opening_hours: ""
-website: "https://www.noshallesdesaintmartin.fr/"
\ No newline at end of file
+website: https://www.noshallesdesaintmartin.fr/
diff --git a/data/cities/fillinges/busato.yml b/data/cities/fillinges/busato.yml
index 92a1817d2..a88cfb561 100644
--- a/data/cities/fillinges/busato.yml
+++ b/data/cities/fillinges/busato.yml
@@ -4,8 +4,9 @@ latitude: 46.15059
 longitude: 6.32032
 postcode: "74250"
 city: Fillinges
-street: "Route de Thonon"
-housenumber: 175
+street: Route de Thonon
+housenumber: "175"
 phone: ""
-opening_hours: "Mo-Th 08:00-12:30, 13:30-19:00; Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:00-12:30, 13:30-19:00; Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00,
+    14:00-17:00; Su off
+website: ""
diff --git a/data/cities/fillinges/callendrier.yml b/data/cities/fillinges/callendrier.yml
index 96e549656..3a7c285de 100644
--- a/data/cities/fillinges/callendrier.yml
+++ b/data/cities/fillinges/callendrier.yml
@@ -1,11 +1,11 @@
 id: 64104652
-type: way
+type: node
 latitude: 46.16316
 longitude: 6.35476
 postcode: "74250"
 city: Fillinges
-street: "Route de la Vallée Verte"
-housenumber: 146
+street: Route de la Vallée Verte
+housenumber: "146"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fillinges/cdb-autos.yml b/data/cities/fillinges/cdb-autos.yml
index 370c11b5e..4ffd41aa9 100644
--- a/data/cities/fillinges/cdb-autos.yml
+++ b/data/cities/fillinges/cdb-autos.yml
@@ -4,8 +4,8 @@ latitude: 46.151
 longitude: 6.32053
 postcode: "74250"
 city: Fillinges
-street: "Route de Thonon"
-housenumber: 175
+street: Route de Thonon
+housenumber: "175"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fillinges/karine-coifure.yml b/data/cities/fillinges/karine-coifure.yml
index 66f87abde..bb2c5490b 100644
--- a/data/cities/fillinges/karine-coifure.yml
+++ b/data/cities/fillinges/karine-coifure.yml
@@ -1,11 +1,11 @@
 id: 64104650
-type: way
+type: node
 latitude: 46.16326
 longitude: 6.35575
 postcode: "74250"
 city: Fillinges
-street: "Route de la Vallée Verte"
-housenumber: 
+street: Route de la Vallée Verte
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fillinges/la-fruitiere.yml b/data/cities/fillinges/la-fruitiere.yml
index 9fe704774..29cc112a2 100644
--- a/data/cities/fillinges/la-fruitiere.yml
+++ b/data/cities/fillinges/la-fruitiere.yml
@@ -1,11 +1,11 @@
 id: 61967108
-type: way
+type: node
 latitude: 46.15471
 longitude: 6.33913
 postcode: "74250"
 city: Fillinges
-street: "Route du Chef-Lieu"
-housenumber: 1542
+street: Route du Chef-Lieu
+housenumber: "1542"
 phone: ""
-opening_hours: "Mo-Su 07:00-12:00,18:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-12:00,18:00-20:00
+website: ""
diff --git a/data/cities/fillinges/la-ronde-des-pains.yml b/data/cities/fillinges/la-ronde-des-pains.yml
index c485a6d4a..292c51353 100644
--- a/data/cities/fillinges/la-ronde-des-pains.yml
+++ b/data/cities/fillinges/la-ronde-des-pains.yml
@@ -1,11 +1,11 @@
 id: 63566359
-type: way
+type: node
 latitude: 46.16288
 longitude: 6.3533
 postcode: "74250"
 city: Fillinges
-street: "Route de la Vallée Verte"
-housenumber: 80
+street: Route de la Vallée Verte
+housenumber: "80"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fillinges/le-marchand-de-vins.yml b/data/cities/fillinges/le-marchand-de-vins.yml
index 2cf21add0..1e7f6e1ec 100644
--- a/data/cities/fillinges/le-marchand-de-vins.yml
+++ b/data/cities/fillinges/le-marchand-de-vins.yml
@@ -4,8 +4,8 @@ latitude: 46.1539
 longitude: 6.32052
 postcode: "74250"
 city: Fillinges
-street: "Route de Thonon"
-housenumber: 524
+street: Route de Thonon
+housenumber: "524"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 08:30-12:00, 13:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 08:30-12:00, 13:30-18:00
+website: ""
diff --git a/data/cities/fillinges/maison-janin.yml b/data/cities/fillinges/maison-janin.yml
index a3f684504..69524279c 100644
--- a/data/cities/fillinges/maison-janin.yml
+++ b/data/cities/fillinges/maison-janin.yml
@@ -1,11 +1,11 @@
 id: 1244220781
-type: way
+type: node
 latitude: 46.15031
 longitude: 6.32495
 postcode: "74250"
 city: Fillinges
-street: "Route de Serry"
-housenumber: 205
+street: Route de Serry
+housenumber: "205"
 phone: ""
-opening_hours: "Mo-Su 05:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:00-20:00
+website: ""
diff --git a/data/cities/firminy/biocoop.yml b/data/cities/firminy/biocoop.yml
index 670e4d357..46c51cb33 100644
--- a/data/cities/firminy/biocoop.yml
+++ b/data/cities/firminy/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 45.39051
 longitude: 4.27629
 postcode: "42700"
 city: Firminy
-street: "Rue Dorian"
-housenumber: 32
-phone: "+33 4 77 59 28 47"
+street: Rue Dorian
+housenumber: "32"
+phone: +33 4 77 59 28 47
 opening_hours: ""
-website: "https://www.biocoop-lesartisons.eu/"
\ No newline at end of file
+website: https://www.biocoop-lesartisons.eu/
diff --git a/data/cities/firminy/intersport.yml b/data/cities/firminy/intersport.yml
index 37b5b3812..f48067473 100644
--- a/data/cities/firminy/intersport.yml
+++ b/data/cities/firminy/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.39212
 longitude: 4.27531
 postcode: "42700"
 city: Firminy
-street: "Rue Dorian"
-housenumber: 
+street: Rue Dorian
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/firminy/la-paraphonie-firminy.yml b/data/cities/firminy/la-paraphonie-firminy.yml
index 9c3d038dd..c749ad30a 100644
--- a/data/cities/firminy/la-paraphonie-firminy.yml
+++ b/data/cities/firminy/la-paraphonie-firminy.yml
@@ -4,8 +4,8 @@ latitude: 45.38934
 longitude: 4.29846
 postcode: "42700"
 city: Firminy
-street: "Impasse des Artisans"
-housenumber: 
+street: Impasse des Artisans
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/firminy/optical-center.yml b/data/cities/firminy/optical-center.yml
index 6635be004..c844712b1 100644
--- a/data/cities/firminy/optical-center.yml
+++ b/data/cities/firminy/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.39182
 longitude: 4.27602
 postcode: "42700"
 city: Firminy
-street: "Rue Dorian"
-housenumber: 9
+street: Rue Dorian
+housenumber: "9"
 phone: "+33477209090"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/188-opticien-firminy-optical-center"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/188-opticien-firminy-optical-center
diff --git a/data/cities/firminy/yves-rocher.yml b/data/cities/firminy/yves-rocher.yml
index fcf70234a..59d3e67e8 100644
--- a/data/cities/firminy/yves-rocher.yml
+++ b/data/cities/firminy/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.38864
 longitude: 4.28634
 postcode: "42700"
 city: Firminy
-street: "Rue Jean Jaurès"
-housenumber: 81
+street: Rue Jean Jaurès
+housenumber: "81"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-19:00"
-website: "https://www.yves-rocher.fr/magasins-instituts-de-beaute/firminy/S-FRYROC771"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-19:00
+website: https://www.yves-rocher.fr/magasins-instituts-de-beaute/firminy/S-FRYROC771
diff --git a/data/cities/flaine/go-sport-montagne-route-de-desserte-de-flaine-forum.yml b/data/cities/flaine/go-sport-montagne-route-de-desserte-de-flaine-forum.yml
index f699d0501..0bfe74b31 100644
--- a/data/cities/flaine/go-sport-montagne-route-de-desserte-de-flaine-forum.yml
+++ b/data/cities/flaine/go-sport-montagne-route-de-desserte-de-flaine-forum.yml
@@ -4,8 +4,8 @@ latitude: 46.00487
 longitude: 6.69525
 postcode: "74300"
 city: Flaine
-street: "Route de desserte de Flaine Forum"
-housenumber: 
+street: Route de desserte de Flaine Forum
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:30
+website: ""
diff --git a/data/cities/flaine/go-sport-montagne.yml b/data/cities/flaine/go-sport-montagne.yml
index 74b71ef0b..7458255f7 100644
--- a/data/cities/flaine/go-sport-montagne.yml
+++ b/data/cities/flaine/go-sport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 46.00726
 longitude: 6.69401
 postcode: "74300"
 city: Flaine
-street: "Route de Desserte de Flaine Forêt"
-housenumber: 
+street: Route de Desserte de Flaine Forêt
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/flaine/skiset.yml b/data/cities/flaine/skiset.yml
index 6ab8c8652..d14d3e08c 100644
--- a/data/cities/flaine/skiset.yml
+++ b/data/cities/flaine/skiset.yml
@@ -4,8 +4,8 @@ latitude: 46.00743
 longitude: 6.69312
 postcode: "74300"
 city: Flaine
-street: "Route de Desserte de Flaine Forêt"
-housenumber: 
+street: Route de Desserte de Flaine Forêt
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 09:00-12:00, 14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-12:00, 14:00-18:30
+website: ""
diff --git a/data/cities/flaine/sport-2000-2.yml b/data/cities/flaine/sport-2000-2.yml
index 99a6bee14..97539bc67 100644
--- a/data/cities/flaine/sport-2000-2.yml
+++ b/data/cities/flaine/sport-2000-2.yml
@@ -5,7 +5,7 @@ longitude: 6.69035
 postcode: "74300"
 city: Flaine
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/flaine/sport-2000-ski-shop-flaine.yml b/data/cities/flaine/sport-2000-ski-shop-flaine.yml
index 8718f418c..c212329b8 100644
--- a/data/cities/flaine/sport-2000-ski-shop-flaine.yml
+++ b/data/cities/flaine/sport-2000-ski-shop-flaine.yml
@@ -4,8 +4,8 @@ latitude: 46.00836
 longitude: 6.67413
 postcode: "74300"
 city: Flaine
-street: "Résidence Les Portes du Grand Massif"
-housenumber: 
+street: Résidence Les Portes du Grand Massif
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:30-10:30,16:30-19:30; Sa 08:30-20:00; Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-10:30,16:30-19:30; Sa 08:30-20:00; Su 08:30-19:00
+website: ""
diff --git a/data/cities/flaine/sport-2000.yml b/data/cities/flaine/sport-2000.yml
index 47e98cef7..dd6acbb13 100644
--- a/data/cities/flaine/sport-2000.yml
+++ b/data/cities/flaine/sport-2000.yml
@@ -5,7 +5,7 @@ longitude: 6.69514
 postcode: "74300"
 city: Flaine
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/fleurie/de-la-vigne-au-verre.yml b/data/cities/fleurie/de-la-vigne-au-verre.yml
index 5b367c314..fad0f3ac0 100644
--- a/data/cities/fleurie/de-la-vigne-au-verre.yml
+++ b/data/cities/fleurie/de-la-vigne-au-verre.yml
@@ -4,8 +4,8 @@ latitude: 46.19258
 longitude: 4.69751
 postcode: "69820"
 city: Fleurie
-street: "Place de la Bascule"
-housenumber: 
-phone: "+33 4 74 69 84 71"
-opening_hours: "Tu-Sa 09:30-12:30, 14:00-18:30; Su-Mo off"
-website: ""
\ No newline at end of file
+street: Place de la Bascule
+housenumber: ""
+phone: +33 4 74 69 84 71
+opening_hours: Tu-Sa 09:30-12:30, 14:00-18:30; Su-Mo off
+website: ""
diff --git a/data/cities/fleurie/domaine-de-la-madone.yml b/data/cities/fleurie/domaine-de-la-madone.yml
index e0302b993..3965dfeb0 100644
--- a/data/cities/fleurie/domaine-de-la-madone.yml
+++ b/data/cities/fleurie/domaine-de-la-madone.yml
@@ -1,11 +1,11 @@
 id: 126402695
-type: way
+type: node
 latitude: 46.19735
 longitude: 4.6851
 postcode: "69820"
 city: Fleurie
-street: "La Madone"
-housenumber: 
-phone: "+33  4 74 69 81 51"
+street: La Madone
+housenumber: ""
+phone: +33  4 74 69 81 51
 opening_hours: ""
-website: "https://www.domaine-de-la-madone.com"
\ No newline at end of file
+website: https://www.domaine-de-la-madone.com
diff --git a/data/cities/fleurie/le-petit-casino.yml b/data/cities/fleurie/le-petit-casino.yml
index 32106ab20..4da5315c2 100644
--- a/data/cities/fleurie/le-petit-casino.yml
+++ b/data/cities/fleurie/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.19232
 longitude: 4.69731
 postcode: "69820"
 city: Fleurie
-street: "Rue de la Mairie"
-housenumber: 
-phone: "+33 4 74 04 10 04"
-opening_hours: "Mo off; Tu-Sa 07:30-12:30, 15:30-19:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+street: Rue de la Mairie
+housenumber: ""
+phone: +33 4 74 04 10 04
+opening_hours: Mo off; Tu-Sa 07:30-12:30, 15:30-19:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/fleurie/therese-et-roland-lemaitre.yml b/data/cities/fleurie/therese-et-roland-lemaitre.yml
index 0bc6fe9a3..2ee6b392e 100644
--- a/data/cities/fleurie/therese-et-roland-lemaitre.yml
+++ b/data/cities/fleurie/therese-et-roland-lemaitre.yml
@@ -5,7 +5,7 @@ longitude: 4.71985
 postcode: "69820"
 city: Fleurie
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/flumet/intersport.yml b/data/cities/flumet/intersport.yml
index 3bcfd4003..057987293 100644
--- a/data/cities/flumet/intersport.yml
+++ b/data/cities/flumet/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.81817
 longitude: 6.51478
 postcode: "73590"
 city: Flumet
-street: "Avenue du Mont Blanc"
-housenumber: 146
+street: Avenue du Mont Blanc
+housenumber: "146"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/action.yml b/data/cities/fontaine/action.yml
index bfec4b956..71424d420 100644
--- a/data/cities/fontaine/action.yml
+++ b/data/cities/fontaine/action.yml
@@ -1,11 +1,11 @@
 id: 66598246
-type: way
+type: node
 latitude: 45.1899
 longitude: 5.68324
 postcode: "38600"
 city: Fontaine
-street: "Boulevard Paul Langevin"
-housenumber: 10
+street: Boulevard Paul Langevin
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.action.com/fr-fr/points-de-vente/fontaine-10-boulevard-paul-langevin/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.action.com/fr-fr/points-de-vente/fontaine-10-boulevard-paul-langevin/
diff --git a/data/cities/fontaine/alimentation-generale.yml b/data/cities/fontaine/alimentation-generale.yml
index 6f62373d0..7f3001656 100644
--- a/data/cities/fontaine/alimentation-generale.yml
+++ b/data/cities/fontaine/alimentation-generale.yml
@@ -4,8 +4,8 @@ latitude: 45.18908
 longitude: 5.69527
 postcode: "38600"
 city: Fontaine
-street: "Avenue Aristide Briand"
-housenumber: 47
+street: Avenue Aristide Briand
+housenumber: "47"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/auchan.yml b/data/cities/fontaine/auchan.yml
index 6263eefa3..6b76c5513 100644
--- a/data/cities/fontaine/auchan.yml
+++ b/data/cities/fontaine/auchan.yml
@@ -1,11 +1,11 @@
 id: 1184463483
-type: way
+type: node
 latitude: 45.19828
 longitude: 5.67161
 postcode: "38600"
 city: Fontaine
-street: "Boulevard Paul Langevin"
-housenumber: 120
+street: Boulevard Paul Langevin
+housenumber: "120"
 phone: ""
-opening_hours: "Mo-Sa 07:30-21:00; Su 09:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-21:00; Su 09:00-21:00
+website: ""
diff --git a/data/cities/fontaine/boucherie-italienne.yml b/data/cities/fontaine/boucherie-italienne.yml
index 9226596c4..97be8dd48 100644
--- a/data/cities/fontaine/boucherie-italienne.yml
+++ b/data/cities/fontaine/boucherie-italienne.yml
@@ -4,8 +4,8 @@ latitude: 45.1925
 longitude: 5.69774
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 28
+street: Avenue du Vercors
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/claona.yml b/data/cities/fontaine/claona.yml
index e2f5d7ffe..8e207fb9f 100644
--- a/data/cities/fontaine/claona.yml
+++ b/data/cities/fontaine/claona.yml
@@ -4,8 +4,8 @@ latitude: 45.18924
 longitude: 5.69513
 postcode: "38600"
 city: Fontaine
-street: "Avenue Aristide Briand"
-housenumber: 48
+street: Avenue Aristide Briand
+housenumber: "48"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/cycles-et-go.yml b/data/cities/fontaine/cycles-et-go.yml
index bb561e294..9a0f6382f 100644
--- a/data/cities/fontaine/cycles-et-go.yml
+++ b/data/cities/fontaine/cycles-et-go.yml
@@ -4,8 +4,8 @@ latitude: 45.19307
 longitude: 5.67245
 postcode: "38600"
 city: Fontaine
-street: "Rue de l'Abbé Vincent"
-housenumber: 15
+street: Rue de l'Abbé Vincent
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,13:00-17:00 ; Sa 09:00-14:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,13:00-17:00 ; Sa 09:00-14:30
+website: ""
diff --git a/data/cities/fontaine/cycles-saveuil.yml b/data/cities/fontaine/cycles-saveuil.yml
index 6d315268d..92693f9c6 100644
--- a/data/cities/fontaine/cycles-saveuil.yml
+++ b/data/cities/fontaine/cycles-saveuil.yml
@@ -4,8 +4,8 @@ latitude: 45.19236
 longitude: 5.6988
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 13
+street: Avenue du Vercors
+housenumber: "13"
 phone: ""
-opening_hours: "Tu-Th 07:00-12:30,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 07:00-12:30,13:30-19:00
+website: ""
diff --git a/data/cities/fontaine/europole-garage.yml b/data/cities/fontaine/europole-garage.yml
index 67504ce30..631e92fa6 100644
--- a/data/cities/fontaine/europole-garage.yml
+++ b/data/cities/fontaine/europole-garage.yml
@@ -1,11 +1,11 @@
 id: 66593050
-type: way
+type: node
 latitude: 45.19259
 longitude: 5.69462
 postcode: "38600"
 city: Fontaine
-street: "Boulevard Joliot Curie"
+street: Boulevard Joliot Curie
 housenumber: 55/57
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/fernandez-nelly.yml b/data/cities/fontaine/fernandez-nelly.yml
index 5a98d09bb..fc1262665 100644
--- a/data/cities/fontaine/fernandez-nelly.yml
+++ b/data/cities/fontaine/fernandez-nelly.yml
@@ -4,8 +4,8 @@ latitude: 45.1923
 longitude: 5.69755
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 25
+street: Avenue du Vercors
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/galerie-marchande-auchan.yml b/data/cities/fontaine/galerie-marchande-auchan.yml
index d34493094..b2b2a23d1 100644
--- a/data/cities/fontaine/galerie-marchande-auchan.yml
+++ b/data/cities/fontaine/galerie-marchande-auchan.yml
@@ -1,11 +1,11 @@
 id: 1307918246
-type: way
+type: node
 latitude: 45.19835
 longitude: 5.67188
 postcode: "38600"
 city: Fontaine
-street: "Boulevard Paul Langevin"
-housenumber: 120
+street: Boulevard Paul Langevin
+housenumber: "120"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/garage-azzopardi.yml b/data/cities/fontaine/garage-azzopardi.yml
index d42ae0a9c..71fa43f96 100644
--- a/data/cities/fontaine/garage-azzopardi.yml
+++ b/data/cities/fontaine/garage-azzopardi.yml
@@ -4,8 +4,8 @@ latitude: 45.19766
 longitude: 5.69557
 postcode: "38600"
 city: Fontaine
-street: "Rue Jean Pain"
+street: Rue Jean Pain
 housenumber: 3b
 phone: "0616315907"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/gifi.yml b/data/cities/fontaine/gifi.yml
index 5b8b530c2..0bc719dfb 100644
--- a/data/cities/fontaine/gifi.yml
+++ b/data/cities/fontaine/gifi.yml
@@ -1,11 +1,11 @@
 id: 66593143
-type: way
+type: node
 latitude: 45.19613
 longitude: 5.67597
 postcode: "38600"
 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:00,14:00-18:00"
-website: "https://magasins.gifi.fr/fr/gifi-grenoble-29658"
\ No newline at end of file
+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:00,14:00-18:00
+website: https://magasins.gifi.fr/fr/gifi-grenoble-29658
diff --git a/data/cities/fontaine/hallwash.yml b/data/cities/fontaine/hallwash.yml
index c1d5aa377..b69728a72 100644
--- a/data/cities/fontaine/hallwash.yml
+++ b/data/cities/fontaine/hallwash.yml
@@ -4,8 +4,8 @@ latitude: 45.18903
 longitude: 5.69802
 postcode: "38600"
 city: Fontaine
-street: "Avenue Aristide Briand"
-housenumber: 21
-phone: "+33 4 38 02 95 89"
+street: Avenue Aristide Briand
+housenumber: "21"
+phone: +33 4 38 02 95 89
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/interior-metal.yml b/data/cities/fontaine/interior-metal.yml
index 85571d66d..509226bab 100644
--- a/data/cities/fontaine/interior-metal.yml
+++ b/data/cities/fontaine/interior-metal.yml
@@ -4,8 +4,8 @@ latitude: 45.19248
 longitude: 5.69922
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 12
+street: Avenue du Vercors
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/laverie-de-fontaine.yml b/data/cities/fontaine/laverie-de-fontaine.yml
index f28fda084..e62fcd804 100644
--- a/data/cities/fontaine/laverie-de-fontaine.yml
+++ b/data/cities/fontaine/laverie-de-fontaine.yml
@@ -4,8 +4,8 @@ latitude: 45.19248
 longitude: 5.69883
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 16
+street: Avenue du Vercors
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-20:00
+website: ""
diff --git a/data/cities/fontaine/le-chantier.yml b/data/cities/fontaine/le-chantier.yml
index e83049f9c..7226bb808 100644
--- a/data/cities/fontaine/le-chantier.yml
+++ b/data/cities/fontaine/le-chantier.yml
@@ -4,8 +4,8 @@ latitude: 45.19642
 longitude: 5.69631
 postcode: "38600"
 city: Fontaine
-street: "Rue Paul Vaillant-Couturier"
-housenumber: 14
+street: Rue Paul Vaillant-Couturier
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/le-fournil-patissier.yml b/data/cities/fontaine/le-fournil-patissier.yml
index 8f6e81de0..959f54003 100644
--- a/data/cities/fontaine/le-fournil-patissier.yml
+++ b/data/cities/fontaine/le-fournil-patissier.yml
@@ -4,8 +4,8 @@ latitude: 45.18906
 longitude: 5.69715
 postcode: "38600"
 city: Fontaine
-street: "Avenue Aristide Briand"
-housenumber: 31
+street: Avenue Aristide Briand
+housenumber: "31"
 phone: ""
-opening_hours: "Tu-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:00-19:00
+website: ""
diff --git a/data/cities/fontaine/le-ptit-salon.yml b/data/cities/fontaine/le-ptit-salon.yml
index f1c125e74..9d3574429 100644
--- a/data/cities/fontaine/le-ptit-salon.yml
+++ b/data/cities/fontaine/le-ptit-salon.yml
@@ -4,8 +4,8 @@ latitude: 45.18906
 longitude: 5.69642
 postcode: "38600"
 city: Fontaine
-street: "Avenue Aristide Briand"
-housenumber: 35
+street: Avenue Aristide Briand
+housenumber: "35"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:00,14:00-18:30; Th off; Sa 09:00-17:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:00,14:00-18:30; Th off; Sa 09:00-17:30
+website: ""
diff --git a/data/cities/fontaine/le-soleil-du-vercors.yml b/data/cities/fontaine/le-soleil-du-vercors.yml
index c7dd4b3c9..bb87371ab 100644
--- a/data/cities/fontaine/le-soleil-du-vercors.yml
+++ b/data/cities/fontaine/le-soleil-du-vercors.yml
@@ -4,8 +4,8 @@ latitude: 45.19251
 longitude: 5.69764
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 28
+street: Avenue du Vercors
+housenumber: "28"
 phone: ""
-opening_hours: "Th-Tu 04:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Th-Tu 04:00-20:00
+website: ""
diff --git a/data/cities/fontaine/les-fees-miroir.yml b/data/cities/fontaine/les-fees-miroir.yml
index 45a7a8c14..89d5ef266 100644
--- a/data/cities/fontaine/les-fees-miroir.yml
+++ b/data/cities/fontaine/les-fees-miroir.yml
@@ -4,8 +4,8 @@ latitude: 45.1925
 longitude: 5.69806
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 22
+street: Avenue du Vercors
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/les-soupapes.yml b/data/cities/fontaine/les-soupapes.yml
index f1ce62015..3e86ba814 100644
--- a/data/cities/fontaine/les-soupapes.yml
+++ b/data/cities/fontaine/les-soupapes.yml
@@ -4,8 +4,8 @@ latitude: 45.18785
 longitude: 5.68215
 postcode: "38600"
 city: Fontaine
-street: "Rue Guy Môquet"
-housenumber: 8
-phone: "+33 9 86 12 04 42"
-opening_hours: "Mo 14:00-18:00"
-website: "https://www.le-tamis.info/structure/solenoides"
\ No newline at end of file
+street: Rue Guy Môquet
+housenumber: "8"
+phone: +33 9 86 12 04 42
+opening_hours: Mo 14:00-18:00
+website: https://www.le-tamis.info/structure/solenoides
diff --git a/data/cities/fontaine/maison-fa.yml b/data/cities/fontaine/maison-fa.yml
index 349af4b7c..299c06461 100644
--- a/data/cities/fontaine/maison-fa.yml
+++ b/data/cities/fontaine/maison-fa.yml
@@ -4,8 +4,8 @@ latitude: 45.19156
 longitude: 5.68639
 postcode: "38600"
 city: Fontaine
-street: "Avenue Aristide Briand"
-housenumber: 103
+street: Avenue Aristide Briand
+housenumber: "103"
 phone: ""
-opening_hours: "Tu-Su 09:30-12:30,14:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 09:30-12:30,14:30-19:30
+website: ""
diff --git a/data/cities/fontaine/optique-saveuil.yml b/data/cities/fontaine/optique-saveuil.yml
index b759ac170..c18ebb1cb 100644
--- a/data/cities/fontaine/optique-saveuil.yml
+++ b/data/cities/fontaine/optique-saveuil.yml
@@ -4,8 +4,8 @@ latitude: 45.19229
 longitude: 5.69744
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 25
+street: Avenue du Vercors
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/patricia-daniels.yml b/data/cities/fontaine/patricia-daniels.yml
index 92ea488ed..b970e58c0 100644
--- a/data/cities/fontaine/patricia-daniels.yml
+++ b/data/cities/fontaine/patricia-daniels.yml
@@ -4,8 +4,8 @@ latitude: 45.19233
 longitude: 5.69952
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
+street: Avenue du Vercors
 housenumber: 3 bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/pomme-damour.yml b/data/cities/fontaine/pomme-damour.yml
index 679bddfb1..a08946519 100644
--- a/data/cities/fontaine/pomme-damour.yml
+++ b/data/cities/fontaine/pomme-damour.yml
@@ -4,8 +4,8 @@ latitude: 45.19234
 longitude: 5.69773
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 23
+street: Avenue du Vercors
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaine/portalp.yml b/data/cities/fontaine/portalp.yml
index 05fe672c1..8cf5e64bf 100644
--- a/data/cities/fontaine/portalp.yml
+++ b/data/cities/fontaine/portalp.yml
@@ -4,8 +4,8 @@ latitude: 45.2021
 longitude: 5.68408
 postcode: "38600"
 city: Fontaine
-street: "Allée de la Pinéa"
-housenumber: 9
+street: Allée de la Pinéa
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: "https://www.portalp.com"
\ No newline at end of file
+website: https://www.portalp.com
diff --git a/data/cities/fontaine/premier-angle.yml b/data/cities/fontaine/premier-angle.yml
index 2db3db88b..052c34205 100644
--- a/data/cities/fontaine/premier-angle.yml
+++ b/data/cities/fontaine/premier-angle.yml
@@ -4,8 +4,8 @@ latitude: 45.189
 longitude: 5.70035
 postcode: "38600"
 city: Fontaine
-street: "Avenue Aristide Briand"
-housenumber: 1
+street: Avenue Aristide Briand
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 07:00-19:00, Sa,Su 08:00-12:00, Sa 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-19:00, Sa,Su 08:00-12:00, Sa 14:00-19:00
+website: ""
diff --git a/data/cities/fontaine/ready4pneus.yml b/data/cities/fontaine/ready4pneus.yml
index 8ffa8477e..03e6841ff 100644
--- a/data/cities/fontaine/ready4pneus.yml
+++ b/data/cities/fontaine/ready4pneus.yml
@@ -4,8 +4,8 @@ latitude: 45.19797
 longitude: 5.68815
 postcode: "38600"
 city: Fontaine
-street: "Rue Jean Pain"
-housenumber: 56
-phone: "+33 7 58 84 39 22"
-opening_hours: "Mo-Sa 08:30-18:30"
-website: "https://www.ready4pneus.fr/"
\ No newline at end of file
+street: Rue Jean Pain
+housenumber: "56"
+phone: +33 7 58 84 39 22
+opening_hours: Mo-Sa 08:30-18:30
+website: https://www.ready4pneus.fr/
diff --git a/data/cities/fontaine/salah-coiffure.yml b/data/cities/fontaine/salah-coiffure.yml
index 150096d79..990df8053 100644
--- a/data/cities/fontaine/salah-coiffure.yml
+++ b/data/cities/fontaine/salah-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.19233
 longitude: 5.69941
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
-housenumber: 5
+street: Avenue du Vercors
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Th,Sa,Su 09:00-19:00; Fr 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th,Sa,Su 09:00-19:00; Fr 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/fontaine/speedy.yml b/data/cities/fontaine/speedy.yml
index 4b14f8091..e1c350c22 100644
--- a/data/cities/fontaine/speedy.yml
+++ b/data/cities/fontaine/speedy.yml
@@ -1,11 +1,11 @@
 id: 1307949940
-type: way
+type: node
 latitude: 45.19808
 longitude: 5.67202
 postcode: "38600"
 city: Fontaine
-street: "Boulevard Paul Langevin"
-housenumber: 120
+street: Boulevard Paul Langevin
+housenumber: "120"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:30,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:30,14:00-18:00
+website: ""
diff --git a/data/cities/fontaine/tabac-presse-des-alpes.yml b/data/cities/fontaine/tabac-presse-des-alpes.yml
index 9b8fd0c30..fc6850ec4 100644
--- a/data/cities/fontaine/tabac-presse-des-alpes.yml
+++ b/data/cities/fontaine/tabac-presse-des-alpes.yml
@@ -4,8 +4,8 @@ latitude: 45.19731
 longitude: 5.68098
 postcode: "38600"
 city: Fontaine
-street: "Rue des Alpes"
-housenumber: 55
+street: Rue des Alpes
+housenumber: "55"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:00; Su 07:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:00; Su 07:00-12:00
+website: ""
diff --git a/data/cities/fontaine/vival-avenue-du-vercors.yml b/data/cities/fontaine/vival-avenue-du-vercors.yml
index 22ffa0e4a..32328858c 100644
--- a/data/cities/fontaine/vival-avenue-du-vercors.yml
+++ b/data/cities/fontaine/vival-avenue-du-vercors.yml
@@ -4,8 +4,8 @@ latitude: 45.19253
 longitude: 5.69744
 postcode: "38600"
 city: Fontaine
-street: "Avenue du Vercors"
+street: Avenue du Vercors
 housenumber: 28 bis
 phone: ""
-opening_hours: "Tu-Sa 07:30-13:00,15:00-19:30; Su 08:30-13:00"
-website: "https://magasins.vival.fr/fr/vival-fontaine-vercors"
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-13:00,15:00-19:30; Su 08:30-13:00
+website: https://magasins.vival.fr/fr/vival-fontaine-vercors
diff --git a/data/cities/fontaine/vival.yml b/data/cities/fontaine/vival.yml
index 8850f634c..3fbaccafa 100644
--- a/data/cities/fontaine/vival.yml
+++ b/data/cities/fontaine/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.1984
 longitude: 5.69311
 postcode: "38600"
 city: Fontaine
-street: "Boulevard Joliot Curie"
-housenumber: 128
+street: Boulevard Joliot Curie
+housenumber: "128"
 phone: ""
-opening_hours: "Mo-Sa 07:30-13:00,15:00-20:00; Su 08:00-13:00,15:00-20:00"
-website: "https://magasins.vival.fr/fr/vival-fontaine"
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-13:00,15:00-20:00; Su 08:00-13:00,15:00-20:00
+website: https://magasins.vival.fr/fr/vival-fontaine
diff --git a/data/cities/fontaine/yesss-electrique-fontaine.yml b/data/cities/fontaine/yesss-electrique-fontaine.yml
index 336b7f465..67c6de4e5 100644
--- a/data/cities/fontaine/yesss-electrique-fontaine.yml
+++ b/data/cities/fontaine/yesss-electrique-fontaine.yml
@@ -4,8 +4,8 @@ latitude: 45.20145
 longitude: 5.67787
 postcode: "38600"
 city: Fontaine
-street: "Rue de Sassenage"
-housenumber: 23
+street: Rue de Sassenage
+housenumber: "23"
 phone: "+33476840560"
-opening_hours: "Mo-Fr 07:15-12:00 13:30-17:30"
-website: "https://www.yesss-fr.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 07:15-12:00 13:30-17:30
+website: https://www.yesss-fr.com/
diff --git a/data/cities/fontaines-saint-martin/instant-floral.yml b/data/cities/fontaines-saint-martin/instant-floral.yml
index ae4a530db..21c9d7cbc 100644
--- a/data/cities/fontaines-saint-martin/instant-floral.yml
+++ b/data/cities/fontaines-saint-martin/instant-floral.yml
@@ -5,7 +5,7 @@ longitude: 4.85519
 postcode: ""
 city: Fontaines-Saint-Martin
 street: ""
-housenumber: 
-phone: "+33 4 78 33 84 40"
+housenumber: ""
+phone: +33 4 78 33 84 40
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaines-saint-martin/royal-st-martin.yml b/data/cities/fontaines-saint-martin/royal-st-martin.yml
index 11e4e8794..75df51d4f 100644
--- a/data/cities/fontaines-saint-martin/royal-st-martin.yml
+++ b/data/cities/fontaines-saint-martin/royal-st-martin.yml
@@ -5,7 +5,7 @@ longitude: 4.85508
 postcode: ""
 city: Fontaines-Saint-Martin
 street: ""
-housenumber: 
-phone: "+33 4 78 22 59 98"
+housenumber: ""
+phone: +33 4 78 22 59 98
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fontaines-sur-saone/casa-mia.yml b/data/cities/fontaines-sur-saone/casa-mia.yml
index 0bcc79221..bedc89432 100644
--- a/data/cities/fontaines-sur-saone/casa-mia.yml
+++ b/data/cities/fontaines-sur-saone/casa-mia.yml
@@ -5,7 +5,7 @@ longitude: 4.84822
 postcode: ""
 city: Fontaines-sur-Saône
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 08:30-19:30, Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-19:30, Su 08:30-12:30
+website: ""
diff --git a/data/cities/fontaines-sur-saone/ma-bricotheque.yml b/data/cities/fontaines-sur-saone/ma-bricotheque.yml
index aa6467973..a68409d9d 100644
--- a/data/cities/fontaines-sur-saone/ma-bricotheque.yml
+++ b/data/cities/fontaines-sur-saone/ma-bricotheque.yml
@@ -5,7 +5,7 @@ longitude: 4.86311
 postcode: ""
 city: Fontaines-sur-Saône
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Th 13:30-16:30"
-website: "https://business.facebook.com/MaBricothequeVDS/?fref=nf"
\ No newline at end of file
+opening_hours: Th 13:30-16:30
+website: https://business.facebook.com/MaBricothequeVDS/?fref=nf
diff --git a/data/cities/fontanil-cornillon/ad-poids-lourds.yml b/data/cities/fontanil-cornillon/ad-poids-lourds.yml
index d59ffaa60..754aafad0 100644
--- a/data/cities/fontanil-cornillon/ad-poids-lourds.yml
+++ b/data/cities/fontanil-cornillon/ad-poids-lourds.yml
@@ -1,11 +1,11 @@
 id: 82104871
-type: way
+type: node
 latitude: 45.2462
 longitude: 5.6579
 postcode: "38120"
 city: Fontanil-Cornillon
-street: "Rue de la Louisiane"
-housenumber: 
+street: Rue de la Louisiane
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.ad-poidslourds.fr/"
\ No newline at end of file
+website: https://www.ad-poidslourds.fr/
diff --git a/data/cities/fontanil-cornillon/mercedes-benz.yml b/data/cities/fontanil-cornillon/mercedes-benz.yml
index 902e5f9a3..b591f66f5 100644
--- a/data/cities/fontanil-cornillon/mercedes-benz.yml
+++ b/data/cities/fontanil-cornillon/mercedes-benz.yml
@@ -1,11 +1,11 @@
 id: 82100852
-type: way
+type: node
 latitude: 45.24478
 longitude: 5.65759
 postcode: "38120"
 city: Fontanil-Cornillon
-street: "Rue de la Louisiane"
-housenumber: 6
-phone: "+33 4 76 04 20 42"
-opening_hours: "Mo-Fr 09:00-12:30,13:30-19:00; Sa 10:00-12:30,13:30-18:00"
-website: "https://www.groupe-huillier.mercedes-benz.fr/"
\ No newline at end of file
+street: Rue de la Louisiane
+housenumber: "6"
+phone: +33 4 76 04 20 42
+opening_hours: Mo-Fr 09:00-12:30,13:30-19:00; Sa 10:00-12:30,13:30-18:00
+website: https://www.groupe-huillier.mercedes-benz.fr/
diff --git a/data/cities/fourneaux/boucherie-charcuterie.yml b/data/cities/fourneaux/boucherie-charcuterie.yml
index 97e0785d8..9e5610940 100644
--- a/data/cities/fourneaux/boucherie-charcuterie.yml
+++ b/data/cities/fourneaux/boucherie-charcuterie.yml
@@ -4,8 +4,8 @@ latitude: 45.19228
 longitude: 6.65418
 postcode: "73500"
 city: Fourneaux
-street: "Rue de la Concorde"
-housenumber: 3
+street: Rue de la Concorde
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: "https://www.boucherierittaud.com/la-boucherie/l-%C3%A9picerie-fine/"
\ No newline at end of file
+website: https://www.boucherierittaud.com/la-boucherie/l-%C3%A9picerie-fine/
diff --git a/data/cities/fourneaux/brun-dcoupe-coiffure.yml b/data/cities/fourneaux/brun-dcoupe-coiffure.yml
index c8bf06ded..ae33182f3 100644
--- a/data/cities/fourneaux/brun-dcoupe-coiffure.yml
+++ b/data/cities/fourneaux/brun-dcoupe-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.19254
 longitude: 6.6543
 postcode: "73500"
 city: Fourneaux
-street: "Rue de la Concorde"
-housenumber: 4
+street: Rue de la Concorde
+housenumber: "4"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-14:00"
-website: "https://app.flexybeauty.com/brun-d_coupe"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-14:00
+website: https://app.flexybeauty.com/brun-d_coupe
diff --git a/data/cities/fourneaux/carrosserie-peinture-fontana-guy.yml b/data/cities/fourneaux/carrosserie-peinture-fontana-guy.yml
index 69c5e48a4..6cc04435f 100644
--- a/data/cities/fourneaux/carrosserie-peinture-fontana-guy.yml
+++ b/data/cities/fourneaux/carrosserie-peinture-fontana-guy.yml
@@ -4,8 +4,8 @@ latitude: 45.1915
 longitude: 6.64856
 postcode: "73500"
 city: Fourneaux
-street: "Avenue de la Liberté"
-housenumber: 44
+street: Avenue de la Liberté
+housenumber: "44"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fourneaux/frejus-optique.yml b/data/cities/fourneaux/frejus-optique.yml
index cc22d6819..1a2c8affe 100644
--- a/data/cities/fourneaux/frejus-optique.yml
+++ b/data/cities/fourneaux/frejus-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.1915
 longitude: 6.64646
 postcode: "73500"
 city: Fourneaux
-street: "Avenue de la Liberté"
-housenumber: 
-phone: "+33 4 79 05 10 63"
+street: Avenue de la Liberté
+housenumber: ""
+phone: +33 4 79 05 10 63
 opening_hours: ""
-website: "https://www.frejus-optique.com/"
\ No newline at end of file
+website: https://www.frejus-optique.com/
diff --git a/data/cities/fourneaux/houin-pere-et-fils.yml b/data/cities/fourneaux/houin-pere-et-fils.yml
index a7204ae44..051d74b35 100644
--- a/data/cities/fourneaux/houin-pere-et-fils.yml
+++ b/data/cities/fourneaux/houin-pere-et-fils.yml
@@ -4,8 +4,8 @@ latitude: 45.19186
 longitude: 6.65061
 postcode: "73500"
 city: Fourneaux
-street: "Avenue de la Liberté"
-housenumber: 22
+street: Avenue de la Liberté
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fourneaux/intermarche-super.yml b/data/cities/fourneaux/intermarche-super.yml
index 52206f191..0954e2467 100644
--- a/data/cities/fourneaux/intermarche-super.yml
+++ b/data/cities/fourneaux/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 141263848
-type: way
+type: node
 latitude: 45.19138
 longitude: 6.6447
 postcode: "73500"
 city: Fourneaux
-street: "avenue de la Liberté"
-housenumber: 70
-phone: "+33 4 79 05 22 45"
-opening_hours: "Mo-Su 08:45-19:30"
-website: "https://www.intermarche.com/magasins/10393/fourneaux-73500"
\ No newline at end of file
+street: avenue de la Liberté
+housenumber: "70"
+phone: +33 4 79 05 22 45
+opening_hours: Mo-Su 08:45-19:30
+website: https://www.intermarche.com/magasins/10393/fourneaux-73500
diff --git a/data/cities/fourneaux/marbrerie-faure.yml b/data/cities/fourneaux/marbrerie-faure.yml
index 1642828af..465ad7932 100644
--- a/data/cities/fourneaux/marbrerie-faure.yml
+++ b/data/cities/fourneaux/marbrerie-faure.yml
@@ -4,8 +4,8 @@ latitude: 45.19238
 longitude: 6.65349
 postcode: "73500"
 city: Fourneaux
-street: "Rue de la Concorde"
+street: Rue de la Concorde
 housenumber: 12 bis
-phone: "+33 4 79053461"
+phone: +33 4 79053461
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fourneaux/natashoes.yml b/data/cities/fourneaux/natashoes.yml
index e0b185259..0c33673ab 100644
--- a/data/cities/fourneaux/natashoes.yml
+++ b/data/cities/fourneaux/natashoes.yml
@@ -4,8 +4,8 @@ latitude: 45.19222
 longitude: 6.65383
 postcode: "73500"
 city: Fourneaux
-street: "Rue de la Concorde"
-housenumber: 5
+street: Rue de la Concorde
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: "https://www.facebook.com/Nathashoes/"
\ No newline at end of file
+website: https://www.facebook.com/Nathashoes/
diff --git a/data/cities/fourneaux/point-s-jgc-pneus.yml b/data/cities/fourneaux/point-s-jgc-pneus.yml
index 9f04fc80a..45d0eba11 100644
--- a/data/cities/fourneaux/point-s-jgc-pneus.yml
+++ b/data/cities/fourneaux/point-s-jgc-pneus.yml
@@ -4,8 +4,8 @@ latitude: 45.19193
 longitude: 6.65095
 postcode: "73500"
 city: Fourneaux
-street: "Avenue de la Liberté"
-housenumber: 20
-phone: "+33 4 57 40 40 15"
-opening_hours: "Mo-Fr 08:00-12:00,13:30-18:30; Sa 08:00-12:00"
-website: "http://www.jgc-pneu.fr/"
\ No newline at end of file
+street: Avenue de la Liberté
+housenumber: "20"
+phone: +33 4 57 40 40 15
+opening_hours: Mo-Fr 08:00-12:00,13:30-18:30; Sa 08:00-12:00
+website: http://www.jgc-pneu.fr/
diff --git a/data/cities/fourneaux/sicoli-copy.yml b/data/cities/fourneaux/sicoli-copy.yml
index 774949a07..9565e149c 100644
--- a/data/cities/fourneaux/sicoli-copy.yml
+++ b/data/cities/fourneaux/sicoli-copy.yml
@@ -4,8 +4,8 @@ latitude: 45.19244
 longitude: 6.65379
 postcode: "73500"
 city: Fourneaux
-street: "Rue de la Concorde"
-housenumber: 8
+street: Rue de la Concorde
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/fourneaux/terroir-de-maurienne.yml b/data/cities/fourneaux/terroir-de-maurienne.yml
index 73c143a99..afbd43acf 100644
--- a/data/cities/fourneaux/terroir-de-maurienne.yml
+++ b/data/cities/fourneaux/terroir-de-maurienne.yml
@@ -4,8 +4,8 @@ latitude: 45.19239
 longitude: 6.65355
 postcode: "73500"
 city: Fourneaux
-street: "Rue de la Concorde"
-housenumber: 12
+street: Rue de la Concorde
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: "https://terroirdemaurienne.com/"
\ No newline at end of file
+website: https://terroirdemaurienne.com/
diff --git a/data/cities/frangy/carrefour-contact.yml b/data/cities/frangy/carrefour-contact.yml
index 943f7313b..54067ebaf 100644
--- a/data/cities/frangy/carrefour-contact.yml
+++ b/data/cities/frangy/carrefour-contact.yml
@@ -1,11 +1,11 @@
 id: 176393057
-type: way
+type: node
 latitude: 46.01758
 longitude: 5.92505
 postcode: "74270"
 city: Frangy
-street: "Route du Tram"
-housenumber: 178
+street: Route du Tram
+housenumber: "178"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/frangy/utile.yml b/data/cities/frangy/utile.yml
index 5d1c5723c..0d30b099e 100644
--- a/data/cities/frangy/utile.yml
+++ b/data/cities/frangy/utile.yml
@@ -4,8 +4,8 @@ latitude: 46.01871
 longitude: 5.92863
 postcode: "74270"
 city: Frangy
-street: "Rue du Grand Pont"
-housenumber: 3
+street: Rue du Grand Pont
+housenumber: "3"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 08:00-12:15, 14:30-19:00; Su 08:30-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 08:00-12:15, 14:30-19:00; Su 08:30-12:15
+website: ""
diff --git a/data/cities/frans/beaute-dantan.yml b/data/cities/frans/beaute-dantan.yml
index 8d5fb576f..50ef74047 100644
--- a/data/cities/frans/beaute-dantan.yml
+++ b/data/cities/frans/beaute-dantan.yml
@@ -1,11 +1,11 @@
 id: 732057037
-type: way
+type: node
 latitude: 45.99145
 longitude: 4.77388
 postcode: "01480"
 city: Frans
-street: "Rue des Gagères"
-housenumber: 9
-phone: "+33 4 74 69 47 22"
+street: Rue des Gagères
+housenumber: "9"
+phone: +33 4 74 69 47 22
 opening_hours: ""
-website: "https://beautedantan.fr/"
\ No newline at end of file
+website: https://beautedantan.fr/
diff --git a/data/cities/frans/salon-isaline.yml b/data/cities/frans/salon-isaline.yml
index 1e278e194..245f468a0 100644
--- a/data/cities/frans/salon-isaline.yml
+++ b/data/cities/frans/salon-isaline.yml
@@ -1,11 +1,11 @@
 id: 166609450
-type: way
+type: node
 latitude: 45.99187
 longitude: 4.77335
 postcode: "01480"
 city: Frans
-street: "Rue du Creuzat"
-housenumber: 32
+street: Rue du Creuzat
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/froges/boulangerie-annabelle.yml b/data/cities/froges/boulangerie-annabelle.yml
index 138d2fc73..717e46712 100644
--- a/data/cities/froges/boulangerie-annabelle.yml
+++ b/data/cities/froges/boulangerie-annabelle.yml
@@ -4,8 +4,8 @@ latitude: 45.27069
 longitude: 5.92113
 postcode: "38190"
 city: Froges
-street: "Rue Joliot-Curie"
-housenumber: 9
+street: Rue Joliot-Curie
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/froges/elevation-coiffure.yml b/data/cities/froges/elevation-coiffure.yml
index 159efdecd..9fdd15039 100644
--- a/data/cities/froges/elevation-coiffure.yml
+++ b/data/cities/froges/elevation-coiffure.yml
@@ -1,11 +1,11 @@
 id: 63578306
-type: way
+type: node
 latitude: 45.27329
 longitude: 5.92467
 postcode: "38190"
 city: Froges
-street: "Boulevard de la République"
-housenumber: 119
+street: Boulevard de la République
+housenumber: "119"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/frontenex/boucherie-du-grand-roc.yml b/data/cities/frontenex/boucherie-du-grand-roc.yml
index 85ef18ce9..84e7fdbb5 100644
--- a/data/cities/frontenex/boucherie-du-grand-roc.yml
+++ b/data/cities/frontenex/boucherie-du-grand-roc.yml
@@ -4,8 +4,8 @@ latitude: 45.63401
 longitude: 6.31353
 postcode: "73460"
 city: Frontenex
-street: "Rue de la Mairie"
-housenumber: 4
-phone: "04 79 31 44 11"
+street: Rue de la Mairie
+housenumber: "4"
+phone: 04 79 31 44 11
 opening_hours: ""
-website: "http://m.facebook.com/pages/category/Butcher-Shop/Boucherie-du-Grand-Roc-1630440050562385"
\ No newline at end of file
+website: http://m.facebook.com/pages/category/Butcher-Shop/Boucherie-du-Grand-Roc-1630440050562385
diff --git a/data/cities/frontenex/ekosport.yml b/data/cities/frontenex/ekosport.yml
index 52c163ac0..210551c73 100644
--- a/data/cities/frontenex/ekosport.yml
+++ b/data/cities/frontenex/ekosport.yml
@@ -1,11 +1,11 @@
 id: 171955540
-type: way
+type: node
 latitude: 45.62764
 longitude: 6.31731
 postcode: "73460"
 city: Frontenex
-street: "Rue de l'Industrie"
-housenumber: 10
+street: Rue de l'Industrie
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/frontenex/vision-nature.yml b/data/cities/frontenex/vision-nature.yml
index b102a3054..27fa85def 100644
--- a/data/cities/frontenex/vision-nature.yml
+++ b/data/cities/frontenex/vision-nature.yml
@@ -4,8 +4,8 @@ latitude: 45.63288
 longitude: 6.31108
 postcode: "73460"
 city: Frontenex
-street: "Rue de la Mairie"
+street: Rue de la Mairie
 housenumber: 28 bis
-phone: "+33 456101975"
+phone: +33 456101975
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gaillard/bricorama.yml b/data/cities/gaillard/bricorama.yml
index a009f3207..963203d50 100644
--- a/data/cities/gaillard/bricorama.yml
+++ b/data/cities/gaillard/bricorama.yml
@@ -1,11 +1,11 @@
 id: 25711054
-type: way
+type: node
 latitude: 46.18016
 longitude: 6.21705
 postcode: "74240"
 city: Gaillard
-street: "Rue René Cassin"
-housenumber: 12
+street: Rue René Cassin
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:15, 14:00-19:00; Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:15, 14:00-19:00; Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/gaillard/casino-supermache.yml b/data/cities/gaillard/casino-supermache.yml
index b01fb25cc..5bca65095 100644
--- a/data/cities/gaillard/casino-supermache.yml
+++ b/data/cities/gaillard/casino-supermache.yml
@@ -1,11 +1,11 @@
 id: 200081737
-type: way
+type: node
 latitude: 46.19116
 longitude: 6.21498
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 97
+street: Rue de Genève
+housenumber: "97"
 phone: ""
-opening_hours: "Mo-Sa 08:00-23:59; Su 08:30-23:59"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-23:59; Su 08:30-23:59
+website: ""
diff --git a/data/cities/gaillard/gifi.yml b/data/cities/gaillard/gifi.yml
index 332a708ec..4ba47ca8e 100644
--- a/data/cities/gaillard/gifi.yml
+++ b/data/cities/gaillard/gifi.yml
@@ -1,11 +1,11 @@
 id: 205407145
-type: way
+type: node
 latitude: 46.18053
 longitude: 6.21462
 postcode: "74240"
 city: Gaillard
-street: "Rue René Cassin"
-housenumber: 3
+street: Rue René Cassin
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/gaillard/intermarche.yml b/data/cities/gaillard/intermarche.yml
index fcc753c1c..4348c21df 100644
--- a/data/cities/gaillard/intermarche.yml
+++ b/data/cities/gaillard/intermarche.yml
@@ -1,11 +1,11 @@
 id: 201891493
-type: way
+type: node
 latitude: 46.18132
 longitude: 6.21705
 postcode: "74240"
 city: Gaillard
-street: "Rue René Cassin"
-housenumber: 5
+street: Rue René Cassin
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:45; Su 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:45; Su 08:30-12:00
+website: ""
diff --git a/data/cities/gaillard/kunz-pressing.yml b/data/cities/gaillard/kunz-pressing.yml
index 23d7429c3..b8285b6b2 100644
--- a/data/cities/gaillard/kunz-pressing.yml
+++ b/data/cities/gaillard/kunz-pressing.yml
@@ -4,8 +4,8 @@ latitude: 46.19148
 longitude: 6.21416
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 102
+street: Rue de Genève
+housenumber: "102"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/gaillard/la-paniere.yml b/data/cities/gaillard/la-paniere.yml
index eadb1baf9..8a5582ecd 100644
--- a/data/cities/gaillard/la-paniere.yml
+++ b/data/cities/gaillard/la-paniere.yml
@@ -4,8 +4,8 @@ latitude: 46.19191
 longitude: 6.21007
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 124
+street: Rue de Genève
+housenumber: "124"
 phone: ""
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/gaillard/le-boucherie-verte.yml b/data/cities/gaillard/le-boucherie-verte.yml
index 3387d87a9..526809f3a 100644
--- a/data/cities/gaillard/le-boucherie-verte.yml
+++ b/data/cities/gaillard/le-boucherie-verte.yml
@@ -4,8 +4,8 @@ latitude: 46.19189
 longitude: 6.21067
 postcode: "74240"
 city: Gaillard
-street: "rue de Genève"
-housenumber: 118
-phone: "+33 450 04 73 89"
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+street: rue de Genève
+housenumber: "118"
+phone: +33 450 04 73 89
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/gaillard/le-comptoir-de-la-viande.yml b/data/cities/gaillard/le-comptoir-de-la-viande.yml
index 3e695ae33..80abb0e9a 100644
--- a/data/cities/gaillard/le-comptoir-de-la-viande.yml
+++ b/data/cities/gaillard/le-comptoir-de-la-viande.yml
@@ -4,8 +4,8 @@ latitude: 46.19183
 longitude: 6.209
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 141
+street: Rue de Genève
+housenumber: "141"
 phone: ""
-opening_hours: "Mo-Su 08:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-21:00
+website: ""
diff --git a/data/cities/gaillard/lepicerie-de-gaillard.yml b/data/cities/gaillard/lepicerie-de-gaillard.yml
index 336b14ee5..cc248a633 100644
--- a/data/cities/gaillard/lepicerie-de-gaillard.yml
+++ b/data/cities/gaillard/lepicerie-de-gaillard.yml
@@ -4,8 +4,8 @@ latitude: 46.19042
 longitude: 6.21144
 postcode: "74240"
 city: Gaillard
-street: "Rue de la Libération"
-housenumber: 13
+street: Rue de la Libération
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Th, Su 08:45-22:30; Fr-Sa 08:45-23:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th, Su 08:45-22:30; Fr-Sa 08:45-23:00
+website: ""
diff --git a/data/cities/gaillard/lexus-annemasse.yml b/data/cities/gaillard/lexus-annemasse.yml
index c93de90e9..46d375a9d 100644
--- a/data/cities/gaillard/lexus-annemasse.yml
+++ b/data/cities/gaillard/lexus-annemasse.yml
@@ -4,8 +4,8 @@ latitude: 46.18573
 longitude: 6.22006
 postcode: "74240"
 city: Gaillard
-street: "Rue de l'Industrie"
-housenumber: 8
+street: Rue de l'Industrie
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gaillard/monsieur-store.yml b/data/cities/gaillard/monsieur-store.yml
index eecd8ed65..1cb71805e 100644
--- a/data/cities/gaillard/monsieur-store.yml
+++ b/data/cities/gaillard/monsieur-store.yml
@@ -4,8 +4,8 @@ latitude: 46.19159
 longitude: 6.21665
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 84
+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: ""
\ No newline at end of file
+opening_hours: Tu-Fr 14:00-18:30; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/gaillard/opel.yml b/data/cities/gaillard/opel.yml
index b180266e4..e69277b2c 100644
--- a/data/cities/gaillard/opel.yml
+++ b/data/cities/gaillard/opel.yml
@@ -1,11 +1,11 @@
 id: 205408522
-type: way
+type: node
 latitude: 46.18044
 longitude: 6.21345
 postcode: "74240"
 city: Gaillard
-street: "Rue René Cassin"
-housenumber: 1
+street: Rue René Cassin
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gaillard/orencash.yml b/data/cities/gaillard/orencash.yml
index 2ff4d9cc4..77dfc2bb3 100644
--- a/data/cities/gaillard/orencash.yml
+++ b/data/cities/gaillard/orencash.yml
@@ -4,8 +4,9 @@ latitude: 46.19153
 longitude: 6.21426
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 102
+street: Rue de Genève
+housenumber: "102"
 phone: ""
-opening_hours: "Mo 14:00-19:30, Tu-Th 09:00-13:00, 15:00-19:30; Fr 09:00-14:30; Sa off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:30, Tu-Th 09:00-13:00, 15:00-19:30; Fr 09:00-14:30; Sa
+    off
+website: ""
diff --git a/data/cities/gaillard/spar.yml b/data/cities/gaillard/spar.yml
index 046414b23..ea16c7f44 100644
--- a/data/cities/gaillard/spar.yml
+++ b/data/cities/gaillard/spar.yml
@@ -1,11 +1,11 @@
 id: 200400323
-type: way
+type: node
 latitude: 46.19215
 longitude: 6.21089
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 118
+street: Rue de Genève
+housenumber: "118"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:15
+website: ""
diff --git a/data/cities/gaillard/speedy.yml b/data/cities/gaillard/speedy.yml
index e0169a95e..95a221d7b 100644
--- a/data/cities/gaillard/speedy.yml
+++ b/data/cities/gaillard/speedy.yml
@@ -1,11 +1,11 @@
 id: 643969752
-type: way
+type: node
 latitude: 46.19195
 longitude: 6.22008
 postcode: "74240"
 city: Gaillard
-street: "Rue de Genève"
-housenumber: 58
+street: Rue de Genève
+housenumber: "58"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gaillard/toyota-degeneve-annemasse.yml b/data/cities/gaillard/toyota-degeneve-annemasse.yml
index 15094c994..a0bbcde94 100644
--- a/data/cities/gaillard/toyota-degeneve-annemasse.yml
+++ b/data/cities/gaillard/toyota-degeneve-annemasse.yml
@@ -4,8 +4,8 @@ latitude: 46.18567
 longitude: 6.21972
 postcode: "74240"
 city: Gaillard
-street: "Rue de l'Industrie"
-housenumber: 8
+street: Rue de l'Industrie
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/genas/10-la-boutique.yml b/data/cities/genas/10-la-boutique.yml
index 50a3dc2cb..dc897a0d8 100644
--- a/data/cities/genas/10-la-boutique.yml
+++ b/data/cities/genas/10-la-boutique.yml
@@ -4,8 +4,8 @@ latitude: 45.73431
 longitude: 4.99832
 postcode: "69740"
 city: Genas
-street: "Rue de l'Égalité"
-housenumber: 15
-phone: "04 78 70 75 46"
-opening_hours: "Tu-Sa 09:30-12:30,14:30-19:00"
-website: "https://www.10laboutique.fr/"
\ No newline at end of file
+street: Rue de l'Égalité
+housenumber: "15"
+phone: 04 78 70 75 46
+opening_hours: Tu-Sa 09:30-12:30,14:30-19:00
+website: https://www.10laboutique.fr/
diff --git a/data/cities/genas/boulangerie-giboulet-marie.yml b/data/cities/genas/boulangerie-giboulet-marie.yml
index 8ef31fcc7..ffb6157a4 100644
--- a/data/cities/genas/boulangerie-giboulet-marie.yml
+++ b/data/cities/genas/boulangerie-giboulet-marie.yml
@@ -4,8 +4,8 @@ latitude: 45.73851
 longitude: 5.0163
 postcode: "69740"
 city: Genas
-street: "Rue Jean Jaurès"
-housenumber: 21
-phone: "+33 4 78 90 10 41"
-opening_hours: "Mo-Fr 06:30-19:00; Sa 07:00-19:00; Su 07:00-12:30"
-website: "https://www.facebook.com/GibouletMarie.Azieu"
\ No newline at end of file
+street: Rue Jean Jaurès
+housenumber: "21"
+phone: +33 4 78 90 10 41
+opening_hours: Mo-Fr 06:30-19:00; Sa 07:00-19:00; Su 07:00-12:30
+website: https://www.facebook.com/GibouletMarie.Azieu
diff --git a/data/cities/genas/chris-ayva.yml b/data/cities/genas/chris-ayva.yml
index 2fc117450..954408aec 100644
--- a/data/cities/genas/chris-ayva.yml
+++ b/data/cities/genas/chris-ayva.yml
@@ -4,8 +4,8 @@ latitude: 45.73803
 longitude: 5.01591
 postcode: "69740"
 city: Genas
-street: "Rue Jean Jaurès"
-housenumber: 26
-phone: "+33 4 78 90 81 52"
-opening_hours: "Tu 09:00-12:00,14:00-18:30; We,Fr 09:00-18:30; Th 09:00-17:30; Sa 08:30-16:00"
-website: ""
\ No newline at end of file
+street: Rue Jean Jaurès
+housenumber: "26"
+phone: +33 4 78 90 81 52
+opening_hours: Tu 09:00-12:00,14:00-18:30; We,Fr 09:00-18:30; Th 09:00-17:30; Sa 08:30-16:00
+website: ""
diff --git a/data/cities/genas/la-boucherie-dazieu.yml b/data/cities/genas/la-boucherie-dazieu.yml
index a90c935ab..45750e48b 100644
--- a/data/cities/genas/la-boucherie-dazieu.yml
+++ b/data/cities/genas/la-boucherie-dazieu.yml
@@ -4,8 +4,8 @@ latitude: 45.73777
 longitude: 5.01613
 postcode: "69740"
 city: Genas
-street: "Rue Jean Jaurès"
-housenumber: 22
-phone: "+33 4 78 90 18 23"
-opening_hours: "Mo off; Tu-Sa 08:00-19:00; Su 08:00-12:00"
-website: "https://www.leshallesdegenas.fr/"
\ No newline at end of file
+street: Rue Jean Jaurès
+housenumber: "22"
+phone: +33 4 78 90 18 23
+opening_hours: Mo off; Tu-Sa 08:00-19:00; Su 08:00-12:00
+website: https://www.leshallesdegenas.fr/
diff --git a/data/cities/genas/lail-des-ours.yml b/data/cities/genas/lail-des-ours.yml
index 63066deb8..764599a70 100644
--- a/data/cities/genas/lail-des-ours.yml
+++ b/data/cities/genas/lail-des-ours.yml
@@ -4,8 +4,8 @@ latitude: 45.73967
 longitude: 5.0191
 postcode: "69740"
 city: Genas
-street: "Rue Lamartine"
+street: Rue Lamartine
 housenumber: 14A
-phone: "04 78 90 71 21"
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: "https://www.laildesours.fr/"
\ No newline at end of file
+phone: 04 78 90 71 21
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: https://www.laildesours.fr/
diff --git a/data/cities/genas/latelier-du-rond-point.yml b/data/cities/genas/latelier-du-rond-point.yml
index 90bc82713..ed00417c5 100644
--- a/data/cities/genas/latelier-du-rond-point.yml
+++ b/data/cities/genas/latelier-du-rond-point.yml
@@ -4,8 +4,8 @@ latitude: 45.73064
 longitude: 4.99055
 postcode: "69740"
 city: Genas
-street: "Rue Roger Salengro"
-housenumber: 9
+street: Rue Roger Salengro
+housenumber: "9"
 phone: "+33437608665"
-opening_hours: "Mo-Fr 06:30-19:30; Sa 07:30-19:30"
-website: "https://latelierdurondpoint-genas.eatbu.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-19:30; Sa 07:30-19:30
+website: https://latelierdurondpoint-genas.eatbu.com/
diff --git a/data/cities/genas/le-rivage.yml b/data/cities/genas/le-rivage.yml
index 4f5450666..0d5c34c64 100644
--- a/data/cities/genas/le-rivage.yml
+++ b/data/cities/genas/le-rivage.yml
@@ -5,7 +5,7 @@ longitude: 5.01662
 postcode: "69740"
 city: Genas
 street: ""
-housenumber: 2
-phone: "+33 4 87 37 62 74"
-opening_hours: "We 10:30-15:00; Th-Sa 10:30-15:00,18:00-21:00; Su 10:00-15:00"
-website: "https://rivage-restaurant.fr/"
\ No newline at end of file
+housenumber: "2"
+phone: +33 4 87 37 62 74
+opening_hours: We 10:30-15:00; Th-Sa 10:30-15:00,18:00-21:00; Su 10:00-15:00
+website: https://rivage-restaurant.fr/
diff --git a/data/cities/genas/le-vestiaire-de-charlie.yml b/data/cities/genas/le-vestiaire-de-charlie.yml
index ed8dd4cee..de3d7f798 100644
--- a/data/cities/genas/le-vestiaire-de-charlie.yml
+++ b/data/cities/genas/le-vestiaire-de-charlie.yml
@@ -5,7 +5,7 @@ longitude: 5.01679
 postcode: "69740"
 city: Genas
 street: ""
-housenumber: 6
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Th 10:00-12:30,14:00-18:00; Fr 10:00-12:30; Sa 09:30-12:00"
-website: "https://www.levestiairedecharlie.com/"
\ No newline at end of file
+opening_hours: Tu-Th 10:00-12:30,14:00-18:00; Fr 10:00-12:30; Sa 09:30-12:00
+website: https://www.levestiairedecharlie.com/
diff --git a/data/cities/genas/lomble-chevalier.yml b/data/cities/genas/lomble-chevalier.yml
index 9e38213bf..80eb59fe0 100644
--- a/data/cities/genas/lomble-chevalier.yml
+++ b/data/cities/genas/lomble-chevalier.yml
@@ -4,8 +4,8 @@ latitude: 45.7322
 longitude: 4.99798
 postcode: "69740"
 city: Genas
-street: "Rue de la République"
-housenumber: 9
+street: Rue de la République
+housenumber: "9"
 phone: ""
-opening_hours: "We-Su"
-website: ""
\ No newline at end of file
+opening_hours: We-Su
+website: ""
diff --git a/data/cities/genas/passion-coiffure.yml b/data/cities/genas/passion-coiffure.yml
index 05baa8150..06e704e10 100644
--- a/data/cities/genas/passion-coiffure.yml
+++ b/data/cities/genas/passion-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 45.73693
 longitude: 5.0167
 postcode: "69740"
 city: Genas
-street: "Rue Jean Jaurès"
+street: Rue Jean Jaurès
 housenumber: 13b
-phone: "+33 478901046"
-opening_hours: "Tu 09:00-16:00; We 09:00-12:00; Th 09:00-17:00; Fr 09:00-18:00; Sa 09:00-15:00"
-website: ""
\ No newline at end of file
+phone: +33 478901046
+opening_hours: Tu 09:00-16:00; We 09:00-12:00; Th 09:00-17:00; Fr 09:00-18:00; Sa
+    09:00-15:00
+website: ""
diff --git a/data/cities/genas/recit-music.yml b/data/cities/genas/recit-music.yml
index 0134f0b2e..c730f7761 100644
--- a/data/cities/genas/recit-music.yml
+++ b/data/cities/genas/recit-music.yml
@@ -4,8 +4,8 @@ latitude: 45.73114
 longitude: 5.00407
 postcode: "69740"
 city: Genas
-street: "Rue de la République"
-housenumber: 72
+street: Rue de la République
+housenumber: "72"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/genas/tabac-presse-loto.yml b/data/cities/genas/tabac-presse-loto.yml
index b78ffd303..7b18e995f 100644
--- a/data/cities/genas/tabac-presse-loto.yml
+++ b/data/cities/genas/tabac-presse-loto.yml
@@ -5,7 +5,7 @@ longitude: 5.01638
 postcode: "69740"
 city: Genas
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/genay/genay-racing.yml b/data/cities/genay/genay-racing.yml
index 40828ecfb..2e20913a7 100644
--- a/data/cities/genay/genay-racing.yml
+++ b/data/cities/genay/genay-racing.yml
@@ -1,11 +1,11 @@
 id: 127434159
-type: way
+type: node
 latitude: 45.8915
 longitude: 4.82681
 postcode: "69730"
 city: Genay
-street: "chemin champ fleuri"
-housenumber: 307
-phone: "+33 6 70 59 60 46"
+street: chemin champ fleuri
+housenumber: "307"
+phone: +33 6 70 59 60 46
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/genay/ordinatop.yml b/data/cities/genay/ordinatop.yml
index 067762dbc..deede1cd1 100644
--- a/data/cities/genay/ordinatop.yml
+++ b/data/cities/genay/ordinatop.yml
@@ -4,8 +4,8 @@ latitude: 45.89915
 longitude: 4.82232
 postcode: "69730"
 city: Genay
-street: "Rue des Jonchères"
-housenumber: 444
+street: Rue des Jonchères
+housenumber: "444"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/genay/technic-auto.yml b/data/cities/genay/technic-auto.yml
index cd4798d81..1c2b08762 100644
--- a/data/cities/genay/technic-auto.yml
+++ b/data/cities/genay/technic-auto.yml
@@ -1,11 +1,11 @@
 id: 320042531
-type: way
+type: node
 latitude: 45.89018
 longitude: 4.82946
 postcode: "69730"
 city: Genay
-street: "Route de Reyrieux"
-housenumber: 41
+street: Route de Reyrieux
+housenumber: "41"
 phone: "+33478982992"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00"
-website: "http://www.technicauto69.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00
+website: http://www.technicauto69.fr/
diff --git a/data/cities/gex/auto-center-01.yml b/data/cities/gex/auto-center-01.yml
index 840fb2a58..030e85502 100644
--- a/data/cities/gex/auto-center-01.yml
+++ b/data/cities/gex/auto-center-01.yml
@@ -4,8 +4,8 @@ latitude: 46.33958
 longitude: 6.07452
 postcode: "01170"
 city: Gex
-street: "Rue des Entrepreneurs"
-housenumber: 190
+street: Rue des Entrepreneurs
+housenumber: "190"
 phone: "+33457284927"
-opening_hours: "Mo-Fr 08:15-12:00,13:15-18:00; Sa 09:00-12:00,13:00-16:30; Su,PH off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:15-12:00,13:15-18:00; Sa 09:00-12:00,13:00-16:30; Su,PH off
+website: ""
diff --git a/data/cities/gex/bricomarche.yml b/data/cities/gex/bricomarche.yml
index 2295f8b36..a737f2dbd 100644
--- a/data/cities/gex/bricomarche.yml
+++ b/data/cities/gex/bricomarche.yml
@@ -1,11 +1,11 @@
 id: 96892328
-type: way
+type: node
 latitude: 46.33754
 longitude: 6.07565
 postcode: "01170"
 city: Gex
-street: "Rue de l'Aiglette-Sud"
-housenumber: 193
+street: Rue de l'Aiglette-Sud
+housenumber: "193"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gex/cessy-velos.yml b/data/cities/gex/cessy-velos.yml
index 91dc97aa9..3406cc26f 100644
--- a/data/cities/gex/cessy-velos.yml
+++ b/data/cities/gex/cessy-velos.yml
@@ -4,8 +4,8 @@ latitude: 46.33122
 longitude: 6.06508
 postcode: "01170"
 city: Gex
-street: "Chemin de Belle Ferme"
-housenumber: 555
+street: Chemin de Belle Ferme
+housenumber: "555"
 phone: "+33642995750"
-opening_hours: "Tu-Su 10:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 10:00-19:30
+website: ""
diff --git a/data/cities/gex/intermarche-super.yml b/data/cities/gex/intermarche-super.yml
index 6da289039..effa81d58 100644
--- a/data/cities/gex/intermarche-super.yml
+++ b/data/cities/gex/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 96894021
-type: way
+type: node
 latitude: 46.33841
 longitude: 6.07716
 postcode: "01170"
 city: Gex
-street: "Rue de l'Aiglette-Sud"
-housenumber: 61
+street: Rue de l'Aiglette-Sud
+housenumber: "61"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gieres/aspirateur-service.yml b/data/cities/gieres/aspirateur-service.yml
index 1eceab239..c8e0ac9ac 100644
--- a/data/cities/gieres/aspirateur-service.yml
+++ b/data/cities/gieres/aspirateur-service.yml
@@ -4,8 +4,8 @@ latitude: 45.18771
 longitude: 5.77684
 postcode: "38610"
 city: Gières
-street: "Rue des Essarts"
-housenumber: 5
-phone: "+33 4 76 54 20 00"
-opening_hours: "Mo-Fr 07:30-12:00,13:30-17:00"
-website: "https://www.aspirateurservice.com/"
\ No newline at end of file
+street: Rue des Essarts
+housenumber: "5"
+phone: +33 4 76 54 20 00
+opening_hours: Mo-Fr 07:30-12:00,13:30-17:00
+website: https://www.aspirateurservice.com/
diff --git a/data/cities/gieres/bertet-musique.yml b/data/cities/gieres/bertet-musique.yml
index bd36e39df..0f25f77ef 100644
--- a/data/cities/gieres/bertet-musique.yml
+++ b/data/cities/gieres/bertet-musique.yml
@@ -1,11 +1,11 @@
 id: 62690178
-type: way
+type: node
 latitude: 45.18165
 longitude: 5.78718
 postcode: "38610"
 city: Gières
-street: "Avenue Esclangon"
+street: Avenue Esclangon
 housenumber: 1 bis
-phone: "+334 76 89 40 40"
-opening_hours: "Tu-Sa 09:00-12:00 14:00-19:00"
-website: "https://www.bertet-musique.com/"
\ No newline at end of file
+phone: +334 76 89 40 40
+opening_hours: Tu-Sa 09:00-12:00 14:00-19:00
+website: https://www.bertet-musique.com/
diff --git a/data/cities/gieres/boulangerie-cohendet.yml b/data/cities/gieres/boulangerie-cohendet.yml
index def154192..525599e30 100644
--- a/data/cities/gieres/boulangerie-cohendet.yml
+++ b/data/cities/gieres/boulangerie-cohendet.yml
@@ -4,8 +4,8 @@ latitude: 45.18193
 longitude: 5.7923
 postcode: "38610"
 city: Gières
-street: "Place de la République"
-housenumber: 14
+street: Place de la République
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gieres/boulangerie-le-chamandier.yml b/data/cities/gieres/boulangerie-le-chamandier.yml
index 7de53b842..defcc9869 100644
--- a/data/cities/gieres/boulangerie-le-chamandier.yml
+++ b/data/cities/gieres/boulangerie-le-chamandier.yml
@@ -4,8 +4,8 @@ latitude: 45.18252
 longitude: 5.78106
 postcode: "38610"
 city: Gières
-street: "Rue du Bois Taillis"
-housenumber: 17
+street: Rue du Bois Taillis
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gieres/brasserie-o-bistro.yml b/data/cities/gieres/brasserie-o-bistro.yml
index b5065b7a7..1b261a634 100644
--- a/data/cities/gieres/brasserie-o-bistro.yml
+++ b/data/cities/gieres/brasserie-o-bistro.yml
@@ -1,11 +1,11 @@
 id: 61406318
-type: way
+type: node
 latitude: 45.18719
 longitude: 5.77753
 postcode: "38610"
 city: Gières
-street: "Rue de la Condamine"
-housenumber: 6
+street: Rue de la Condamine
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gieres/carrosserie-de-mayencin.yml b/data/cities/gieres/carrosserie-de-mayencin.yml
index a53d3426f..0856a4dbc 100644
--- a/data/cities/gieres/carrosserie-de-mayencin.yml
+++ b/data/cities/gieres/carrosserie-de-mayencin.yml
@@ -4,8 +4,8 @@ latitude: 45.18667
 longitude: 5.77761
 postcode: "38610"
 city: Gières
-street: "Rue de Mayencin"
-housenumber: 7
+street: Rue de Mayencin
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 07:30-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/gieres/espace-multiservice.yml b/data/cities/gieres/espace-multiservice.yml
index 3f097bb3f..737e6abfb 100644
--- a/data/cities/gieres/espace-multiservice.yml
+++ b/data/cities/gieres/espace-multiservice.yml
@@ -5,7 +5,7 @@ longitude: 5.79272
 postcode: "38610"
 city: Gières
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gieres/foussier-grenoble.yml b/data/cities/gieres/foussier-grenoble.yml
index dbb51d30d..3f048b90b 100644
--- a/data/cities/gieres/foussier-grenoble.yml
+++ b/data/cities/gieres/foussier-grenoble.yml
@@ -1,11 +1,11 @@
 id: 61406319
-type: way
+type: node
 latitude: 45.18717
 longitude: 5.77888
 postcode: "38610"
 city: Gières
-street: "Rue de la Condamine"
-housenumber: 9
-phone: "+33 4 78 49 49 49"
-opening_hours: "Mo-Fr 07:00-12:00, 13:30-17:30"
-website: "https://www.foussier.fr/nos-magasins-et-points-de-retrait/foussier-grenoble/155"
\ No newline at end of file
+street: Rue de la Condamine
+housenumber: "9"
+phone: +33 4 78 49 49 49
+opening_hours: Mo-Fr 07:00-12:00, 13:30-17:30
+website: https://www.foussier.fr/nos-magasins-et-points-de-retrait/foussier-grenoble/155
diff --git a/data/cities/gieres/imprimerie-des-ecureuils.yml b/data/cities/gieres/imprimerie-des-ecureuils.yml
index 42fa48e78..72d5f575e 100644
--- a/data/cities/gieres/imprimerie-des-ecureuils.yml
+++ b/data/cities/gieres/imprimerie-des-ecureuils.yml
@@ -1,11 +1,11 @@
 id: 61406317
-type: way
+type: node
 latitude: 45.18714
 longitude: 5.7771
 postcode: "38610"
 city: Gières
-street: "Rue de Mayencin"
-housenumber: 3
-phone: "+33 4 76 42 11 92"
-opening_hours: "Mo-Fr 07:30-12:00, 13:30-18:00"
-website: ""
\ No newline at end of file
+street: Rue de Mayencin
+housenumber: "3"
+phone: +33 4 76 42 11 92
+opening_hours: Mo-Fr 07:30-12:00, 13:30-18:00
+website: ""
diff --git a/data/cities/gieres/la-belle-saison.yml b/data/cities/gieres/la-belle-saison.yml
index 0b2156dc3..a1721dcf6 100644
--- a/data/cities/gieres/la-belle-saison.yml
+++ b/data/cities/gieres/la-belle-saison.yml
@@ -4,8 +4,8 @@ latitude: 45.18176
 longitude: 5.78996
 postcode: "38610"
 city: Gières
-street: "Grand' Rue"
-housenumber: 
-phone: "+33 4 76 24 30 85"
-opening_hours: "Tu-Fr 07:00-12:00,15:30-19:00; Sa 07:00-12:15,15:30-18:30"
-website: ""
\ No newline at end of file
+street: Grand' Rue
+housenumber: ""
+phone: +33 4 76 24 30 85
+opening_hours: Tu-Fr 07:00-12:00,15:30-19:00; Sa 07:00-12:15,15:30-18:30
+website: ""
diff --git a/data/cities/gieres/la-feuille-noire.yml b/data/cities/gieres/la-feuille-noire.yml
index eb7ced93f..c771dd4a3 100644
--- a/data/cities/gieres/la-feuille-noire.yml
+++ b/data/cities/gieres/la-feuille-noire.yml
@@ -4,8 +4,8 @@ latitude: 45.18154
 longitude: 5.79093
 postcode: "38610"
 city: Gières
-street: "Passage du Campanile"
-housenumber: 4
+street: Passage du Campanile
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gieres/latelier-pains-et-snacking.yml b/data/cities/gieres/latelier-pains-et-snacking.yml
index e990364f5..367f3b9c1 100644
--- a/data/cities/gieres/latelier-pains-et-snacking.yml
+++ b/data/cities/gieres/latelier-pains-et-snacking.yml
@@ -4,8 +4,8 @@ latitude: 45.18572
 longitude: 5.80349
 postcode: "38610"
 city: Gières
-street: "Rue de la Libération"
-housenumber: 40
-phone: "+33 9 51 00 80 79"
-opening_hours: "Mo-Fr 06:30-18:45"
-website: ""
\ No newline at end of file
+street: Rue de la Libération
+housenumber: "40"
+phone: +33 9 51 00 80 79
+opening_hours: Mo-Fr 06:30-18:45
+website: ""
diff --git a/data/cities/gieres/les-ptits-boucans.yml b/data/cities/gieres/les-ptits-boucans.yml
index 4ad2f710b..48c087e28 100644
--- a/data/cities/gieres/les-ptits-boucans.yml
+++ b/data/cities/gieres/les-ptits-boucans.yml
@@ -4,8 +4,8 @@ latitude: 45.18234
 longitude: 5.79194
 postcode: "38610"
 city: Gières
-street: "Place de la République"
-housenumber: 9
+street: Place de la République
+housenumber: "9"
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/gieres/mercedes-benz.yml b/data/cities/gieres/mercedes-benz.yml
index d8851dbd8..7f94b680b 100644
--- a/data/cities/gieres/mercedes-benz.yml
+++ b/data/cities/gieres/mercedes-benz.yml
@@ -1,11 +1,11 @@
 id: 61406321
-type: way
+type: node
 latitude: 45.18735
 longitude: 5.77955
 postcode: "38610"
 city: Gières
-street: "Rue de la Condamine"
-housenumber: 7
-phone: "+33 4 76 42 24 24"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: "https://www.groupe-huillier.mercedes-benz.fr"
\ No newline at end of file
+street: Rue de la Condamine
+housenumber: "7"
+phone: +33 4 76 42 24 24
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: https://www.groupe-huillier.mercedes-benz.fr
diff --git a/data/cities/gieres/mvelo-agence-campus.yml b/data/cities/gieres/mvelo-agence-campus.yml
index c908125df..c13abd9be 100644
--- a/data/cities/gieres/mvelo-agence-campus.yml
+++ b/data/cities/gieres/mvelo-agence-campus.yml
@@ -4,8 +4,8 @@ latitude: 45.19257
 longitude: 5.77114
 postcode: "38610"
 city: Gières
-street: "Rue de la Bibliothèque"
-housenumber: 411
+street: Rue de la Bibliothèque
+housenumber: "411"
 phone: ""
-opening_hours: "Mo-Fr 09:30-13:00,13:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-13:00,13:30-18:30
+website: ""
diff --git a/data/cities/gieres/noris-arts-martiaux.yml b/data/cities/gieres/noris-arts-martiaux.yml
index 3029c5a90..c7c79375f 100644
--- a/data/cities/gieres/noris-arts-martiaux.yml
+++ b/data/cities/gieres/noris-arts-martiaux.yml
@@ -4,8 +4,8 @@ latitude: 45.18745
 longitude: 5.77695
 postcode: "38610"
 city: Gières
-street: "Rue de Mayencin"
-housenumber: 1
+street: Rue de Mayencin
+housenumber: "1"
 phone: ""
-opening_hours: "Tu,We,Fr,Sa 10:00-12:00,14:00-18:00; Th 10:00-12:00,14:00-16:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu,We,Fr,Sa 10:00-12:00,14:00-18:00; Th 10:00-12:00,14:00-16:30
+website: ""
diff --git a/data/cities/gieres/routens-evolution-gieres.yml b/data/cities/gieres/routens-evolution-gieres.yml
index 0e7ab3a68..508f124cc 100644
--- a/data/cities/gieres/routens-evolution-gieres.yml
+++ b/data/cities/gieres/routens-evolution-gieres.yml
@@ -1,11 +1,11 @@
 id: 42351081
-type: way
+type: node
 latitude: 45.17994
 longitude: 5.7877
 postcode: "38610"
 city: Gières
-street: "Avenue Henri Duhamel"
-housenumber: 2
+street: Avenue Henri Duhamel
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gieres/spar.yml b/data/cities/gieres/spar.yml
index 55c66a874..c9aab720e 100644
--- a/data/cities/gieres/spar.yml
+++ b/data/cities/gieres/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.18213
 longitude: 5.792
 postcode: "38610"
 city: Gières
-street: "Place de la République"
-housenumber: 5
-phone: "+33 4 76 89 37 50"
-opening_hours: "Mo-Sa 08:00-12:30,15:30-19:30; Su 09:00-12:30"
-website: "https://magasins.spar.fr/fr/s/spar-supermarche-gieres"
\ No newline at end of file
+street: Place de la République
+housenumber: "5"
+phone: +33 4 76 89 37 50
+opening_hours: Mo-Sa 08:00-12:30,15:30-19:30; Su 09:00-12:30
+website: https://magasins.spar.fr/fr/s/spar-supermarche-gieres
diff --git a/data/cities/gilhoc-sur-ormeze/boulangerie-patisserie.yml b/data/cities/gilhoc-sur-ormeze/boulangerie-patisserie.yml
index 4f9f2f077..880318036 100644
--- a/data/cities/gilhoc-sur-ormeze/boulangerie-patisserie.yml
+++ b/data/cities/gilhoc-sur-ormeze/boulangerie-patisserie.yml
@@ -5,7 +5,7 @@ longitude: 4.68831
 postcode: ""
 city: Gilhoc-sur-Ormèze
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gillon/moene.yml b/data/cities/gillon/moene.yml
index 369352bea..1c062846f 100644
--- a/data/cities/gillon/moene.yml
+++ b/data/cities/gillon/moene.yml
@@ -1,11 +1,11 @@
 id: 259813549
-type: way
+type: node
 latitude: 45.92322
 longitude: 6.08769
 postcode: "74330"
 city: Gillon
-street: "Route de Bellegarde"
-housenumber: 1
-phone: "+33 4 50 22 00 86"
+street: Route de Bellegarde
+housenumber: "1"
+phone: +33 4 50 22 00 86
 opening_hours: ""
-website: "https://pieces-auto-moene.com"
\ No newline at end of file
+website: https://pieces-auto-moene.com
diff --git a/data/cities/gilly-sur-isere/culture-velo.yml b/data/cities/gilly-sur-isere/culture-velo.yml
index d6493d3e9..edfc11e92 100644
--- a/data/cities/gilly-sur-isere/culture-velo.yml
+++ b/data/cities/gilly-sur-isere/culture-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.65583
 longitude: 6.35957
 postcode: "73200"
 city: Gilly-sur-Isère
-street: "Avenue Georges Pompidou"
-housenumber: 271
+street: Avenue Georges Pompidou
+housenumber: "271"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/givors/groupe-chopard.yml b/data/cities/givors/groupe-chopard.yml
index 1e9f7ee90..ad8bdb63e 100644
--- a/data/cities/givors/groupe-chopard.yml
+++ b/data/cities/givors/groupe-chopard.yml
@@ -4,8 +4,8 @@ latitude: 45.58697
 longitude: 4.76302
 postcode: "69700"
 city: Givors
-street: "3 Avenue Georges Charpak Givors"
-housenumber: 3
-phone: "+33 4 78 07 44 10"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-12:00,14:00-18:00"
-website: "https://www.groupechopard.com/peugeot/contact/peugeot-givors/"
\ No newline at end of file
+street: 3 Avenue Georges Charpak Givors
+housenumber: "3"
+phone: +33 4 78 07 44 10
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-12:00,14:00-18:00
+website: https://www.groupechopard.com/peugeot/contact/peugeot-givors/
diff --git a/data/cities/givors/intersport.yml b/data/cities/givors/intersport.yml
index d19b5eced..05e3494e1 100644
--- a/data/cities/givors/intersport.yml
+++ b/data/cities/givors/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.58377
 longitude: 4.74842
 postcode: "69700"
 city: Givors
-street: "Rue de la Paix"
-housenumber: 7
+street: Rue de la Paix
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/givors/mag-presse-tabac.yml b/data/cities/givors/mag-presse-tabac.yml
index 1f8b51897..71b1960ce 100644
--- a/data/cities/givors/mag-presse-tabac.yml
+++ b/data/cities/givors/mag-presse-tabac.yml
@@ -4,8 +4,8 @@ latitude: 45.58264
 longitude: 4.77271
 postcode: ""
 city: Givors
-street: "Rue Roger Salengro"
-housenumber: 1
+street: Rue Roger Salengro
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 07:00-12:30,15:00-19:00; Sa 07:30-12:30; Su 07:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:30,15:00-19:00; Sa 07:30-12:30; Su 07:30-13:00
+website: ""
diff --git a/data/cities/givors/mon-asie-exotique.yml b/data/cities/givors/mon-asie-exotique.yml
index 8ee4a3306..e32ca91ea 100644
--- a/data/cities/givors/mon-asie-exotique.yml
+++ b/data/cities/givors/mon-asie-exotique.yml
@@ -1,11 +1,11 @@
 id: 66656086
-type: way
+type: node
 latitude: 45.5933
 longitude: 4.76985
 postcode: "69700"
 city: Givors
-street: "Rue Jean Ligonnet"
-housenumber: 61
+street: Rue Jean Ligonnet
+housenumber: "61"
 phone: ""
-opening_hours: "Tu-Sa 09:00-20:30; Su 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-20:30; Su 09:00-18:00
+website: ""
diff --git a/data/cities/givors/rize.yml b/data/cities/givors/rize.yml
index c6935a30d..c394bcff9 100644
--- a/data/cities/givors/rize.yml
+++ b/data/cities/givors/rize.yml
@@ -1,11 +1,11 @@
 id: 66655565
-type: way
+type: node
 latitude: 45.58803
 longitude: 4.77053
 postcode: "69700"
 city: Givors
-street: "Rue du Moulin"
-housenumber: 1
-phone: "+33 9 81 42 44 46"
-opening_hours: "Mo-Fr 09:00-12:30,15:00-19:00; Sa 09:00-19:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+street: Rue du Moulin
+housenumber: "1"
+phone: +33 9 81 42 44 46
+opening_hours: Mo-Fr 09:00-12:30,15:00-19:00; Sa 09:00-19:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/gleize/chez-georges.yml b/data/cities/gleize/chez-georges.yml
index b8a1ab098..3fc1394c0 100644
--- a/data/cities/gleize/chez-georges.yml
+++ b/data/cities/gleize/chez-georges.yml
@@ -5,7 +5,7 @@ longitude: 4.70578
 postcode: "69400"
 city: Gleizé
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/gleize/intemporelle.yml b/data/cities/gleize/intemporelle.yml
index 966411be7..fa6acc208 100644
--- a/data/cities/gleize/intemporelle.yml
+++ b/data/cities/gleize/intemporelle.yml
@@ -4,8 +4,8 @@ latitude: 45.98178
 longitude: 4.68185
 postcode: "69400"
 city: Gleizé
-street: "Rue camille jordan"
-housenumber: 294
+street: Rue camille jordan
+housenumber: "294"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:00"
-website: "www.linstitutenligne.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:00
+website: www.linstitutenligne.fr
diff --git a/data/cities/gleize/materiel-velo.yml b/data/cities/gleize/materiel-velo.yml
index dc6290ca6..fa3cba7cb 100644
--- a/data/cities/gleize/materiel-velo.yml
+++ b/data/cities/gleize/materiel-velo.yml
@@ -4,8 +4,8 @@ latitude: 46.00665
 longitude: 4.70974
 postcode: "69400"
 city: Gleizé
-street: "Rue de la Farnière"
-housenumber: 671
-phone: "+33 4 37 55 36 18"
-opening_hours: "Mo-Sa 09:30-12:00,14:30-19:00"
-website: "https://www.materiel-velo.com/a20-magasin-materiel-velo-gleize.html"
\ No newline at end of file
+street: Rue de la Farnière
+housenumber: "671"
+phone: +33 4 37 55 36 18
+opening_hours: Mo-Sa 09:30-12:00,14:30-19:00
+website: https://www.materiel-velo.com/a20-magasin-materiel-velo-gleize.html
diff --git a/data/cities/goncelin/au-cours-des-halles.yml b/data/cities/goncelin/au-cours-des-halles.yml
index 2ff67100a..2735f0c2f 100644
--- a/data/cities/goncelin/au-cours-des-halles.yml
+++ b/data/cities/goncelin/au-cours-des-halles.yml
@@ -4,8 +4,8 @@ latitude: 45.34144
 longitude: 5.97755
 postcode: "38570"
 city: Goncelin
-street: "Avenue des Tirignons"
-housenumber: 24
-phone: "+33 4 76 71 74 73"
-opening_hours: "Tu-Sa 08:15-12:15,15:00-19:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+street: Avenue des Tirignons
+housenumber: "24"
+phone: +33 4 76 71 74 73
+opening_hours: Tu-Sa 08:15-12:15,15:00-19:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/goncelin/boucherie-charvet.yml b/data/cities/goncelin/boucherie-charvet.yml
index d4ae8d3b4..391ebc29a 100644
--- a/data/cities/goncelin/boucherie-charvet.yml
+++ b/data/cities/goncelin/boucherie-charvet.yml
@@ -4,8 +4,8 @@ latitude: 45.34224
 longitude: 5.97757
 postcode: "38570"
 city: Goncelin
-street: "Avenue des Tirignons"
-housenumber: 37
-phone: "+33 4 76 71 70 42"
+street: Avenue des Tirignons
+housenumber: "37"
+phone: +33 4 76 71 70 42
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/goncelin/boulangerie-de-sabine.yml b/data/cities/goncelin/boulangerie-de-sabine.yml
index 018a672b0..1966e20c8 100644
--- a/data/cities/goncelin/boulangerie-de-sabine.yml
+++ b/data/cities/goncelin/boulangerie-de-sabine.yml
@@ -5,7 +5,7 @@ longitude: 5.97766
 postcode: ""
 city: Goncelin
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/goncelin/optic-belledonne.yml b/data/cities/goncelin/optic-belledonne.yml
index 1c2a03df3..8b53b86b1 100644
--- a/data/cities/goncelin/optic-belledonne.yml
+++ b/data/cities/goncelin/optic-belledonne.yml
@@ -4,8 +4,8 @@ latitude: 45.34297
 longitude: 5.97781
 postcode: "38570"
 city: Goncelin
-street: "Avenue des Tirignons"
-housenumber: 51
-phone: "+33 4 76 08 46 67"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue des Tirignons
+housenumber: "51"
+phone: +33 4 76 08 46 67
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/grane/utile.yml b/data/cities/grane/utile.yml
index f76027626..eb8d20dc8 100644
--- a/data/cities/grane/utile.yml
+++ b/data/cities/grane/utile.yml
@@ -4,8 +4,8 @@ latitude: 44.73405
 longitude: 4.92539
 postcode: "26400"
 city: Grane
-street: "Montée du Beffroi"
-housenumber: 
+street: Montée du Beffroi
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 08:30-12:30,14:00-19:00; Fr-Sa 08:30-19:00; Su 08:30-12:30"
-website: "https://www.magasins-u.com"
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:30,14:00-19:00; Fr-Sa 08:30-19:00; Su 08:30-12:30
+website: https://www.magasins-u.com
diff --git a/data/cities/grenay/lg-moto-lg-quad.yml b/data/cities/grenay/lg-moto-lg-quad.yml
index dc0ababd5..e7ed46e90 100644
--- a/data/cities/grenay/lg-moto-lg-quad.yml
+++ b/data/cities/grenay/lg-moto-lg-quad.yml
@@ -1,11 +1,11 @@
 id: 128924955
-type: way
+type: node
 latitude: 45.66685
 longitude: 5.09267
 postcode: "38540"
 city: Grenay
-street: "Impasse de Satolas"
-housenumber: 2
-phone: "+33 4 74 94 69 61"
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.lgquad.com/"
\ No newline at end of file
+street: Impasse de Satolas
+housenumber: "2"
+phone: +33 4 74 94 69 61
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: https://www.lgquad.com/
diff --git a/data/cities/grenoble/action.yml b/data/cities/grenoble/action.yml
index 08e1e037f..3c285a221 100644
--- a/data/cities/grenoble/action.yml
+++ b/data/cities/grenoble/action.yml
@@ -1,11 +1,11 @@
 id: 512917497
-type: way
+type: node
 latitude: 45.15788
 longitude: 5.73282
 postcode: "38100"
 city: Grenoble
-street: "Avenue de Belledonne"
-housenumber: 14
+street: Avenue de Belledonne
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/adelaide-cookies.yml b/data/cities/grenoble/adelaide-cookies.yml
index 5bf99c096..475fe9ffc 100644
--- a/data/cities/grenoble/adelaide-cookies.yml
+++ b/data/cities/grenoble/adelaide-cookies.yml
@@ -4,8 +4,8 @@ latitude: 45.19237
 longitude: 5.7299
 postcode: "38000"
 city: Grenoble
-street: "Rue Lafayette"
+street: Rue Lafayette
 housenumber: 1 bis
-phone: "+33 4 76 54 87 73"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.adelaide-cookies.com/"
\ No newline at end of file
+phone: +33 4 76 54 87 73
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.adelaide-cookies.com/
diff --git a/data/cities/grenoble/adrenaline-sport.yml b/data/cities/grenoble/adrenaline-sport.yml
index 5e41563fb..0f6c50194 100644
--- a/data/cities/grenoble/adrenaline-sport.yml
+++ b/data/cities/grenoble/adrenaline-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.18612
 longitude: 5.73273
 postcode: "38000"
 city: Grenoble
-street: "Place Paul Vallier"
-housenumber: 24
+street: Place Paul Vallier
+housenumber: "24"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:30,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30,14:30-19:00
+website: ""
diff --git a/data/cities/grenoble/afb-shop.yml b/data/cities/grenoble/afb-shop.yml
index a424f39c9..8cd59aede 100644
--- a/data/cities/grenoble/afb-shop.yml
+++ b/data/cities/grenoble/afb-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.21506
 longitude: 5.68509
 postcode: "38950"
 city: Grenoble
-street: "Rue Louis Gagnière"
-housenumber: 25
-phone: "+33 476 044 242"
-opening_hours: "Mo-Fr 10:00-12:30,13:30-17:00"
-website: ""
\ No newline at end of file
+street: Rue Louis Gagnière
+housenumber: "25"
+phone: +33 476 044 242
+opening_hours: Mo-Fr 10:00-12:30,13:30-17:00
+website: ""
diff --git a/data/cities/grenoble/airgraph.yml b/data/cities/grenoble/airgraph.yml
index 570b7e37f..d9c6e5c1e 100644
--- a/data/cities/grenoble/airgraph.yml
+++ b/data/cities/grenoble/airgraph.yml
@@ -4,8 +4,8 @@ latitude: 45.18053
 longitude: 5.73588
 postcode: "38100"
 city: Grenoble
-street: "Rue Mallifaud"
-housenumber: 27
-phone: "+33 6 19 76 27 05"
+street: Rue Mallifaud
+housenumber: "27"
+phone: +33 6 19 76 27 05
 opening_hours: ""
-website: "https://www.pagesjaunes.fr/pros/52485887"
\ No newline at end of file
+website: https://www.pagesjaunes.fr/pros/52485887
diff --git a/data/cities/grenoble/alpha-bike.yml b/data/cities/grenoble/alpha-bike.yml
index 0df4b9544..2ed86809c 100644
--- a/data/cities/grenoble/alpha-bike.yml
+++ b/data/cities/grenoble/alpha-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.19142
 longitude: 5.7205
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 3
+street: Cours Jean Jaurès
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/alteck.yml b/data/cities/grenoble/alteck.yml
index c975af5c0..cfa9c5007 100644
--- a/data/cities/grenoble/alteck.yml
+++ b/data/cities/grenoble/alteck.yml
@@ -4,8 +4,8 @@ latitude: 45.18533
 longitude: 5.72037
 postcode: "38000"
 city: Grenoble
-street: "Place Condorcet"
-housenumber: 7
-phone: "+33 4 76 88 61 28"
-opening_hours: "Tu-Sa 09:00-12:30,14:30-19:00; Mo sur RDV"
-website: "http://www.alteck.fr/"
\ No newline at end of file
+street: Place Condorcet
+housenumber: "7"
+phone: +33 4 76 88 61 28
+opening_hours: Tu-Sa 09:00-12:30,14:30-19:00; Mo "sur RDV"
+website: http://www.alteck.fr/
diff --git a/data/cities/grenoble/anne-lise-signouret.yml b/data/cities/grenoble/anne-lise-signouret.yml
index 789afa2ed..b09a806bd 100644
--- a/data/cities/grenoble/anne-lise-signouret.yml
+++ b/data/cities/grenoble/anne-lise-signouret.yml
@@ -4,8 +4,8 @@ latitude: 45.18752
 longitude: 5.72976
 postcode: ""
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 
+street: Rue de Strasbourg
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://signouret-chocolatier.fr"
\ No newline at end of file
+website: https://signouret-chocolatier.fr
diff --git a/data/cities/grenoble/antigone.yml b/data/cities/grenoble/antigone.yml
index c551599d4..c1484e06f 100644
--- a/data/cities/grenoble/antigone.yml
+++ b/data/cities/grenoble/antigone.yml
@@ -4,8 +4,8 @@ latitude: 45.17942
 longitude: 5.70849
 postcode: "38000"
 city: Grenoble
-street: "Rue des Violettes"
-housenumber: 22
+street: Rue des Violettes
+housenumber: "22"
 phone: ""
-opening_hours: "We 18:30-21:30; Su 16:00-19:00"
-website: "https://www.bibliothequeantigone.org/"
\ No newline at end of file
+opening_hours: We 18:30-21:30; Su 16:00-19:00
+website: https://www.bibliothequeantigone.org/
diff --git a/data/cities/grenoble/arias-diffusion-de-meubles-grenoblois.yml b/data/cities/grenoble/arias-diffusion-de-meubles-grenoblois.yml
index db1e6c8cb..af4e8a6b4 100644
--- a/data/cities/grenoble/arias-diffusion-de-meubles-grenoblois.yml
+++ b/data/cities/grenoble/arias-diffusion-de-meubles-grenoblois.yml
@@ -4,8 +4,8 @@ latitude: 45.18747
 longitude: 5.70603
 postcode: "38000"
 city: Grenoble
-street: "Rue Ampère"
-housenumber: 13
-phone: "+33 4 38 12 90 98"
-opening_hours: "Mo-Sa 09:30-12:00, Mo-Fr 14:30-19:00"
-website: ""
\ No newline at end of file
+street: Rue Ampère
+housenumber: "13"
+phone: +33 4 38 12 90 98
+opening_hours: Mo-Sa 09:30-12:00, Mo-Fr 14:30-19:00
+website: ""
diff --git a/data/cities/grenoble/armand-thiery.yml b/data/cities/grenoble/armand-thiery.yml
index 2aeb95e9c..e28fc5197 100644
--- a/data/cities/grenoble/armand-thiery.yml
+++ b/data/cities/grenoble/armand-thiery.yml
@@ -1,11 +1,11 @@
 id: 512900588
-type: way
+type: node
 latitude: 45.15774
 longitude: 5.73138
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 85
-phone: "+33 4 76 23 53 95"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Armand-Thiery-Femme"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "85"
+phone: +33 4 76 23 53 95
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Armand-Thiery-Femme
diff --git a/data/cities/grenoble/arts-et-piano.yml b/data/cities/grenoble/arts-et-piano.yml
index 01ef34000..b811cee83 100644
--- a/data/cities/grenoble/arts-et-piano.yml
+++ b/data/cities/grenoble/arts-et-piano.yml
@@ -4,8 +4,8 @@ latitude: 45.18882
 longitude: 5.70415
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 161
+street: Cours Berriat
+housenumber: "161"
 phone: ""
-opening_hours: "Tu-Sa 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 14:00-19:00
+website: ""
diff --git a/data/cities/grenoble/atelier-du-byclou.yml b/data/cities/grenoble/atelier-du-byclou.yml
index b6f7e8bcb..7d3f929a7 100644
--- a/data/cities/grenoble/atelier-du-byclou.yml
+++ b/data/cities/grenoble/atelier-du-byclou.yml
@@ -4,8 +4,8 @@ latitude: 45.18126
 longitude: 5.71747
 postcode: "38000"
 city: Grenoble
-street: "Square Charles Michels"
-housenumber: 2
-phone: "+33 6 98 98 68 04"
-opening_hours: "Mo-Th 08:30-12:00,14:00-18:45; Fr 08:30-12:00, 14:00-17:45"
-website: ""
\ No newline at end of file
+street: Square Charles Michels
+housenumber: "2"
+phone: +33 6 98 98 68 04
+opening_hours: Mo-Th 08:30-12:00,14:00-18:45; Fr 08:30-12:00, 14:00-17:45
+website: ""
diff --git a/data/cities/grenoble/au-ble-dor.yml b/data/cities/grenoble/au-ble-dor.yml
index da09b0142..65a00d04c 100644
--- a/data/cities/grenoble/au-ble-dor.yml
+++ b/data/cities/grenoble/au-ble-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.1627
 longitude: 5.7167
 postcode: "38100"
 city: Grenoble
-street: "Avenue Léon Blum"
-housenumber: 105
+street: Avenue Léon Blum
+housenumber: "105"
 phone: ""
-opening_hours: "Mo-Su 05:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:00-20:00
+website: ""
diff --git a/data/cities/grenoble/au-chardon-bleu.yml b/data/cities/grenoble/au-chardon-bleu.yml
index 95d834069..ff615ccc5 100644
--- a/data/cities/grenoble/au-chardon-bleu.yml
+++ b/data/cities/grenoble/au-chardon-bleu.yml
@@ -4,8 +4,8 @@ latitude: 45.18178
 longitude: 5.72989
 postcode: "38000"
 city: Grenoble
-street: "Avenue Albert 1er de Belgique"
-housenumber: 27
-phone: "+33 4 76 87 36 49"
-opening_hours: "Mo-Sa 06:45-19:45"
-website: "http://www.auchardonbleu.com/boutiques/albert-1er-de-belgique/"
\ No newline at end of file
+street: Avenue Albert 1er de Belgique
+housenumber: "27"
+phone: +33 4 76 87 36 49
+opening_hours: Mo-Sa 06:45-19:45
+website: http://www.auchardonbleu.com/boutiques/albert-1er-de-belgique/
diff --git a/data/cities/grenoble/au-local.yml b/data/cities/grenoble/au-local.yml
index 60316be26..aaa16a6cc 100644
--- a/data/cities/grenoble/au-local.yml
+++ b/data/cities/grenoble/au-local.yml
@@ -4,8 +4,8 @@ latitude: 45.16568
 longitude: 5.72897
 postcode: "38100"
 city: Grenoble
-street: "Avenue Marie Reynoard"
+street: Avenue Marie Reynoard
 housenumber: 13bis
 phone: ""
-opening_hours: "Fr 15:30-18:20"
-website: "https://au-local.org/lieux-de-distribution/"
\ No newline at end of file
+opening_hours: Fr 15:30-18:20
+website: https://au-local.org/lieux-de-distribution/
diff --git a/data/cities/grenoble/au-vieux-campeur.yml b/data/cities/grenoble/au-vieux-campeur.yml
index 6e8140fd3..188080436 100644
--- a/data/cities/grenoble/au-vieux-campeur.yml
+++ b/data/cities/grenoble/au-vieux-campeur.yml
@@ -1,11 +1,11 @@
 id: 398056926
-type: way
+type: node
 latitude: 45.18367
 longitude: 5.7227
 postcode: "38000"
 city: Grenoble
-street: "Rue Berthe de Boissieux"
-housenumber: 25
+street: Rue Berthe de Boissieux
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/auchan-supermarche.yml b/data/cities/grenoble/auchan-supermarche.yml
index ef2ae563d..2e9fd7fa3 100644
--- a/data/cities/grenoble/auchan-supermarche.yml
+++ b/data/cities/grenoble/auchan-supermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.18092
 longitude: 5.71977
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Maréchal Foch"
+street: Boulevard Maréchal Foch
 housenumber: 56-58
-phone: "+33 4 76 86 57 67"
-opening_hours: "Mo-Sa 08:30-20:30; Su 08:30-12:00"
-website: "https://www.auchan.fr/magasins/supermarche-grenoble-foch/sl-1260"
\ No newline at end of file
+phone: +33 4 76 86 57 67
+opening_hours: Mo-Sa 08:30-20:30; Su 08:30-12:00
+website: https://www.auchan.fr/magasins/supermarche-grenoble-foch/sl-1260
diff --git a/data/cities/grenoble/auchan.yml b/data/cities/grenoble/auchan.yml
index 08225ba42..d0a5b07f8 100644
--- a/data/cities/grenoble/auchan.yml
+++ b/data/cities/grenoble/auchan.yml
@@ -1,11 +1,11 @@
 id: 40491752
-type: way
+type: node
 latitude: 45.1709
 longitude: 5.73894
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jean Perrot"
+street: Avenue Jean Perrot
 housenumber: 112 bis
-phone: "+33 4 76 25 26 15"
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:00-12:30"
-website: "https://www.auchan.fr/magasins/supermarche-grenoble-perrot/sl-1170"
\ No newline at end of file
+phone: +33 4 76 25 26 15
+opening_hours: Mo-Sa 08:00-20:00; Su 08:00-12:30
+website: https://www.auchan.fr/magasins/supermarche-grenoble-perrot/sl-1170
diff --git a/data/cities/grenoble/audika.yml b/data/cities/grenoble/audika.yml
index ff35e69af..2337211a8 100644
--- a/data/cities/grenoble/audika.yml
+++ b/data/cities/grenoble/audika.yml
@@ -4,8 +4,8 @@ latitude: 45.18957
 longitude: 5.72005
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 24
-phone: "+33 4 76 56 97 50"
-opening_hours: "Mo-Fr 09:30-12:00,14:00-18:00"
-website: "https://www.audika.fr/centres/isere/audioprothesiste-audika-grenoble-alsace-lorraine"
\ No newline at end of file
+street: Avenue Alsace Lorraine
+housenumber: "24"
+phone: +33 4 76 56 97 50
+opening_hours: Mo-Fr 09:30-12:00,14:00-18:00
+website: https://www.audika.fr/centres/isere/audioprothesiste-audika-grenoble-alsace-lorraine
diff --git a/data/cities/grenoble/audio-pour-tous.yml b/data/cities/grenoble/audio-pour-tous.yml
index 2a6040a05..553f655d5 100644
--- a/data/cities/grenoble/audio-pour-tous.yml
+++ b/data/cities/grenoble/audio-pour-tous.yml
@@ -1,11 +1,11 @@
 id: 512915555
-type: way
+type: node
 latitude: 45.15835
 longitude: 5.73265
 postcode: "38100"
 city: Grenoble
-street: "Grande Place"
-housenumber: 34
+street: Grande Place
+housenumber: "34"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/aux-delices-des-chanazous.yml b/data/cities/grenoble/aux-delices-des-chanazous.yml
index 53e612ef4..ac263638c 100644
--- a/data/cities/grenoble/aux-delices-des-chanazous.yml
+++ b/data/cities/grenoble/aux-delices-des-chanazous.yml
@@ -1,11 +1,11 @@
 id: 77479048
-type: way
+type: node
 latitude: 45.18066
 longitude: 5.74486
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jeanne d'Arc"
-housenumber: 68
+street: Avenue Jeanne d'Arc
+housenumber: "68"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:00
+website: ""
diff --git a/data/cities/grenoble/b-f-autos-carrosserie-et-peinture.yml b/data/cities/grenoble/b-f-autos-carrosserie-et-peinture.yml
index aded26690..40a2c804e 100644
--- a/data/cities/grenoble/b-f-autos-carrosserie-et-peinture.yml
+++ b/data/cities/grenoble/b-f-autos-carrosserie-et-peinture.yml
@@ -4,8 +4,8 @@ latitude: 45.17442
 longitude: 5.70536
 postcode: "38100"
 city: Grenoble
-street: "Avenue Rhin et Danube"
-housenumber: 47
-phone: "+33 4 76 49 14 14"
+street: Avenue Rhin et Danube
+housenumber: "47"
+phone: +33 4 76 49 14 14
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/bangkok-thai-massage.yml b/data/cities/grenoble/bangkok-thai-massage.yml
index 0de1f6c79..331f50cb2 100644
--- a/data/cities/grenoble/bangkok-thai-massage.yml
+++ b/data/cities/grenoble/bangkok-thai-massage.yml
@@ -4,8 +4,8 @@ latitude: 45.19359
 longitude: 5.72176
 postcode: "38000"
 city: Grenoble
-street: "Quai de France"
-housenumber: 22
+street: Quai de France
+housenumber: "22"
 phone: "0950988682"
-opening_hours: "11:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: 11:00-19:30
+website: ""
diff --git a/data/cities/grenoble/beauty-art.yml b/data/cities/grenoble/beauty-art.yml
index 867a6db86..d59573a1a 100644
--- a/data/cities/grenoble/beauty-art.yml
+++ b/data/cities/grenoble/beauty-art.yml
@@ -4,8 +4,8 @@ latitude: 45.18272
 longitude: 5.71038
 postcode: "38000"
 city: Grenoble
-street: "Rue d'Alembert"
-housenumber: 116
+street: Rue d'Alembert
+housenumber: "116"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/bike-corner.yml b/data/cities/grenoble/bike-corner.yml
index 2a9ca3122..3871e7930 100644
--- a/data/cities/grenoble/bike-corner.yml
+++ b/data/cities/grenoble/bike-corner.yml
@@ -4,8 +4,8 @@ latitude: 45.18432
 longitude: 5.72114
 postcode: "38000"
 city: Grenoble
-street: "Rue de Turenne"
-housenumber: 15
+street: Rue de Turenne
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00
+website: ""
diff --git a/data/cities/grenoble/bimp.yml b/data/cities/grenoble/bimp.yml
index 9848bcc44..325130166 100644
--- a/data/cities/grenoble/bimp.yml
+++ b/data/cities/grenoble/bimp.yml
@@ -4,8 +4,9 @@ latitude: 45.18606
 longitude: 5.70475
 postcode: "38000"
 city: Grenoble
-street: "Rue des Arts et Métiers"
-housenumber: 5
-phone: "+33 4 76 23 05 18"
-opening_hours: "Mo-Th 09:00-12:30, 14:00-18:00; Fr 09:00-12:30, 14:00-17:30; Mo-Fr 09:00-18:00"
-website: "https://www.bimp.fr/"
\ No newline at end of file
+street: Rue des Arts et Métiers
+housenumber: "5"
+phone: +33 4 76 23 05 18
+opening_hours: Mo-Th 09:00-12:30, 14:00-18:00; Fr 09:00-12:30, 14:00-17:30; Mo-Fr
+    09:00-18:00
+website: https://www.bimp.fr/
diff --git a/data/cities/grenoble/biocoop.yml b/data/cities/grenoble/biocoop.yml
index 6e92a6fb7..eba50834c 100644
--- a/data/cities/grenoble/biocoop.yml
+++ b/data/cities/grenoble/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 45.18837
 longitude: 5.72594
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Agutte Sembat"
-housenumber: 8
-phone: "+33 4 38 86 37 32"
-opening_hours: "Mo 14:00-19:30; Tu-Sa 10:00-19:30"
-website: "https://www.biocoopchampollion.fr"
\ No newline at end of file
+street: Boulevard Agutte Sembat
+housenumber: "8"
+phone: +33 4 38 86 37 32
+opening_hours: Mo 14:00-19:30; Tu-Sa 10:00-19:30
+website: https://www.biocoopchampollion.fr
diff --git a/data/cities/grenoble/bonobo.yml b/data/cities/grenoble/bonobo.yml
index 2b8929a08..2c2864358 100644
--- a/data/cities/grenoble/bonobo.yml
+++ b/data/cities/grenoble/bonobo.yml
@@ -1,11 +1,11 @@
 id: 512901256
-type: way
+type: node
 latitude: 45.15794
 longitude: 5.731
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 75
-phone: "+33 4 76 48 53 03"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Bonobo"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "75"
+phone: +33 4 76 48 53 03
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Bonobo
diff --git a/data/cities/grenoble/boucherie-de-labbaye-el-qods.yml b/data/cities/grenoble/boucherie-de-labbaye-el-qods.yml
index eeea53a13..83158ab94 100644
--- a/data/cities/grenoble/boucherie-de-labbaye-el-qods.yml
+++ b/data/cities/grenoble/boucherie-de-labbaye-el-qods.yml
@@ -4,8 +4,9 @@ latitude: 45.18059
 longitude: 5.74526
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jeanne d'Arc"
-housenumber: 83
+street: Avenue Jeanne d'Arc
+housenumber: "83"
 phone: ""
-opening_hours: "Mo-Th 08:00-13:00;15:00-19:00; Fr 08:00-12:00;15:00-19:00; Sa 08:00-19:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:00-13:00;15:00-19:00; Fr 08:00-12:00;15:00-19:00; Sa 08:00-19:00;
+    Su 08:00-13:00
+website: ""
diff --git a/data/cities/grenoble/boucherie-remy.yml b/data/cities/grenoble/boucherie-remy.yml
index 8495d0284..7cdd44828 100644
--- a/data/cities/grenoble/boucherie-remy.yml
+++ b/data/cities/grenoble/boucherie-remy.yml
@@ -4,8 +4,8 @@ latitude: 45.18029
 longitude: 5.70647
 postcode: "38000"
 city: Grenoble
-street: "Boulevard joseph vallier"
-housenumber: 56
+street: Boulevard Joseph Vallier
+housenumber: "56"
 phone: ""
-opening_hours: "Tu-Sa 07:00-13:00,15:00-19:30; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:00-13:00,15:00-19:30; Su 07:00-12:30
+website: ""
diff --git a/data/cities/grenoble/boulangerie-annabelle.yml b/data/cities/grenoble/boulangerie-annabelle.yml
index b1556f458..9c2d14f5c 100644
--- a/data/cities/grenoble/boulangerie-annabelle.yml
+++ b/data/cities/grenoble/boulangerie-annabelle.yml
@@ -4,8 +4,8 @@ latitude: 45.18478
 longitude: 5.72984
 postcode: "38000"
 city: Grenoble
-street: "Rue du 4e Régiment du Génie"
-housenumber: 4
+street: Rue du 4e Régiment du Génie
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30
+website: ""
diff --git a/data/cities/grenoble/boulangerie-la-cymaise.yml b/data/cities/grenoble/boulangerie-la-cymaise.yml
index 19b48c60f..af815b481 100644
--- a/data/cities/grenoble/boulangerie-la-cymaise.yml
+++ b/data/cities/grenoble/boulangerie-la-cymaise.yml
@@ -4,8 +4,8 @@ latitude: 45.19483
 longitude: 5.72837
 postcode: "38000"
 city: Grenoble
-street: "Quai Perrière"
-housenumber: 2
+street: Quai Perrière
+housenumber: "2"
 phone: "+33476872915"
-opening_hours: "Mo-Sa 06:30-20:00; Tu off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-20:00; Tu off
+website: ""
diff --git a/data/cities/grenoble/boulangerie-patisserie-coste.yml b/data/cities/grenoble/boulangerie-patisserie-coste.yml
index 5fc76cbf2..39ecdcd79 100644
--- a/data/cities/grenoble/boulangerie-patisserie-coste.yml
+++ b/data/cities/grenoble/boulangerie-patisserie-coste.yml
@@ -4,8 +4,8 @@ latitude: 45.19005
 longitude: 5.71702
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 44
-phone: "+33 4 76 46 41 93"
-opening_hours: "Mo-Sa 06:30-19:00; Su off"
-website: ""
\ No newline at end of file
+street: Avenue Alsace Lorraine
+housenumber: "44"
+phone: +33 4 76 46 41 93
+opening_hours: Mo-Sa 06:30-19:00; Su off
+website: ""
diff --git a/data/cities/grenoble/boulangerie-patisserie-gamond.yml b/data/cities/grenoble/boulangerie-patisserie-gamond.yml
index a2b8be87a..2dc83246e 100644
--- a/data/cities/grenoble/boulangerie-patisserie-gamond.yml
+++ b/data/cities/grenoble/boulangerie-patisserie-gamond.yml
@@ -4,8 +4,8 @@ latitude: 45.19484
 longitude: 5.71424
 postcode: "38000"
 city: Grenoble
-street: "Rue Arago"
+street: Rue Arago
 housenumber: 7 bis
-phone: "+33 4 76 46 71 86"
-opening_hours: "Mo-Fr 07:30-13:30,15:30-19:00; Sa,Su off"
-website: ""
\ No newline at end of file
+phone: +33 4 76 46 71 86
+opening_hours: Mo-Fr 07:30-13:30,15:30-19:00; Sa,Su off
+website: ""
diff --git a/data/cities/grenoble/bourbon.yml b/data/cities/grenoble/bourbon.yml
index 03e48181e..be0637e20 100644
--- a/data/cities/grenoble/bourbon.yml
+++ b/data/cities/grenoble/bourbon.yml
@@ -4,8 +4,8 @@ latitude: 45.19222
 longitude: 5.73137
 postcode: "38000"
 city: Grenoble
-street: "Place Notre-Dame"
-housenumber: 3
+street: Place Notre-Dame
+housenumber: "3"
 phone: ""
-opening_hours: "Mo,Tu,Th-Sa 05:30-19:15; PH,Su 05:30-18:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th-Sa 05:30-19:15; PH,Su 05:30-18:15
+website: ""
diff --git a/data/cities/grenoble/boutique-du-baobab.yml b/data/cities/grenoble/boutique-du-baobab.yml
index 1e566dffb..ca8138608 100644
--- a/data/cities/grenoble/boutique-du-baobab.yml
+++ b/data/cities/grenoble/boutique-du-baobab.yml
@@ -1,11 +1,11 @@
 id: 398056948
-type: way
+type: node
 latitude: 45.18431
 longitude: 5.72415
 postcode: "38000"
 city: Grenoble
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/grenoble/boutique-officielle-gf38.yml b/data/cities/grenoble/boutique-officielle-gf38.yml
index 662325a39..643497c62 100644
--- a/data/cities/grenoble/boutique-officielle-gf38.yml
+++ b/data/cities/grenoble/boutique-officielle-gf38.yml
@@ -4,8 +4,8 @@ latitude: 45.18812
 longitude: 5.74005
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Jean Pain"
-housenumber: 3
-phone: "+33 4 76 14 89 56"
-opening_hours: "We-Fr 10:00-18:00"
-website: "https://www.gf38.fr/"
\ No newline at end of file
+street: Boulevard Jean Pain
+housenumber: "3"
+phone: +33 4 76 14 89 56
+opening_hours: We-Fr 10:00-18:00
+website: https://www.gf38.fr/
diff --git a/data/cities/grenoble/boxmax.yml b/data/cities/grenoble/boxmax.yml
index ffef8c28b..1527b13a5 100644
--- a/data/cities/grenoble/boxmax.yml
+++ b/data/cities/grenoble/boxmax.yml
@@ -4,8 +4,8 @@ latitude: 45.17028
 longitude: 5.72755
 postcode: "38100"
 city: Grenoble
-street: "Rue des Alliés"
-housenumber: 35
+street: Rue des Alliés
+housenumber: "35"
 phone: ""
-opening_hours: "Sa 09:00-17:00; Mo-Fr 07:30-18:00"
-website: "https://boxmax.com"
\ No newline at end of file
+opening_hours: Sa 09:00-17:00; Mo-Fr 07:30-18:00
+website: https://boxmax.com
diff --git a/data/cities/grenoble/cafe-velo.yml b/data/cities/grenoble/cafe-velo.yml
index 6dd6bf108..a4d69345a 100644
--- a/data/cities/grenoble/cafe-velo.yml
+++ b/data/cities/grenoble/cafe-velo.yml
@@ -1,11 +1,11 @@
 id: 61113744
-type: way
+type: node
 latitude: 45.18458
 longitude: 5.70976
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 59
+street: Rue Nicolas Chorier
+housenumber: "59"
 phone: ""
-opening_hours: "Mo-We 09:00-19:00; Th 09:00-23:00; Fr 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We 09:00-19:00; Th 09:00-23:00; Fr 09:00-19:00
+website: ""
diff --git a/data/cities/grenoble/cafes-et-thes-frederic.yml b/data/cities/grenoble/cafes-et-thes-frederic.yml
index 9a1edadd2..8abda2f77 100644
--- a/data/cities/grenoble/cafes-et-thes-frederic.yml
+++ b/data/cities/grenoble/cafes-et-thes-frederic.yml
@@ -1,11 +1,11 @@
 id: 512917492
-type: way
+type: node
 latitude: 45.15751
 longitude: 5.73271
 postcode: "38100"
 city: Grenoble
-street: "Avenue de Belledonne"
-housenumber: 6
-phone: "+33 4 76 09 77 61"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Cafes-Thes-Frederic"
\ No newline at end of file
+street: Avenue de Belledonne
+housenumber: "6"
+phone: +33 4 76 09 77 61
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Cafes-Thes-Frederic
diff --git a/data/cities/grenoble/calme-et-harmonie.yml b/data/cities/grenoble/calme-et-harmonie.yml
index 33ca89214..9b9687572 100644
--- a/data/cities/grenoble/calme-et-harmonie.yml
+++ b/data/cities/grenoble/calme-et-harmonie.yml
@@ -4,8 +4,8 @@ latitude: 45.1862
 longitude: 5.71802
 postcode: "38000"
 city: Grenoble
-street: "Rue Étienne Marcel"
-housenumber: 1
-phone: "+33 4 80 38 98 62"
+street: Rue Étienne Marcel
+housenumber: "1"
+phone: +33 4 80 38 98 62
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/calzedonia.yml b/data/cities/grenoble/calzedonia.yml
index 6a3c7101c..cc137a7d5 100644
--- a/data/cities/grenoble/calzedonia.yml
+++ b/data/cities/grenoble/calzedonia.yml
@@ -1,11 +1,11 @@
 id: 512915188
-type: way
+type: node
 latitude: 45.15816
 longitude: 5.73121
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 76
-phone: "+33 9 62 12 21 24"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Calzedonia"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "76"
+phone: +33 9 62 12 21 24
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Calzedonia
diff --git a/data/cities/grenoble/cargoloc.yml b/data/cities/grenoble/cargoloc.yml
index 99afd79e0..e3406784c 100644
--- a/data/cities/grenoble/cargoloc.yml
+++ b/data/cities/grenoble/cargoloc.yml
@@ -4,8 +4,8 @@ latitude: 45.19519
 longitude: 5.71402
 postcode: "38000"
 city: Grenoble
-street: "Rue Arago"
-housenumber: 10
+street: Rue Arago
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Fr: 08:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: 'Mo-Fr: 08:30-18:30'
+website: ""
diff --git a/data/cities/grenoble/caroll.yml b/data/cities/grenoble/caroll.yml
index 12d01e1e1..cc5ed812d 100644
--- a/data/cities/grenoble/caroll.yml
+++ b/data/cities/grenoble/caroll.yml
@@ -1,11 +1,11 @@
 id: 512900587
-type: way
+type: node
 latitude: 45.15786
 longitude: 5.73153
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 83
-phone: "+33 4 76 22 87 33"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Caroll"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "83"
+phone: +33 4 76 22 87 33
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Caroll
diff --git a/data/cities/grenoble/carrefour-city-cours-jean-jaures.yml b/data/cities/grenoble/carrefour-city-cours-jean-jaures.yml
index 64e77f6af..abf7ec9be 100644
--- a/data/cities/grenoble/carrefour-city-cours-jean-jaures.yml
+++ b/data/cities/grenoble/carrefour-city-cours-jean-jaures.yml
@@ -4,8 +4,8 @@ latitude: 45.19052
 longitude: 5.71956
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 22
+street: Cours Jean Jaurès
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/grenoble/carrefour-city-grande-rue.yml b/data/cities/grenoble/carrefour-city-grande-rue.yml
index e7fab5c05..e7740ca0d 100644
--- a/data/cities/grenoble/carrefour-city-grande-rue.yml
+++ b/data/cities/grenoble/carrefour-city-grande-rue.yml
@@ -4,8 +4,8 @@ latitude: 45.19184
 longitude: 5.72858
 postcode: "38000"
 city: Grenoble
-street: "Grande Rue"
+street: Grande Rue
 housenumber: 17-19
 phone: ""
-opening_hours: "Mo-Sa 07:00-22_00; Su 08:00-22:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-22_00; Su 08:00-22:00
+website: ""
diff --git a/data/cities/grenoble/carrefour-city-grenoble-viallet.yml b/data/cities/grenoble/carrefour-city-grenoble-viallet.yml
index 239a16963..1d7740b4f 100644
--- a/data/cities/grenoble/carrefour-city-grenoble-viallet.yml
+++ b/data/cities/grenoble/carrefour-city-grenoble-viallet.yml
@@ -4,8 +4,8 @@ latitude: 45.19185
 longitude: 5.72487
 postcode: "38000"
 city: Grenoble
-street: "Avenue Félix Viallet"
-housenumber: 2
+street: Avenue Félix Viallet
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/city-grenoble-viallet"
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/city-grenoble-viallet
diff --git a/data/cities/grenoble/carrefour-city-rue-de-strasbourg.yml b/data/cities/grenoble/carrefour-city-rue-de-strasbourg.yml
index 36a1f081c..1750886ae 100644
--- a/data/cities/grenoble/carrefour-city-rue-de-strasbourg.yml
+++ b/data/cities/grenoble/carrefour-city-rue-de-strasbourg.yml
@@ -4,8 +4,8 @@ latitude: 45.18674
 longitude: 5.7312
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 18
+street: Rue de Strasbourg
+housenumber: "18"
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-21:00; Su 08:30-19:00
+website: ""
diff --git a/data/cities/grenoble/carrefour-city.yml b/data/cities/grenoble/carrefour-city.yml
index 9d818ad9d..c585fe2e5 100644
--- a/data/cities/grenoble/carrefour-city.yml
+++ b/data/cities/grenoble/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.18756
 longitude: 5.71922
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 31
+street: Cours Jean Jaurès
+housenumber: "31"
 phone: ""
-opening_hours: "Su 09:00-12:30; Mo-Sa 07:00-21:00"
-website: "https://www.carrefour.fr/magasin/city-grenoble-jaures-31"
\ No newline at end of file
+opening_hours: Su 09:00-12:30; Mo-Sa 07:00-21:00
+website: https://www.carrefour.fr/magasin/city-grenoble-jaures-31
diff --git a/data/cities/grenoble/carrefour-contact.yml b/data/cities/grenoble/carrefour-contact.yml
index ce491625a..eb94d18d4 100644
--- a/data/cities/grenoble/carrefour-contact.yml
+++ b/data/cities/grenoble/carrefour-contact.yml
@@ -1,11 +1,11 @@
 id: 77670288
-type: way
+type: node
 latitude: 45.17834
 longitude: 5.74373
 postcode: "38100"
 city: Grenoble
-street: "Rue André Argouges"
-housenumber: 14
-phone: "+33 4 76 03 02 48"
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/contact-grenoble-argouges"
\ No newline at end of file
+street: Rue André Argouges
+housenumber: "14"
+phone: +33 4 76 03 02 48
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/contact-grenoble-argouges
diff --git a/data/cities/grenoble/carrefour-express.yml b/data/cities/grenoble/carrefour-express.yml
index 27294f15c..4743974e1 100644
--- a/data/cities/grenoble/carrefour-express.yml
+++ b/data/cities/grenoble/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.20103
 longitude: 5.70642
 postcode: "38000"
 city: Grenoble
-street: "Avenue des Martyrs"
-housenumber: 66
-phone: "+33 4 76 88 82 06"
-opening_hours: "Mo-Fr 07:30-20:00; Sa 08:30-20:00; Su 09:00-18:00"
-website: "https://www.carrefour.fr/magasin/express-grenoble-martyrs"
\ No newline at end of file
+street: Avenue des Martyrs
+housenumber: "66"
+phone: +33 4 76 88 82 06
+opening_hours: Mo-Fr 07:30-20:00; Sa 08:30-20:00; Su 09:00-18:00
+website: https://www.carrefour.fr/magasin/express-grenoble-martyrs
diff --git a/data/cities/grenoble/casa.yml b/data/cities/grenoble/casa.yml
index c17917bcb..990791d07 100644
--- a/data/cities/grenoble/casa.yml
+++ b/data/cities/grenoble/casa.yml
@@ -1,11 +1,11 @@
 id: 512917488
-type: way
+type: node
 latitude: 45.1575
 longitude: 5.7324
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 96
-phone: "+33 4 76 40 68 24"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/CASA"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "96"
+phone: +33 4 76 40 68 24
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/CASA
diff --git a/data/cities/grenoble/casabio-rue-nicolas-chorier.yml b/data/cities/grenoble/casabio-rue-nicolas-chorier.yml
index 7db837109..4872f2dcf 100644
--- a/data/cities/grenoble/casabio-rue-nicolas-chorier.yml
+++ b/data/cities/grenoble/casabio-rue-nicolas-chorier.yml
@@ -4,8 +4,8 @@ latitude: 45.18584
 longitude: 5.71235
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 32
-phone: "+33 4 76 48 82 32"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://casabiochorier.biocoop.net/"
\ No newline at end of file
+street: Rue Nicolas Chorier
+housenumber: "32"
+phone: +33 4 76 48 82 32
+opening_hours: Mo-Sa 09:00-19:00
+website: https://casabiochorier.biocoop.net/
diff --git a/data/cities/grenoble/casabio.yml b/data/cities/grenoble/casabio.yml
index ca6a73db5..f53d23450 100644
--- a/data/cities/grenoble/casabio.yml
+++ b/data/cities/grenoble/casabio.yml
@@ -4,8 +4,8 @@ latitude: 45.16005
 longitude: 5.7091
 postcode: "38100"
 city: Grenoble
-street: "Cours de la Libération et du Général de Gaulle"
-housenumber: 234
+street: Cours de la Libération et du Général de Gaulle
+housenumber: "234"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/grenoble/casino-shop-avenue-alsace-lorraine.yml b/data/cities/grenoble/casino-shop-avenue-alsace-lorraine.yml
index 9ec9acb2b..9c91e4a49 100644
--- a/data/cities/grenoble/casino-shop-avenue-alsace-lorraine.yml
+++ b/data/cities/grenoble/casino-shop-avenue-alsace-lorraine.yml
@@ -4,8 +4,8 @@ latitude: 45.19004
 longitude: 5.71711
 postcode: ""
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 
+street: Avenue Alsace Lorraine
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 05:00-02:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:00-02:00
+website: ""
diff --git a/data/cities/grenoble/casino-shop-rue-des-eaux-claires.yml b/data/cities/grenoble/casino-shop-rue-des-eaux-claires.yml
index 60fa694be..433dc16b2 100644
--- a/data/cities/grenoble/casino-shop-rue-des-eaux-claires.yml
+++ b/data/cities/grenoble/casino-shop-rue-des-eaux-claires.yml
@@ -4,8 +4,8 @@ latitude: 45.17577
 longitude: 5.70921
 postcode: "38100"
 city: Grenoble
-street: "Rue des Eaux Claires"
-housenumber: 47
+street: Rue des Eaux Claires
+housenumber: "47"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:30; Su 09:00-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30; Su 09:00-12:45
+website: ""
diff --git a/data/cities/grenoble/casino-shop.yml b/data/cities/grenoble/casino-shop.yml
index 5bf7d1801..9a7db135b 100644
--- a/data/cities/grenoble/casino-shop.yml
+++ b/data/cities/grenoble/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.18057
 longitude: 5.70518
 postcode: "38000"
 city: Grenoble
-street: "Rue Ampère"
-housenumber: 60
+street: Rue Ampère
+housenumber: "60"
 phone: "+33476293485"
-opening_hours: "Mo-Sa 08:00-21:00; Su 09:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-21:00; Su 09:00-20:00
+website: ""
diff --git a/data/cities/grenoble/casino.yml b/data/cities/grenoble/casino.yml
index 715d0f15d..25764620a 100644
--- a/data/cities/grenoble/casino.yml
+++ b/data/cities/grenoble/casino.yml
@@ -4,8 +4,8 @@ latitude: 45.1804
 longitude: 5.71175
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
+street: Boulevard Joseph Vallier
 housenumber: 24b
-phone: "+33 4 76 84 45 00"
-opening_hours: "Mo-Sa 07:00-24:00; Su 08:00-24:00"
-website: "https://magasins.supercasino.fr/supermarche/grenoble-vallier/CS990"
\ No newline at end of file
+phone: +33 4 76 84 45 00
+opening_hours: Mo-Sa 07:00-24:00; Su 08:00-24:00
+website: https://magasins.supercasino.fr/supermarche/grenoble-vallier/CS990
diff --git a/data/cities/grenoble/cassandre.yml b/data/cities/grenoble/cassandre.yml
index ad5cd3cc0..0b42fb2fa 100644
--- a/data/cities/grenoble/cassandre.yml
+++ b/data/cities/grenoble/cassandre.yml
@@ -4,8 +4,8 @@ latitude: 45.18774
 longitude: 5.7224
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
+street: Cours Berriat
 housenumber: 11B
-phone: "+33 4 76 46 31 71"
-opening_hours: "We-Fr 10:00-19:00; Sa 08:30-19:00; Su 08:30-12:30"
-website: "https://www.chocolatiercassandre.com/"
\ No newline at end of file
+phone: +33 4 76 46 31 71
+opening_hours: We-Fr 10:00-19:00; Sa 08:30-19:00; Su 08:30-12:30
+website: https://www.chocolatiercassandre.com/
diff --git a/data/cities/grenoble/catane-coiffure.yml b/data/cities/grenoble/catane-coiffure.yml
index f7a94d3ca..ce31087eb 100644
--- a/data/cities/grenoble/catane-coiffure.yml
+++ b/data/cities/grenoble/catane-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.17946
 longitude: 5.70561
 postcode: "38100"
 city: Grenoble
-street: "Avenue Rhin et Danube"
-housenumber: 5
+street: Avenue Rhin et Danube
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Th 09:00-19:00; Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-19:00; Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/grenoble/cave-de-lile-verte.yml b/data/cities/grenoble/cave-de-lile-verte.yml
index 429829cf9..8856dfa44 100644
--- a/data/cities/grenoble/cave-de-lile-verte.yml
+++ b/data/cities/grenoble/cave-de-lile-verte.yml
@@ -4,8 +4,8 @@ latitude: 45.19976
 longitude: 5.7383
 postcode: "38000"
 city: Grenoble
-street: "Rue Ravier Piquet"
+street: Rue Ravier Piquet
 housenumber: 24 bis
-phone: "+33 4 76 03 27 55"
-opening_hours: "Mo-Sa 10:00-12:30,15:00-20:00"
-website: "https://www.facebook.com/Cave-de-lIle-Verte-1951321165195799"
\ No newline at end of file
+phone: +33 4 76 03 27 55
+opening_hours: Mo-Sa 10:00-12:30,15:00-20:00
+website: https://www.facebook.com/Cave-de-lIle-Verte-1951321165195799
diff --git a/data/cities/grenoble/cest-deux-euros.yml b/data/cities/grenoble/cest-deux-euros.yml
index 7fb5355ad..2a2813c1b 100644
--- a/data/cities/grenoble/cest-deux-euros.yml
+++ b/data/cities/grenoble/cest-deux-euros.yml
@@ -4,8 +4,8 @@ latitude: 45.18955
 longitude: 5.72025
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 20
+street: Avenue Alsace Lorraine
+housenumber: "20"
 phone: ""
-opening_hours: "Mo 11:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 11:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/grenoble/chapellerie-la-parisienne.yml b/data/cities/grenoble/chapellerie-la-parisienne.yml
index daa258aed..c73c4f019 100644
--- a/data/cities/grenoble/chapellerie-la-parisienne.yml
+++ b/data/cities/grenoble/chapellerie-la-parisienne.yml
@@ -4,8 +4,8 @@ latitude: 45.19196
 longitude: 5.72952
 postcode: "38000"
 city: Grenoble
-street: "Rue Lafayette"
-housenumber: 4
-phone: "+33 4 76 54 53 97"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-13:00,14:00-19:00"
-website: "https://www.chapellerie-laparisienne.fr/"
\ No newline at end of file
+street: Rue Lafayette
+housenumber: "4"
+phone: +33 4 76 54 53 97
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-13:00,14:00-19:00
+website: https://www.chapellerie-laparisienne.fr/
diff --git a/data/cities/grenoble/chez-niwa.yml b/data/cities/grenoble/chez-niwa.yml
index 926d4ab47..586bf6575 100644
--- a/data/cities/grenoble/chez-niwa.yml
+++ b/data/cities/grenoble/chez-niwa.yml
@@ -4,8 +4,8 @@ latitude: 45.18236
 longitude: 5.73052
 postcode: "38000"
 city: Grenoble
-street: "Rue Paul Janet"
-housenumber: 8
+street: Rue Paul Janet
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Su 12:00-02:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 12:00-02:00
+website: ""
diff --git a/data/cities/grenoble/city-laverie.yml b/data/cities/grenoble/city-laverie.yml
index 216caeef5..53ff106d8 100644
--- a/data/cities/grenoble/city-laverie.yml
+++ b/data/cities/grenoble/city-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.18645
 longitude: 5.71694
 postcode: "38000"
 city: Grenoble
-street: "Rue Gabriel Péri"
-housenumber: 45
+street: Rue Gabriel Péri
+housenumber: "45"
 phone: ""
-opening_hours: "Mo-Su 08:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-21:00
+website: ""
diff --git a/data/cities/grenoble/claires.yml b/data/cities/grenoble/claires.yml
index 6d9fc0ed8..6adab2b6c 100644
--- a/data/cities/grenoble/claires.yml
+++ b/data/cities/grenoble/claires.yml
@@ -1,11 +1,11 @@
 id: 512901263
-type: way
+type: node
 latitude: 45.15802
 longitude: 5.73124
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 79
-phone: "+33 4 76 21 87 07"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Claire-s"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "79"
+phone: +33 4 76 21 87 07
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Claire-s
diff --git a/data/cities/grenoble/classic-garage.yml b/data/cities/grenoble/classic-garage.yml
index 39192afc6..794ed8ad4 100644
--- a/data/cities/grenoble/classic-garage.yml
+++ b/data/cities/grenoble/classic-garage.yml
@@ -4,8 +4,8 @@ latitude: 45.18106
 longitude: 5.73004
 postcode: "38100"
 city: Grenoble
-street: "Rue du Colonel Bougault"
-housenumber: 39
+street: Rue du Colonel Bougault
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/comeda.yml b/data/cities/grenoble/comeda.yml
index 18a47b5a7..aa3e83bb7 100644
--- a/data/cities/grenoble/comeda.yml
+++ b/data/cities/grenoble/comeda.yml
@@ -4,8 +4,8 @@ latitude: 45.18134
 longitude: 5.7294
 postcode: "38100"
 city: Grenoble
-street: "Rue Marcel Porte"
-housenumber: 2
+street: Rue Marcel Porte
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: "http://www.comeda.net/"
\ No newline at end of file
+website: http://www.comeda.net/
diff --git a/data/cities/grenoble/cookies-enfant.yml b/data/cities/grenoble/cookies-enfant.yml
index defb26f52..fca2f60c1 100644
--- a/data/cities/grenoble/cookies-enfant.yml
+++ b/data/cities/grenoble/cookies-enfant.yml
@@ -4,8 +4,8 @@ latitude: 45.17714
 longitude: 5.72647
 postcode: ""
 city: Grenoble
-street: "Rue de Stalingrad"
-housenumber: 59
+street: Rue de Stalingrad
+housenumber: "59"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:30,14:00-18:00; We 09:30-12:00,14:30-18:30; Sa 14:30-18:30"
-website: "https://www.facebook.com/depotventecookies/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30,14:00-18:00; We 09:30-12:00,14:30-18:30; Sa 14:30-18:30
+website: https://www.facebook.com/depotventecookies/
diff --git a/data/cities/grenoble/cooperative-laitiere-de-la-haute-tarentaise.yml b/data/cities/grenoble/cooperative-laitiere-de-la-haute-tarentaise.yml
index b5e37f7bd..ccfc45979 100644
--- a/data/cities/grenoble/cooperative-laitiere-de-la-haute-tarentaise.yml
+++ b/data/cities/grenoble/cooperative-laitiere-de-la-haute-tarentaise.yml
@@ -4,8 +4,8 @@ latitude: 45.18759
 longitude: 5.72833
 postcode: "38000"
 city: Grenoble
-street: "Rue Lesdiguières"
-housenumber: 16
-phone: "+33 4 76 27 63 04"
-opening_hours: "Tu-We 10:30-12:30, 14:30-19:00; Th-Fr 10:30-13:00;14:30-19:00; Sa 10:30-13:00;14:00-19:00"
-website: "http://www.fromagebeaufort.fr/magasins-de-vente/grenoble"
\ No newline at end of file
+street: Rue Lesdiguières
+housenumber: "16"
+phone: +33 4 76 27 63 04
+opening_hours: Tu-We 10:30-12:30, 14:30-19:00; Th-Fr 10:30-13:00;14:30-19:00; Sa 10:30-13:00;14:00-19:00
+website: http://www.fromagebeaufort.fr/magasins-de-vente/grenoble
diff --git a/data/cities/grenoble/courir.yml b/data/cities/grenoble/courir.yml
index 5a22e18a0..d66cf1afb 100644
--- a/data/cities/grenoble/courir.yml
+++ b/data/cities/grenoble/courir.yml
@@ -1,11 +1,11 @@
 id: 512917500
-type: way
+type: node
 latitude: 45.15814
 longitude: 5.73281
 postcode: "38100"
 city: Grenoble
-street: "Avenue de Belledonne"
-housenumber: 20
-phone: "+33 4 76 29 48 35"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Courir"
\ No newline at end of file
+street: Avenue de Belledonne
+housenumber: "20"
+phone: +33 4 76 29 48 35
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Courir
diff --git a/data/cities/grenoble/cycles-cattin.yml b/data/cities/grenoble/cycles-cattin.yml
index 1669c082c..fded2e443 100644
--- a/data/cities/grenoble/cycles-cattin.yml
+++ b/data/cities/grenoble/cycles-cattin.yml
@@ -4,8 +4,8 @@ latitude: 45.17852
 longitude: 5.72805
 postcode: "38100"
 city: Grenoble
-street: "Rue des Déportés du 11 Novembre 1943"
-housenumber: 23
+street: Rue des Déportés du 11 Novembre 1943
+housenumber: "23"
 phone: ""
-opening_hours: "Mo 12:00-17:00, We 12:00-17:00, Fr 12:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 12:00-17:00, We 12:00-17:00, Fr 12:00-17:00
+website: ""
diff --git a/data/cities/grenoble/cyclolivine.yml b/data/cities/grenoble/cyclolivine.yml
index fb4b7759b..ff3815763 100644
--- a/data/cities/grenoble/cyclolivine.yml
+++ b/data/cities/grenoble/cyclolivine.yml
@@ -4,8 +4,8 @@ latitude: 45.18252
 longitude: 5.71262
 postcode: "38000"
 city: Grenoble
-street: "Rue Charrel"
-housenumber: 22
+street: Rue Charrel
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/davidetson.yml b/data/cities/grenoble/davidetson.yml
index b22b6bd45..12c2e4cb9 100644
--- a/data/cities/grenoble/davidetson.yml
+++ b/data/cities/grenoble/davidetson.yml
@@ -1,11 +1,11 @@
 id: 648255582
-type: way
+type: node
 latitude: 45.2024
 longitude: 5.70466
 postcode: "38000"
 city: Grenoble
-street: "Avenue des Martyrs"
+street: Avenue des Martyrs
 housenumber: 82B
-phone: "+33 975241781"
-opening_hours: "Th-Fr 09:00-19:00; Sa 08:30-17:30"
-website: "https://davidetson.com/salon/grenoble-presquile/"
\ No newline at end of file
+phone: +33 975241781
+opening_hours: Th-Fr 09:00-19:00; Sa 08:30-17:30
+website: https://davidetson.com/salon/grenoble-presquile/
diff --git a/data/cities/grenoble/dawelo.yml b/data/cities/grenoble/dawelo.yml
index d70477eac..d3b659d7e 100644
--- a/data/cities/grenoble/dawelo.yml
+++ b/data/cities/grenoble/dawelo.yml
@@ -4,8 +4,8 @@ latitude: 45.18853
 longitude: 5.71227
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 104
+street: Cours Berriat
+housenumber: "104"
 phone: ""
-opening_hours: "Tu,We,Fr 09:00-12:00, 14:30-18:00; Th 10:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,We,Fr 09:00-12:00, 14:30-18:00; Th 10:00-18:00
+website: ""
diff --git a/data/cities/grenoble/day-by-day-mon-epicerie-en-vrac.yml b/data/cities/grenoble/day-by-day-mon-epicerie-en-vrac.yml
index 5f26c9315..4e988269a 100644
--- a/data/cities/grenoble/day-by-day-mon-epicerie-en-vrac.yml
+++ b/data/cities/grenoble/day-by-day-mon-epicerie-en-vrac.yml
@@ -4,8 +4,8 @@ latitude: 45.18519
 longitude: 5.72044
 postcode: "38000"
 city: Grenoble
-street: "Place Condorcet"
-housenumber: 5
+street: Place Condorcet
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Su 09:30-13:00, 15:00-19:30"
-website: "https://daybyday-shop.com/magasin/grenoble"
\ No newline at end of file
+opening_hours: Tu-Su 09:30-13:00, 15:00-19:30
+website: https://daybyday-shop.com/magasin/grenoble
diff --git a/data/cities/grenoble/de-matteo-chauffage-climatisation-sanitaire.yml b/data/cities/grenoble/de-matteo-chauffage-climatisation-sanitaire.yml
index 4c0d8804e..f36349fac 100644
--- a/data/cities/grenoble/de-matteo-chauffage-climatisation-sanitaire.yml
+++ b/data/cities/grenoble/de-matteo-chauffage-climatisation-sanitaire.yml
@@ -4,8 +4,8 @@ latitude: 45.18773
 longitude: 5.71771
 postcode: "38000"
 city: Grenoble
-street: "Rue Gabriel Péri"
-housenumber: 25
+street: Rue Gabriel Péri
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/dead-is-hype-bicycles-workshop.yml b/data/cities/grenoble/dead-is-hype-bicycles-workshop.yml
index 4e15f2f30..2db6397ad 100644
--- a/data/cities/grenoble/dead-is-hype-bicycles-workshop.yml
+++ b/data/cities/grenoble/dead-is-hype-bicycles-workshop.yml
@@ -4,8 +4,8 @@ latitude: 45.18818
 longitude: 5.72532
 postcode: "38000"
 city: Grenoble
-street: "Rue Paul Bert"
-housenumber: 6
+street: Rue Paul Bert
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/decathlon.yml b/data/cities/grenoble/decathlon.yml
index dc0bebdce..135b74f4c 100644
--- a/data/cities/grenoble/decathlon.yml
+++ b/data/cities/grenoble/decathlon.yml
@@ -1,11 +1,11 @@
 id: 398056942
-type: way
+type: node
 latitude: 45.18412
 longitude: 5.72361
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Gambetta"
-housenumber: 48
+street: Boulevard Gambetta
+housenumber: "48"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-grenoble-centre-ville-centre-commercial-caserne-de-bonne--0070077300773"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: https://www.decathlon.fr/store-view/magasin-de-sports-grenoble-centre-ville-centre-commercial-caserne-de-bonne--0070077300773
diff --git a/data/cities/grenoble/decitre.yml b/data/cities/grenoble/decitre.yml
index 542b4c85f..a8f726aa0 100644
--- a/data/cities/grenoble/decitre.yml
+++ b/data/cities/grenoble/decitre.yml
@@ -5,7 +5,7 @@ longitude: 5.72917
 postcode: "38000"
 city: Grenoble
 street: ""
-housenumber: 
-phone: "+33 4 76 03 36 36"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.decitre.fr/aide/nos-librairies/grenoble"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 76 03 36 36
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.decitre.fr/aide/nos-librairies/grenoble
diff --git a/data/cities/grenoble/des-racines-et-des-herbes.yml b/data/cities/grenoble/des-racines-et-des-herbes.yml
index 62aef009a..f7723cc41 100644
--- a/data/cities/grenoble/des-racines-et-des-herbes.yml
+++ b/data/cities/grenoble/des-racines-et-des-herbes.yml
@@ -4,8 +4,8 @@ latitude: 45.18359
 longitude: 5.7181
 postcode: "38000"
 city: Grenoble
-street: "Rue Camille Desmoulins"
-housenumber: 5
-phone: "+33 4 76 46 18 75"
-opening_hours: "Sa 09:00-12:30,14:00-17:30; Tu-Fr 09:00-12:30,13:45-19:00"
-website: ""
\ No newline at end of file
+street: Rue Camille Desmoulins
+housenumber: "5"
+phone: +33 4 76 46 18 75
+opening_hours: Sa 09:00-12:30,14:00-17:30; Tu-Fr 09:00-12:30,13:45-19:00
+website: ""
diff --git a/data/cities/grenoble/dk-traiteur.yml b/data/cities/grenoble/dk-traiteur.yml
index b334e45b0..ae1a5507b 100644
--- a/data/cities/grenoble/dk-traiteur.yml
+++ b/data/cities/grenoble/dk-traiteur.yml
@@ -4,8 +4,8 @@ latitude: 45.1841
 longitude: 5.74112
 postcode: "38100"
 city: Grenoble
-street: "Rue Léon Jouhaux"
-housenumber: 3
+street: Rue Léon Jouhaux
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/du-pain-et-des-frangins.yml b/data/cities/grenoble/du-pain-et-des-frangins.yml
index 8f4072aa6..35298eab9 100644
--- a/data/cities/grenoble/du-pain-et-des-frangins.yml
+++ b/data/cities/grenoble/du-pain-et-des-frangins.yml
@@ -4,8 +4,8 @@ latitude: 45.19144
 longitude: 5.71985
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 8
+street: Cours Jean Jaurès
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Fr 06:30-13:30,16:00-19:00; Sa 07:30-13:30,16:00-18:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:30-13:30,16:00-19:00; Sa 07:30-13:30,16:00-18:00; Su 08:00-13:00
+website: ""
diff --git a/data/cities/grenoble/du-pain-sur-la-planche.yml b/data/cities/grenoble/du-pain-sur-la-planche.yml
index 8091cec87..35804c35a 100644
--- a/data/cities/grenoble/du-pain-sur-la-planche.yml
+++ b/data/cities/grenoble/du-pain-sur-la-planche.yml
@@ -4,8 +4,8 @@ latitude: 45.18792
 longitude: 5.72282
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 2
+street: Cours Berriat
+housenumber: "2"
 phone: "+33476479471"
-opening_hours: "Mo-Sa 07:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:30
+website: ""
diff --git a/data/cities/grenoble/e-veloshop.yml b/data/cities/grenoble/e-veloshop.yml
index 2dd274b25..f86a76390 100644
--- a/data/cities/grenoble/e-veloshop.yml
+++ b/data/cities/grenoble/e-veloshop.yml
@@ -4,8 +4,8 @@ latitude: 45.18927
 longitude: 5.72555
 postcode: "38000"
 city: Grenoble
-street: "Place Victor Hugo"
-housenumber: 5
+street: Place Victor Hugo
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/edelbikes.yml b/data/cities/grenoble/edelbikes.yml
index 8804560e9..cbf1d2097 100644
--- a/data/cities/grenoble/edelbikes.yml
+++ b/data/cities/grenoble/edelbikes.yml
@@ -4,8 +4,8 @@ latitude: 45.18258
 longitude: 5.71254
 postcode: "38000"
 city: Grenoble
-street: "Rue Charrel"
-housenumber: 22
+street: Rue Charrel
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,15:00-18:30; We 15:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,15:00-18:30; We 15:00-18:30
+website: ""
diff --git a/data/cities/grenoble/edouard-b.yml b/data/cities/grenoble/edouard-b.yml
index bbc819df3..d63161f1f 100644
--- a/data/cities/grenoble/edouard-b.yml
+++ b/data/cities/grenoble/edouard-b.yml
@@ -4,8 +4,8 @@ latitude: 45.18751
 longitude: 5.72813
 postcode: "38000"
 city: Grenoble
-street: "Rue Lesdiguières"
-housenumber: 16
-phone: "+33 4 76 46 00 46"
-opening_hours: "Tu 10:00-20:00; We-Th 10:00-21:00; Fr 10:00-19:00; Sa 08:00-12:00"
-website: "https://www.planity.com/edouard-b-38000-grenoble"
\ No newline at end of file
+street: Rue Lesdiguières
+housenumber: "16"
+phone: +33 4 76 46 00 46
+opening_hours: Tu 10:00-20:00; We-Th 10:00-21:00; Fr 10:00-19:00; Sa 08:00-12:00
+website: https://www.planity.com/edouard-b-38000-grenoble
diff --git a/data/cities/grenoble/elegance-coiffure.yml b/data/cities/grenoble/elegance-coiffure.yml
index 212190b2c..3dab7d57b 100644
--- a/data/cities/grenoble/elegance-coiffure.yml
+++ b/data/cities/grenoble/elegance-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.18712
 longitude: 5.73226
 postcode: "38000"
 city: Grenoble
-street: "Rue Fantin Latour"
-housenumber: 12
+street: Rue Fantin Latour
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: "https://www.elegancecoiffure-grenoble.fr/"
\ No newline at end of file
+website: https://www.elegancecoiffure-grenoble.fr/
diff --git a/data/cities/grenoble/energybike.yml b/data/cities/grenoble/energybike.yml
index fb4a0de1e..a7e155232 100644
--- a/data/cities/grenoble/energybike.yml
+++ b/data/cities/grenoble/energybike.yml
@@ -4,8 +4,8 @@ latitude: 45.19359
 longitude: 5.72184
 postcode: "38000"
 city: Grenoble
-street: "Quai de France"
-housenumber: 22
+street: Quai de France
+housenumber: "22"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:00,14:00-17:45; Su,Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00,14:00-17:45; Su,Mo off
+website: ""
diff --git a/data/cities/grenoble/eni.yml b/data/cities/grenoble/eni.yml
index 2cde252c4..6f420b88d 100644
--- a/data/cities/grenoble/eni.yml
+++ b/data/cities/grenoble/eni.yml
@@ -4,8 +4,8 @@ latitude: 45.17889
 longitude: 5.70513
 postcode: "38000"
 city: Grenoble
-street: "Avenue Rhin et Danube"
-housenumber: 32
+street: Avenue Rhin et Danube
+housenumber: "32"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/grenoble/ensolia.yml b/data/cities/grenoble/ensolia.yml
index d74db86d2..e86a78ccd 100644
--- a/data/cities/grenoble/ensolia.yml
+++ b/data/cities/grenoble/ensolia.yml
@@ -5,7 +5,7 @@ longitude: 5.73083
 postcode: "38100"
 city: Grenoble
 street: ""
-housenumber: 
-phone: "+33 4 57 39 62 35"
+housenumber: ""
+phone: +33 4 57 39 62 35
 opening_hours: ""
-website: "http://ensolia.com/"
\ No newline at end of file
+website: http://ensolia.com/
diff --git a/data/cities/grenoble/epicerie-arax.yml b/data/cities/grenoble/epicerie-arax.yml
index bec865608..bbc446514 100644
--- a/data/cities/grenoble/epicerie-arax.yml
+++ b/data/cities/grenoble/epicerie-arax.yml
@@ -4,8 +4,8 @@ latitude: 45.18483
 longitude: 5.7218
 postcode: "38000"
 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"
-website: "https://epicerie-arax.com/"
\ No newline at end of file
+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
+website: https://epicerie-arax.com/
diff --git a/data/cities/grenoble/epicerie-locavore.yml b/data/cities/grenoble/epicerie-locavore.yml
index 3a5d9adf9..163d69a92 100644
--- a/data/cities/grenoble/epicerie-locavore.yml
+++ b/data/cities/grenoble/epicerie-locavore.yml
@@ -4,8 +4,8 @@ latitude: 45.18452
 longitude: 5.72076
 postcode: "38000"
 city: Grenoble
-street: "Place Jacqueline Marval"
-housenumber: 1
-phone: "+33 6 88 68 74 83"
-opening_hours: "Tu-Fr 09:00-12:30,16:00-20:00; Sa-Su 16:00-20:00"
-website: "https://epicerie.locavore.fr/"
\ No newline at end of file
+street: Place Jacqueline Marval
+housenumber: "1"
+phone: +33 6 88 68 74 83
+opening_hours: Tu-Fr 09:00-12:30,16:00-20:00; Sa-Su 16:00-20:00
+website: https://epicerie.locavore.fr/
diff --git a/data/cities/grenoble/epicuria.yml b/data/cities/grenoble/epicuria.yml
index 57a0a561d..41b58007b 100644
--- a/data/cities/grenoble/epicuria.yml
+++ b/data/cities/grenoble/epicuria.yml
@@ -4,8 +4,8 @@ latitude: 45.18765
 longitude: 5.72944
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 1
-phone: "+33 9 72 52 13 13"
-opening_hours: "Mo-Su 06:30-20:00"
-website: "http://www.epicuriasucresale.com/"
\ No newline at end of file
+street: Rue de Strasbourg
+housenumber: "1"
+phone: +33 9 72 52 13 13
+opening_hours: Mo-Su 06:30-20:00
+website: http://www.epicuriasucresale.com/
diff --git a/data/cities/grenoble/episol.yml b/data/cities/grenoble/episol.yml
index 3b6d9df29..1a3645c66 100644
--- a/data/cities/grenoble/episol.yml
+++ b/data/cities/grenoble/episol.yml
@@ -4,8 +4,8 @@ latitude: 45.17644
 longitude: 5.72477
 postcode: "38100"
 city: Grenoble
-street: "Rue du Général Ferrié"
-housenumber: 45
-phone: "+33 9 82 53 01 12"
-opening_hours: "Tu-Fr 10:00-13:00,15:00-19:00; Sa 10:00-13:00,15:00-18:00; Su off"
-website: "http://www.episol.fr/"
\ No newline at end of file
+street: Rue du Général Ferrié
+housenumber: "45"
+phone: +33 9 82 53 01 12
+opening_hours: Tu-Fr 10:00-13:00,15:00-19:00; Sa 10:00-13:00,15:00-18:00; Su off
+website: http://www.episol.fr/
diff --git a/data/cities/grenoble/estelle-beaute.yml b/data/cities/grenoble/estelle-beaute.yml
index f6941e0d4..c217a9141 100644
--- a/data/cities/grenoble/estelle-beaute.yml
+++ b/data/cities/grenoble/estelle-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.17989
 longitude: 5.70881
 postcode: "38100"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 45
-phone: "+33 4 38 12 84 97"
+street: Boulevard Joseph Vallier
+housenumber: "45"
+phone: +33 4 38 12 84 97
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/fine-auto-38.yml b/data/cities/grenoble/fine-auto-38.yml
index 6168218cd..c7ea0061a 100644
--- a/data/cities/grenoble/fine-auto-38.yml
+++ b/data/cities/grenoble/fine-auto-38.yml
@@ -4,8 +4,8 @@ latitude: 45.1689
 longitude: 5.71528
 postcode: "38000"
 city: Grenoble
-street: "Rue Général Mangin"
-housenumber: 71
-phone: "+334 38 49 77 14"
+street: Rue Général Mangin
+housenumber: "71"
+phone: +334 38 49 77 14
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/fit-et-gourmande.yml b/data/cities/grenoble/fit-et-gourmande.yml
index c52947c5a..bf78e6874 100644
--- a/data/cities/grenoble/fit-et-gourmande.yml
+++ b/data/cities/grenoble/fit-et-gourmande.yml
@@ -4,8 +4,8 @@ latitude: 45.1814
 longitude: 5.72452
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Maréchal Foch"
-housenumber: 22
-phone: "+33 6 13 86 78 24"
-opening_hours: "Mo 09:00-15:00; Tu-Fr 09:00-18:00; Sa 09:00-13:00"
-website: "https://fit-et-gourmande.com"
\ No newline at end of file
+street: Boulevard Maréchal Foch
+housenumber: "22"
+phone: +33 6 13 86 78 24
+opening_hours: Mo 09:00-15:00; Tu-Fr 09:00-18:00; Sa 09:00-13:00
+website: https://fit-et-gourmande.com
diff --git a/data/cities/grenoble/fnac-grenoble-victor-hugo.yml b/data/cities/grenoble/fnac-grenoble-victor-hugo.yml
index 055ec5c83..a1a8c6624 100644
--- a/data/cities/grenoble/fnac-grenoble-victor-hugo.yml
+++ b/data/cities/grenoble/fnac-grenoble-victor-hugo.yml
@@ -4,8 +4,8 @@ latitude: 45.19039
 longitude: 5.7263
 postcode: "38000"
 city: Grenoble
-street: "Rue Félix Poulat"
-housenumber: 4
-phone: "+33 825 020 020"
-opening_hours: "Mo-Sa 10:00-19:30"
-website: "https://www.fnac.com/Grenoble-Victor-Hugo/Fnac-Grenoble-Victor-Hugo/cl99/w-4"
\ No newline at end of file
+street: Rue Félix Poulat
+housenumber: "4"
+phone: +33 825 020 020
+opening_hours: Mo-Sa 10:00-19:30
+website: https://www.fnac.com/Grenoble-Victor-Hugo/Fnac-Grenoble-Victor-Hugo/cl99/w-4
diff --git a/data/cities/grenoble/fnac.yml b/data/cities/grenoble/fnac.yml
index d2cb50fc3..ed1075d7b 100644
--- a/data/cities/grenoble/fnac.yml
+++ b/data/cities/grenoble/fnac.yml
@@ -1,11 +1,11 @@
 id: 512915173
-type: way
+type: node
 latitude: 45.1578
 longitude: 5.73191
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 90
+street: Avenue du Vercors
+housenumber: "90"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/grenoble/foodlab.yml b/data/cities/grenoble/foodlab.yml
index 7b36048d3..189bc5e94 100644
--- a/data/cities/grenoble/foodlab.yml
+++ b/data/cities/grenoble/foodlab.yml
@@ -4,8 +4,8 @@ latitude: 45.16965
 longitude: 5.72856
 postcode: "38100"
 city: Grenoble
-street: "Rue Leconte de Lisle"
-housenumber: 14
+street: Rue Leconte de Lisle
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/france-pare-brise.yml b/data/cities/grenoble/france-pare-brise.yml
index 6689ff060..ed642570f 100644
--- a/data/cities/grenoble/france-pare-brise.yml
+++ b/data/cities/grenoble/france-pare-brise.yml
@@ -4,8 +4,8 @@ latitude: 45.19087
 longitude: 5.71828
 postcode: "38000"
 city: Grenoble
-street: "Avenue Félix Viallet"
-housenumber: 36
-phone: "+33 4 76 27 80 39"
-opening_hours: "Mo-Fr 07:30-19:00; Sa 09:00-17:00; Su off"
-website: "https://www.franceparebrise.fr/reparation-pare-brise/grenoble"
\ No newline at end of file
+street: Avenue Félix Viallet
+housenumber: "36"
+phone: +33 4 76 27 80 39
+opening_hours: Mo-Fr 07:30-19:00; Sa 09:00-17:00; Su off
+website: https://www.franceparebrise.fr/reparation-pare-brise/grenoble
diff --git a/data/cities/grenoble/franprix.yml b/data/cities/grenoble/franprix.yml
index e159272a4..fae504fda 100644
--- a/data/cities/grenoble/franprix.yml
+++ b/data/cities/grenoble/franprix.yml
@@ -4,8 +4,8 @@ latitude: 45.18577
 longitude: 5.71379
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 27
-phone: "+33 4 76 23 43 77"
-opening_hours: "Mo-Sa 07:30-21:00; Su 09:00-13:00"
-website: "https://www.franprix.fr/magasins/4384"
\ No newline at end of file
+street: Rue Nicolas Chorier
+housenumber: "27"
+phone: +33 4 76 23 43 77
+opening_hours: Mo-Sa 07:30-21:00; Su 09:00-13:00
+website: https://www.franprix.fr/magasins/4384
diff --git a/data/cities/grenoble/free.yml b/data/cities/grenoble/free.yml
index 2bd5e6963..0f77316bc 100644
--- a/data/cities/grenoble/free.yml
+++ b/data/cities/grenoble/free.yml
@@ -1,11 +1,11 @@
 id: 1108557933
-type: way
+type: node
 latitude: 45.1574
 longitude: 5.73257
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 100
+street: Avenue du Vercors
+housenumber: "100"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/grenoble/fromagerie-de-lile-verte.yml b/data/cities/grenoble/fromagerie-de-lile-verte.yml
index 7fb861ec0..6a39dd1a7 100644
--- a/data/cities/grenoble/fromagerie-de-lile-verte.yml
+++ b/data/cities/grenoble/fromagerie-de-lile-verte.yml
@@ -4,8 +4,8 @@ latitude: 45.19752
 longitude: 5.73729
 postcode: "38000"
 city: Grenoble
-street: "Avenue Maréchal Randon"
-housenumber: 29
+street: Avenue Maréchal Randon
+housenumber: "29"
 phone: ""
-opening_hours: "Tu-Sa 08:00-12:30,16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-12:30,16:00-19:00
+website: ""
diff --git a/data/cities/grenoble/fromagerie-les-alpages.yml b/data/cities/grenoble/fromagerie-les-alpages.yml
index 7b73de8ce..bd48e817b 100644
--- a/data/cities/grenoble/fromagerie-les-alpages.yml
+++ b/data/cities/grenoble/fromagerie-les-alpages.yml
@@ -4,8 +4,8 @@ latitude: 45.18746
 longitude: 5.72938
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 4
-phone: "+33 4 76 46 32 62"
-opening_hours: "Tu-Sa 06:00-12:30, 15:30-19:30"
-website: "https://les-alpages.fr/"
\ No newline at end of file
+street: Rue de Strasbourg
+housenumber: "4"
+phone: +33 4 76 46 32 62
+opening_hours: Tu-Sa 06:00-12:30, 15:30-19:30
+website: https://les-alpages.fr/
diff --git a/data/cities/grenoble/gamecash.yml b/data/cities/grenoble/gamecash.yml
index 930055d49..8b0d041f1 100644
--- a/data/cities/grenoble/gamecash.yml
+++ b/data/cities/grenoble/gamecash.yml
@@ -4,8 +4,8 @@ latitude: 45.18903
 longitude: 5.72861
 postcode: ""
 city: Grenoble
-street: "Rue Saint-Jacques"
-housenumber: 19
-phone: "+33 476 018 460"
-opening_hours: "Mo 14:00-18:00; Tu-Fr 10:00-12:30,14:00-19:00; Sa 10:00-12:30,13:30-19:00"
-website: "https://www.gamecash.fr/magasin-gamecash-grenoble-m165.html"
\ No newline at end of file
+street: Rue Saint-Jacques
+housenumber: "19"
+phone: +33 476 018 460
+opening_hours: Tu-Sa 10:30-12:30,13:30-18:30
+website: https://www.gamecash.fr/magasin-gamecash-grenoble-m165.html
diff --git a/data/cities/grenoble/garage-des-quais.yml b/data/cities/grenoble/garage-des-quais.yml
index 5e7590174..f94c8be33 100644
--- a/data/cities/grenoble/garage-des-quais.yml
+++ b/data/cities/grenoble/garage-des-quais.yml
@@ -4,8 +4,8 @@ latitude: 45.19683
 longitude: 5.71426
 postcode: "38000"
 city: Grenoble
-street: "Quai de la Graille"
-housenumber: 31
+street: Quai de la Graille
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/garage-lavoisier.yml b/data/cities/grenoble/garage-lavoisier.yml
index 9e5ff6d49..798bdf287 100644
--- a/data/cities/grenoble/garage-lavoisier.yml
+++ b/data/cities/grenoble/garage-lavoisier.yml
@@ -4,8 +4,8 @@ latitude: 45.17963
 longitude: 5.73447
 postcode: "38100"
 city: Grenoble
-street: "Rue Lavoisier"
-housenumber: 8
+street: Rue Lavoisier
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/gibert-joseph-boulevard-gambetta.yml b/data/cities/grenoble/gibert-joseph-boulevard-gambetta.yml
index 78dd29f5d..e56864f97 100644
--- a/data/cities/grenoble/gibert-joseph-boulevard-gambetta.yml
+++ b/data/cities/grenoble/gibert-joseph-boulevard-gambetta.yml
@@ -4,8 +4,8 @@ latitude: 45.18726
 longitude: 5.72366
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Gambetta"
-housenumber: 20
-phone: "+33 4 76 86 43 54"
-opening_hours: "Mo 10:30-19:00; Tu-Sa 09:30-19:00; Su off"
-website: "https://www.gibert.com/stores/grenoble-gibert-joseph-bd-musique-video"
\ No newline at end of file
+street: Boulevard Gambetta
+housenumber: "20"
+phone: +33 4 76 86 43 54
+opening_hours: Mo 10:30-19:00; Tu-Sa 09:30-19:00; Su off
+website: https://www.gibert.com/stores/grenoble-gibert-joseph-bd-musique-video
diff --git a/data/cities/grenoble/gibert-joseph-cours-berriat.yml b/data/cities/grenoble/gibert-joseph-cours-berriat.yml
index 5dae2aa1a..5bdf96d89 100644
--- a/data/cities/grenoble/gibert-joseph-cours-berriat.yml
+++ b/data/cities/grenoble/gibert-joseph-cours-berriat.yml
@@ -4,8 +4,8 @@ latitude: 45.18754
 longitude: 5.72328
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 5
-phone: "+33 4 76 43 93 42"
-opening_hours: "Mo 10:30-19:00; Tu-Sa 10:00-19:00; Su off"
-website: "https://www.gibert.com/stores/grenoble-gibert-joseph-librairie-scolaire-et-universitaire"
\ No newline at end of file
+street: Cours Berriat
+housenumber: "5"
+phone: +33 4 76 43 93 42
+opening_hours: Mo 10:30-19:00; Tu-Sa 10:00-19:00; Su off
+website: https://www.gibert.com/stores/grenoble-gibert-joseph-librairie-scolaire-et-universitaire
diff --git a/data/cities/grenoble/gibert-joseph.yml b/data/cities/grenoble/gibert-joseph.yml
index 2f453f7f0..f44b63f55 100644
--- a/data/cities/grenoble/gibert-joseph.yml
+++ b/data/cities/grenoble/gibert-joseph.yml
@@ -4,8 +4,8 @@ latitude: 45.18805
 longitude: 5.72382
 postcode: "38000"
 city: Grenoble
-street: "Rue Béranger"
-housenumber: 4
-phone: "+33 4 76 43 04 30"
-opening_hours: "Mo 10:30-18:45; Tu-Sa 10:00-18:45; Su off"
-website: "https://www.gibert.com/stores/grenoble-gibert-joseph-librairie-papeterie"
\ No newline at end of file
+street: Rue Béranger
+housenumber: "4"
+phone: +33 4 76 43 04 30
+opening_hours: Mo 10:30-18:45; Tu-Sa 10:00-18:45; Su off
+website: https://www.gibert.com/stores/grenoble-gibert-joseph-librairie-papeterie
diff --git a/data/cities/grenoble/gourmand-et-mignon.yml b/data/cities/grenoble/gourmand-et-mignon.yml
index 63f96af5d..871220c3f 100644
--- a/data/cities/grenoble/gourmand-et-mignon.yml
+++ b/data/cities/grenoble/gourmand-et-mignon.yml
@@ -4,8 +4,8 @@ latitude: 45.18145
 longitude: 5.7247
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Maréchal Foch"
-housenumber: 20
+street: Boulevard Maréchal Foch
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Th,Su 07:30-20:00; Fr 07:30-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th,Su 07:30-20:00; Fr 07:30-16:00
+website: ""
diff --git a/data/cities/grenoble/grain-de-beaute.yml b/data/cities/grenoble/grain-de-beaute.yml
index 9ab53d6ab..36603228f 100644
--- a/data/cities/grenoble/grain-de-beaute.yml
+++ b/data/cities/grenoble/grain-de-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.18253
 longitude: 5.72748
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Gambetta"
-housenumber: 65
+street: Boulevard Gambetta
+housenumber: "65"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00
+website: ""
diff --git a/data/cities/grenoble/grandoptical.yml b/data/cities/grenoble/grandoptical.yml
index 1710a0aa9..fc7eece6e 100644
--- a/data/cities/grenoble/grandoptical.yml
+++ b/data/cities/grenoble/grandoptical.yml
@@ -4,8 +4,8 @@ latitude: 45.19127
 longitude: 5.72733
 postcode: "38000"
 city: Grenoble
-street: "Place Grenette"
-housenumber: 6
-phone: "+33 4 76 44 40 53"
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: "https://opticiens.grandoptical.com/59-opticien-grandoptical-grenoble-centre"
\ No newline at end of file
+street: Place Grenette
+housenumber: "6"
+phone: +33 4 76 44 40 53
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: https://opticiens.grandoptical.com/59-opticien-grandoptical-grenoble-centre
diff --git a/data/cities/grenoble/granit-design.yml b/data/cities/grenoble/granit-design.yml
index eff1bccce..a8c1a1ea0 100644
--- a/data/cities/grenoble/granit-design.yml
+++ b/data/cities/grenoble/granit-design.yml
@@ -4,8 +4,8 @@ latitude: 45.1804
 longitude: 5.70586
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 60
+street: Boulevard Joseph Vallier
+housenumber: "60"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/grenoble-medical-handiworkshop.yml b/data/cities/grenoble/grenoble-medical-handiworkshop.yml
index 4a4c77d46..c62c42465 100644
--- a/data/cities/grenoble/grenoble-medical-handiworkshop.yml
+++ b/data/cities/grenoble/grenoble-medical-handiworkshop.yml
@@ -4,8 +4,8 @@ latitude: 45.18024
 longitude: 5.73561
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jean Perrot"
-housenumber: 29
+street: Avenue Jean Perrot
+housenumber: "29"
 phone: ""
-opening_hours: "Mo 09:30-12:30,13:30-18:00; Tu-Fr 13:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 09:30-12:30,13:30-18:00; Tu-Fr 13:30-18:00
+website: ""
diff --git a/data/cities/grenoble/halimy-market.yml b/data/cities/grenoble/halimy-market.yml
index 15e677d8a..f446dcc85 100644
--- a/data/cities/grenoble/halimy-market.yml
+++ b/data/cities/grenoble/halimy-market.yml
@@ -4,8 +4,8 @@ latitude: 45.17537
 longitude: 5.7151
 postcode: "38100"
 city: Grenoble
-street: "Cours de la Libération et du Général de Gaulle"
-housenumber: 55
+street: Cours de la Libération et du Général de Gaulle
+housenumber: "55"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/hifi-vaudaine.yml b/data/cities/grenoble/hifi-vaudaine.yml
index 2e2f283c2..09cfe3863 100644
--- a/data/cities/grenoble/hifi-vaudaine.yml
+++ b/data/cities/grenoble/hifi-vaudaine.yml
@@ -4,8 +4,8 @@ latitude: 45.18625
 longitude: 5.7234
 postcode: "38000"
 city: Grenoble
-street: "Rue Lakanal"
-housenumber: 5
-phone: "+33 4 76 46 74 98"
-opening_hours: "Tu-Fr 13:00-19:00; Sa 10:30-19:00"
-website: "https://hifivaudaine.com"
\ No newline at end of file
+street: Rue Lakanal
+housenumber: "5"
+phone: +33 4 76 46 74 98
+opening_hours: Tu-Fr 13:00-19:00; Sa 10:30-19:00
+website: https://hifivaudaine.com
diff --git a/data/cities/grenoble/histoire-dor-montres.yml b/data/cities/grenoble/histoire-dor-montres.yml
index eaafd4f1d..268aefdb5 100644
--- a/data/cities/grenoble/histoire-dor-montres.yml
+++ b/data/cities/grenoble/histoire-dor-montres.yml
@@ -1,11 +1,11 @@
 id: 512915171
-type: way
+type: node
 latitude: 45.15821
 longitude: 5.73156
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 50
-phone: "+33 4 76 40 30 63"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/boutiques-restaurants/histoire-d-or-montres"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "50"
+phone: +33 4 76 40 30 63
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/boutiques-restaurants/histoire-d-or-montres
diff --git a/data/cities/grenoble/histoire-dor.yml b/data/cities/grenoble/histoire-dor.yml
index c59d134c2..81b5c77e5 100644
--- a/data/cities/grenoble/histoire-dor.yml
+++ b/data/cities/grenoble/histoire-dor.yml
@@ -1,11 +1,11 @@
 id: 512915195
-type: way
+type: node
 latitude: 45.15831
 longitude: 5.73105
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 58
-phone: "+33 4 76 23 17 08"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Histoire-d-Or-Bijouterie"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "58"
+phone: +33 4 76 23 17 08
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Histoire-d-Or-Bijouterie
diff --git a/data/cities/grenoble/house-of-the-sun.yml b/data/cities/grenoble/house-of-the-sun.yml
index d4eb9aa32..163faeab2 100644
--- a/data/cities/grenoble/house-of-the-sun.yml
+++ b/data/cities/grenoble/house-of-the-sun.yml
@@ -4,8 +4,8 @@ latitude: 45.18565
 longitude: 5.72311
 postcode: "38000"
 city: Grenoble
-street: "Rue Lesdiguières"
-housenumber: 50
+street: Rue Lesdiguières
+housenumber: "50"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/grenoble/ikks.yml b/data/cities/grenoble/ikks.yml
index dae3435e1..542d08a93 100644
--- a/data/cities/grenoble/ikks.yml
+++ b/data/cities/grenoble/ikks.yml
@@ -1,11 +1,11 @@
 id: 512899510
-type: way
+type: node
 latitude: 45.15774
 longitude: 5.73176
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 89
-phone: "+33 4 76 22 85 69"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/IKKS-Women-Junior"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "89"
+phone: +33 4 76 22 85 69
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/IKKS-Women-Junior
diff --git a/data/cities/grenoble/ile-aux-tresors.yml b/data/cities/grenoble/ile-aux-tresors.yml
index aad5f5b2c..4f8a30a9f 100644
--- a/data/cities/grenoble/ile-aux-tresors.yml
+++ b/data/cities/grenoble/ile-aux-tresors.yml
@@ -4,8 +4,8 @@ latitude: 45.19217
 longitude: 5.73177
 postcode: "38000"
 city: Grenoble
-street: "Rue Saint-Hugues"
-housenumber: 
+street: Rue Saint-Hugues
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/grenoble/imprimerie-armand.yml b/data/cities/grenoble/imprimerie-armand.yml
index e7ed392b2..2db1c549f 100644
--- a/data/cities/grenoble/imprimerie-armand.yml
+++ b/data/cities/grenoble/imprimerie-armand.yml
@@ -4,8 +4,8 @@ latitude: 45.19176
 longitude: 5.71994
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 2
+street: Cours Jean Jaurès
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:30,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:30,14:00-18:00
+website: ""
diff --git a/data/cities/grenoble/indigo.yml b/data/cities/grenoble/indigo.yml
index d7c23c254..38085159a 100644
--- a/data/cities/grenoble/indigo.yml
+++ b/data/cities/grenoble/indigo.yml
@@ -4,8 +4,8 @@ latitude: 45.18799
 longitude: 5.72877
 postcode: "38000"
 city: Grenoble
-street: "Place de l'Étoile"
-housenumber: 1
+street: Place de l'Étoile
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://www.boutiqueindigogrenoble.com/"
\ No newline at end of file
+website: https://www.boutiqueindigogrenoble.com/
diff --git a/data/cities/grenoble/insomnight.yml b/data/cities/grenoble/insomnight.yml
index 61abe4518..317a70d16 100644
--- a/data/cities/grenoble/insomnight.yml
+++ b/data/cities/grenoble/insomnight.yml
@@ -4,8 +4,8 @@ latitude: 45.17745
 longitude: 5.71582
 postcode: "38100"
 city: Grenoble
-street: "Cours de la Libération et du Général de Gaulle"
-housenumber: 29
-phone: "+33 4 76 87 31 88"
+street: Cours de la Libération et du Général de Gaulle
+housenumber: "29"
+phone: +33 4 76 87 31 88
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/instinct-tifs.yml b/data/cities/grenoble/instinct-tifs.yml
index e2c4078e2..aa67134a7 100644
--- a/data/cities/grenoble/instinct-tifs.yml
+++ b/data/cities/grenoble/instinct-tifs.yml
@@ -4,8 +4,8 @@ latitude: 45.19079
 longitude: 5.72503
 postcode: "38000"
 city: Grenoble
-street: "Rue de Belgrade"
-housenumber: 10
-phone: "+33 4 76 47 38 56"
+street: Rue de Belgrade
+housenumber: "10"
+phone: +33 4 76 47 38 56
 opening_hours: ""
-website: "http://www.instinctifs.fr/"
\ No newline at end of file
+website: http://www.instinctifs.fr/
diff --git a/data/cities/grenoble/interlude-espace-coiffure.yml b/data/cities/grenoble/interlude-espace-coiffure.yml
index 267119217..acd632200 100644
--- a/data/cities/grenoble/interlude-espace-coiffure.yml
+++ b/data/cities/grenoble/interlude-espace-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.18764
 longitude: 5.72157
 postcode: "38000"
 city: Grenoble
-street: "Rue Thiers"
-housenumber: 15
-phone: "+33 4 76 46 32 39"
-opening_hours: "Tu-Fr 09:30-19:00; Sa 09:30-18:00"
-website: "http://www.interlude-espace-coiffure.fr/"
\ No newline at end of file
+street: Rue Thiers
+housenumber: "15"
+phone: +33 4 76 46 32 39
+opening_hours: Tu-Fr 09:30-19:00; Sa 09:30-18:00
+website: http://www.interlude-espace-coiffure.fr/
diff --git a/data/cities/grenoble/intermarche-boulevard-marechal-foch.yml b/data/cities/grenoble/intermarche-boulevard-marechal-foch.yml
index f79d147b9..f57fe88b4 100644
--- a/data/cities/grenoble/intermarche-boulevard-marechal-foch.yml
+++ b/data/cities/grenoble/intermarche-boulevard-marechal-foch.yml
@@ -1,11 +1,11 @@
 id: 27108404
-type: way
+type: node
 latitude: 45.18085
 longitude: 5.72559
 postcode: "38100"
 city: Grenoble
-street: "Boulevard Maréchal Foch"
-housenumber: 13
+street: Boulevard Maréchal Foch
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Sa 08:15-20:00; Su 08:15-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:15-20:00; Su 08:15-12:45
+website: ""
diff --git a/data/cities/grenoble/intermarche-route-de-lyon.yml b/data/cities/grenoble/intermarche-route-de-lyon.yml
index 3bb6041b0..9a9a61177 100644
--- a/data/cities/grenoble/intermarche-route-de-lyon.yml
+++ b/data/cities/grenoble/intermarche-route-de-lyon.yml
@@ -1,11 +1,11 @@
 id: 68281813
-type: way
+type: node
 latitude: 45.19577
 longitude: 5.71884
 postcode: ""
 city: Grenoble
-street: "Route de Lyon"
-housenumber: 15
+street: Route de Lyon
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/grenoble/intermarche.yml b/data/cities/grenoble/intermarche.yml
index e381a1089..24bcb2576 100644
--- a/data/cities/grenoble/intermarche.yml
+++ b/data/cities/grenoble/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.18833
 longitude: 5.72075
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
+street: Cours Berriat
 housenumber: 26-28
-phone: "+33 4 76 86 57 00"
-opening_hours: "Mo-Sa 08:15-20:00; Su 08:15-12:45"
-website: "https://www.intermarche.com/magasins/11679/Grenoble-38000/infos-pratiques"
\ No newline at end of file
+phone: +33 4 76 86 57 00
+opening_hours: Mo-Sa 08:15-20:00; Su 08:15-12:45
+website: https://www.intermarche.com/magasins/11679/Grenoble-38000/infos-pratiques
diff --git a/data/cities/grenoble/intersport.yml b/data/cities/grenoble/intersport.yml
index 5963bccb5..b1e70b292 100644
--- a/data/cities/grenoble/intersport.yml
+++ b/data/cities/grenoble/intersport.yml
@@ -1,11 +1,11 @@
 id: 512898605
-type: way
+type: node
 latitude: 45.15728
 longitude: 5.73258
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 105
+street: Avenue du Vercors
+housenumber: "105"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/jardin-du-the.yml b/data/cities/grenoble/jardin-du-the.yml
index d4af739eb..d9f26d7c3 100644
--- a/data/cities/grenoble/jardin-du-the.yml
+++ b/data/cities/grenoble/jardin-du-the.yml
@@ -4,8 +4,8 @@ latitude: 45.18875
 longitude: 5.72759
 postcode: "38000"
 city: Grenoble
-street: "Rue Millet"
-housenumber: 1
-phone: "+33 7 63 51 46 38"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://jardin-du-the.com"
\ No newline at end of file
+street: Rue Millet
+housenumber: "1"
+phone: +33 7 63 51 46 38
+opening_hours: Mo-Sa 09:30-20:00
+website: https://jardin-du-the.com
diff --git a/data/cities/grenoble/jean-pascal-in.yml b/data/cities/grenoble/jean-pascal-in.yml
index c83395918..06634806d 100644
--- a/data/cities/grenoble/jean-pascal-in.yml
+++ b/data/cities/grenoble/jean-pascal-in.yml
@@ -4,8 +4,8 @@ latitude: 45.18741
 longitude: 5.73001
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 5
+street: Rue de Strasbourg
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/jennyfer.yml b/data/cities/grenoble/jennyfer.yml
index ac7628449..ccdf0bb7e 100644
--- a/data/cities/grenoble/jennyfer.yml
+++ b/data/cities/grenoble/jennyfer.yml
@@ -1,11 +1,11 @@
 id: 512917498
-type: way
+type: node
 latitude: 45.15796
 longitude: 5.73282
 postcode: "38100"
 city: Grenoble
-street: "Avenue de Belledonne"
-housenumber: 16
-phone: "+33 4 76 29 13 52"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Jennyfer"
\ No newline at end of file
+street: Avenue de Belledonne
+housenumber: "16"
+phone: +33 4 76 29 13 52
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Jennyfer
diff --git a/data/cities/grenoble/jeux-du-monde.yml b/data/cities/grenoble/jeux-du-monde.yml
index e98ff46d1..b4ce587fc 100644
--- a/data/cities/grenoble/jeux-du-monde.yml
+++ b/data/cities/grenoble/jeux-du-monde.yml
@@ -4,8 +4,8 @@ latitude: 45.18663
 longitude: 5.72386
 postcode: "38000"
 city: Grenoble
-street: "Rue Lakanal"
-housenumber: 1
+street: Rue Lakanal
+housenumber: "1"
 phone: "+33954734834"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.jeuxdumonde.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.jeuxdumonde.com/
diff --git a/data/cities/grenoble/joan-sellerie.yml b/data/cities/grenoble/joan-sellerie.yml
index daa9ccc52..fb571548d 100644
--- a/data/cities/grenoble/joan-sellerie.yml
+++ b/data/cities/grenoble/joan-sellerie.yml
@@ -4,8 +4,8 @@ latitude: 45.19386
 longitude: 5.71521
 postcode: "38000"
 city: Grenoble
-street: "Rue Jean Macé"
-housenumber: 28
-phone: "+33 6 33 28 40 54"
-opening_hours: "Mo-Th 8:30-12:00,14:00-18:00 ; Fr 8:30-12:00,14:00-16:00 ;"
-website: "https://www.joansellerie.fr"
\ No newline at end of file
+street: Rue Jean Macé
+housenumber: "28"
+phone: +33 6 33 28 40 54
+opening_hours: Mo-Th 8:30-12:00,14:00-18:00 ; Fr 8:30-12:00,14:00-16:00 ;
+website: https://www.joansellerie.fr
diff --git a/data/cities/grenoble/jules-avenue-de-la-chartreuse.yml b/data/cities/grenoble/jules-avenue-de-la-chartreuse.yml
index 5d2f3e799..ef53a4557 100644
--- a/data/cities/grenoble/jules-avenue-de-la-chartreuse.yml
+++ b/data/cities/grenoble/jules-avenue-de-la-chartreuse.yml
@@ -1,11 +1,11 @@
 id: 512915189
-type: way
+type: node
 latitude: 45.15831
 longitude: 5.73135
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 54
-phone: "+33 4 76 22 78 19"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Jules"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "54"
+phone: +33 4 76 22 78 19
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Jules
diff --git a/data/cities/grenoble/jules.yml b/data/cities/grenoble/jules.yml
index 9c5b9ccab..e14fcf9ff 100644
--- a/data/cities/grenoble/jules.yml
+++ b/data/cities/grenoble/jules.yml
@@ -4,8 +4,8 @@ latitude: 45.18979
 longitude: 5.72686
 postcode: "38000"
 city: Grenoble
-street: "Rue de la Poste"
+street: Rue de la Poste
 housenumber: 4;6
-phone: "+33 4 76 27 35 86"
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: "https://www.jules.com/fr-fr/magasins/16001204/"
\ No newline at end of file
+phone: +33 4 76 27 35 86
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: https://www.jules.com/fr-fr/magasins/16001204/
diff --git a/data/cities/grenoble/k-store.yml b/data/cities/grenoble/k-store.yml
index 4c50937c2..4b5acafa5 100644
--- a/data/cities/grenoble/k-store.yml
+++ b/data/cities/grenoble/k-store.yml
@@ -1,11 +1,11 @@
 id: 31527837
-type: way
+type: node
 latitude: 45.18832
 longitude: 5.72025
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
+street: Cours Berriat
 housenumber: 26-28
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/kaporal.yml b/data/cities/grenoble/kaporal.yml
index eab2e1f7a..ffc8e47a8 100644
--- a/data/cities/grenoble/kaporal.yml
+++ b/data/cities/grenoble/kaporal.yml
@@ -1,11 +1,11 @@
 id: 512900586
-type: way
+type: node
 latitude: 45.15792
 longitude: 5.73143
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 81
-phone: "+33 4 76 09 89 68"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Kaporal"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "81"
+phone: +33 4 76 09 89 68
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Kaporal
diff --git a/data/cities/grenoble/keiraliss.yml b/data/cities/grenoble/keiraliss.yml
index 335ae078e..d9c2f1e83 100644
--- a/data/cities/grenoble/keiraliss.yml
+++ b/data/cities/grenoble/keiraliss.yml
@@ -4,8 +4,8 @@ latitude: 45.18594
 longitude: 5.71785
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 2
+street: Rue Nicolas Chorier
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/kozma-ski-service.yml b/data/cities/grenoble/kozma-ski-service.yml
index 822c98098..dd28c8d73 100644
--- a/data/cities/grenoble/kozma-ski-service.yml
+++ b/data/cities/grenoble/kozma-ski-service.yml
@@ -4,8 +4,8 @@ latitude: 45.18275
 longitude: 5.70643
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 84
+street: Rue Nicolas Chorier
+housenumber: "84"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:00,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00,15:00-19:00
+website: ""
diff --git a/data/cities/grenoble/krys.yml b/data/cities/grenoble/krys.yml
index d5924ea1e..32da63cdd 100644
--- a/data/cities/grenoble/krys.yml
+++ b/data/cities/grenoble/krys.yml
@@ -1,11 +1,11 @@
 id: 512917499
-type: way
+type: node
 latitude: 45.15805
 longitude: 5.73282
 postcode: "38100"
 city: Grenoble
-street: "Avenue de Belledonne"
-housenumber: 18
-phone: "+33 4 76 33 22 44"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Krys"
\ No newline at end of file
+street: Avenue de Belledonne
+housenumber: "18"
+phone: +33 4 76 33 22 44
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Krys
diff --git a/data/cities/grenoble/la-barquette.yml b/data/cities/grenoble/la-barquette.yml
index 62c21b4d1..eda7503fb 100644
--- a/data/cities/grenoble/la-barquette.yml
+++ b/data/cities/grenoble/la-barquette.yml
@@ -4,8 +4,8 @@ latitude: 45.17274
 longitude: 5.70316
 postcode: "38100"
 city: Grenoble
-street: "Rue Anatole France"
-housenumber: 88
+street: Rue Anatole France
+housenumber: "88"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/la-belle-histoire.yml b/data/cities/grenoble/la-belle-histoire.yml
index c7ddc5dbc..41674be15 100644
--- a/data/cities/grenoble/la-belle-histoire.yml
+++ b/data/cities/grenoble/la-belle-histoire.yml
@@ -4,8 +4,8 @@ latitude: 45.18879
 longitude: 5.72798
 postcode: ""
 city: Grenoble
-street: "Rue de la Poste"
-housenumber: 
+street: Rue de la Poste
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/la-bonne-pioche.yml b/data/cities/grenoble/la-bonne-pioche.yml
index 74280cfa3..7da8ca803 100644
--- a/data/cities/grenoble/la-bonne-pioche.yml
+++ b/data/cities/grenoble/la-bonne-pioche.yml
@@ -4,8 +4,8 @@ latitude: 45.18894
 longitude: 5.729
 postcode: "38000"
 city: Grenoble
-street: "Rue Condillac"
-housenumber: 2
-phone: "+33 4 38 38 31 22"
-opening_hours: "Mo-Fr 9:00-19:30; Sa 9:00-19:00"
-website: "https://www.labonnepiochegrenoble.com"
\ No newline at end of file
+street: Rue Condillac
+housenumber: "2"
+phone: +33 4 38 38 31 22
+opening_hours: Mo-Fr 9:00-19:30; Sa 9:00-19:00
+website: https://www.labonnepiochegrenoble.com
diff --git a/data/cities/grenoble/la-centrale-jardinerie.yml b/data/cities/grenoble/la-centrale-jardinerie.yml
index 5238290ef..293195a25 100644
--- a/data/cities/grenoble/la-centrale-jardinerie.yml
+++ b/data/cities/grenoble/la-centrale-jardinerie.yml
@@ -4,8 +4,8 @@ latitude: 45.18819
 longitude: 5.72681
 postcode: "38000"
 city: Grenoble
-street: "Square Docteur Léon Martin"
-housenumber: 6
-phone: "+33 9 81 11 78 49"
-opening_hours: "Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Square Docteur Léon Martin
+housenumber: "6"
+phone: +33 9 81 11 78 49
+opening_hours: Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/grenoble/la-corbeille-de-sophie.yml b/data/cities/grenoble/la-corbeille-de-sophie.yml
index c9dca897a..c0eca0fed 100644
--- a/data/cities/grenoble/la-corbeille-de-sophie.yml
+++ b/data/cities/grenoble/la-corbeille-de-sophie.yml
@@ -4,8 +4,8 @@ latitude: 45.18894
 longitude: 5.70542
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 166
+street: Cours Berriat
+housenumber: "166"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:30, Mo,We,Fr 16:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:30, Mo,We,Fr 16:00-18:00
+website: ""
diff --git a/data/cities/grenoble/la-derailleuse.yml b/data/cities/grenoble/la-derailleuse.yml
index 2a3060451..fe8b5de34 100644
--- a/data/cities/grenoble/la-derailleuse.yml
+++ b/data/cities/grenoble/la-derailleuse.yml
@@ -4,8 +4,8 @@ latitude: 45.18032
 longitude: 5.72633
 postcode: "38100"
 city: Grenoble
-street: "Rue de Stalingrad"
-housenumber: 24
+street: Rue de Stalingrad
+housenumber: "24"
 phone: ""
-opening_hours: "Mo,Tu,Th, Fr: 17:00-19:00; We: 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: 'Mo,Tu,Th, Fr: 17:00-19:00; We: 09:30-12:30'
+website: ""
diff --git a/data/cities/grenoble/la-ferme-de-bonne.yml b/data/cities/grenoble/la-ferme-de-bonne.yml
index c75eae2db..ae1eb6ddd 100644
--- a/data/cities/grenoble/la-ferme-de-bonne.yml
+++ b/data/cities/grenoble/la-ferme-de-bonne.yml
@@ -4,8 +4,8 @@ latitude: 45.18312
 longitude: 5.72506
 postcode: "38000"
 city: Grenoble
-street: "Allée Henri Frenay"
-housenumber: 14
-phone: "+33 4 76 43 34 46"
-opening_hours: "We-Fr 09:00-19:00; Sa 09:00-18:00"
-website: "https://www.facebook.com/lafermedebonne/"
\ No newline at end of file
+street: Allée Henri Frenay
+housenumber: "14"
+phone: +33 4 76 43 34 46
+opening_hours: We-Fr 09:00-19:00; Sa 09:00-18:00
+website: https://www.facebook.com/lafermedebonne/
diff --git a/data/cities/grenoble/la-fournee.yml b/data/cities/grenoble/la-fournee.yml
index 9dfe1e531..e957f22b1 100644
--- a/data/cities/grenoble/la-fournee.yml
+++ b/data/cities/grenoble/la-fournee.yml
@@ -4,8 +4,8 @@ latitude: 45.17985
 longitude: 5.71661
 postcode: ""
 city: Grenoble
-street: "Cours de la Libération et du Général de Gaulle"
-housenumber: 5
+street: Cours de la Libération et du Général de Gaulle
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/grenoble/la-gerbe-dor.yml b/data/cities/grenoble/la-gerbe-dor.yml
index 320d05dd4..a52b0a81e 100644
--- a/data/cities/grenoble/la-gerbe-dor.yml
+++ b/data/cities/grenoble/la-gerbe-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.19874
 longitude: 5.73836
 postcode: "38000"
 city: Grenoble
-street: "Place du Grésivaudan"
-housenumber: 4
+street: Place du Grésivaudan
+housenumber: "4"
 phone: ""
-opening_hours: "Tu-Sa 06:30-19:30; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:30-19:30; Su 06:30-13:00
+website: ""
diff --git a/data/cities/grenoble/la-laverie-boulevard-marechal-foch.yml b/data/cities/grenoble/la-laverie-boulevard-marechal-foch.yml
index 415adbfd7..85f880844 100644
--- a/data/cities/grenoble/la-laverie-boulevard-marechal-foch.yml
+++ b/data/cities/grenoble/la-laverie-boulevard-marechal-foch.yml
@@ -4,8 +4,8 @@ latitude: 45.18104
 longitude: 5.7225
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Maréchal Foch"
-housenumber: 36
-phone: "+33 6 77 54 22 77"
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+street: Boulevard Maréchal Foch
+housenumber: "36"
+phone: +33 6 77 54 22 77
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/grenoble/la-laverie.yml b/data/cities/grenoble/la-laverie.yml
index 78af2e8b2..a25bb6d4c 100644
--- a/data/cities/grenoble/la-laverie.yml
+++ b/data/cities/grenoble/la-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.16684
 longitude: 5.72821
 postcode: "38000"
 city: Grenoble
-street: "Avenue Marie Reynoard"
+street: Avenue Marie Reynoard
 housenumber: 8bis
-phone: "+33 6 77 54 22 77"
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+phone: +33 6 77 54 22 77
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/grenoble/la-moisson.yml b/data/cities/grenoble/la-moisson.yml
index 70af81535..803a5923c 100644
--- a/data/cities/grenoble/la-moisson.yml
+++ b/data/cities/grenoble/la-moisson.yml
@@ -4,8 +4,8 @@ latitude: 45.17205
 longitude: 5.72463
 postcode: "38100"
 city: Grenoble
-street: "Rue de Stalingrad"
+street: Rue de Stalingrad
 housenumber: 105 bis
 phone: ""
-opening_hours: "Mo-Sa 05:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 05:30-20:00
+website: ""
diff --git a/data/cities/grenoble/la-randonnee.yml b/data/cities/grenoble/la-randonnee.yml
index 2d33914b1..74a3839b6 100644
--- a/data/cities/grenoble/la-randonnee.yml
+++ b/data/cities/grenoble/la-randonnee.yml
@@ -4,8 +4,8 @@ latitude: 45.18076
 longitude: 5.72679
 postcode: "38100"
 city: Grenoble
-street: "Rue de Stalingrad"
-housenumber: 13
+street: Rue de Stalingrad
+housenumber: "13"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:30, Tu-Fr 14:30-19:00, Sa 14:30-18:00"
-website: "https://larandonnee.boutique/"
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30, Tu-Fr 14:30-19:00, Sa 14:30-18:00
+website: https://larandonnee.boutique/
diff --git a/data/cities/grenoble/la-remise.yml b/data/cities/grenoble/la-remise.yml
index d5433a220..4e6d133bf 100644
--- a/data/cities/grenoble/la-remise.yml
+++ b/data/cities/grenoble/la-remise.yml
@@ -4,8 +4,8 @@ latitude: 45.17752
 longitude: 5.72449
 postcode: "38100"
 city: Grenoble
-street: "Rue du Général Ferrié"
-housenumber: 35
-phone: "+33 4 76 46 02 94"
-opening_hours: "Tu-Sa 09:30-12:30, 14:00-17:45"
-website: "https://www.laremise-asso.org/"
\ No newline at end of file
+street: Rue du Général Ferrié
+housenumber: "35"
+phone: +33 4 76 46 02 94
+opening_hours: Tu-Sa 09:30-12:30, 14:00-17:45
+website: https://www.laremise-asso.org/
diff --git a/data/cities/grenoble/la-ressource.yml b/data/cities/grenoble/la-ressource.yml
index d43510fd8..b143d28b1 100644
--- a/data/cities/grenoble/la-ressource.yml
+++ b/data/cities/grenoble/la-ressource.yml
@@ -4,8 +4,8 @@ latitude: 45.17377
 longitude: 5.73065
 postcode: "38100"
 city: Grenoble
-street: "Rue Émile Zola"
-housenumber: 3
-phone: "+33 4 76 17 14 92"
-opening_hours: "Tu,Th 10:00-17:00"
-website: ""
\ No newline at end of file
+street: Rue Émile Zola
+housenumber: "3"
+phone: +33 4 76 17 14 92
+opening_hours: Tu,Th 10:00-17:00
+website: ""
diff --git a/data/cities/grenoble/la-roue-libre.yml b/data/cities/grenoble/la-roue-libre.yml
index 4132546f6..594ee263d 100644
--- a/data/cities/grenoble/la-roue-libre.yml
+++ b/data/cities/grenoble/la-roue-libre.yml
@@ -4,8 +4,8 @@ latitude: 45.17751
 longitude: 5.70988
 postcode: "38100"
 city: Grenoble
-street: "Rue des Eaux Claires"
-housenumber: 24
+street: Rue des Eaux Claires
+housenumber: "24"
 phone: ""
-opening_hours: "Mo-Fr 11:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 11:00-19:00
+website: ""
diff --git a/data/cities/grenoble/la-soupe-aux-cailloux.yml b/data/cities/grenoble/la-soupe-aux-cailloux.yml
index 914fd63ed..6131b7e93 100644
--- a/data/cities/grenoble/la-soupe-aux-cailloux.yml
+++ b/data/cities/grenoble/la-soupe-aux-cailloux.yml
@@ -4,8 +4,8 @@ latitude: 45.17597
 longitude: 5.73795
 postcode: "38100"
 city: Grenoble
-street: "Rue de la Station Ponsard"
+street: Rue de la Station Ponsard
 housenumber: 4a
 phone: ""
-opening_hours: "Tu-Th 17:00-20:00"
-website: "https://lasoupeauxcailloux.com"
\ No newline at end of file
+opening_hours: Tu-Th 17:00-20:00
+website: https://lasoupeauxcailloux.com
diff --git a/data/cities/grenoble/la-talemelerie-rue-ampere.yml b/data/cities/grenoble/la-talemelerie-rue-ampere.yml
index 9637014d3..0ca8c28a2 100644
--- a/data/cities/grenoble/la-talemelerie-rue-ampere.yml
+++ b/data/cities/grenoble/la-talemelerie-rue-ampere.yml
@@ -4,8 +4,8 @@ latitude: 45.18576
 longitude: 5.70592
 postcode: "38000"
 city: Grenoble
-street: "Rue Ampère"
-housenumber: 29
-phone: "+33 4 76 47 84 49"
-opening_hours: "Mo-Fr 06:30-19:00; Sa 07:00-13:30"
-website: "https://www.latalemelerie.com/"
\ No newline at end of file
+street: Rue Ampère
+housenumber: "29"
+phone: +33 4 76 47 84 49
+opening_hours: Mo-Fr 06:30-19:00; Sa 07:00-13:30
+website: https://www.latalemelerie.com/
diff --git a/data/cities/grenoble/la-talemelerie.yml b/data/cities/grenoble/la-talemelerie.yml
index c98dfa6e9..adfb2429f 100644
--- a/data/cities/grenoble/la-talemelerie.yml
+++ b/data/cities/grenoble/la-talemelerie.yml
@@ -4,8 +4,8 @@ latitude: 45.19105
 longitude: 5.73023
 postcode: "38000"
 city: Grenoble
-street: "Place Sainte-Claire"
-housenumber: 12
-phone: "+33 4 76 42 08 34"
-opening_hours: "Mo-Fr 06:45-20:00; Sa 06:45-19:30; Su 06:45-13:30"
-website: "https://www.latalemelerie.com/"
\ No newline at end of file
+street: Place Sainte-Claire
+housenumber: "12"
+phone: +33 4 76 42 08 34
+opening_hours: Mo-Fr 06:45-20:00; Sa 06:45-19:30; Su 06:45-13:30
+website: https://www.latalemelerie.com/
diff --git a/data/cities/grenoble/label-tete.yml b/data/cities/grenoble/label-tete.yml
index dcb20b26b..0bedce781 100644
--- a/data/cities/grenoble/label-tete.yml
+++ b/data/cities/grenoble/label-tete.yml
@@ -5,7 +5,7 @@ longitude: 5.72863
 postcode: "38100"
 city: Grenoble
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/lanae-tricot.yml b/data/cities/grenoble/lanae-tricot.yml
index a1f0d1a5a..5c7a107a3 100644
--- a/data/cities/grenoble/lanae-tricot.yml
+++ b/data/cities/grenoble/lanae-tricot.yml
@@ -4,8 +4,8 @@ latitude: 45.1864
 longitude: 5.72255
 postcode: "38000"
 city: Grenoble
-street: "Rue Génissieu"
-housenumber: 5
+street: Rue Génissieu
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:30,14:00-19:00"
-website: "https://www.lanae-tricot.com/"
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30,14:00-19:00
+website: https://www.lanae-tricot.com/
diff --git a/data/cities/grenoble/lapericerie.yml b/data/cities/grenoble/lapericerie.yml
index 524f1cd5a..1856ddbc3 100644
--- a/data/cities/grenoble/lapericerie.yml
+++ b/data/cities/grenoble/lapericerie.yml
@@ -4,8 +4,8 @@ latitude: 45.18423
 longitude: 5.71808
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 83
+street: Cours Jean Jaurès
+housenumber: "83"
 phone: ""
-opening_hours: "Mo off; Tu-Fr 10:00-14:30,16:30-22:00; Sa 10:00-23:00; Su 10:00-14:00"
-website: "https://apericerie.fr/"
\ No newline at end of file
+opening_hours: Mo off; Tu-Fr 10:00-14:30,16:30-22:00; Sa 10:00-23:00; Su 10:00-14:00
+website: https://apericerie.fr/
diff --git a/data/cities/grenoble/larret-gourmand.yml b/data/cities/grenoble/larret-gourmand.yml
index 5f23a0cce..78fb2e42f 100644
--- a/data/cities/grenoble/larret-gourmand.yml
+++ b/data/cities/grenoble/larret-gourmand.yml
@@ -4,8 +4,8 @@ latitude: 45.18988
 longitude: 5.71584
 postcode: "38000"
 city: Grenoble
-street: "Place de la Gare"
-housenumber: 4
-phone: "+33 4 76 87 34 17"
-opening_hours: "Mo-Fr 04:00-19:45; Sa 04:00-15:00"
-website: ""
\ No newline at end of file
+street: Place de la Gare
+housenumber: "4"
+phone: +33 4 76 87 34 17
+opening_hours: Mo-Fr 04:00-19:45; Sa 04:00-15:00
+website: ""
diff --git a/data/cities/grenoble/lart-du-velo.yml b/data/cities/grenoble/lart-du-velo.yml
index 9204dc5dd..24f06499c 100644
--- a/data/cities/grenoble/lart-du-velo.yml
+++ b/data/cities/grenoble/lart-du-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.19039
 longitude: 5.73301
 postcode: "38000"
 city: Grenoble
-street: "Rue Abbé de la Salle"
-housenumber: 1
+street: Rue Abbé de la Salle
+housenumber: "1"
 phone: ""
-opening_hours: "Tu,Th 10:00-12:30, 14:00-19:00; We,Fr,Sa 10:00-12:30, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Th 10:00-12:30, 14:00-19:00; We,Fr,Sa 10:00-12:30, 14:00-18:00
+website: ""
diff --git a/data/cities/grenoble/latelier-de-francoise-tapissiere-decoratrice.yml b/data/cities/grenoble/latelier-de-francoise-tapissiere-decoratrice.yml
index 022cd8db5..7bf11f1e4 100644
--- a/data/cities/grenoble/latelier-de-francoise-tapissiere-decoratrice.yml
+++ b/data/cities/grenoble/latelier-de-francoise-tapissiere-decoratrice.yml
@@ -4,8 +4,8 @@ latitude: 45.18668
 longitude: 5.73214
 postcode: "38000"
 city: Grenoble
-street: "Rue Champollion"
-housenumber: 16
+street: Rue Champollion
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: "https://www.tapisserie-rideaux-grenoble.fr/"
\ No newline at end of file
+website: https://www.tapisserie-rideaux-grenoble.fr/
diff --git a/data/cities/grenoble/laverie-2000.yml b/data/cities/grenoble/laverie-2000.yml
index 43a780481..1a2a1f612 100644
--- a/data/cities/grenoble/laverie-2000.yml
+++ b/data/cities/grenoble/laverie-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.18171
 longitude: 5.74458
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jeanne d'Arc"
-housenumber: 56
+street: Avenue Jeanne d'Arc
+housenumber: "56"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/laverie-automatique-2000.yml b/data/cities/grenoble/laverie-automatique-2000.yml
index 8cce4c7a9..75114cc04 100644
--- a/data/cities/grenoble/laverie-automatique-2000.yml
+++ b/data/cities/grenoble/laverie-automatique-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.1888
 longitude: 5.70763
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 152
+street: Cours Berriat
+housenumber: "152"
 phone: ""
-opening_hours: "Mo-Su 07:00-21:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-21:30
+website: ""
diff --git a/data/cities/grenoble/laverie-berriat.yml b/data/cities/grenoble/laverie-berriat.yml
index 78b8692fb..a86b2e82c 100644
--- a/data/cities/grenoble/laverie-berriat.yml
+++ b/data/cities/grenoble/laverie-berriat.yml
@@ -4,8 +4,8 @@ latitude: 45.18824
 longitude: 5.71721
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 58
-phone: "+33 6 11 95 30 30; +33 4 76 96 28 03"
-opening_hours: "Mo-Su 07:00-21:00"
-website: "http://www.laverie-grenoble.fr/laverie-berriat"
\ No newline at end of file
+street: Cours Berriat
+housenumber: "58"
+phone: +33 6 11 95 30 30; +33 4 76 96 28 03
+opening_hours: Mo-Su 07:00-21:00
+website: http://www.laverie-grenoble.fr/laverie-berriat
diff --git a/data/cities/grenoble/laverie-bleu-claire.yml b/data/cities/grenoble/laverie-bleu-claire.yml
index 7c9488566..613c74cad 100644
--- a/data/cities/grenoble/laverie-bleu-claire.yml
+++ b/data/cities/grenoble/laverie-bleu-claire.yml
@@ -4,8 +4,8 @@ latitude: 45.19463
 longitude: 5.72801
 postcode: "38000"
 city: Grenoble
-street: "Quai Perrière"
-housenumber: 10
-phone: "+33 4 76 47 01 41"
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+street: Quai Perrière
+housenumber: "10"
+phone: +33 4 76 47 01 41
+opening_hours: Mo-Su 07:00-20:00
+website: ""
diff --git a/data/cities/grenoble/laverie-by-kis-wash.yml b/data/cities/grenoble/laverie-by-kis-wash.yml
index 17a79403d..35a2eabe7 100644
--- a/data/cities/grenoble/laverie-by-kis-wash.yml
+++ b/data/cities/grenoble/laverie-by-kis-wash.yml
@@ -4,8 +4,8 @@ latitude: 45.1857
 longitude: 5.74674
 postcode: "38100"
 city: Grenoble
-street: "Chemin de la Blanchisserie"
-housenumber: 1
-phone: "+33 6 69 44 38 02"
-opening_hours: "Mo-Su 07:00-22:00"
-website: ""
\ No newline at end of file
+street: Chemin de la Blanchisserie
+housenumber: "1"
+phone: +33 6 69 44 38 02
+opening_hours: Mo-Su 07:00-22:00
+website: ""
diff --git a/data/cities/grenoble/laverie-de-lile-verte.yml b/data/cities/grenoble/laverie-de-lile-verte.yml
index ccbec5628..ea657eadf 100644
--- a/data/cities/grenoble/laverie-de-lile-verte.yml
+++ b/data/cities/grenoble/laverie-de-lile-verte.yml
@@ -4,8 +4,8 @@ latitude: 45.19812
 longitude: 5.7377
 postcode: "38000"
 city: Grenoble
-street: "Avenue Maréchal Randon"
+street: Avenue Maréchal Randon
 housenumber: 16bis
-phone: "+33 6 61 46 00 58"
-opening_hours: "Mo-Su 07:30-21:30"
-website: "https://www.washndry-concept.com/laverie/laverie-lile-verte-grenoble/"
\ No newline at end of file
+phone: +33 6 61 46 00 58
+opening_hours: Mo-Su 07:30-21:30
+website: https://www.washndry-concept.com/laverie/laverie-lile-verte-grenoble/
diff --git a/data/cities/grenoble/laverie-jean-perrot.yml b/data/cities/grenoble/laverie-jean-perrot.yml
index 9eeb438c2..9f78999f3 100644
--- a/data/cities/grenoble/laverie-jean-perrot.yml
+++ b/data/cities/grenoble/laverie-jean-perrot.yml
@@ -1,11 +1,11 @@
 id: 50184981
-type: way
+type: node
 latitude: 45.18087
 longitude: 5.73514
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jean Perrot"
-housenumber: 27
-phone: "+33 6 11 95 30 30"
-opening_hours: "Mo-Su 07:00-22:00"
-website: "http://www.laverie-grenoble.fr/laverie-jean-perrot"
\ No newline at end of file
+street: Avenue Jean Perrot
+housenumber: "27"
+phone: +33 6 11 95 30 30
+opening_hours: Mo-Su 07:00-22:00
+website: http://www.laverie-grenoble.fr/laverie-jean-perrot
diff --git a/data/cities/grenoble/laverie-nicolas-chorier.yml b/data/cities/grenoble/laverie-nicolas-chorier.yml
index 37da6e28f..27bfefe56 100644
--- a/data/cities/grenoble/laverie-nicolas-chorier.yml
+++ b/data/cities/grenoble/laverie-nicolas-chorier.yml
@@ -4,8 +4,8 @@ latitude: 45.18586
 longitude: 5.71264
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 30
+street: Rue Nicolas Chorier
+housenumber: "30"
 phone: ""
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-20:00
+website: ""
diff --git a/data/cities/grenoble/laverie-stalingrad.yml b/data/cities/grenoble/laverie-stalingrad.yml
index 03ebe7566..9ff2fde77 100644
--- a/data/cities/grenoble/laverie-stalingrad.yml
+++ b/data/cities/grenoble/laverie-stalingrad.yml
@@ -4,8 +4,8 @@ latitude: 45.17715
 longitude: 5.72633
 postcode: "38100"
 city: Grenoble
-street: "Rue de Stalingrad"
-housenumber: 59
-phone: "+33 4 76 50 96 57"
-opening_hours: "Mo-Su 07:00-20:00"
-website: "http://www.laverie-grenoble.fr/laverie-stalingrad"
\ No newline at end of file
+street: Rue de Stalingrad
+housenumber: "59"
+phone: +33 4 76 50 96 57
+opening_hours: Mo-Su 07:00-20:00
+website: http://www.laverie-grenoble.fr/laverie-stalingrad
diff --git a/data/cities/grenoble/laverie-thiers.yml b/data/cities/grenoble/laverie-thiers.yml
index f17a713d8..134038c1c 100644
--- a/data/cities/grenoble/laverie-thiers.yml
+++ b/data/cities/grenoble/laverie-thiers.yml
@@ -4,8 +4,8 @@ latitude: 45.18758
 longitude: 5.72131
 postcode: "38000"
 city: Grenoble
-street: "Rue Thiers"
-housenumber: 14
-phone: "+33 4 76 96 28 03"
-opening_hours: "Mo-Su 07:00-22:00"
-website: "http://www.laverie-grenoble.fr/laverie-thiers-1"
\ No newline at end of file
+street: Rue Thiers
+housenumber: "14"
+phone: +33 4 76 96 28 03
+opening_hours: Mo-Su 07:00-22:00
+website: http://www.laverie-grenoble.fr/laverie-thiers-1
diff --git a/data/cities/grenoble/laverie-vallier.yml b/data/cities/grenoble/laverie-vallier.yml
index c6e8bfbd3..e2801d58b 100644
--- a/data/cities/grenoble/laverie-vallier.yml
+++ b/data/cities/grenoble/laverie-vallier.yml
@@ -4,8 +4,8 @@ latitude: 45.18031
 longitude: 5.70778
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 48
-phone: "+33 6 68 59 08 74"
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+street: Boulevard Joseph Vallier
+housenumber: "48"
+phone: +33 6 68 59 08 74
+opening_hours: Mo-Su 07:00-20:00
+website: ""
diff --git a/data/cities/grenoble/le-berthelot.yml b/data/cities/grenoble/le-berthelot.yml
index 8e1d0cecd..26e0a4b51 100644
--- a/data/cities/grenoble/le-berthelot.yml
+++ b/data/cities/grenoble/le-berthelot.yml
@@ -4,8 +4,8 @@ latitude: 45.18001
 longitude: 5.7319
 postcode: "38100"
 city: Grenoble
-street: "Avenue Marcelin Berthelot"
-housenumber: 5
-phone: "+33 4 76 87 83 74"
-opening_hours: "Mo-Fr 07:30-22:00; Sa,Su 08:00-22:00"
-website: ""
\ No newline at end of file
+street: Avenue Marcelin Berthelot
+housenumber: "5"
+phone: +33 4 76 87 83 74
+opening_hours: Mo-Fr 07:30-22:00; Sa,Su 08:00-22:00
+website: ""
diff --git a/data/cities/grenoble/le-chantilly.yml b/data/cities/grenoble/le-chantilly.yml
index 0395d3371..9c1af4f28 100644
--- a/data/cities/grenoble/le-chantilly.yml
+++ b/data/cities/grenoble/le-chantilly.yml
@@ -4,8 +4,8 @@ latitude: 45.19425
 longitude: 5.71927
 postcode: "38000"
 city: Grenoble
-street: "Route de Lyon"
-housenumber: 4
-phone: "+33 4 76 46 50 10"
-opening_hours: "Tu-Sa 06:30-19:30; Su 06:30-19:00"
-website: ""
\ No newline at end of file
+street: Route de Lyon
+housenumber: "4"
+phone: +33 4 76 46 50 10
+opening_hours: Tu-Sa 06:30-19:30; Su 06:30-19:00
+website: ""
diff --git a/data/cities/grenoble/le-chardon-bleu.yml b/data/cities/grenoble/le-chardon-bleu.yml
index 5d5ea64ee..b7bb269e8 100644
--- a/data/cities/grenoble/le-chardon-bleu.yml
+++ b/data/cities/grenoble/le-chardon-bleu.yml
@@ -4,8 +4,8 @@ latitude: 45.1892
 longitude: 5.72067
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 23
-phone: "+33 4 76 12 05 93"
-opening_hours: "Mo-Sa 06:45-19:45"
-website: "https://www.auchardonbleu.com/boutiques/alsace-lorraine/"
\ No newline at end of file
+street: Avenue Alsace Lorraine
+housenumber: "23"
+phone: +33 4 76 12 05 93
+opening_hours: Mo-Sa 06:45-19:45
+website: https://www.auchardonbleu.com/boutiques/alsace-lorraine/
diff --git a/data/cities/grenoble/le-chardon-dore.yml b/data/cities/grenoble/le-chardon-dore.yml
index ee302a069..094394024 100644
--- a/data/cities/grenoble/le-chardon-dore.yml
+++ b/data/cities/grenoble/le-chardon-dore.yml
@@ -4,8 +4,8 @@ latitude: 45.19144
 longitude: 5.72732
 postcode: "38000"
 city: Grenoble
-street: "Rue Montorge"
-housenumber: 2
-phone: "+33 4 76 54 08 94"
-opening_hours: "Mo 14:00-19:30; Tu-Sa 08:15-19:30"
-website: "https://www.lechardondore.com/"
\ No newline at end of file
+street: Rue Montorge
+housenumber: "2"
+phone: +33 4 76 54 08 94
+opening_hours: Mo 14:00-19:30; Tu-Sa 08:15-19:30
+website: https://www.lechardondore.com/
diff --git a/data/cities/grenoble/le-flash-bar-tabac.yml b/data/cities/grenoble/le-flash-bar-tabac.yml
index e94089918..3ab8511ef 100644
--- a/data/cities/grenoble/le-flash-bar-tabac.yml
+++ b/data/cities/grenoble/le-flash-bar-tabac.yml
@@ -4,8 +4,8 @@ latitude: 45.1837
 longitude: 5.71066
 postcode: "38000"
 city: Grenoble
-street: "Rue d'Alembert"
-housenumber: 85
-phone: "+33 4 76 49 03 54"
+street: Rue d'Alembert
+housenumber: "85"
+phone: +33 4 76 49 03 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/le-fournil-notre-dame.yml b/data/cities/grenoble/le-fournil-notre-dame.yml
index 1efc0e07e..904c91b81 100644
--- a/data/cities/grenoble/le-fournil-notre-dame.yml
+++ b/data/cities/grenoble/le-fournil-notre-dame.yml
@@ -4,8 +4,8 @@ latitude: 45.19338
 longitude: 5.73183
 postcode: "38000"
 city: Grenoble
-street: "Place Notre-Dame"
-housenumber: 2
+street: Place Notre-Dame
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/le-friand.yml b/data/cities/grenoble/le-friand.yml
index 9fbb76f7f..241fcacc4 100644
--- a/data/cities/grenoble/le-friand.yml
+++ b/data/cities/grenoble/le-friand.yml
@@ -4,8 +4,8 @@ latitude: 45.16745
 longitude: 5.71246
 postcode: "38100"
 city: Grenoble
-street: "Cours de la Libération et du Général de Gaulle"
-housenumber: 159
+street: Cours de la Libération et du Général de Gaulle
+housenumber: "159"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:30, Su 06:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:30, Su 06:30-18:00
+website: ""
diff --git a/data/cities/grenoble/le-fruitier.yml b/data/cities/grenoble/le-fruitier.yml
index ca673a1ee..cae83679c 100644
--- a/data/cities/grenoble/le-fruitier.yml
+++ b/data/cities/grenoble/le-fruitier.yml
@@ -4,8 +4,8 @@ latitude: 45.18783
 longitude: 5.729
 postcode: "38000"
 city: Grenoble
-street: "Place de l'Étoile"
-housenumber: 1
+street: Place de l'Étoile
+housenumber: "1"
 phone: ""
-opening_hours: "Tu-Sa 07:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:00-19:30
+website: ""
diff --git a/data/cities/grenoble/le-gourmet.yml b/data/cities/grenoble/le-gourmet.yml
index 2a46f361a..434a6f852 100644
--- a/data/cities/grenoble/le-gourmet.yml
+++ b/data/cities/grenoble/le-gourmet.yml
@@ -4,8 +4,8 @@ latitude: 45.18917
 longitude: 5.72086
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 21
-phone: "+33 4 38 86 90 00"
-opening_hours: "Mo-Sa 10:00-19:30"
-website: ""
\ No newline at end of file
+street: Avenue Alsace Lorraine
+housenumber: "21"
+phone: +33 4 38 86 90 00
+opening_hours: Mo-Sa 10:00-19:30
+website: ""
diff --git a/data/cities/grenoble/le-jardin-des-songes.yml b/data/cities/grenoble/le-jardin-des-songes.yml
index c4ded7be7..699d96a9b 100644
--- a/data/cities/grenoble/le-jardin-des-songes.yml
+++ b/data/cities/grenoble/le-jardin-des-songes.yml
@@ -4,8 +4,8 @@ latitude: 45.19204
 longitude: 5.73045
 postcode: "38000"
 city: Grenoble
-street: "Rue Pierre Duclot"
-housenumber: 6
+street: Rue Pierre Duclot
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/le-livre-voyageur.yml b/data/cities/grenoble/le-livre-voyageur.yml
index 2ae2974e4..c4acbdcfc 100644
--- a/data/cities/grenoble/le-livre-voyageur.yml
+++ b/data/cities/grenoble/le-livre-voyageur.yml
@@ -4,8 +4,8 @@ latitude: 45.18818
 longitude: 5.72658
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Agutte Sembat"
-housenumber: 9
-phone: "04 76 46 15 32"
-opening_hours: "Tu-Sa 11:00-18:00"
-website: ""
\ No newline at end of file
+street: Boulevard Agutte Sembat
+housenumber: "9"
+phone: 04 76 46 15 32
+opening_hours: Tu-Sa 11:00-18:00
+website: ""
diff --git a/data/cities/grenoble/le-panier-des-alpins.yml b/data/cities/grenoble/le-panier-des-alpins.yml
index 9a413c9d8..8d7e5b57f 100644
--- a/data/cities/grenoble/le-panier-des-alpins.yml
+++ b/data/cities/grenoble/le-panier-des-alpins.yml
@@ -4,8 +4,8 @@ latitude: 45.16998
 longitude: 5.71885
 postcode: "38100"
 city: Grenoble
-street: "Rue René Lesage"
-housenumber: 20
+street: Rue René Lesage
+housenumber: "20"
 phone: ""
-opening_hours: "Tu-Fr 08:00-12:30, 15:00-19:30; Sa, Su 08:00-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:00-12:30, 15:00-19:30; Sa, Su 08:00-12:45
+website: ""
diff --git a/data/cities/grenoble/le-petit-mitron-maison-razurel.yml b/data/cities/grenoble/le-petit-mitron-maison-razurel.yml
index 1fe5f81db..356b06e6f 100644
--- a/data/cities/grenoble/le-petit-mitron-maison-razurel.yml
+++ b/data/cities/grenoble/le-petit-mitron-maison-razurel.yml
@@ -4,8 +4,8 @@ latitude: 45.18031
 longitude: 5.70718
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 52
+street: Boulevard Joseph Vallier
+housenumber: "52"
 phone: ""
-opening_hours: "Tu-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 06:00-20:00
+website: ""
diff --git a/data/cities/grenoble/le-petit-ravito.yml b/data/cities/grenoble/le-petit-ravito.yml
index bf7bd1101..4e9d60068 100644
--- a/data/cities/grenoble/le-petit-ravito.yml
+++ b/data/cities/grenoble/le-petit-ravito.yml
@@ -4,8 +4,8 @@ latitude: 45.18898
 longitude: 5.70595
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
+street: Cours Berriat
 housenumber: 162 bis
 phone: ""
-opening_hours: "Mo 15:00-19:00; Tu-Sa 09:30-14:00,15:00-19:00"
-website: "https://www.leptitravito.fr"
\ No newline at end of file
+opening_hours: Mo 15:00-19:00; Tu-Sa 09:30-14:00,15:00-19:00
+website: https://www.leptitravito.fr
diff --git a/data/cities/grenoble/le-petrin-de-malherbe.yml b/data/cities/grenoble/le-petrin-de-malherbe.yml
index bd27977ef..0864a1b86 100644
--- a/data/cities/grenoble/le-petrin-de-malherbe.yml
+++ b/data/cities/grenoble/le-petrin-de-malherbe.yml
@@ -4,8 +4,8 @@ latitude: 45.17036
 longitude: 5.73932
 postcode: "38100"
 city: Grenoble
-street: "Avenue Malherbe"
-housenumber: 3
+street: Avenue Malherbe
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Fr 06:00-19:30;Sa 06:30-19:30;Su 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:00-19:30;Sa 06:30-19:30;Su 06:30-13:00
+website: ""
diff --git a/data/cities/grenoble/le-salon-rue-thiers.yml b/data/cities/grenoble/le-salon-rue-thiers.yml
index b642b77e7..fdc4637f7 100644
--- a/data/cities/grenoble/le-salon-rue-thiers.yml
+++ b/data/cities/grenoble/le-salon-rue-thiers.yml
@@ -4,8 +4,8 @@ latitude: 45.18343
 longitude: 5.71848
 postcode: "38000"
 city: Grenoble
-street: "Rue Thiers"
-housenumber: 70
+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
+opening_hours: Mo,Tu,Th,Fr 09:00-19:00; We 14:00-19:00
+website: ""
diff --git a/data/cities/grenoble/le-salon.yml b/data/cities/grenoble/le-salon.yml
index 8b12258bf..dd12a5c45 100644
--- a/data/cities/grenoble/le-salon.yml
+++ b/data/cities/grenoble/le-salon.yml
@@ -4,8 +4,8 @@ latitude: 45.18525
 longitude: 5.72188
 postcode: "38000"
 city: Grenoble
-street: "Rue de Turenne"
-housenumber: 2
+street: Rue de Turenne
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/le-temps-du-lilas.yml b/data/cities/grenoble/le-temps-du-lilas.yml
index 1c9010e34..69b63a5fc 100644
--- a/data/cities/grenoble/le-temps-du-lilas.yml
+++ b/data/cities/grenoble/le-temps-du-lilas.yml
@@ -4,8 +4,8 @@ latitude: 45.19203
 longitude: 5.73472
 postcode: "38000"
 city: Grenoble
-street: "Rue Très Cloîtres"
-housenumber: 54
+street: Rue Très Cloîtres
+housenumber: "54"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/le-velvet-studio.yml b/data/cities/grenoble/le-velvet-studio.yml
index 30b4ace18..4cb770b5a 100644
--- a/data/cities/grenoble/le-velvet-studio.yml
+++ b/data/cities/grenoble/le-velvet-studio.yml
@@ -5,7 +5,7 @@ longitude: 5.73087
 postcode: "38000"
 city: Grenoble
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 11:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 11:00-18:00
+website: ""
diff --git a/data/cities/grenoble/le-verger-des-gourmets.yml b/data/cities/grenoble/le-verger-des-gourmets.yml
index ce697be0a..bb49d9c98 100644
--- a/data/cities/grenoble/le-verger-des-gourmets.yml
+++ b/data/cities/grenoble/le-verger-des-gourmets.yml
@@ -4,8 +4,8 @@ latitude: 45.18115
 longitude: 5.7349
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jean Perrot"
-housenumber: 23
+street: Avenue Jean Perrot
+housenumber: "23"
 phone: ""
-opening_hours: "Tu-Fr 08:00-12:30, Tu-Th 14:30-18:30, Fr 14:30-18:00, Sa 08:00-14:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:00-12:30, Tu-Th 14:30-18:30, Fr 14:30-18:00, Sa 08:00-14:00
+website: ""
diff --git a/data/cities/grenoble/le-vesuve.yml b/data/cities/grenoble/le-vesuve.yml
index 7c753edfe..24092761f 100644
--- a/data/cities/grenoble/le-vesuve.yml
+++ b/data/cities/grenoble/le-vesuve.yml
@@ -4,8 +4,8 @@ latitude: 45.18944
 longitude: 5.71909
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 37
+street: Avenue Alsace Lorraine
+housenumber: "37"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/le-vin-des-alpes.yml b/data/cities/grenoble/le-vin-des-alpes.yml
index 1858e71ad..6107330f3 100644
--- a/data/cities/grenoble/le-vin-des-alpes.yml
+++ b/data/cities/grenoble/le-vin-des-alpes.yml
@@ -4,8 +4,8 @@ latitude: 45.1873
 longitude: 5.72977
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 8
-phone: "+33 4 76 43 04 39"
-opening_hours: "Tu-We 11:00-19:00; Th-Fr 11:00-20:00; Sa 10:30-19:00"
-website: "https://levindesalpes.fr/"
\ No newline at end of file
+street: Rue de Strasbourg
+housenumber: "8"
+phone: +33 4 76 43 04 39
+opening_hours: Tu-We 11:00-19:00; Th-Fr 11:00-20:00; Sa 10:30-19:00
+website: https://levindesalpes.fr/
diff --git a/data/cities/grenoble/leau-vive.yml b/data/cities/grenoble/leau-vive.yml
index e76533eea..5ef60a761 100644
--- a/data/cities/grenoble/leau-vive.yml
+++ b/data/cities/grenoble/leau-vive.yml
@@ -4,8 +4,8 @@ latitude: 45.18801
 longitude: 5.72538
 postcode: "38000"
 city: Grenoble
-street: "Cours Lafontaine"
-housenumber: 6
+street: Cours Lafontaine
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-13:00"
-website: "http://grenoble-lafontaine.eau-vive.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-13:00
+website: http://grenoble-lafontaine.eau-vive.com/
diff --git a/data/cities/grenoble/leco-pain-dantan.yml b/data/cities/grenoble/leco-pain-dantan.yml
index c7840d90d..79fb83859 100644
--- a/data/cities/grenoble/leco-pain-dantan.yml
+++ b/data/cities/grenoble/leco-pain-dantan.yml
@@ -4,8 +4,8 @@ latitude: 45.17025
 longitude: 5.73988
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jean Perrot"
+street: Avenue Jean Perrot
 housenumber: 114B
 phone: ""
-opening_hours: "Mo-Fr 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 16:00-19:00
+website: ""
diff --git a/data/cities/grenoble/lego.yml b/data/cities/grenoble/lego.yml
index 4f92b1685..b930dc59e 100644
--- a/data/cities/grenoble/lego.yml
+++ b/data/cities/grenoble/lego.yml
@@ -1,11 +1,11 @@
 id: 512917491
-type: way
+type: node
 latitude: 45.15746
 longitude: 5.73284
 postcode: "38100"
 city: Grenoble
-street: "Cour des Erables"
-housenumber: 104
+street: Cour des Erables
+housenumber: "104"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/lelefan.yml b/data/cities/grenoble/lelefan.yml
index 8b10bf49f..7719c31bb 100644
--- a/data/cities/grenoble/lelefan.yml
+++ b/data/cities/grenoble/lelefan.yml
@@ -4,8 +4,8 @@ latitude: 45.17507
 longitude: 5.73041
 postcode: "38100"
 city: Grenoble
-street: "avenue Marcellin Berthelot"
-housenumber: 32
-phone: "+33 9 72 64 91 14"
-opening_hours: "Mo-Fr 10:00-13:30, 16:00-19:00; We 10:00-13:30, 16:00-20:30; Sa 10:00-19:00"
-website: "https://lelefan.org/"
\ No newline at end of file
+street: Avenue Marcellin Berthelot
+housenumber: "32"
+phone: +33 9 72 64 91 14
+opening_hours: Mo-Fr 10:00-13:30, 16:00-19:00; We 10:00-13:30, 16:00-20:30; Sa 10:00-19:00
+website: https://lelefan.org/
diff --git a/data/cities/grenoble/lelysee.yml b/data/cities/grenoble/lelysee.yml
index 63e404c9c..e9ce44579 100644
--- a/data/cities/grenoble/lelysee.yml
+++ b/data/cities/grenoble/lelysee.yml
@@ -4,8 +4,8 @@ latitude: 45.17977
 longitude: 5.707
 postcode: "38100"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 55
+street: Boulevard Joseph Vallier
+housenumber: "55"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/leonidas.yml b/data/cities/grenoble/leonidas.yml
index ec6f3f9c5..2af176585 100644
--- a/data/cities/grenoble/leonidas.yml
+++ b/data/cities/grenoble/leonidas.yml
@@ -4,8 +4,8 @@ latitude: 45.19001
 longitude: 5.72506
 postcode: "38000"
 city: Grenoble
-street: "Rue Molière"
-housenumber: 2
-phone: "+33 4 76 46 80 87"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: "https://www.leonidas.com/en/shops/grenoble/leonidas-grenoble"
\ No newline at end of file
+street: Rue Molière
+housenumber: "2"
+phone: +33 4 76 46 80 87
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: https://www.leonidas.com/en/shops/grenoble/leonidas-grenoble
diff --git a/data/cities/grenoble/les-cafes-berriat.yml b/data/cities/grenoble/les-cafes-berriat.yml
index 3758d233a..604d4e445 100644
--- a/data/cities/grenoble/les-cafes-berriat.yml
+++ b/data/cities/grenoble/les-cafes-berriat.yml
@@ -4,8 +4,8 @@ latitude: 45.18779
 longitude: 5.72117
 postcode: "38000"
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 21
-phone: "+33 4 76 46 43 16"
-opening_hours: "Tu-Fr 08:30-12:30,14:00-19:00; Sa 09:00-12:30,14:00-19:00"
-website: "http://cafesberriat.free.fr/"
\ No newline at end of file
+street: Cours Berriat
+housenumber: "21"
+phone: +33 4 76 46 43 16
+opening_hours: Tu-Fr 08:30-12:30,14:00-19:00; Sa 09:00-12:30,14:00-19:00
+website: http://cafesberriat.free.fr/
diff --git a/data/cities/grenoble/les-contrees-du-jeu.yml b/data/cities/grenoble/les-contrees-du-jeu.yml
index 44da81967..c1c87cf82 100644
--- a/data/cities/grenoble/les-contrees-du-jeu.yml
+++ b/data/cities/grenoble/les-contrees-du-jeu.yml
@@ -4,8 +4,8 @@ latitude: 45.18759
 longitude: 5.73104
 postcode: "38000"
 city: Grenoble
-street: "Rue Beyle-Stendhal"
-housenumber: 6
+street: Rue Beyle-Stendhal
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://lescontreesdujeu.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://lescontreesdujeu.com/
diff --git a/data/cities/grenoble/les-deux-soeurs-alimentation.yml b/data/cities/grenoble/les-deux-soeurs-alimentation.yml
index f28d917dd..47c1aac2c 100644
--- a/data/cities/grenoble/les-deux-soeurs-alimentation.yml
+++ b/data/cities/grenoble/les-deux-soeurs-alimentation.yml
@@ -4,8 +4,8 @@ latitude: 45.18421
 longitude: 5.73034
 postcode: "38000"
 city: Grenoble
-street: "Rue du 4e Régiment du Génie"
-housenumber: 8
+street: Rue du 4e Régiment du Génie
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/les-ecrins.yml b/data/cities/grenoble/les-ecrins.yml
index 28f02c4d1..1c8ea4b58 100644
--- a/data/cities/grenoble/les-ecrins.yml
+++ b/data/cities/grenoble/les-ecrins.yml
@@ -4,8 +4,8 @@ latitude: 45.18929
 longitude: 5.72641
 postcode: "38000"
 city: Grenoble
-street: "Rue de Bonne"
-housenumber: 11
-phone: "+33 4 76 46 48 22"
-opening_hours: "Mo 14:00-19:30; Tu-Sa 08:00-19:30; Su off"
-website: "https://www.patisserie-lesecrins.com/"
\ No newline at end of file
+street: Rue de Bonne
+housenumber: "11"
+phone: +33 4 76 46 48 22
+opening_hours: Mo 14:00-19:30; Tu-Sa 08:00-19:30; Su off
+website: https://www.patisserie-lesecrins.com/
diff --git a/data/cities/grenoble/les-fees-maison.yml b/data/cities/grenoble/les-fees-maison.yml
index d85f5f442..d8d4b0e7a 100644
--- a/data/cities/grenoble/les-fees-maison.yml
+++ b/data/cities/grenoble/les-fees-maison.yml
@@ -4,8 +4,8 @@ latitude: 45.1911
 longitude: 5.72532
 postcode: "38000"
 city: Grenoble
-street: "Rue de Belgrade"
-housenumber: 11
-phone: "+33 4 76 43 45 54"
-opening_hours: "Mo-Sa 07:00-19:30; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+street: Rue de Belgrade
+housenumber: "11"
+phone: +33 4 76 43 45 54
+opening_hours: Mo-Sa 07:00-19:30; Su 08:00-13:00
+website: ""
diff --git a/data/cities/grenoble/les-fleurs-du-quai.yml b/data/cities/grenoble/les-fleurs-du-quai.yml
index 5b74f6f0e..89e5be33b 100644
--- a/data/cities/grenoble/les-fleurs-du-quai.yml
+++ b/data/cities/grenoble/les-fleurs-du-quai.yml
@@ -4,8 +4,8 @@ latitude: 45.19534
 longitude: 5.72962
 postcode: "38000"
 city: Grenoble
-street: "Quai Mounier"
-housenumber: 2
+street: Quai Mounier
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 09:00-13:00, 13:00-19:00; Tu-Su 09:30-12:35,15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 09:00-13:00, 13:00-19:00; Tu-Su 09:30-12:35,15:30-19:30
+website: ""
diff --git a/data/cities/grenoble/les-gourmandises-de-lenza.yml b/data/cities/grenoble/les-gourmandises-de-lenza.yml
index baae9f41f..bac9bdce3 100644
--- a/data/cities/grenoble/les-gourmandises-de-lenza.yml
+++ b/data/cities/grenoble/les-gourmandises-de-lenza.yml
@@ -4,8 +4,8 @@ latitude: 45.17514
 longitude: 5.70847
 postcode: "38100"
 city: Grenoble
-street: "Rue des Eaux Claires"
-housenumber: 54
+street: Rue des Eaux Claires
+housenumber: "54"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:00
+website: ""
diff --git a/data/cities/grenoble/les-massages-de-marie-au-home-studio-cafe.yml b/data/cities/grenoble/les-massages-de-marie-au-home-studio-cafe.yml
index 4f33ea450..849d79861 100644
--- a/data/cities/grenoble/les-massages-de-marie-au-home-studio-cafe.yml
+++ b/data/cities/grenoble/les-massages-de-marie-au-home-studio-cafe.yml
@@ -4,8 +4,8 @@ latitude: 45.18037
 longitude: 5.71111
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 28
+street: Boulevard Joseph Vallier
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Fr 09:00-18:00"
-website: "https://lavalsedespissenlits.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-18:00
+website: https://lavalsedespissenlits.fr/
diff --git a/data/cities/grenoble/les-rutilantes.yml b/data/cities/grenoble/les-rutilantes.yml
index 20223bbc5..61fdc2970 100644
--- a/data/cities/grenoble/les-rutilantes.yml
+++ b/data/cities/grenoble/les-rutilantes.yml
@@ -4,8 +4,8 @@ latitude: 45.18935
 longitude: 5.71876
 postcode: "38000"
 city: Grenoble
-street: "Rue Gabriel Péri"
-housenumber: 1
+street: Rue Gabriel Péri
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-We 16:00-23:00; Th, Fr 16:00-01:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We 16:00-23:00; Th, Fr 16:00-01:00
+website: ""
diff --git a/data/cities/grenoble/les-sept-royaumes.yml b/data/cities/grenoble/les-sept-royaumes.yml
index f9ec4bc37..d03521c06 100644
--- a/data/cities/grenoble/les-sept-royaumes.yml
+++ b/data/cities/grenoble/les-sept-royaumes.yml
@@ -4,8 +4,8 @@ latitude: 45.1918
 longitude: 5.72965
 postcode: "38000"
 city: Grenoble
-street: "Rue Lafayette"
-housenumber: 5
-phone: "+33 4 76 54 58 35"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://les7royaumes.com/"
\ No newline at end of file
+street: Rue Lafayette
+housenumber: "5"
+phone: +33 4 76 54 58 35
+opening_hours: Mo-Sa 10:00-19:00
+website: https://les7royaumes.com/
diff --git a/data/cities/grenoble/lespace-du-fumeur.yml b/data/cities/grenoble/lespace-du-fumeur.yml
index 6d6a07ed0..3a7e93667 100644
--- a/data/cities/grenoble/lespace-du-fumeur.yml
+++ b/data/cities/grenoble/lespace-du-fumeur.yml
@@ -1,11 +1,11 @@
 id: 512915553
-type: way
+type: node
 latitude: 45.15831
 longitude: 5.73276
 postcode: "38100"
 city: Grenoble
-street: "Grande Place"
-housenumber: 24
+street: Grande Place
+housenumber: "24"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/librairie-glenat.yml b/data/cities/grenoble/librairie-glenat.yml
index 4f652abfb..c63b9a905 100644
--- a/data/cities/grenoble/librairie-glenat.yml
+++ b/data/cities/grenoble/librairie-glenat.yml
@@ -4,8 +4,8 @@ latitude: 45.18914
 longitude: 5.72109
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 19
-phone: "+33 4 76 46 34 60"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "https://librairiegrenoble.glenat.com/"
\ No newline at end of file
+street: Avenue Alsace Lorraine
+housenumber: "19"
+phone: +33 4 76 46 34 60
+opening_hours: Tu-Sa 10:00-19:00
+website: https://librairiegrenoble.glenat.com/
diff --git a/data/cities/grenoble/librairie-la-derive.yml b/data/cities/grenoble/librairie-la-derive.yml
index bdb3c1ae6..d369bcb15 100644
--- a/data/cities/grenoble/librairie-la-derive.yml
+++ b/data/cities/grenoble/librairie-la-derive.yml
@@ -4,8 +4,8 @@ latitude: 45.19119
 longitude: 5.73037
 postcode: "38000"
 city: Grenoble
-street: "Place Sainte-Claire"
-housenumber: 10
+street: Place Sainte-Claire
+housenumber: "10"
 phone: ""
-opening_hours: "Mo 14:00-18:00, Tu-Fr 10:00-19:00, Sa 10:00-12:00; 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:00, Tu-Fr 10:00-19:00, Sa 10:00-12:00; 14:00-19:00
+website: ""
diff --git a/data/cities/grenoble/librairie-le-square.yml b/data/cities/grenoble/librairie-le-square.yml
index 55d07ce6d..5d7512efa 100644
--- a/data/cities/grenoble/librairie-le-square.yml
+++ b/data/cities/grenoble/librairie-le-square.yml
@@ -4,8 +4,8 @@ latitude: 45.18832
 longitude: 5.72718
 postcode: "38000"
 city: Grenoble
-street: "Square Docteur Léon Martin"
-housenumber: 2
+street: Square Docteur Léon Martin
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-19:00"
-website: "https://www.librairielesquare.com/"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-19:00
+website: https://www.librairielesquare.com/
diff --git a/data/cities/grenoble/lidl.yml b/data/cities/grenoble/lidl.yml
index 4251d59b4..51fc6e22f 100644
--- a/data/cities/grenoble/lidl.yml
+++ b/data/cities/grenoble/lidl.yml
@@ -4,8 +4,8 @@ latitude: 45.21691
 longitude: 5.69395
 postcode: "38950"
 city: Grenoble
-street: "Avenue du Général Leclerc"
-housenumber: 
+street: Avenue du Général Leclerc
+housenumber: ""
 phone: ""
-opening_hours: "08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: 08:30-19:30
+website: ""
diff --git a/data/cities/grenoble/loc-ve.yml b/data/cities/grenoble/loc-ve.yml
index f91a4aa6b..7462c8d9c 100644
--- a/data/cities/grenoble/loc-ve.yml
+++ b/data/cities/grenoble/loc-ve.yml
@@ -1,11 +1,11 @@
 id: 50210383
-type: way
+type: node
 latitude: 45.1634
 longitude: 5.7113
 postcode: "38100"
 city: Grenoble
-street: "Cours de la Libération et du Général de Gaulle"
-housenumber: 191
+street: Cours de la Libération et du Général de Gaulle
+housenumber: "191"
 phone: ""
-opening_hours: "Mo-Sa 09:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-18:30
+website: ""
diff --git a/data/cities/grenoble/loccitane.yml b/data/cities/grenoble/loccitane.yml
index 3b2a123ed..8ea03b50d 100644
--- a/data/cities/grenoble/loccitane.yml
+++ b/data/cities/grenoble/loccitane.yml
@@ -1,11 +1,11 @@
 id: 512901875
-type: way
+type: node
 latitude: 45.15814
 longitude: 5.73103
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 73
-phone: "+33 4 38 49 03 95"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/L-Occitane-en-Provence"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "73"
+phone: +33 4 38 49 03 95
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/L-Occitane-en-Provence
diff --git a/data/cities/grenoble/louis-pion.yml b/data/cities/grenoble/louis-pion.yml
index 303bb0ed3..69335a89b 100644
--- a/data/cities/grenoble/louis-pion.yml
+++ b/data/cities/grenoble/louis-pion.yml
@@ -1,11 +1,11 @@
 id: 512917493
-type: way
+type: node
 latitude: 45.15756
 longitude: 5.73266
 postcode: "38100"
 city: Grenoble
-street: "Avenue de Belledonne"
-housenumber: 8
-phone: "+33 4 76 22 00 25"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Louis-Pion"
\ No newline at end of file
+street: Avenue de Belledonne
+housenumber: "8"
+phone: +33 4 76 22 00 25
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Louis-Pion
diff --git a/data/cities/grenoble/lux-laverie-rue-ampere.yml b/data/cities/grenoble/lux-laverie-rue-ampere.yml
index 87d82af4d..2b4282d6f 100644
--- a/data/cities/grenoble/lux-laverie-rue-ampere.yml
+++ b/data/cities/grenoble/lux-laverie-rue-ampere.yml
@@ -4,8 +4,8 @@ latitude: 45.18563
 longitude: 5.7056
 postcode: "38000"
 city: Grenoble
-street: "Rue Ampère"
-housenumber: 10
-phone: "+33 6 77 54 22 77"
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+street: Rue Ampère
+housenumber: "10"
+phone: +33 6 77 54 22 77
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/grenoble/lux-laverie.yml b/data/cities/grenoble/lux-laverie.yml
index 3900f82ec..489cbf05d 100644
--- a/data/cities/grenoble/lux-laverie.yml
+++ b/data/cities/grenoble/lux-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.18134
 longitude: 5.71721
 postcode: "38000"
 city: Grenoble
-street: "Rue Général Janssen"
-housenumber: 3
+street: Rue Général Janssen
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/grenoble/lycorink.yml b/data/cities/grenoble/lycorink.yml
index 55c8c8a29..e783d3947 100644
--- a/data/cities/grenoble/lycorink.yml
+++ b/data/cities/grenoble/lycorink.yml
@@ -4,8 +4,8 @@ latitude: 45.18594
 longitude: 5.7179
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 2
+street: Rue Nicolas Chorier
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Sa 10:00-18:00; Mo 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-18:00; Mo 14:00-19:00
+website: ""
diff --git a/data/cities/grenoble/ma-petite-armoire.yml b/data/cities/grenoble/ma-petite-armoire.yml
index 7f7b3b766..581f0fda6 100644
--- a/data/cities/grenoble/ma-petite-armoire.yml
+++ b/data/cities/grenoble/ma-petite-armoire.yml
@@ -4,8 +4,8 @@ latitude: 45.18219
 longitude: 5.72611
 postcode: "38000"
 city: Grenoble
-street: "Rue André Maginot"
-housenumber: 5
+street: Rue André Maginot
+housenumber: "5"
 phone: ""
-opening_hours: "Tu 10:00-18:30, We-Fr 14:00-18:30, Sa 10:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 10:00-18:30, We-Fr 14:00-18:30, Sa 10:00-13:00
+website: ""
diff --git a/data/cities/grenoble/maison-floran.yml b/data/cities/grenoble/maison-floran.yml
index e169a5a18..94a4833c7 100644
--- a/data/cities/grenoble/maison-floran.yml
+++ b/data/cities/grenoble/maison-floran.yml
@@ -4,8 +4,8 @@ latitude: 45.18816
 longitude: 5.72407
 postcode: "38000"
 city: Grenoble
-street: "Rue Béranger"
-housenumber: 2
-phone: "+33 4 76 85 02 42"
-opening_hours: "Mo-Sa 07:00-19:45; Su off"
-website: ""
\ No newline at end of file
+street: Rue Béranger
+housenumber: "2"
+phone: +33 4 76 85 02 42
+opening_hours: Mo-Sa 07:00-19:45; Su off
+website: ""
diff --git a/data/cities/grenoble/maison-lantheaume.yml b/data/cities/grenoble/maison-lantheaume.yml
index 3d4b71447..eceeae2f0 100644
--- a/data/cities/grenoble/maison-lantheaume.yml
+++ b/data/cities/grenoble/maison-lantheaume.yml
@@ -4,8 +4,8 @@ latitude: 45.18806
 longitude: 5.72626
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Agutte Sembat"
-housenumber: 10
+street: Boulevard Agutte Sembat
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/maison-lenoir-rue-ampere.yml b/data/cities/grenoble/maison-lenoir-rue-ampere.yml
index 882c57e95..ea4cee659 100644
--- a/data/cities/grenoble/maison-lenoir-rue-ampere.yml
+++ b/data/cities/grenoble/maison-lenoir-rue-ampere.yml
@@ -4,8 +4,8 @@ latitude: 45.188
 longitude: 5.70602
 postcode: "38000"
 city: Grenoble
-street: "Rue Ampère"
-housenumber: 5
+street: Rue Ampère
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 06:30-20:00, Su 07:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-20:00, Su 07:00-19:00
+website: ""
diff --git a/data/cities/grenoble/maison-lenoir.yml b/data/cities/grenoble/maison-lenoir.yml
index 59aff8421..40ff8402a 100644
--- a/data/cities/grenoble/maison-lenoir.yml
+++ b/data/cities/grenoble/maison-lenoir.yml
@@ -4,8 +4,8 @@ latitude: 45.19117
 longitude: 5.73281
 postcode: "38000"
 city: Grenoble
-street: "Rue Bayard"
-housenumber: 17
+street: Rue Bayard
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Fr 07:00-19:30; Sa 07:00-13:30,15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-19:30; Sa 07:00-13:30,15:30-19:30
+website: ""
diff --git a/data/cities/grenoble/maison-manival.yml b/data/cities/grenoble/maison-manival.yml
index 10c0acc81..5bb105dbe 100644
--- a/data/cities/grenoble/maison-manival.yml
+++ b/data/cities/grenoble/maison-manival.yml
@@ -4,8 +4,8 @@ latitude: 45.18315
 longitude: 5.71709
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 98
+street: Cours Jean Jaurès
+housenumber: "98"
 phone: ""
-opening_hours: "Tu-Su 07:00-19:00"
-website: "https://maison-manival.com/"
\ No newline at end of file
+opening_hours: Tu-Su 07:00-19:00
+website: https://maison-manival.com/
diff --git a/data/cities/grenoble/mango.yml b/data/cities/grenoble/mango.yml
index aa4784688..0dc2ce9d5 100644
--- a/data/cities/grenoble/mango.yml
+++ b/data/cities/grenoble/mango.yml
@@ -1,11 +1,11 @@
 id: 512915560
-type: way
+type: node
 latitude: 45.15833
 longitude: 5.73213
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 42
-phone: "+33 4 38 70 24 20"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Mango"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "42"
+phone: +33 4 38 70 24 20
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Mango
diff --git a/data/cities/grenoble/matt-store-is.yml b/data/cities/grenoble/matt-store-is.yml
index 54d264e3b..1cfde6d82 100644
--- a/data/cities/grenoble/matt-store-is.yml
+++ b/data/cities/grenoble/matt-store-is.yml
@@ -4,8 +4,8 @@ latitude: 45.18668
 longitude: 5.72405
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Gambetta"
-housenumber: 24
-phone: "+33 4 85 02 40 48"
-opening_hours: "Mo 14:00-19:00, Tu-Su 10:00-13:00;14:00-19:00"
-website: "https://matt-store-is.business.site/"
\ No newline at end of file
+street: Boulevard Gambetta
+housenumber: "24"
+phone: +33 4 85 02 40 48
+opening_hours: Mo 14:00-19:00, Tu-Su 10:00-13:00;14:00-19:00
+website: https://matt-store-is.business.site/
diff --git a/data/cities/grenoble/maxluna.yml b/data/cities/grenoble/maxluna.yml
index 5302bda19..8a44c4f3a 100644
--- a/data/cities/grenoble/maxluna.yml
+++ b/data/cities/grenoble/maxluna.yml
@@ -4,8 +4,8 @@ latitude: 45.18851
 longitude: 5.7233
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Gambetta"
-housenumber: 27
-phone: "+33 9 52 31 27 93"
-opening_hours: "Mo 13:00-18:00; Tu-Sa 10:00-19:00; Su off"
-website: "https://www.maxluna.fr/"
\ No newline at end of file
+street: Boulevard Gambetta
+housenumber: "27"
+phone: +33 9 52 31 27 93
+opening_hours: Mo 13:00-18:00; Tu-Sa 10:00-19:00; Su off
+website: https://www.maxluna.fr/
diff --git a/data/cities/grenoble/metakin.yml b/data/cities/grenoble/metakin.yml
index 34829f72e..10be9d7a0 100644
--- a/data/cities/grenoble/metakin.yml
+++ b/data/cities/grenoble/metakin.yml
@@ -4,8 +4,8 @@ latitude: 45.17274
 longitude: 5.70331
 postcode: "38100"
 city: Grenoble
-street: "Rue Anatole France"
-housenumber: 88
+street: Rue Anatole France
+housenumber: "88"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/midas.yml b/data/cities/grenoble/midas.yml
index 848c72898..c033e1ed3 100644
--- a/data/cities/grenoble/midas.yml
+++ b/data/cities/grenoble/midas.yml
@@ -4,8 +4,8 @@ latitude: 45.18058
 longitude: 5.70569
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 62
-phone: "+33 4 76 70 24 44"
-opening_hours: "Mo-Fr 08:00-19:00; Sa 08:00-17:00"
-website: "https://www.midas.fr/"
\ No newline at end of file
+street: Boulevard Joseph Vallier
+housenumber: "62"
+phone: +33 4 76 70 24 44
+opening_hours: Mo-Fr 08:00-19:00; Sa 08:00-17:00
+website: https://www.midas.fr/
diff --git a/data/cities/grenoble/mobi.yml b/data/cities/grenoble/mobi.yml
index f14b16617..aea5385b5 100644
--- a/data/cities/grenoble/mobi.yml
+++ b/data/cities/grenoble/mobi.yml
@@ -4,8 +4,8 @@ latitude: 45.17704
 longitude: 5.70952
 postcode: "38100"
 city: Grenoble
-street: "Rue des Eaux Claires"
-housenumber: 30
-phone: "+33 4 76 21 24 09"
-opening_hours: "Mo-Fr 07:00-12:00,13:30-18:00; Sa 08:00-12:00"
-website: "https://www.rao.fr/magasins/rao-grenoble"
\ No newline at end of file
+street: Rue des Eaux Claires
+housenumber: "30"
+phone: +33 4 76 21 24 09
+opening_hours: Mo-Fr 07:00-12:00,13:30-18:00; Sa 08:00-12:00
+website: https://www.rao.fr/magasins/rao-grenoble
diff --git a/data/cities/grenoble/momie-grenoble.yml b/data/cities/grenoble/momie-grenoble.yml
index 824a9eb72..c219cec9a 100644
--- a/data/cities/grenoble/momie-grenoble.yml
+++ b/data/cities/grenoble/momie-grenoble.yml
@@ -4,8 +4,8 @@ latitude: 45.192
 longitude: 5.72971
 postcode: "38000"
 city: Grenoble
-street: "Rue Lafayette"
-housenumber: 1
-phone: "+33 4 76 51 66 22"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Lafayette
+housenumber: "1"
+phone: +33 4 76 51 66 22
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/grenoble/mon-petit-jean.yml b/data/cities/grenoble/mon-petit-jean.yml
index e25154e68..c826f76e7 100644
--- a/data/cities/grenoble/mon-petit-jean.yml
+++ b/data/cities/grenoble/mon-petit-jean.yml
@@ -4,8 +4,8 @@ latitude: 45.18631
 longitude: 5.71814
 postcode: "38000"
 city: Grenoble
-street: "Cours Jean Jaurès"
-housenumber: 66
+street: Cours Jean Jaurès
+housenumber: "66"
 phone: ""
-opening_hours: "Mo,Sa 14:00-19:00; Tu-Fr 10:00-12:30,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Sa 14:00-19:00; Tu-Fr 10:00-12:30,13:30-19:00
+website: ""
diff --git a/data/cities/grenoble/morgan.yml b/data/cities/grenoble/morgan.yml
index 64f7bfdc7..af397c04b 100644
--- a/data/cities/grenoble/morgan.yml
+++ b/data/cities/grenoble/morgan.yml
@@ -1,11 +1,11 @@
 id: 512899324
-type: way
+type: node
 latitude: 45.15759
 longitude: 5.73203
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 93
-phone: "+33 4 76 22 11 71"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Morgan"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "93"
+phone: +33 4 76 22 11 71
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Morgan
diff --git a/data/cities/grenoble/multiservices.yml b/data/cities/grenoble/multiservices.yml
index b28a4ccc4..e982d1775 100644
--- a/data/cities/grenoble/multiservices.yml
+++ b/data/cities/grenoble/multiservices.yml
@@ -4,8 +4,8 @@ latitude: 45.18541
 longitude: 5.72315
 postcode: "38000"
 city: Grenoble
-street: "Rue Lesdiguières"
-housenumber: 49
+street: Rue Lesdiguières
+housenumber: "49"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
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 796e3dbdf..d78166e28 100644
--- a/data/cities/grenoble/mvelo-agence-et-atelier-grenoble-gare.yml
+++ b/data/cities/grenoble/mvelo-agence-et-atelier-grenoble-gare.yml
@@ -1,11 +1,11 @@
 id: 431729735
-type: way
+type: node
 latitude: 45.1923
 longitude: 5.71455
 postcode: "38000"
 city: Grenoble
-street: "Parvis Madeleine-Pauliac/Escadron Bleu"
-housenumber: 11
+street: Parvis Madeleine-Pauliac/Escadron Bleu
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Fr 07:30-19:30; Sa,Su 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-19:30; Sa,Su 09:00-18:00
+website: ""
diff --git a/data/cities/grenoble/mvelo-agence-grenoble-presquile.yml b/data/cities/grenoble/mvelo-agence-grenoble-presquile.yml
index 9efd7e4b0..5f1e9fe8e 100644
--- a/data/cities/grenoble/mvelo-agence-grenoble-presquile.yml
+++ b/data/cities/grenoble/mvelo-agence-grenoble-presquile.yml
@@ -4,8 +4,8 @@ latitude: 45.20277
 longitude: 5.70416
 postcode: "38000"
 city: Grenoble
-street: "Avenue des Martyrs"
-housenumber: 84
+street: Avenue des Martyrs
+housenumber: "84"
 phone: ""
-opening_hours: "Apr-Oct: Mo-Su 09:00-19:00; Nov-Mar: Mo-Su 10:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: 'Apr-Oct: Mo-Su 09:00-19:00; Nov-Mar: Mo-Su 10:00-17:00'
+website: ""
diff --git a/data/cities/grenoble/naf-naf.yml b/data/cities/grenoble/naf-naf.yml
index 2e58f30f0..6167f93ea 100644
--- a/data/cities/grenoble/naf-naf.yml
+++ b/data/cities/grenoble/naf-naf.yml
@@ -1,11 +1,11 @@
 id: 512915166
-type: way
+type: node
 latitude: 45.15835
 longitude: 5.73186
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 44
-phone: "+33 4 76 09 22 08"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/boutiques-restaurants/naf-naf"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "44"
+phone: +33 4 76 09 22 08
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/boutiques-restaurants/naf-naf
diff --git a/data/cities/grenoble/natura-velo.yml b/data/cities/grenoble/natura-velo.yml
index d6780a93b..d2d76e870 100644
--- a/data/cities/grenoble/natura-velo.yml
+++ b/data/cities/grenoble/natura-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.18594
 longitude: 5.74338
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Clemenceau"
-housenumber: 7
+street: Boulevard Clemenceau
+housenumber: "7"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:30,14:00-19:00; PH off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30,14:00-19:00; PH off
+website: ""
diff --git a/data/cities/grenoble/nett-land.yml b/data/cities/grenoble/nett-land.yml
index c9d774e84..4e155cdda 100644
--- a/data/cities/grenoble/nett-land.yml
+++ b/data/cities/grenoble/nett-land.yml
@@ -4,8 +4,8 @@ latitude: 45.1805
 longitude: 5.74529
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jeanne d'Arc"
-housenumber: 83
+street: Avenue Jeanne d'Arc
+housenumber: "83"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/nina-net.yml b/data/cities/grenoble/nina-net.yml
index 26f2895b9..058fb8da1 100644
--- a/data/cities/grenoble/nina-net.yml
+++ b/data/cities/grenoble/nina-net.yml
@@ -4,8 +4,8 @@ latitude: 45.17588
 longitude: 5.7094
 postcode: "38100"
 city: Grenoble
-street: "Rue des Eaux Claires"
-housenumber: 47
+street: Rue des Eaux Claires
+housenumber: "47"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/nocibe.yml b/data/cities/grenoble/nocibe.yml
index 5b0cd5a32..6f3eec77d 100644
--- a/data/cities/grenoble/nocibe.yml
+++ b/data/cities/grenoble/nocibe.yml
@@ -1,11 +1,11 @@
 id: 512898603
-type: way
+type: node
 latitude: 45.1574
 longitude: 5.73236
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 97
-phone: "+33 4 76 23 50 60"
-opening_hours: "Mo-Sa 10:00-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Nocibe"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "97"
+phone: +33 4 76 23 50 60
+opening_hours: Mo-Sa 10:00-20:00
+website: https://grand-place.klepierre.fr/Shopping/Nocibe
diff --git a/data/cities/grenoble/noelie.yml b/data/cities/grenoble/noelie.yml
index cea5f220c..26477ec10 100644
--- a/data/cities/grenoble/noelie.yml
+++ b/data/cities/grenoble/noelie.yml
@@ -1,11 +1,11 @@
 id: 512899323
-type: way
+type: node
 latitude: 45.1576
 longitude: 5.7319
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 91
-phone: "+33 4 76 48 30 84"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Cleor"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "91"
+phone: +33 4 76 48 30 84
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Cleor
diff --git a/data/cities/grenoble/nuit-et-sommeil.yml b/data/cities/grenoble/nuit-et-sommeil.yml
index 9176ab92f..c5151cf47 100644
--- a/data/cities/grenoble/nuit-et-sommeil.yml
+++ b/data/cities/grenoble/nuit-et-sommeil.yml
@@ -4,8 +4,8 @@ latitude: 45.18418
 longitude: 5.71347
 postcode: "38000"
 city: Grenoble
-street: "Rue de New York"
-housenumber: 30
+street: Rue de New York
+housenumber: "30"
 phone: ""
-opening_hours: "Tu-Fr 10:00-12:00,14:00-18:30; Sa 10:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:00,14:00-18:30; Sa 10:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/grenoble/numidie.yml b/data/cities/grenoble/numidie.yml
index 76c8ea427..78d821101 100644
--- a/data/cities/grenoble/numidie.yml
+++ b/data/cities/grenoble/numidie.yml
@@ -4,8 +4,8 @@ latitude: 45.18818
 longitude: 5.71501
 postcode: ""
 city: Grenoble
-street: "Cours Berriat"
-housenumber: 69
+street: Cours Berriat
+housenumber: "69"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/omerveilles.yml b/data/cities/grenoble/omerveilles.yml
index a0acefe53..679d8d054 100644
--- a/data/cities/grenoble/omerveilles.yml
+++ b/data/cities/grenoble/omerveilles.yml
@@ -4,8 +4,8 @@ latitude: 45.19192
 longitude: 5.73176
 postcode: "38000"
 city: Grenoble
-street: "Rue Bayard"
-housenumber: 5
-phone: "+33 4 76 24 77 82"
-opening_hours: "Mo-Fr 14:00-19:00; Sa 10:00-19:00"
-website: "http://omerveilles.com/"
\ No newline at end of file
+street: Rue Bayard
+housenumber: "5"
+phone: +33 4 76 24 77 82
+opening_hours: Mo-Fr 14:00-19:00; Sa 10:00-19:00
+website: http://omerveilles.com/
diff --git a/data/cities/grenoble/one-shop.yml b/data/cities/grenoble/one-shop.yml
index 8370fd898..4db66a79a 100644
--- a/data/cities/grenoble/one-shop.yml
+++ b/data/cities/grenoble/one-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.18544
 longitude: 5.71162
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 41
+street: Rue Nicolas Chorier
+housenumber: "41"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/onglart.yml b/data/cities/grenoble/onglart.yml
index e8f4a2946..57189a9a1 100644
--- a/data/cities/grenoble/onglart.yml
+++ b/data/cities/grenoble/onglart.yml
@@ -4,8 +4,8 @@ latitude: 45.18043
 longitude: 5.73561
 postcode: "38100"
 city: Grenoble
-street: "Avenue Jean Perrot"
-housenumber: 29
+street: Avenue Jean Perrot
+housenumber: "29"
 phone: ""
-opening_hours: "Tu-Th 09:00-12:00,14:00-19:00; Fr-Sa 09:00-18:00"
-website: "http://onglerie-grenoble.fr/"
\ No newline at end of file
+opening_hours: Tu-Th 09:00-12:00,14:00-19:00; Fr-Sa 09:00-18:00
+website: http://onglerie-grenoble.fr/
diff --git a/data/cities/grenoble/only.yml b/data/cities/grenoble/only.yml
index a1da1ef20..88da4fce2 100644
--- a/data/cities/grenoble/only.yml
+++ b/data/cities/grenoble/only.yml
@@ -1,11 +1,11 @@
 id: 512902960
-type: way
+type: node
 latitude: 45.15823
 longitude: 5.73087
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 70
+street: Avenue du Vercors
+housenumber: "70"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/optique-des-alpins.yml b/data/cities/grenoble/optique-des-alpins.yml
index 79f71ccff..c361b3653 100644
--- a/data/cities/grenoble/optique-des-alpins.yml
+++ b/data/cities/grenoble/optique-des-alpins.yml
@@ -4,8 +4,8 @@ latitude: 45.17074
 longitude: 5.72342
 postcode: "38100"
 city: Grenoble
-street: "Rue de Stalingrad"
-housenumber: 130
+street: Rue de Stalingrad
+housenumber: "130"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:30, 15:00-19:00; Sa 10:00-18:00; on appointemnt"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30, 15:00-19:00; Sa 10:00-18:00; "on appointemnt"
+website: ""
diff --git a/data/cities/grenoble/or-en-cash.yml b/data/cities/grenoble/or-en-cash.yml
index 7f780b50c..95c906f41 100644
--- a/data/cities/grenoble/or-en-cash.yml
+++ b/data/cities/grenoble/or-en-cash.yml
@@ -4,8 +4,8 @@ latitude: 45.17981
 longitude: 5.7058
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Joseph Vallier"
-housenumber: 65
-phone: "+33 4 38 49 25 51"
-opening_hours: "Mo-Fr 09:30-18:00"
-website: "https://orencash.fr/"
\ No newline at end of file
+street: Boulevard Joseph Vallier
+housenumber: "65"
+phone: +33 4 38 49 25 51
+opening_hours: Mo-Fr 09:30-18:00
+website: https://orencash.fr/
diff --git a/data/cities/grenoble/oxybul.yml b/data/cities/grenoble/oxybul.yml
index 76cfd68df..00207046b 100644
--- a/data/cities/grenoble/oxybul.yml
+++ b/data/cities/grenoble/oxybul.yml
@@ -1,11 +1,11 @@
 id: 512899511
-type: way
+type: node
 latitude: 45.15751
 longitude: 5.73179
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 89
-phone: "+33 4 76 09 65 59"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Oxybul-Eveil-Jeux"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "89"
+phone: +33 4 76 09 65 59
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Oxybul-Eveil-Jeux
diff --git a/data/cities/grenoble/pandora.yml b/data/cities/grenoble/pandora.yml
index 65da94e66..4b1e0ede8 100644
--- a/data/cities/grenoble/pandora.yml
+++ b/data/cities/grenoble/pandora.yml
@@ -1,11 +1,11 @@
 id: 512915170
-type: way
+type: node
 latitude: 45.15821
 longitude: 5.73163
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 50
-phone: "+33 9 67 72 01 58"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/boutiques-restaurants/pandora"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "50"
+phone: +33 9 67 72 01 58
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/boutiques-restaurants/pandora
diff --git a/data/cities/grenoble/parfois.yml b/data/cities/grenoble/parfois.yml
index 7c6b7e67c..40c0becd2 100644
--- a/data/cities/grenoble/parfois.yml
+++ b/data/cities/grenoble/parfois.yml
@@ -1,11 +1,11 @@
 id: 512915192
-type: way
+type: node
 latitude: 45.15828
 longitude: 5.73105
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 74
-phone: "+33 4 76 70 42 49"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "74"
+phone: +33 4 76 70 42 49
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/grenoble/pascal-lavigne-luthier.yml b/data/cities/grenoble/pascal-lavigne-luthier.yml
index 1c4ac38f9..20c8f8d29 100644
--- a/data/cities/grenoble/pascal-lavigne-luthier.yml
+++ b/data/cities/grenoble/pascal-lavigne-luthier.yml
@@ -4,8 +4,8 @@ latitude: 45.18522
 longitude: 5.7092
 postcode: "38000"
 city: Grenoble
-street: "Rue Mozart"
-housenumber: 10
-phone: "+33 4 76 70 01 68"
+street: Rue Mozart
+housenumber: "10"
+phone: +33 4 76 70 01 68
 opening_hours: ""
-website: "https://www.pascal-lavigne.fr/"
\ No newline at end of file
+website: https://www.pascal-lavigne.fr/
diff --git a/data/cities/grenoble/pates-et-pains.yml b/data/cities/grenoble/pates-et-pains.yml
index 951805749..edd8c29eb 100644
--- a/data/cities/grenoble/pates-et-pains.yml
+++ b/data/cities/grenoble/pates-et-pains.yml
@@ -4,8 +4,8 @@ latitude: 45.2025
 longitude: 5.7045
 postcode: "38000"
 city: Grenoble
-street: "Rue Winston Churchill"
-housenumber: 28
+street: Rue Winston Churchill
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Fr 07:00-19:00; Sa 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-13:00
+website: ""
diff --git a/data/cities/grenoble/patisserie-sarrazin.yml b/data/cities/grenoble/patisserie-sarrazin.yml
index e5d23da5b..5b2878982 100644
--- a/data/cities/grenoble/patisserie-sarrazin.yml
+++ b/data/cities/grenoble/patisserie-sarrazin.yml
@@ -4,8 +4,8 @@ latitude: 45.18845
 longitude: 5.72409
 postcode: "38000"
 city: Grenoble
-street: "Place Victor Hugo"
-housenumber: 10
-phone: "+33 4 76 87 55 14"
-opening_hours: "Tu-Sa 06:15-19:00"
-website: ""
\ No newline at end of file
+street: Place Victor Hugo
+housenumber: "10"
+phone: +33 4 76 87 55 14
+opening_hours: Tu-Sa 06:15-19:00
+website: ""
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
index c2787e8da..b77106427 100644
--- 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
@@ -1,11 +1,11 @@
 id: 398056960
-type: way
+type: node
 latitude: 45.18418
 longitude: 5.72413
 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 08:00-19:30; Su 08:00-14:00"
-website: "https://paul.fr/stores/grenoble"
\ No newline at end of file
+street: Zac De Bonne, Centre Commercial Caserne De Bonne
+housenumber: ""
+phone: +33 4 76 27 83 26
+opening_hours: Mo-Sa 08:00-19:30; Su 08:00-14:00
+website: https://paul.fr/stores/grenoble
diff --git a/data/cities/grenoble/paul.yml b/data/cities/grenoble/paul.yml
index 90d5ddc9a..288622e6e 100644
--- a/data/cities/grenoble/paul.yml
+++ b/data/cities/grenoble/paul.yml
@@ -4,8 +4,8 @@ latitude: 45.20194
 longitude: 5.70529
 postcode: "38000"
 city: Grenoble
-street: "Avenue des Martyrs"
-housenumber: 78
-phone: "+33 4 82 29 98 92"
-opening_hours: "Mo-Fr 06:30-19:00; Sa 07:30-13:00"
-website: "https://paul.fr/stores/grenoble_presqu_ile"
\ No newline at end of file
+street: Avenue des Martyrs
+housenumber: "78"
+phone: +33 4 82 29 98 92
+opening_hours: Mo-Fr 06:30-19:00; Sa 07:30-13:00
+website: https://paul.fr/stores/grenoble_presqu_ile
diff --git a/data/cities/grenoble/point-p.yml b/data/cities/grenoble/point-p.yml
index 84dea0e36..de82be5fd 100644
--- a/data/cities/grenoble/point-p.yml
+++ b/data/cities/grenoble/point-p.yml
@@ -4,8 +4,8 @@ latitude: 45.17487
 longitude: 5.70431
 postcode: "38100"
 city: Grenoble
-street: "Avenue Rhin et Danube, 38100 Grenoble"
-housenumber: 48
-phone: "+33 4 76 84 40 40"
+street: Avenue Rhin et Danube, 38100 Grenoble
+housenumber: "48"
+phone: +33 4 76 84 40 40
 opening_hours: ""
-website: "https://www.pointp.fr/"
\ No newline at end of file
+website: https://www.pointp.fr/
diff --git a/data/cities/grenoble/point-retouche.yml b/data/cities/grenoble/point-retouche.yml
index 82948a096..8c1860489 100644
--- a/data/cities/grenoble/point-retouche.yml
+++ b/data/cities/grenoble/point-retouche.yml
@@ -4,8 +4,8 @@ latitude: 45.17955
 longitude: 5.70557
 postcode: "38000"
 city: Grenoble
-street: "Avenue Rhin et Danube"
-housenumber: 3
-phone: "+33 9 52 21 50 15"
-opening_hours: "Mo-Fr 09:00-12:00,12:30-18:00; Sa 09:00-12:30"
-website: "https://www.servet.fr/"
\ No newline at end of file
+street: Avenue Rhin et Danube
+housenumber: "3"
+phone: +33 9 52 21 50 15
+opening_hours: Mo-Fr 09:00-12:00,12:30-18:00; Sa 09:00-12:30
+website: https://www.servet.fr/
diff --git a/data/cities/grenoble/poissonnerie-lachenal.yml b/data/cities/grenoble/poissonnerie-lachenal.yml
index 1165df817..73f6ab76e 100644
--- a/data/cities/grenoble/poissonnerie-lachenal.yml
+++ b/data/cities/grenoble/poissonnerie-lachenal.yml
@@ -4,8 +4,8 @@ latitude: 45.18471
 longitude: 5.73026
 postcode: "38000"
 city: Grenoble
-street: "Rue du 4e Régiment du Génie"
-housenumber: 1
+street: Rue du 4e Régiment du Génie
+housenumber: "1"
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30,16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,16:00-19:00
+website: ""
diff --git a/data/cities/grenoble/raphael-philatelie.yml b/data/cities/grenoble/raphael-philatelie.yml
index c8fb8a0fb..16e8a9477 100644
--- a/data/cities/grenoble/raphael-philatelie.yml
+++ b/data/cities/grenoble/raphael-philatelie.yml
@@ -4,8 +4,8 @@ latitude: 45.18926
 longitude: 5.72022
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 33
+street: Avenue Alsace Lorraine
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/rapidgarage.yml b/data/cities/grenoble/rapidgarage.yml
index 0b72001dd..c171099e7 100644
--- a/data/cities/grenoble/rapidgarage.yml
+++ b/data/cities/grenoble/rapidgarage.yml
@@ -4,8 +4,8 @@ latitude: 45.19623
 longitude: 5.71871
 postcode: "38000"
 city: Grenoble
-street: "Route de Lyon"
-housenumber: 29
+street: Route de Lyon
+housenumber: "29"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/recyclerie-sportive-grenoble.yml b/data/cities/grenoble/recyclerie-sportive-grenoble.yml
index 521a6559e..54f0f5cf8 100644
--- a/data/cities/grenoble/recyclerie-sportive-grenoble.yml
+++ b/data/cities/grenoble/recyclerie-sportive-grenoble.yml
@@ -4,8 +4,8 @@ latitude: 45.19004
 longitude: 5.72962
 postcode: "38000"
 city: Grenoble
-street: "Rue Raoul Blanchard"
-housenumber: 3
-phone: "07 68 53 23 35"
-opening_hours: "We-Fr 13:00-19:00; Sa 11:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Raoul Blanchard
+housenumber: "3"
+phone: 07 68 53 23 35
+opening_hours: We-Fr 13:00-19:00; Sa 11:00-19:00
+website: ""
diff --git a/data/cities/grenoble/richardson.yml b/data/cities/grenoble/richardson.yml
index 84f663726..3c611b590 100644
--- a/data/cities/grenoble/richardson.yml
+++ b/data/cities/grenoble/richardson.yml
@@ -1,11 +1,11 @@
 id: 43391265
-type: way
+type: node
 latitude: 45.1719
 longitude: 5.72904
 postcode: "38100"
 city: Grenoble
-street: "Rue Gustave Flaubert"
-housenumber: 19
+street: Rue Gustave Flaubert
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Th 07:45-12:00, 14:00-17:30; Fr 07:45-12:00, 14:00-16:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:45-12:00, 14:00-17:30; Fr 07:45-12:00, 14:00-16:15
+website: ""
diff --git a/data/cities/grenoble/room-17.yml b/data/cities/grenoble/room-17.yml
index 59217156a..0f32d95ff 100644
--- a/data/cities/grenoble/room-17.yml
+++ b/data/cities/grenoble/room-17.yml
@@ -4,8 +4,8 @@ latitude: 45.18618
 longitude: 5.72369
 postcode: ""
 city: Grenoble
-street: "Rue Aubert Dubayet"
-housenumber: 3
+street: Rue Aubert Dubayet
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/rougegorge.yml b/data/cities/grenoble/rougegorge.yml
index 372d20df3..548544c5c 100644
--- a/data/cities/grenoble/rougegorge.yml
+++ b/data/cities/grenoble/rougegorge.yml
@@ -1,11 +1,11 @@
 id: 512915558
-type: way
+type: node
 latitude: 45.15833
 longitude: 5.73226
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 38
-phone: "+33 4 76 70 21 56"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/RougeGorge"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "38"
+phone: +33 4 76 70 21 56
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/RougeGorge
diff --git a/data/cities/grenoble/select-fruits.yml b/data/cities/grenoble/select-fruits.yml
index 36a6e5263..91bcb5566 100644
--- a/data/cities/grenoble/select-fruits.yml
+++ b/data/cities/grenoble/select-fruits.yml
@@ -4,8 +4,8 @@ latitude: 45.18649
 longitude: 5.73226
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 21
+street: Rue de Strasbourg
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 07:30-20:00; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-20:00; Su 07:30-12:30
+website: ""
diff --git a/data/cities/grenoble/sesam.yml b/data/cities/grenoble/sesam.yml
index b4161af5c..89c0a2e5d 100644
--- a/data/cities/grenoble/sesam.yml
+++ b/data/cities/grenoble/sesam.yml
@@ -4,8 +4,8 @@ latitude: 45.1921
 longitude: 5.72938
 postcode: "38000"
 city: Grenoble
-street: "Rue des Clercs"
-housenumber: 12
-phone: "+33 4 76 51 31 10"
-opening_hours: "Mo 14:00-19:00"
-website: "http://www.sesam-bijoux.fr/"
\ No newline at end of file
+street: Rue des Clercs
+housenumber: "12"
+phone: +33 4 76 51 31 10
+opening_hours: Mo 14:00-19:00
+website: http://www.sesam-bijoux.fr/
diff --git a/data/cities/grenoble/siam-bangkok.yml b/data/cities/grenoble/siam-bangkok.yml
index c93107786..d8c91b5f2 100644
--- a/data/cities/grenoble/siam-bangkok.yml
+++ b/data/cities/grenoble/siam-bangkok.yml
@@ -1,11 +1,11 @@
 id: 626383006
-type: way
+type: node
 latitude: 45.16737
 longitude: 5.7325
 postcode: "38100"
 city: Grenoble
-street: "Avenue La Bruyère"
-housenumber: 38
+street: Avenue La Bruyère
+housenumber: "38"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:30,14:00-19:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:30,14:00-19:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/grenoble/soupcon-de-magie.yml b/data/cities/grenoble/soupcon-de-magie.yml
new file mode 100644
index 000000000..f36ed5298
--- /dev/null
+++ b/data/cities/grenoble/soupcon-de-magie.yml
@@ -0,0 +1,11 @@
+id: 2432222064
+type: node
+latitude: 45.1893
+longitude: 5.72742
+postcode: "38000"
+city: Grenoble
+street: Rue de la Poste
+housenumber: "18"
+phone: ""
+opening_hours: Tu-Sa 10:30-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/grenoble/spar.yml b/data/cities/grenoble/spar.yml
index 7e09a1832..055047705 100644
--- a/data/cities/grenoble/spar.yml
+++ b/data/cities/grenoble/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.18642
 longitude: 5.73185
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 22
+street: Rue de Strasbourg
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:50; Su 08:30-12:50"
-website: "https://magasins.spar.fr/fr/s/spar-supermarche-grenoble-strasbourg"
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-20:50; Su 08:30-12:50
+website: https://magasins.spar.fr/fr/s/spar-supermarche-grenoble-strasbourg
diff --git a/data/cities/grenoble/speed-queen.yml b/data/cities/grenoble/speed-queen.yml
index 0dbfe280b..00f57fc4d 100644
--- a/data/cities/grenoble/speed-queen.yml
+++ b/data/cities/grenoble/speed-queen.yml
@@ -4,8 +4,8 @@ latitude: 45.19045
 longitude: 5.7171
 postcode: "38000"
 city: Grenoble
-street: "Avenue Félix Viallet"
-housenumber: 43
+street: Avenue Félix Viallet
+housenumber: "43"
 phone: ""
-opening_hours: "06:00-20:30"
-website: ""
\ No newline at end of file
+opening_hours: 06:00-20:30
+website: ""
diff --git a/data/cities/grenoble/splendid-garage.yml b/data/cities/grenoble/splendid-garage.yml
index 8ee9c0868..f2e718f19 100644
--- a/data/cities/grenoble/splendid-garage.yml
+++ b/data/cities/grenoble/splendid-garage.yml
@@ -4,8 +4,8 @@ latitude: 45.19768
 longitude: 5.73566
 postcode: "38000"
 city: Grenoble
-street: "Rue Eugène Delacroix"
-housenumber: 4
-phone: "+33 4 76 42 74 72"
-opening_hours: "Tu-Fr 07:45-12:00,13:30-18:00; Mo 07:45-12:00,13:15-18:00"
-website: ""
\ No newline at end of file
+street: Rue Eugène Delacroix
+housenumber: "4"
+phone: +33 4 76 42 74 72
+opening_hours: Tu-Fr 07:45-12:00,13:30-18:00; Mo 07:45-12:00,13:15-18:00
+website: ""
diff --git a/data/cities/grenoble/tabac-presse-des-allies.yml b/data/cities/grenoble/tabac-presse-des-allies.yml
index 1608c9d89..b1f00fa34 100644
--- a/data/cities/grenoble/tabac-presse-des-allies.yml
+++ b/data/cities/grenoble/tabac-presse-des-allies.yml
@@ -4,8 +4,8 @@ latitude: 45.17358
 longitude: 5.71821
 postcode: "38100"
 city: Grenoble
-street: "Rue des Alliés"
-housenumber: 116
+street: Rue des Alliés
+housenumber: "116"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/tabac-presse-lafayette.yml b/data/cities/grenoble/tabac-presse-lafayette.yml
index 318a720f3..a0a281621 100644
--- a/data/cities/grenoble/tabac-presse-lafayette.yml
+++ b/data/cities/grenoble/tabac-presse-lafayette.yml
@@ -4,8 +4,8 @@ latitude: 45.19186
 longitude: 5.72948
 postcode: "38000"
 city: Grenoble
-street: "Rue Lafayette"
-housenumber: 4
+street: Rue Lafayette
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Th 07:00-19:30; Fr,Sa 07:00-21:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:00-19:30; Fr,Sa 07:00-21:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/grenoble/tabac-presse-loto-arago.yml b/data/cities/grenoble/tabac-presse-loto-arago.yml
index 7259ae19d..c4ce86b30 100644
--- a/data/cities/grenoble/tabac-presse-loto-arago.yml
+++ b/data/cities/grenoble/tabac-presse-loto-arago.yml
@@ -4,8 +4,8 @@ latitude: 45.19482
 longitude: 5.71428
 postcode: "38000"
 city: Grenoble
-street: "Rue Arago"
-housenumber: 7
-phone: "+33 4 76 46 64 53"
-opening_hours: "Mo-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Arago
+housenumber: "7"
+phone: +33 4 76 46 64 53
+opening_hours: Mo-Sa 07:00-19:00
+website: ""
diff --git a/data/cities/grenoble/tabac-presse-loto.yml b/data/cities/grenoble/tabac-presse-loto.yml
index e16195d2c..703c0eda3 100644
--- a/data/cities/grenoble/tabac-presse-loto.yml
+++ b/data/cities/grenoble/tabac-presse-loto.yml
@@ -4,8 +4,8 @@ latitude: 45.18318
 longitude: 5.71831
 postcode: "38000"
 city: Grenoble
-street: "Rue Thiers"
-housenumber: 74
+street: Rue Thiers
+housenumber: "74"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/tabac-presse.yml b/data/cities/grenoble/tabac-presse.yml
index 18dc0b15b..b081495db 100644
--- a/data/cities/grenoble/tabac-presse.yml
+++ b/data/cities/grenoble/tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.18664
 longitude: 5.73143
 postcode: "38000"
 city: Grenoble
-street: "Rue de Strasbourg"
-housenumber: 
+street: Rue de Strasbourg
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/tezenis.yml b/data/cities/grenoble/tezenis.yml
index 8574b64dd..02470619c 100644
--- a/data/cities/grenoble/tezenis.yml
+++ b/data/cities/grenoble/tezenis.yml
@@ -1,11 +1,11 @@
 id: 512915181
-type: way
+type: node
 latitude: 45.15805
 longitude: 5.7314
 postcode: "38100"
 city: Grenoble
-street: "Avenue du Vercors"
-housenumber: 80
+street: Avenue du Vercors
+housenumber: "80"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/grenoble/tigre-et-dragon.yml b/data/cities/grenoble/tigre-et-dragon.yml
index bd42cefa8..310b0e08a 100644
--- a/data/cities/grenoble/tigre-et-dragon.yml
+++ b/data/cities/grenoble/tigre-et-dragon.yml
@@ -4,8 +4,8 @@ latitude: 45.18739
 longitude: 5.74461
 postcode: "38100"
 city: Grenoble
-street: "Rue Jules Flandrin"
-housenumber: 18
-phone: "+33 04 76 44 06 31"
-opening_hours: "Mo-Fr 14:00-18:30; We 10:00-12:00,14:00-18:30; Sa 10:00-16:30"
-website: "https://www.tigre-et-dragon.com/"
\ No newline at end of file
+street: Rue Jules Flandrin
+housenumber: "18"
+phone: +33 04 76 44 06 31
+opening_hours: Mo-Fr 14:00-18:30; We 10:00-12:00,14:00-18:30; Sa 10:00-16:30
+website: https://www.tigre-et-dragon.com/
diff --git a/data/cities/grenoble/tui.yml b/data/cities/grenoble/tui.yml
index 909750ca2..8eefeda5a 100644
--- a/data/cities/grenoble/tui.yml
+++ b/data/cities/grenoble/tui.yml
@@ -4,8 +4,8 @@ latitude: 45.18956
 longitude: 5.72013
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 24
-phone: "+33 4 76 43 28 06"
-opening_hours: "Mo-Fr 09:30-18:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+street: Avenue Alsace Lorraine
+housenumber: "24"
+phone: +33 4 76 43 28 06
+opening_hours: Mo-Fr 09:30-18:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/grenoble/u-express.yml b/data/cities/grenoble/u-express.yml
index f8bf524a3..e66827ded 100644
--- a/data/cities/grenoble/u-express.yml
+++ b/data/cities/grenoble/u-express.yml
@@ -4,8 +4,8 @@ latitude: 45.1851
 longitude: 5.71683
 postcode: "38000"
 city: Grenoble
-street: "Avenue de Vizille"
-housenumber: 17
-phone: "+33 4 76 84 67 44"
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:00-13:00"
-website: "https://www.magasins-u.com/magasin/uexpress-grenoblevizille"
\ No newline at end of file
+street: Avenue de Vizille
+housenumber: "17"
+phone: +33 4 76 84 67 44
+opening_hours: Mo-Sa 08:00-20:00; Su 08:00-13:00
+website: https://www.magasins-u.com/magasin/uexpress-grenoblevizille
diff --git a/data/cities/grenoble/un-moment-pour-soi.yml b/data/cities/grenoble/un-moment-pour-soi.yml
index 319b8f40f..84895dd92 100644
--- a/data/cities/grenoble/un-moment-pour-soi.yml
+++ b/data/cities/grenoble/un-moment-pour-soi.yml
@@ -4,8 +4,8 @@ latitude: 45.17663
 longitude: 5.71552
 postcode: "38100"
 city: Grenoble
-street: "Cours de la Libération et du Général de Gaulle"
-housenumber: 43
+street: Cours de la Libération et du Général de Gaulle
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/grenoble/undiz.yml b/data/cities/grenoble/undiz.yml
index 57a09ddc3..7776839cf 100644
--- a/data/cities/grenoble/undiz.yml
+++ b/data/cities/grenoble/undiz.yml
@@ -1,11 +1,11 @@
 id: 512915557
-type: way
+type: node
 latitude: 45.15835
 longitude: 5.73246
 postcode: "38100"
 city: Grenoble
-street: "Avenue de la Chartreuse"
-housenumber: 36
-phone: "+33 4 76 09 88 46"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://grand-place.klepierre.fr/Shopping/Undiz"
\ No newline at end of file
+street: Avenue de la Chartreuse
+housenumber: "36"
+phone: +33 4 76 09 88 46
+opening_hours: Mo-Sa 09:30-20:00
+website: https://grand-place.klepierre.fr/Shopping/Undiz
diff --git a/data/cities/grenoble/union-locale-des-initiatives-solidaires-au-service-de-lemploi.yml b/data/cities/grenoble/union-locale-des-initiatives-solidaires-au-service-de-lemploi.yml
index f1a50dc3e..d0de2cc0d 100644
--- a/data/cities/grenoble/union-locale-des-initiatives-solidaires-au-service-de-lemploi.yml
+++ b/data/cities/grenoble/union-locale-des-initiatives-solidaires-au-service-de-lemploi.yml
@@ -1,11 +1,11 @@
 id: 40426208
-type: way
+type: node
 latitude: 45.17611
 longitude: 5.72581
 postcode: "38100"
 city: Grenoble
-street: "Rue Hippolyte Müller"
-housenumber: 2
-phone: "+33 4 76 26 66 94"
-opening_hours: "Tu,Fr 09:30-16:30; Sa[2] 09:30-13:00"
-website: "https://www.ulisse38.com/10238-ulisse-grenoble-solidarite.htm"
\ No newline at end of file
+street: Rue Hippolyte Müller
+housenumber: "2"
+phone: +33 4 76 26 66 94
+opening_hours: Tu,Fr 09:30-16:30; Sa[2] 09:30-13:00
+website: https://www.ulisse38.com/10238-ulisse-grenoble-solidarite.htm
diff --git a/data/cities/grenoble/univairmer.yml b/data/cities/grenoble/univairmer.yml
index 5076ad50a..9729190be 100644
--- a/data/cities/grenoble/univairmer.yml
+++ b/data/cities/grenoble/univairmer.yml
@@ -4,8 +4,8 @@ latitude: 45.18904
 longitude: 5.72165
 postcode: "38000"
 city: Grenoble
-street: "Avenue Alsace Lorraine"
-housenumber: 15
-phone: "+33 4 85 19 00 03"
-opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-13:30,14:00-17:30"
-website: "https://www.kuoni.fr/agences/"
\ No newline at end of file
+street: Avenue Alsace Lorraine
+housenumber: "15"
+phone: +33 4 85 19 00 03
+opening_hours: Mo-Fr 10:00-18:00; Sa 10:00-13:30,14:00-17:30
+website: https://www.kuoni.fr/agences/
diff --git a/data/cities/grenoble/universal-ride.yml b/data/cities/grenoble/universal-ride.yml
index 107f1708f..6ee1be4d4 100644
--- a/data/cities/grenoble/universal-ride.yml
+++ b/data/cities/grenoble/universal-ride.yml
@@ -4,8 +4,8 @@ latitude: 45.16248
 longitude: 5.71377
 postcode: "38100"
 city: Grenoble
-street: "Avenue Paul Verlaine"
-housenumber: 3
-phone: "+33 4 76291764"
+street: Avenue Paul Verlaine
+housenumber: "3"
+phone: +33 4 76291764
 opening_hours: ""
-website: "https://www.ktmonline.fr/"
\ No newline at end of file
+website: https://www.ktmonline.fr/
diff --git a/data/cities/grenoble/utile.yml b/data/cities/grenoble/utile.yml
index 42c68f7a5..a55280460 100644
--- a/data/cities/grenoble/utile.yml
+++ b/data/cities/grenoble/utile.yml
@@ -4,8 +4,8 @@ latitude: 45.18565
 longitude: 5.72741
 postcode: "38000"
 city: Grenoble
-street: "Rue Hoche"
-housenumber: 8
+street: Rue Hoche
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00, Su 08:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00, Su 08:30-13:00
+website: ""
diff --git a/data/cities/grenoble/vision-unik.yml b/data/cities/grenoble/vision-unik.yml
index 32dcce0e1..10e586466 100644
--- a/data/cities/grenoble/vision-unik.yml
+++ b/data/cities/grenoble/vision-unik.yml
@@ -4,8 +4,8 @@ latitude: 45.18029
 longitude: 5.70662
 postcode: "38000"
 city: Grenoble
-street: "Boulevard joseph vallier"
-housenumber: 54
+street: Boulevard Joseph Vallier
+housenumber: "54"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/grenoble/vival-brenier-grenoble.yml b/data/cities/grenoble/vival-brenier-grenoble.yml
index 945d4f6bd..1ebfeb9aa 100644
--- a/data/cities/grenoble/vival-brenier-grenoble.yml
+++ b/data/cities/grenoble/vival-brenier-grenoble.yml
@@ -4,8 +4,8 @@ latitude: 45.19211
 longitude: 5.71924
 postcode: "38000"
 city: Grenoble
-street: "Rue Casimir Brenier"
-housenumber: 4
-phone: "+33 4 76 53 11 91"
-opening_hours: "Mo-Su 07:00-23:00"
-website: "https://magasins.vival.fr/fr/vival-grenoble-brenier"
\ No newline at end of file
+street: Rue Casimir Brenier
+housenumber: "4"
+phone: +33 4 76 53 11 91
+opening_hours: Mo-Su 07:00-23:00
+website: https://magasins.vival.fr/fr/vival-grenoble-brenier
diff --git a/data/cities/grenoble/wargame-spirit.yml b/data/cities/grenoble/wargame-spirit.yml
index 5de8fd8c0..199e824ed 100644
--- a/data/cities/grenoble/wargame-spirit.yml
+++ b/data/cities/grenoble/wargame-spirit.yml
@@ -4,8 +4,9 @@ latitude: 45.18953
 longitude: 5.7226
 postcode: "38000"
 city: Grenoble
-street: "Boulevard Gambetta"
-housenumber: 21
-phone: "+33 4 58 00 56 68"
-opening_hours: "Mo off; Tu 13:00-01:00; We 10:00-13:00,14:00-19:00; Th 13:00-19:00; Fr 13:00-01:00; Sa 10:00-13:00,14:00-19:00; Su off"
-website: "https://www.wargamespirit.fr"
\ No newline at end of file
+street: Boulevard Gambetta
+housenumber: "21"
+phone: +33 4 58 00 56 68
+opening_hours: Mo off; Tu 13:00-01:00; We 10:00-13:00,14:00-19:00; Th 13:00-19:00;
+    Fr 13:00-01:00; Sa 10:00-13:00,14:00-19:00; Su off
+website: https://www.wargamespirit.fr
diff --git a/data/cities/grenoble/warland-surplus.yml b/data/cities/grenoble/warland-surplus.yml
index 319fbe84d..4f00e3d13 100644
--- a/data/cities/grenoble/warland-surplus.yml
+++ b/data/cities/grenoble/warland-surplus.yml
@@ -4,8 +4,8 @@ latitude: 45.18809
 longitude: 5.72575
 postcode: "38000"
 city: Grenoble
-street: "Rue Paul Bert"
-housenumber: 9
-phone: "+33 9 70 99 09 60"
-opening_hours: "Tu-Sa 10:00-19:00; Mo 14:00-19:00"
-website: "https://warland-surplus.fr/"
\ No newline at end of file
+street: Rue Paul Bert
+housenumber: "9"
+phone: +33 9 70 99 09 60
+opening_hours: Tu-Sa 10:00-19:00; Mo 14:00-19:00
+website: https://warland-surplus.fr/
diff --git a/data/cities/grenoble/youbadit.yml b/data/cities/grenoble/youbadit.yml
index 8c553fd7f..fac84d6d3 100644
--- a/data/cities/grenoble/youbadit.yml
+++ b/data/cities/grenoble/youbadit.yml
@@ -4,8 +4,9 @@ latitude: 45.18585
 longitude: 5.7161
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
+street: Rue Nicolas Chorier
 housenumber: 13;15
 phone: ""
-opening_hours: "Mo 13:30-18:30; Tu-We,Fr 09:00-18:00; Th 09:30-12:30,13:30-18:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 13:30-18:30; Tu-We,Fr 09:00-18:00; Th 09:30-12:30,13:30-18:30; Sa-Su
+    off
+website: ""
diff --git a/data/cities/grenoble/youbikeit.yml b/data/cities/grenoble/youbikeit.yml
index e069b906e..fa1cc3933 100644
--- a/data/cities/grenoble/youbikeit.yml
+++ b/data/cities/grenoble/youbikeit.yml
@@ -4,8 +4,8 @@ latitude: 45.18585
 longitude: 5.71617
 postcode: "38000"
 city: Grenoble
-street: "Rue Nicolas Chorier"
-housenumber: 15
+street: Rue Nicolas Chorier
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Fr 09:30-18:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-18:30; Sa-Su off
+website: ""
diff --git a/data/cities/grenoble/yves-rocher.yml b/data/cities/grenoble/yves-rocher.yml
index 9c277a870..617436616 100644
--- a/data/cities/grenoble/yves-rocher.yml
+++ b/data/cities/grenoble/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.18935
 longitude: 5.72847
 postcode: "38000"
 city: Grenoble
-street: "Rue Saint-Jacques"
-housenumber: 13
+street: Rue Saint-Jacques
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/grenoble/grenoble-st-jacques/S-FRYROC2"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/grenoble/grenoble-st-jacques/S-FRYROC2
diff --git a/data/cities/grenoble/zapatos.yml b/data/cities/grenoble/zapatos.yml
index 8c618eaef..42284a480 100644
--- a/data/cities/grenoble/zapatos.yml
+++ b/data/cities/grenoble/zapatos.yml
@@ -4,8 +4,8 @@ latitude: 45.18963
 longitude: 5.72908
 postcode: "38000"
 city: Grenoble
-street: "Rue Vicat"
-housenumber: 5
-phone: "+33 4 76 51 38 20"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-13:00,14:00-19:00; Su off"
-website: "https://www.zapatoschaussures.com"
\ No newline at end of file
+street: Rue Vicat
+housenumber: "5"
+phone: +33 4 76 51 38 20
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-13:00,14:00-19:00; Su off
+website: https://www.zapatoschaussures.com
diff --git a/data/cities/gresse-en-vercors/grillet-sports.yml b/data/cities/gresse-en-vercors/grillet-sports.yml
index 26d9d4224..3013f5ece 100644
--- a/data/cities/gresse-en-vercors/grillet-sports.yml
+++ b/data/cities/gresse-en-vercors/grillet-sports.yml
@@ -5,7 +5,7 @@ longitude: 5.54887
 postcode: "38650"
 city: Gresse-en-Vercors
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 09:00-12:30,14:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-12:30,14:30-18:30
+website: ""
diff --git a/data/cities/gresy-sur-aix/decathlon.yml b/data/cities/gresy-sur-aix/decathlon.yml
index 48f836b5d..061273204 100644
--- a/data/cities/gresy-sur-aix/decathlon.yml
+++ b/data/cities/gresy-sur-aix/decathlon.yml
@@ -1,11 +1,11 @@
 id: 72581675
-type: way
+type: node
 latitude: 45.71874
 longitude: 5.92288
 postcode: "73100"
 city: Grésy-sur-Aix
-street: "Route des Bauges"
-housenumber: 
-phone: "+33 4 79 88 19 90"
-opening_hours: "Mo-Fr 09:30-19:30; Sa 09:00-19:30"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-gresy-sur-aix-aix-les-bains--0070054100541"
\ No newline at end of file
+street: Route des Bauges
+housenumber: ""
+phone: +33 4 79 88 19 90
+opening_hours: Mo-Fr 09:30-19:30; Sa 09:00-19:30
+website: https://www.decathlon.fr/store-view/magasin-de-sports-gresy-sur-aix-aix-les-bains--0070054100541
diff --git a/data/cities/gresy-sur-aix/gamm-vert.yml b/data/cities/gresy-sur-aix/gamm-vert.yml
index ce4547f6d..87a0f64b0 100644
--- a/data/cities/gresy-sur-aix/gamm-vert.yml
+++ b/data/cities/gresy-sur-aix/gamm-vert.yml
@@ -4,8 +4,8 @@ latitude: 45.7145
 longitude: 5.91944
 postcode: "73100"
 city: Grésy-sur-Aix
-street: "Route de Pont-Pierre"
-housenumber: 113
+street: Route de Pont-Pierre
+housenumber: "113"
 phone: "+33479883423"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/gresy-sur-aix/maison-hofer.yml b/data/cities/gresy-sur-aix/maison-hofer.yml
index 8403529cc..2fa972856 100644
--- a/data/cities/gresy-sur-aix/maison-hofer.yml
+++ b/data/cities/gresy-sur-aix/maison-hofer.yml
@@ -4,8 +4,8 @@ latitude: 45.71514
 longitude: 5.91695
 postcode: "73100"
 city: Grésy sur Aix
-street: "Route de l'Albanais"
-housenumber: 773
+street: Route de l'Albanais
+housenumber: "773"
 phone: ""
-opening_hours: "Mo-Su 09:00-13:00; 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-13:00; 15:00-19:00
+website: ""
diff --git a/data/cities/gresy-sur-isere/studio-tyna.yml b/data/cities/gresy-sur-isere/studio-tyna.yml
index 0fefb0c1d..e4c55dfda 100644
--- a/data/cities/gresy-sur-isere/studio-tyna.yml
+++ b/data/cities/gresy-sur-isere/studio-tyna.yml
@@ -4,8 +4,8 @@ latitude: 45.6012
 longitude: 6.25437
 postcode: "73460"
 city: Grésy-sur-Isère
-street: "Place Pierre Bonnet"
-housenumber: 42
-phone: "+33 4 79 37 96 31"
-opening_hours: "Tu,We 09:00-18:00; Th,Fr 09:00-19:00; Sa 09:00-14:00; Su,Mo off"
-website: "https://www.studiotyna.fr"
\ No newline at end of file
+street: Place Pierre Bonnet
+housenumber: "42"
+phone: +33 4 79 37 96 31
+opening_hours: Tu,We 09:00-18:00; Th,Fr 09:00-19:00; Sa 09:00-14:00; Su,Mo off
+website: https://www.studiotyna.fr
diff --git a/data/cities/grezieu-la-varenne/gailleton-fleurs-et-plantes.yml b/data/cities/grezieu-la-varenne/gailleton-fleurs-et-plantes.yml
index a17d131ac..5e5ac33a5 100644
--- a/data/cities/grezieu-la-varenne/gailleton-fleurs-et-plantes.yml
+++ b/data/cities/grezieu-la-varenne/gailleton-fleurs-et-plantes.yml
@@ -1,11 +1,11 @@
 id: 355717257
-type: way
+type: node
 latitude: 45.74795
 longitude: 4.70854
 postcode: "69290"
 city: Grézieu-la-Varenne
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: "0478571362"
-opening_hours: "Mo-Sa 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00
+website: ""
diff --git a/data/cities/grigny/roux-beatrice.yml b/data/cities/grigny/roux-beatrice.yml
index 34e64d362..9080f34e6 100644
--- a/data/cities/grigny/roux-beatrice.yml
+++ b/data/cities/grigny/roux-beatrice.yml
@@ -4,8 +4,8 @@ latitude: 45.60969
 longitude: 4.79257
 postcode: "69520"
 city: Grigny
-street: "Place Jean Jaurès"
-housenumber: 8
+street: Place Jean Jaurès
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Th 08:30-12:00,14:00-19:00; Fr 08:30-19:00; Sa 08:30-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 08:30-12:00,14:00-19:00; Fr 08:30-19:00; Sa 08:30-16:00
+website: ""
diff --git a/data/cities/grilly/divauto.yml b/data/cities/grilly/divauto.yml
index 972fa956e..7716bd7f6 100644
--- a/data/cities/grilly/divauto.yml
+++ b/data/cities/grilly/divauto.yml
@@ -1,11 +1,11 @@
 id: 97161253
-type: way
+type: node
 latitude: 46.33624
 longitude: 6.11657
 postcode: "01220"
 city: Grilly
-street: "Route de Divonne les Bains"
-housenumber: 700
+street: Route de Divonne les Bains
+housenumber: "700"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/groisy/carrefour-market.yml b/data/cities/groisy/carrefour-market.yml
index 94bcab54f..a2f2a93ef 100644
--- a/data/cities/groisy/carrefour-market.yml
+++ b/data/cities/groisy/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 113059662
-type: way
+type: node
 latitude: 46.00213
 longitude: 6.18225
 postcode: "74570"
 city: Groisy
-street: "Rue du Plot"
-housenumber: 81
+street: Rue du Plot
+housenumber: "81"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/groisy/vival.yml b/data/cities/groisy/vival.yml
index 8a925f018..71b58407e 100644
--- a/data/cities/groisy/vival.yml
+++ b/data/cities/groisy/vival.yml
@@ -1,11 +1,11 @@
 id: 113060786
-type: way
+type: node
 latitude: 46.00924
 longitude: 6.16997
 postcode: "74570"
 city: Groisy
-street: "Rue de Boisy"
-housenumber: 571
+street: Rue de Boisy
+housenumber: "571"
 phone: ""
-opening_hours: "Mo-Sa 08:30-12:45, 15:15-20:00; Su 08:30-13:00, 17:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:45, 15:15-20:00; Su 08:30-13:00, 17:00-20:00
+website: ""
diff --git a/data/cities/gruffy/annicoiff.yml b/data/cities/gruffy/annicoiff.yml
index 4ebe773d1..634f12642 100644
--- a/data/cities/gruffy/annicoiff.yml
+++ b/data/cities/gruffy/annicoiff.yml
@@ -4,8 +4,8 @@ latitude: 45.78688
 longitude: 6.0542
 postcode: "74540"
 city: Gruffy
-street: "Route des Bauges"
-housenumber: 
+street: Route des Bauges
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/guereins/locadens.yml b/data/cities/guereins/locadens.yml
index 7ecdb70e0..d23f572f8 100644
--- a/data/cities/guereins/locadens.yml
+++ b/data/cities/guereins/locadens.yml
@@ -4,8 +4,8 @@ latitude: 46.0981
 longitude: 4.76554
 postcode: "01090"
 city: Guéreins
-street: "Route de Montmerle"
-housenumber: 2444
+street: Route de Montmerle
+housenumber: "2444"
 phone: "+33631785602"
-opening_hours: "Mo-Sa 12:15-13:15,17:30-20:00; Su 10:00-12:00"
-website: "https://www.locadens.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 12:15-13:15,17:30-20:00; Su 10:00-12:00
+website: https://www.locadens.fr/
diff --git a/data/cities/habere-poche/ferme-des-grands-champs.yml b/data/cities/habere-poche/ferme-des-grands-champs.yml
index 8a1e8b1fc..2c86ce940 100644
--- a/data/cities/habere-poche/ferme-des-grands-champs.yml
+++ b/data/cities/habere-poche/ferme-des-grands-champs.yml
@@ -4,8 +4,8 @@ latitude: 46.2544
 longitude: 6.4722
 postcode: "74420"
 city: Habère-Poche
-street: "Route de la Croix Lolet"
-housenumber: 
+street: Route de la Croix Lolet
+housenumber: ""
 phone: ""
-opening_hours: "Fr 15:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Fr 15:00-18:00
+website: ""
diff --git a/data/cities/habere-poche/la-ferme-des-moises.yml b/data/cities/habere-poche/la-ferme-des-moises.yml
index 909d3d8d5..f0b28553e 100644
--- a/data/cities/habere-poche/la-ferme-des-moises.yml
+++ b/data/cities/habere-poche/la-ferme-des-moises.yml
@@ -4,8 +4,8 @@ latitude: 46.26896
 longitude: 6.4644
 postcode: "74420"
 city: Habère-Poche
-street: "Route du Mas de l'Épée"
-housenumber: 171
+street: Route du Mas de l'Épée
+housenumber: "171"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 10:00-12:00, 16:00-19:00; Su 10:00-12:00, 16:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 10:00-12:00, 16:00-19:00; Su 10:00-12:00, 16:00-18:00
+website: ""
diff --git a/data/cities/habere-poche/le-petit-casino.yml b/data/cities/habere-poche/le-petit-casino.yml
index bd62420e3..4b85dc4b0 100644
--- a/data/cities/habere-poche/le-petit-casino.yml
+++ b/data/cities/habere-poche/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.24792
 longitude: 6.47321
 postcode: "74420"
 city: Habère-Poche
-street: "Route Valla Verda"
-housenumber: 3440
+street: Route Valla Verda
+housenumber: "3440"
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30,15:30-19:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,15:30-19:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/habere-poche/le-tiennolet.yml b/data/cities/habere-poche/le-tiennolet.yml
index d94fd845b..982e1171b 100644
--- a/data/cities/habere-poche/le-tiennolet.yml
+++ b/data/cities/habere-poche/le-tiennolet.yml
@@ -4,8 +4,8 @@ latitude: 46.25026
 longitude: 6.47266
 postcode: "74420"
 city: Habère-Poche
-street: "Route du Col"
-housenumber: 180
+street: Route du Col
+housenumber: "180"
 phone: ""
-opening_hours: "Mo-Su 07:00-13:00,17:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-13:00,17:00-19:00
+website: ""
diff --git a/data/cities/haute-rivoire/la-miche-taravouerienne.yml b/data/cities/haute-rivoire/la-miche-taravouerienne.yml
index d46aab206..fa77d0e43 100644
--- a/data/cities/haute-rivoire/la-miche-taravouerienne.yml
+++ b/data/cities/haute-rivoire/la-miche-taravouerienne.yml
@@ -4,8 +4,8 @@ latitude: 45.71624
 longitude: 4.39567
 postcode: "69610"
 city: Haute-Rivoire
-street: "Grande Rue"
-housenumber: 167
+street: Grande Rue
+housenumber: "167"
 phone: "+33474263292"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/haute-rivoire/nouvelhair.yml b/data/cities/haute-rivoire/nouvelhair.yml
index af9bd1854..1a65cf7c7 100644
--- a/data/cities/haute-rivoire/nouvelhair.yml
+++ b/data/cities/haute-rivoire/nouvelhair.yml
@@ -4,8 +4,8 @@ latitude: 45.71586
 longitude: 4.39581
 postcode: "69610"
 city: Haute-Rivoire
-street: "Grande Rue"
-housenumber: 216
+street: Grande Rue
+housenumber: "216"
 phone: "+33474263141"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/haute-rivoire/vival.yml b/data/cities/haute-rivoire/vival.yml
index 6217f352d..7a7d8f40f 100644
--- a/data/cities/haute-rivoire/vival.yml
+++ b/data/cities/haute-rivoire/vival.yml
@@ -4,8 +4,9 @@ latitude: 45.71538
 longitude: 4.39598
 postcode: "69610"
 city: Haute-Rivoire
-street: "Grande Rue"
-housenumber: 270
+street: Grande Rue
+housenumber: "270"
 phone: "+33474706148"
-opening_hours: "Mo,Th 06:45-19:30; Tu,We,Fr,Sa 06:45-13:30,15:00-19:30; We 06:45-13:00; Su 07:00-13:00"
-website: "https://magasins.vival.fr/fr/vival-haute-rivoire"
\ No newline at end of file
+opening_hours: Mo,Th 06:45-19:30; Tu,We,Fr,Sa 06:45-13:30,15:00-19:30; We 06:45-13:00;
+    Su 07:00-13:00
+website: https://magasins.vival.fr/fr/vival-haute-rivoire
diff --git a/data/cities/hauteluce/alti-sports.yml b/data/cities/hauteluce/alti-sports.yml
index 9aa9c2f73..bb1b6d786 100644
--- a/data/cities/hauteluce/alti-sports.yml
+++ b/data/cities/hauteluce/alti-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.75758
 longitude: 6.53888
 postcode: "73620"
 city: Hauteluce
-street: "Avenue des Jeux Olympiques"
-housenumber: 
+street: Avenue des Jeux Olympiques
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/hauteluce/les-volatiles-sport-2000.yml b/data/cities/hauteluce/les-volatiles-sport-2000.yml
index 1653a6e46..7ffa0e9fd 100644
--- a/data/cities/hauteluce/les-volatiles-sport-2000.yml
+++ b/data/cities/hauteluce/les-volatiles-sport-2000.yml
@@ -1,11 +1,11 @@
 id: 187381977
-type: way
+type: node
 latitude: 45.75761
 longitude: 6.53739
 postcode: "73620"
 city: Hauteluce
-street: "Avenue des Jeux Olympiques"
-housenumber: 196
+street: Avenue des Jeux Olympiques
+housenumber: "196"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/hauteluce/piccard-sports.yml b/data/cities/hauteluce/piccard-sports.yml
index b5c3ba05f..05e7e4732 100644
--- a/data/cities/hauteluce/piccard-sports.yml
+++ b/data/cities/hauteluce/piccard-sports.yml
@@ -1,11 +1,11 @@
 id: 187384214
-type: way
+type: node
 latitude: 45.75766
 longitude: 6.53703
 postcode: "73620"
 city: Hauteluce
-street: "Avenue des Jeux Olympiques"
-housenumber: 170
+street: Avenue des Jeux Olympiques
+housenumber: "170"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/hauteluce/starski-sports.yml b/data/cities/hauteluce/starski-sports.yml
index c0966f457..89a2ddcf0 100644
--- a/data/cities/hauteluce/starski-sports.yml
+++ b/data/cities/hauteluce/starski-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.7587
 longitude: 6.53588
 postcode: "73620"
 city: Hauteluce
-street: "Avenue des Jeux Olympiques"
-housenumber: 31
+street: Avenue des Jeux Olympiques
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/hauteville-sur-fier/cote-cour.yml b/data/cities/hauteville-sur-fier/cote-cour.yml
index c9c7634a4..28e62525f 100644
--- a/data/cities/hauteville-sur-fier/cote-cour.yml
+++ b/data/cities/hauteville-sur-fier/cote-cour.yml
@@ -4,8 +4,8 @@ latitude: 45.90377
 longitude: 5.97481
 postcode: "74150"
 city: Hauteville-sur-Fier
-street: "Route de Vaulx"
-housenumber: 
+street: Route de Vaulx
+housenumber: ""
 phone: "+33450605152"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/hauteville-sur-fier/fier-et-croustillant.yml b/data/cities/hauteville-sur-fier/fier-et-croustillant.yml
index 66596fe47..2047ca073 100644
--- a/data/cities/hauteville-sur-fier/fier-et-croustillant.yml
+++ b/data/cities/hauteville-sur-fier/fier-et-croustillant.yml
@@ -4,8 +4,8 @@ latitude: 45.90363
 longitude: 5.97481
 postcode: "74150"
 city: Hauteville-sur-Fier
-street: "Route de Vaulx"
-housenumber: 23
-phone: "+33 9 51794543"
-opening_hours: "Mo off; Tu-Sa 06:30-12:30,16:00-19:00; Su 06:30-12:30"
-website: ""
\ No newline at end of file
+street: Route de Vaulx
+housenumber: "23"
+phone: +33 9 51794543
+opening_hours: Mo off; Tu-Sa 06:30-12:30,16:00-19:00; Su 06:30-12:30
+website: ""
diff --git a/data/cities/hauteville-sur-fier/garage-lansard.yml b/data/cities/hauteville-sur-fier/garage-lansard.yml
index 3d0df6309..3b3e38f23 100644
--- a/data/cities/hauteville-sur-fier/garage-lansard.yml
+++ b/data/cities/hauteville-sur-fier/garage-lansard.yml
@@ -1,11 +1,11 @@
 id: 1056881317
-type: way
+type: node
 latitude: 45.9073
 longitude: 5.97655
 postcode: "74150"
 city: Hauteville-sur-Fier
-street: "Chemin des Fours"
-housenumber: 
-phone: "+33 4 50 60 51 58"
+street: Chemin des Fours
+housenumber: ""
+phone: +33 4 50 60 51 58
 opening_hours: ""
-website: "https://garagelansard.wixsite.com/website"
\ No newline at end of file
+website: https://garagelansard.wixsite.com/website
diff --git a/data/cities/heyrieux/atol.yml b/data/cities/heyrieux/atol.yml
index 5305f764a..8edd8c671 100644
--- a/data/cities/heyrieux/atol.yml
+++ b/data/cities/heyrieux/atol.yml
@@ -1,11 +1,11 @@
 id: 129154575
-type: way
+type: node
 latitude: 45.63012
 longitude: 5.06456
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 55
-phone: "+33 4 78 40 00 85"
-opening_hours: "Su-Mo off; Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-13:00,14:00-18:00"
-website: "https://www.opticiens-atol.com/opticiens/heyrieux-55-avenue-du-general-leclerc"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "55"
+phone: +33 4 78 40 00 85
+opening_hours: Su-Mo off; Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-13:00,14:00-18:00
+website: https://www.opticiens-atol.com/opticiens/heyrieux-55-avenue-du-general-leclerc
diff --git a/data/cities/heyrieux/au-presse-papier.yml b/data/cities/heyrieux/au-presse-papier.yml
index 9be61f281..1d2ab9326 100644
--- a/data/cities/heyrieux/au-presse-papier.yml
+++ b/data/cities/heyrieux/au-presse-papier.yml
@@ -4,8 +4,8 @@ latitude: 45.63018
 longitude: 5.06408
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 49
-phone: "+33 4 81 11 71 75"
-opening_hours: "Su-Mo 07:30-12:30; Tu-Sa 07:00-12:30,14:30-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "49"
+phone: +33 4 81 11 71 75
+opening_hours: Su-Mo 07:30-12:30; Tu-Sa 07:00-12:30,14:30-19:00
+website: ""
diff --git a/data/cities/heyrieux/authentik-coiffure.yml b/data/cities/heyrieux/authentik-coiffure.yml
index 6ffe91712..b1ccedff2 100644
--- a/data/cities/heyrieux/authentik-coiffure.yml
+++ b/data/cities/heyrieux/authentik-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.63018
 longitude: 5.06257
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 22
-phone: "+33 4 78 40 50 04"
-opening_hours: "Su-Mo off; Mo-Fr 09:00-18:30; Sa 08:00-16:00"
-website: "https://www.authentikcoiffure.fr/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "22"
+phone: +33 4 78 40 50 04
+opening_hours: Su-Mo off; Mo-Fr 09:00-18:30; Sa 08:00-16:00
+website: https://www.authentikcoiffure.fr/
diff --git a/data/cities/heyrieux/benetti.yml b/data/cities/heyrieux/benetti.yml
index b75987943..84b626546 100644
--- a/data/cities/heyrieux/benetti.yml
+++ b/data/cities/heyrieux/benetti.yml
@@ -1,11 +1,11 @@
 id: 891360107
-type: way
+type: node
 latitude: 45.63019
 longitude: 5.06428
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 53
-phone: "+33 4 78 40 03 06"
-opening_hours: "Su-Mo off; Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00"
-website: "https://bijouteriebenetti.com/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "53"
+phone: +33 4 78 40 03 06
+opening_hours: Su-Mo off; Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00
+website: https://bijouteriebenetti.com/
diff --git a/data/cities/heyrieux/boulangerie-du-cerisier.yml b/data/cities/heyrieux/boulangerie-du-cerisier.yml
index c332bd0ba..a456ab3f8 100644
--- a/data/cities/heyrieux/boulangerie-du-cerisier.yml
+++ b/data/cities/heyrieux/boulangerie-du-cerisier.yml
@@ -4,8 +4,8 @@ latitude: 45.63899
 longitude: 5.04443
 postcode: "38540"
 city: Heyrieux
-street: "Chemin de Savoyan"
-housenumber: 1468
+street: Chemin de Savoyan
+housenumber: "1468"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/heyrieux/chloelial-institut.yml b/data/cities/heyrieux/chloelial-institut.yml
index 3ec3787dc..6f14f87ec 100644
--- a/data/cities/heyrieux/chloelial-institut.yml
+++ b/data/cities/heyrieux/chloelial-institut.yml
@@ -4,8 +4,8 @@ latitude: 45.63014
 longitude: 5.06281
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Rozier"
-housenumber: 10
-phone: "+33 4 72 54 42 38"
-opening_hours: "Th-Fr 09:00-19:00; Sa-We off"
-website: "https://www.chloelia-institut.com/"
\ No newline at end of file
+street: Avenue Rozier
+housenumber: "10"
+phone: +33 4 72 54 42 38
+opening_hours: Th-Fr 09:00-19:00; Sa-We off
+website: https://www.chloelia-institut.com/
diff --git a/data/cities/heyrieux/clopoliver.yml b/data/cities/heyrieux/clopoliver.yml
index c5be84827..313172ecf 100644
--- a/data/cities/heyrieux/clopoliver.yml
+++ b/data/cities/heyrieux/clopoliver.yml
@@ -4,8 +4,8 @@ latitude: 45.62973
 longitude: 5.06634
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 58
-phone: "+33 4 26 17 55 94"
-opening_hours: "Su-Mo off; Tu-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "58"
+phone: +33 4 26 17 55 94
+opening_hours: Su-Mo off; Tu-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/heyrieux/concept-optique.yml b/data/cities/heyrieux/concept-optique.yml
index 229f72ec2..40f81488f 100644
--- a/data/cities/heyrieux/concept-optique.yml
+++ b/data/cities/heyrieux/concept-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.63004
 longitude: 5.06386
 postcode: "38540"
 city: Heyrieux
-street: "Avenue de la République"
-housenumber: 18
-phone: "+33 4 78 22 33 72"
-opening_hours: "Su-Mo off; Tu-Sa 10:00-12:30,14:00-19:00"
-website: "https://concept-optique.com/"
\ No newline at end of file
+street: Avenue de la République
+housenumber: "18"
+phone: +33 4 78 22 33 72
+opening_hours: Su-Mo off; Tu-Sa 10:00-12:30,14:00-19:00
+website: https://concept-optique.com/
diff --git a/data/cities/heyrieux/coups-de-coeur-by-vg.yml b/data/cities/heyrieux/coups-de-coeur-by-vg.yml
index 99514f378..63b84017e 100644
--- a/data/cities/heyrieux/coups-de-coeur-by-vg.yml
+++ b/data/cities/heyrieux/coups-de-coeur-by-vg.yml
@@ -4,8 +4,8 @@ latitude: 45.62966
 longitude: 5.0663
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 58
-phone: "+33 6 29 24 07 28"
-opening_hours: "Su-Mo off; Tu-Sa 09:30-12:30,15:00-19:00"
-website: "https://coups-de-coeur-by-vg.business.site/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "58"
+phone: +33 6 29 24 07 28
+opening_hours: Su-Mo off; Tu-Sa 09:30-12:30,15:00-19:00
+website: https://coups-de-coeur-by-vg.business.site/
diff --git a/data/cities/heyrieux/cuirs-et-caetera.yml b/data/cities/heyrieux/cuirs-et-caetera.yml
index 405b0b90f..0d632bdf7 100644
--- a/data/cities/heyrieux/cuirs-et-caetera.yml
+++ b/data/cities/heyrieux/cuirs-et-caetera.yml
@@ -4,8 +4,8 @@ latitude: 45.63021
 longitude: 5.06387
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 43
-phone: "+33 6 33 89 36 01"
-opening_hours: "Su-Mo off; Tu-Sa 09:30-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "43"
+phone: +33 6 33 89 36 01
+opening_hours: Su-Mo off; Tu-Sa 09:30-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/heyrieux/defitech-services.yml b/data/cities/heyrieux/defitech-services.yml
index 3b2d8772e..680fb316c 100644
--- a/data/cities/heyrieux/defitech-services.yml
+++ b/data/cities/heyrieux/defitech-services.yml
@@ -4,8 +4,8 @@ latitude: 45.62869
 longitude: 5.06425
 postcode: "38540"
 city: Heyrieux
-street: "Place Paul Doumer"
+street: Place Paul Doumer
 housenumber: 9b
-phone: "+33 4 72 48 79 49"
-opening_hours: "Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-12:30"
-website: "https://www.defitech.online/"
\ No newline at end of file
+phone: +33 4 72 48 79 49
+opening_hours: Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-12:30
+website: https://www.defitech.online/
diff --git a/data/cities/heyrieux/espace-bien-etre.yml b/data/cities/heyrieux/espace-bien-etre.yml
index f8bb5259a..ced319463 100644
--- a/data/cities/heyrieux/espace-bien-etre.yml
+++ b/data/cities/heyrieux/espace-bien-etre.yml
@@ -4,8 +4,8 @@ latitude: 45.62982
 longitude: 5.06581
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 54
-phone: "+33 4 78 40 56 94"
-opening_hours: "Su-Mo off; Tu 09:00-19:00; We 09:00-18:00; Th-Fr 09:00-19:00; Sa 09:00-17:00"
-website: "https://app.flexybeauty.com/espace-bien-etre38/home"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "54"
+phone: +33 4 78 40 56 94
+opening_hours: Su-Mo off; Tu 09:00-19:00; We 09:00-18:00; Th-Fr 09:00-19:00; Sa 09:00-17:00
+website: https://app.flexybeauty.com/espace-bien-etre38/home
diff --git a/data/cities/heyrieux/eve-tattoo-ink.yml b/data/cities/heyrieux/eve-tattoo-ink.yml
index 39540adef..bc6b9358c 100644
--- a/data/cities/heyrieux/eve-tattoo-ink.yml
+++ b/data/cities/heyrieux/eve-tattoo-ink.yml
@@ -4,8 +4,8 @@ latitude: 45.62988
 longitude: 5.06634
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 67
-phone: "+33 6 24 52 12 51"
-opening_hours: "Mo-Tu 11:00-19:00; We off; Th-Sa 11:00-19:00; Su off"
-website: "https://eve-tattoo-ink.business.site/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "67"
+phone: +33 6 24 52 12 51
+opening_hours: Mo-Tu 11:00-19:00; We off; Th-Sa 11:00-19:00; Su off
+website: https://eve-tattoo-ink.business.site/
diff --git a/data/cities/heyrieux/garage-loeuillet-citroen.yml b/data/cities/heyrieux/garage-loeuillet-citroen.yml
index 714e17ae6..2b5423f98 100644
--- a/data/cities/heyrieux/garage-loeuillet-citroen.yml
+++ b/data/cities/heyrieux/garage-loeuillet-citroen.yml
@@ -4,8 +4,8 @@ latitude: 45.63471
 longitude: 5.05137
 postcode: "38540"
 city: Heyrieux
-street: "Avenue du 19 Mars 1962"
-housenumber: 652
+street: Avenue du 19 Mars 1962
+housenumber: "652"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/heyrieux/grain-de-malice.yml b/data/cities/heyrieux/grain-de-malice.yml
index 161be4aa9..c67a1e796 100644
--- a/data/cities/heyrieux/grain-de-malice.yml
+++ b/data/cities/heyrieux/grain-de-malice.yml
@@ -4,8 +4,9 @@ latitude: 45.63016
 longitude: 5.06311
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 26
-phone: "+33 4 72 48 72 25"
-opening_hours: "Mo 14:00-19:00; Tu-Th 09:00-12:30,14:00-19:00; Fr 09:00-19:00; Sa 09:00-18:30; Su off"
-website: "https://www.graindemalice.fr/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "26"
+phone: +33 4 72 48 72 25
+opening_hours: Mo 14:00-19:00; Tu-Th 09:00-12:30,14:00-19:00; Fr 09:00-19:00; Sa 09:00-18:30;
+    Su off
+website: https://www.graindemalice.fr/
diff --git a/data/cities/heyrieux/il-etait-une-fois.yml b/data/cities/heyrieux/il-etait-une-fois.yml
index 24dfdcc9b..e7335af83 100644
--- a/data/cities/heyrieux/il-etait-une-fois.yml
+++ b/data/cities/heyrieux/il-etait-une-fois.yml
@@ -4,8 +4,8 @@ latitude: 45.63028
 longitude: 5.06333
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 35
-phone: "+33 4 72 48 74 36"
-opening_hours: "Su-Mo off; Tu-Fr 09:00-12:00,15:00-19:00; Sa 09:00-12:00,15:00-18:00"
-website: "https://iletaitunefois-mode.fr/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "35"
+phone: +33 4 72 48 74 36
+opening_hours: Su-Mo off; Tu-Fr 09:00-12:00,15:00-19:00; Sa 09:00-12:00,15:00-18:00
+website: https://iletaitunefois-mode.fr/
diff --git a/data/cities/heyrieux/latelier-gourmand.yml b/data/cities/heyrieux/latelier-gourmand.yml
index 73b62e63c..46a4417fc 100644
--- a/data/cities/heyrieux/latelier-gourmand.yml
+++ b/data/cities/heyrieux/latelier-gourmand.yml
@@ -4,8 +4,8 @@ latitude: 45.63017
 longitude: 5.06416
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 51
+street: Avenue Général Leclerc
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/heyrieux/le-7.yml b/data/cities/heyrieux/le-7.yml
index c1f5661ba..324455466 100644
--- a/data/cities/heyrieux/le-7.yml
+++ b/data/cities/heyrieux/le-7.yml
@@ -4,8 +4,8 @@ latitude: 45.63003
 longitude: 5.0641
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 38
-phone: "+33 4 78 40 00 24"
-opening_hours: "Mo 07:00-13:00; Tu-Fr 07:00-19:00; Sa 08:00-19:00; Su 08:00-12:30"
-website: "https://le-7-bar-tabac.business.site/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "38"
+phone: +33 4 78 40 00 24
+opening_hours: Mo 07:00-13:00; Tu-Fr 07:00-19:00; Sa 08:00-19:00; Su 08:00-12:30
+website: https://le-7-bar-tabac.business.site/
diff --git a/data/cities/heyrieux/le-temps-des-soins.yml b/data/cities/heyrieux/le-temps-des-soins.yml
index 3e161c87d..3e38e34a6 100644
--- a/data/cities/heyrieux/le-temps-des-soins.yml
+++ b/data/cities/heyrieux/le-temps-des-soins.yml
@@ -4,8 +4,8 @@ latitude: 45.63031
 longitude: 5.06309
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 31
-phone: "+33 4 72 48 70 68"
-opening_hours: "Su-Mo off; Tu 09:00-19:00; We 10:00-17:00; Th-Fr 09:00-19:00; Sa 09:00-17:00"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "31"
+phone: +33 4 72 48 70 68
+opening_hours: Su-Mo off; Tu 09:00-19:00; We 10:00-17:00; Th-Fr 09:00-19:00; Sa 09:00-17:00
+website: ""
diff --git a/data/cities/heyrieux/maison-gauthier.yml b/data/cities/heyrieux/maison-gauthier.yml
index 714ee3f26..c24de57e6 100644
--- a/data/cities/heyrieux/maison-gauthier.yml
+++ b/data/cities/heyrieux/maison-gauthier.yml
@@ -4,8 +4,8 @@ latitude: 45.63026
 longitude: 5.06346
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 37
-phone: "+33 4 72 09 13 17"
-opening_hours: "Mo-Sa 06:00-19:30; Su 06:00-19:30"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "37"
+phone: +33 4 72 09 13 17
+opening_hours: Mo-Sa 06:00-19:30; Su 06:00-19:30
+website: ""
diff --git a/data/cities/heyrieux/manssine-coiffure.yml b/data/cities/heyrieux/manssine-coiffure.yml
index 9684b51a3..852f200b6 100644
--- a/data/cities/heyrieux/manssine-coiffure.yml
+++ b/data/cities/heyrieux/manssine-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.62833
 longitude: 5.0643
 postcode: "38540"
 city: Heyrieux
-street: "Rue Aristide Briand"
-housenumber: 22
+street: Rue Aristide Briand
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/heyrieux/pamela-fleurs.yml b/data/cities/heyrieux/pamela-fleurs.yml
index c25595810..46c8b68ab 100644
--- a/data/cities/heyrieux/pamela-fleurs.yml
+++ b/data/cities/heyrieux/pamela-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.63005
 longitude: 5.06402
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 36
-phone: "+33 4 78 40 00 13"
-opening_hours: "Mo off; Tu-Fr 09:00-12:30,15:00-19:30; Sa 08:30-19:30; Su 08:30-12:30"
-website: "https://pamelafleursheyrie.wixsite.com/pamelafleurs"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "36"
+phone: +33 4 78 40 00 13
+opening_hours: Mo off; Tu-Fr 09:00-12:30,15:00-19:30; Sa 08:30-19:30; Su 08:30-12:30
+website: https://pamelafleursheyrie.wixsite.com/pamelafleurs
diff --git a/data/cities/heyrieux/people-young.yml b/data/cities/heyrieux/people-young.yml
index 4b623cdb1..b986725be 100644
--- a/data/cities/heyrieux/people-young.yml
+++ b/data/cities/heyrieux/people-young.yml
@@ -1,11 +1,11 @@
 id: 891360097
-type: way
+type: node
 latitude: 45.62982
 longitude: 5.06588
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 54
-phone: "+33 4 78 21 70 37"
-opening_hours: "Su-Mo off; Tu-Sa 09:30-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "54"
+phone: +33 4 78 21 70 37
+opening_hours: Su-Mo off; Tu-Sa 09:30-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/heyrieux/peps-coupes.yml b/data/cities/heyrieux/peps-coupes.yml
index 26f43b2c2..a9972e6dd 100644
--- a/data/cities/heyrieux/peps-coupes.yml
+++ b/data/cities/heyrieux/peps-coupes.yml
@@ -4,8 +4,8 @@ latitude: 45.62974
 longitude: 5.06733
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 77
-phone: "+33 4 78 40 01 14"
-opening_hours: "Su-Mo off; Tu-Fr 08:30-18:30; Sa 08:30-17:00"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "77"
+phone: +33 4 78 40 01 14
+opening_hours: Su-Mo off; Tu-Fr 08:30-18:30; Sa 08:30-17:00
+website: ""
diff --git a/data/cities/heyrieux/pompes-funebres-vargas.yml b/data/cities/heyrieux/pompes-funebres-vargas.yml
index 7b76cc7c4..c7439591d 100644
--- a/data/cities/heyrieux/pompes-funebres-vargas.yml
+++ b/data/cities/heyrieux/pompes-funebres-vargas.yml
@@ -4,8 +4,8 @@ latitude: 45.6302
 longitude: 5.06393
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 45
-phone: "+33 4 78 40 07 53"
-opening_hours: "24/7"
-website: "https://www.pompes-funebres-vargas.fr/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "45"
+phone: +33 4 78 40 07 53
+opening_hours: 24/7
+website: https://www.pompes-funebres-vargas.fr/
diff --git a/data/cities/heyrieux/quincaillerie-generale.yml b/data/cities/heyrieux/quincaillerie-generale.yml
index f93e95727..adbac860a 100644
--- a/data/cities/heyrieux/quincaillerie-generale.yml
+++ b/data/cities/heyrieux/quincaillerie-generale.yml
@@ -4,8 +4,8 @@ latitude: 45.63016
 longitude: 5.06318
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 28
-phone: "+33 4 78 40 00 25"
-opening_hours: "Su-Mo off; Tu-Sa 08:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "28"
+phone: +33 4 78 40 00 25
+opening_hours: Su-Mo off; Tu-Sa 08:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/heyrieux/rectiligne.yml b/data/cities/heyrieux/rectiligne.yml
index 6f03a3abe..c425307af 100644
--- a/data/cities/heyrieux/rectiligne.yml
+++ b/data/cities/heyrieux/rectiligne.yml
@@ -4,8 +4,8 @@ latitude: 45.63028
 longitude: 5.06325
 postcode: "38540"
 city: Heyrieux
-street: "Avenue Général Leclerc"
-housenumber: 33
-phone: "+33 4 82 53 24 05"
-opening_hours: "Su-Mo off; Tu-We 09:00-12:00,14:00-18:00; Th-Fr 09:00-19:00; Sa 08:00-17:00"
-website: "https://www.rectiligne-coiffure.fr/"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "33"
+phone: +33 4 82 53 24 05
+opening_hours: Su-Mo off; Tu-We 09:00-12:00,14:00-18:00; Th-Fr 09:00-19:00; Sa 08:00-17:00
+website: https://www.rectiligne-coiffure.fr/
diff --git a/data/cities/huez/sport-2000-ours-blanc.yml b/data/cities/huez/sport-2000-ours-blanc.yml
index a8de5553c..d3414676a 100644
--- a/data/cities/huez/sport-2000-ours-blanc.yml
+++ b/data/cities/huez/sport-2000-ours-blanc.yml
@@ -4,8 +4,8 @@ latitude: 45.09055
 longitude: 6.06752
 postcode: "38750"
 city: Huez
-street: "Galerie de l'Ours Blanc"
-housenumber: 
+street: Galerie de l'Ours Blanc
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/innimond/gaec-les-chamoisees-chevrerie-bernard.yml b/data/cities/innimond/gaec-les-chamoisees-chevrerie-bernard.yml
index 4fdaa6c67..3a45a809b 100644
--- a/data/cities/innimond/gaec-les-chamoisees-chevrerie-bernard.yml
+++ b/data/cities/innimond/gaec-les-chamoisees-chevrerie-bernard.yml
@@ -4,8 +4,8 @@ latitude: 45.7797
 longitude: 5.57725
 postcode: "01680"
 city: Innimond
-street: "Chemin de la Brosse"
-housenumber: 445
+street: Chemin de la Brosse
+housenumber: "445"
 phone: "+33620796739"
 opening_hours: ""
-website: "https://www.gaec-leschamoisees-chevreriebernard.com/"
\ No newline at end of file
+website: https://www.gaec-leschamoisees-chevreriebernard.com/
diff --git a/data/cities/jacob-bellecombette/la-fleurette.yml b/data/cities/jacob-bellecombette/la-fleurette.yml
index 49ad0c4b8..3fa5c5bd7 100644
--- a/data/cities/jacob-bellecombette/la-fleurette.yml
+++ b/data/cities/jacob-bellecombette/la-fleurette.yml
@@ -4,8 +4,8 @@ latitude: 45.55883
 longitude: 5.90473
 postcode: "73000"
 city: Jacob-Bellecombette
-street: "Rue Ernest Grangeat"
-housenumber: 15
+street: Rue Ernest Grangeat
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/jarcieu/boulangerie-benoit.yml b/data/cities/jarcieu/boulangerie-benoit.yml
index 33fc8b1a5..ce38f4338 100644
--- a/data/cities/jarcieu/boulangerie-benoit.yml
+++ b/data/cities/jarcieu/boulangerie-benoit.yml
@@ -4,8 +4,8 @@ latitude: 45.33377
 longitude: 4.94705
 postcode: "38270"
 city: Jarcieu
-street: "Route des Métiers"
-housenumber: 55
+street: Route des Métiers
+housenumber: "55"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/jaujac/biasso.yml b/data/cities/jaujac/biasso.yml
index 1076d75d8..a3a5a123f 100644
--- a/data/cities/jaujac/biasso.yml
+++ b/data/cities/jaujac/biasso.yml
@@ -4,8 +4,8 @@ latitude: 44.6378
 longitude: 4.25768
 postcode: "07380"
 city: Jaujac
-street: "Rue Jean Moulin"
-housenumber: 
-phone: "09 83 42 53 66"
-opening_hours: "Tu-Sa 09:00-12:30/16:00-19:00 Wed 16:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Jean Moulin
+housenumber: ""
+phone: 09 83 42 53 66
+opening_hours: Tu-Sa 09:00-12:30/16:00-19:00 Wed 16:00-19:00
+website: ""
diff --git a/data/cities/jonage/latelier-artisan-fleuriste.yml b/data/cities/jonage/latelier-artisan-fleuriste.yml
index 17d9ab218..f1b6bc214 100644
--- a/data/cities/jonage/latelier-artisan-fleuriste.yml
+++ b/data/cities/jonage/latelier-artisan-fleuriste.yml
@@ -4,8 +4,8 @@ latitude: 45.79609
 longitude: 5.04667
 postcode: "69330"
 city: Jonage
-street: "Rue Nationale"
-housenumber: 68
+street: Rue Nationale
+housenumber: "68"
 phone: ""
-opening_hours: "Tu-Th 09:00-12:30,15:00-19:00; Fr,Sa 09:00-12:30,15:00-19:30; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-12:30,15:00-19:00; Fr,Sa 09:00-12:30,15:00-19:30; Su 09:00-13:00
+website: ""
diff --git a/data/cities/jonage/maison-goupil.yml b/data/cities/jonage/maison-goupil.yml
index ea05423da..d7296bbe6 100644
--- a/data/cities/jonage/maison-goupil.yml
+++ b/data/cities/jonage/maison-goupil.yml
@@ -4,8 +4,8 @@ latitude: 45.79
 longitude: 5.03179
 postcode: "69330"
 city: Jonage
-street: "Rue Nationale"
-housenumber: 1
+street: Rue Nationale
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:30; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:30; Su 07:00-13:00
+website: ""
diff --git a/data/cities/jonage/o-grand-hair.yml b/data/cities/jonage/o-grand-hair.yml
index d57e269bf..556908bf1 100644
--- a/data/cities/jonage/o-grand-hair.yml
+++ b/data/cities/jonage/o-grand-hair.yml
@@ -4,8 +4,8 @@ latitude: 45.79606
 longitude: 5.04654
 postcode: "69330"
 city: Jonage
-street: "Rue Nationale"
+street: Rue Nationale
 housenumber: 66 bis
 phone: ""
-opening_hours: "Tu-Th 09:00-19:00; Fr 09:00-20:00; Sa 08:30-17:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-19:00; Fr 09:00-20:00; Sa 08:30-17:30
+website: ""
diff --git a/data/cities/jonage/optic-2000.yml b/data/cities/jonage/optic-2000.yml
index 45705ed9d..53c2d9149 100644
--- a/data/cities/jonage/optic-2000.yml
+++ b/data/cities/jonage/optic-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.79622
 longitude: 5.0477
 postcode: "69330"
 city: Jonage
-street: "Place Général de Gaulle"
-housenumber: 3
+street: Place Général de Gaulle
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:00; Sa 10:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:00; Sa 10:00-17:00
+website: ""
diff --git a/data/cities/jonage/pasta-nonna.yml b/data/cities/jonage/pasta-nonna.yml
index 445b045dd..606aea5fa 100644
--- a/data/cities/jonage/pasta-nonna.yml
+++ b/data/cities/jonage/pasta-nonna.yml
@@ -4,8 +4,8 @@ latitude: 45.79635
 longitude: 5.04617
 postcode: "69330"
 city: Jonage
-street: "Rue Nationale"
-housenumber: 71
+street: Rue Nationale
+housenumber: "71"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,16:00-19:00
+website: ""
diff --git a/data/cities/jonage/terres-lyonnaises.yml b/data/cities/jonage/terres-lyonnaises.yml
index c2ceb85d2..201c6a881 100644
--- a/data/cities/jonage/terres-lyonnaises.yml
+++ b/data/cities/jonage/terres-lyonnaises.yml
@@ -4,8 +4,8 @@ latitude: 45.79637
 longitude: 5.04673
 postcode: "69330"
 city: Jonage
-street: "Place Général de Gaulle"
-housenumber: 12
+street: Place Général de Gaulle
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Sa 08:00-18:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-18:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/jonage/ups-retrait-colis.yml b/data/cities/jonage/ups-retrait-colis.yml
index 022cbbb29..d99be6fd2 100644
--- a/data/cities/jonage/ups-retrait-colis.yml
+++ b/data/cities/jonage/ups-retrait-colis.yml
@@ -1,11 +1,11 @@
 id: 973463586
-type: way
+type: node
 latitude: 45.78116
 longitude: 5.03398
 postcode: "69330"
 city: Jonage
-street: "Avenue Henri Schneider"
-housenumber: 1037
-phone: "+33 1 73 00 66 61"
-opening_hours: "Mo-Fr 07:30-18:30"
-website: "https://www.ups.com/dropoff/rte?reqType=print_directions&loc=fr_FR&country=FR&Locations=160035&geolat=45.796207427978516&geolong=5.04656982421875&uom=KM&to_geolat=45.780333&to_geolong=5.03694&appid=&is_wwef=false&txtquery=jonage&mapVendorSessionKey=ArqwN-"
\ No newline at end of file
+street: Avenue Henri Schneider
+housenumber: "1037"
+phone: +33 1 73 00 66 61
+opening_hours: Mo-Fr 07:30-18:30
+website: https://www.ups.com/dropoff/rte?reqType=print_directions&loc=fr_FR&country=FR&Locations=160035&geolat=45.796207427978516&geolong=5.04656982421875&uom=KM&to_geolat=45.780333&to_geolong=5.03694&appid=&is_wwef=false&txtquery=jonage&mapVendorSessionKey=ArqwN-
diff --git a/data/cities/jonzier-epagny/le-fournil-jonzierois.yml b/data/cities/jonzier-epagny/le-fournil-jonzierois.yml
index 4639e8a01..38707d9ba 100644
--- a/data/cities/jonzier-epagny/le-fournil-jonzierois.yml
+++ b/data/cities/jonzier-epagny/le-fournil-jonzierois.yml
@@ -5,7 +5,7 @@ longitude: 5.98999
 postcode: "74520"
 city: Jonzier-Epagny
 street: ""
-housenumber: 285
-phone: "+33 4 50 70 96 71"
-opening_hours: "sunrise-sunset open; We off"
-website: ""
\ No newline at end of file
+housenumber: "285"
+phone: +33 4 50 70 96 71
+opening_hours: sunrise-sunset open; We off
+website: ""
diff --git a/data/cities/jonzier-epagny/proxi.yml b/data/cities/jonzier-epagny/proxi.yml
index 8f1efe8ed..f84ae9ff1 100644
--- a/data/cities/jonzier-epagny/proxi.yml
+++ b/data/cities/jonzier-epagny/proxi.yml
@@ -4,8 +4,8 @@ latitude: 46.06947
 longitude: 5.98877
 postcode: "74520"
 city: Jonzier-Épagny
-street: "Route de Novery"
-housenumber: 410
+street: Route de Novery
+housenumber: "410"
 phone: ""
-opening_hours: "Tu,Th,Fr,Sa 08:30-12:30,14:30-19:00; We 08:30-12:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Th,Fr,Sa 08:30-12:30,14:30-19:00; We 08:30-12:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/julienas/atelier-roussot.yml b/data/cities/julienas/atelier-roussot.yml
index ccbdc33ce..c308fa78f 100644
--- a/data/cities/julienas/atelier-roussot.yml
+++ b/data/cities/julienas/atelier-roussot.yml
@@ -5,7 +5,7 @@ longitude: 4.7118
 postcode: ""
 city: Juliénas
 street: ""
-housenumber: 
-phone: "09 70 35 39 66"
+housenumber: ""
+phone: 09 70 35 39 66
 opening_hours: ""
-website: "https://www.atelierroussot.fr/"
\ No newline at end of file
+website: https://www.atelierroussot.fr/
diff --git a/data/cities/julienas/cave-des-grands-vins-julienas-chaintre.yml b/data/cities/julienas/cave-des-grands-vins-julienas-chaintre.yml
index 725d328c2..de95ea47b 100644
--- a/data/cities/julienas/cave-des-grands-vins-julienas-chaintre.yml
+++ b/data/cities/julienas/cave-des-grands-vins-julienas-chaintre.yml
@@ -4,8 +4,8 @@ latitude: 46.23454
 longitude: 4.70055
 postcode: "69840"
 city: Juliénas
-street: "Route de la Cave"
-housenumber: 542
-phone: "+334 74 04 41 66"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00; Sa-Su 10:00-12:00,14:00-18:00"
-website: "https://julienaschaintre.fr/"
\ No newline at end of file
+street: Route de la Cave
+housenumber: "542"
+phone: +334 74 04 41 66
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:00; Sa-Su 10:00-12:00,14:00-18:00
+website: https://julienaschaintre.fr/
diff --git a/data/cities/julienas/clos-de-haute-combe.yml b/data/cities/julienas/clos-de-haute-combe.yml
index 6a372ee5a..e97ec0b5e 100644
--- a/data/cities/julienas/clos-de-haute-combe.yml
+++ b/data/cities/julienas/clos-de-haute-combe.yml
@@ -4,8 +4,8 @@ latitude: 46.24882
 longitude: 4.70432
 postcode: "69840"
 city: Juliénas
-street: "Route de Haute-Combe"
-housenumber: 
-phone: "+33 4 74 04 41 09"
+street: Route de Haute-Combe
+housenumber: ""
+phone: +33 4 74 04 41 09
 opening_hours: ""
-website: "http://www.closdehautecombe.fr/index.htm"
\ No newline at end of file
+website: http://www.closdehautecombe.fr/index.htm
diff --git a/data/cities/julienas/domaine-aucagne-julien.yml b/data/cities/julienas/domaine-aucagne-julien.yml
index 2f772fe05..c1ded6119 100644
--- a/data/cities/julienas/domaine-aucagne-julien.yml
+++ b/data/cities/julienas/domaine-aucagne-julien.yml
@@ -4,8 +4,8 @@ latitude: 46.23595
 longitude: 4.71175
 postcode: "69840"
 city: Juliénas
-street: "Rue Evrard"
-housenumber: 100
+street: Rue Evrard
+housenumber: "100"
 phone: "+33679457432"
-opening_hours: "Mo-Su 09:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-21:00
+website: ""
diff --git a/data/cities/jussy/la-ferme-du-monniati.yml b/data/cities/jussy/la-ferme-du-monniati.yml
index d22c6e831..3187ca73c 100644
--- a/data/cities/jussy/la-ferme-du-monniati.yml
+++ b/data/cities/jussy/la-ferme-du-monniati.yml
@@ -4,8 +4,8 @@ latitude: 46.24249
 longitude: 6.30635
 postcode: "1254"
 city: Jussy
-street: "Route de Monniaz"
-housenumber: 111
+street: Route de Monniaz
+housenumber: "111"
 phone: ""
 opening_hours: ""
-website: "http://www.lafermedumonniati.ch/"
\ No newline at end of file
+website: http://www.lafermedumonniati.ch/
diff --git a/data/cities/la-balme-de-sillingy/boucherie-charcuterie-de-la-mandallaz-jerome-lhomme.yml b/data/cities/la-balme-de-sillingy/boucherie-charcuterie-de-la-mandallaz-jerome-lhomme.yml
index ba203069e..9ebd187b3 100644
--- a/data/cities/la-balme-de-sillingy/boucherie-charcuterie-de-la-mandallaz-jerome-lhomme.yml
+++ b/data/cities/la-balme-de-sillingy/boucherie-charcuterie-de-la-mandallaz-jerome-lhomme.yml
@@ -4,8 +4,8 @@ latitude: 45.96016
 longitude: 6.04086
 postcode: "74330"
 city: La Balme-de-Sillingy
-street: "Route de Paris"
-housenumber: 32
-phone: "+33 4 50 68 72 21"
-opening_hours: "Tu-Sa 08:00-12:30,15:00-19:00; Su 08:00-12:30; Mo off"
-website: ""
\ No newline at end of file
+street: Route de Paris
+housenumber: "32"
+phone: +33 4 50 68 72 21
+opening_hours: Tu-Sa 08:00-12:30,15:00-19:00; Su 08:00-12:30; Mo off
+website: ""
diff --git a/data/cities/la-balme-de-sillingy/netto-la-balme-de-sillingy-supermarche.yml b/data/cities/la-balme-de-sillingy/netto-la-balme-de-sillingy-supermarche.yml
index 97f33dad4..b2a10067b 100644
--- a/data/cities/la-balme-de-sillingy/netto-la-balme-de-sillingy-supermarche.yml
+++ b/data/cities/la-balme-de-sillingy/netto-la-balme-de-sillingy-supermarche.yml
@@ -1,11 +1,11 @@
 id: 717514530
-type: way
+type: node
 latitude: 45.96172
 longitude: 6.03869
 postcode: "74330"
 city: La Balme-de-Sillingy
-street: "Place Docteur Dubois"
-housenumber: 
+street: Place Docteur Dubois
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:30-20:00
+website: ""
diff --git a/data/cities/la-balme-les-grottes/le-marche-balmolan.yml b/data/cities/la-balme-les-grottes/le-marche-balmolan.yml
index 40110c8f5..e13dfa8b7 100644
--- a/data/cities/la-balme-les-grottes/le-marche-balmolan.yml
+++ b/data/cities/la-balme-les-grottes/le-marche-balmolan.yml
@@ -4,8 +4,8 @@ latitude: 45.85218
 longitude: 5.33657
 postcode: "38390"
 city: La Balme-les-Grottes
-street: "Place Colonel Pition"
-housenumber: 
+street: Place Colonel Pition
+housenumber: ""
 phone: ""
-opening_hours: "We-Fr 08:00-20:00; Sa 08:00-23:00; Su 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: We-Fr 08:00-20:00; Sa 08:00-23:00; Su 08:00-16:00
+website: ""
diff --git a/data/cities/la-batie-montgascon/garage-du-replat.yml b/data/cities/la-batie-montgascon/garage-du-replat.yml
index b978f1051..f5db62563 100644
--- a/data/cities/la-batie-montgascon/garage-du-replat.yml
+++ b/data/cities/la-batie-montgascon/garage-du-replat.yml
@@ -4,8 +4,9 @@ latitude: 45.57734
 longitude: 5.52085
 postcode: "38110"
 city: La Bâtie-Montgascon
-street: "Route de Lyon"
-housenumber: 575
+street: Route de Lyon
+housenumber: "575"
 phone: ""
-opening_hours: "Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00; Su closed; Mo 08:00-12:00,14:00-19:00; Tu 08:00-12:00,14:00-19:00; We 08:00-12:00,14:00-19:00; Th 08:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00; Su closed; Mo 08:00-12:00,14:00-19:00;
+    Tu 08:00-12:00,14:00-19:00; We 08:00-12:00,14:00-19:00; Th 08:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/la-batie-montgascon/maison-de-la-presse.yml b/data/cities/la-batie-montgascon/maison-de-la-presse.yml
index c1a9cbd0d..32e6c09a1 100644
--- a/data/cities/la-batie-montgascon/maison-de-la-presse.yml
+++ b/data/cities/la-batie-montgascon/maison-de-la-presse.yml
@@ -5,7 +5,7 @@ longitude: 5.52838
 postcode: "38110"
 city: La Bâtie-Montgascon
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-boisse/au-temple-des-sens.yml b/data/cities/la-boisse/au-temple-des-sens.yml
index a409e716e..96dd01787 100644
--- a/data/cities/la-boisse/au-temple-des-sens.yml
+++ b/data/cities/la-boisse/au-temple-des-sens.yml
@@ -4,8 +4,8 @@ latitude: 45.84466
 longitude: 5.03385
 postcode: "01120"
 city: La Boisse
-street: "Route Nationale"
-housenumber: 1086
-phone: "+33 4 78 06 64 69"
+street: Route Nationale
+housenumber: "1086"
+phone: +33 4 78 06 64 69
 opening_hours: ""
-website: "https://www.autempledesens.com/"
\ No newline at end of file
+website: https://www.autempledesens.com/
diff --git a/data/cities/la-boisse/nouveau-garage-montluel-la-boisse.yml b/data/cities/la-boisse/nouveau-garage-montluel-la-boisse.yml
index 4a2c02743..3aace24a3 100644
--- a/data/cities/la-boisse/nouveau-garage-montluel-la-boisse.yml
+++ b/data/cities/la-boisse/nouveau-garage-montluel-la-boisse.yml
@@ -4,8 +4,8 @@ latitude: 45.84607
 longitude: 5.04073
 postcode: "01120"
 city: La Boisse
-street: "Route Nationale"
-housenumber: 521
-phone: "+33 4 72 25 10 10"
+street: Route Nationale
+housenumber: "521"
+phone: +33 4 72 25 10 10
 opening_hours: ""
-website: "https://concessions.peugeot.fr/la-boisse/"
\ No newline at end of file
+website: https://concessions.peugeot.fr/la-boisse/
diff --git a/data/cities/la-boisse/rentmat.yml b/data/cities/la-boisse/rentmat.yml
index 6cbe508c0..e15376e89 100644
--- a/data/cities/la-boisse/rentmat.yml
+++ b/data/cities/la-boisse/rentmat.yml
@@ -1,11 +1,11 @@
 id: 688147820
-type: way
+type: node
 latitude: 45.83803
 longitude: 5.01648
 postcode: "01120"
 city: La Boisse
-street: "Rue du Pré Neuf"
-housenumber: 
+street: Rue du Pré Neuf
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-bridoire/pomme-c.yml b/data/cities/la-bridoire/pomme-c.yml
index 8945f29a3..80f18c3ce 100644
--- a/data/cities/la-bridoire/pomme-c.yml
+++ b/data/cities/la-bridoire/pomme-c.yml
@@ -4,8 +4,8 @@ latitude: 45.52659
 longitude: 5.74199
 postcode: "73520"
 city: La Bridoire
-street: "Route du Lac"
-housenumber: 378
-phone: "+33 4 76 32 17 11"
+street: Route du Lac
+housenumber: "378"
+phone: +33 4 76 32 17 11
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-buisse/desjoyaux.yml b/data/cities/la-buisse/desjoyaux.yml
index dc5848f7e..74cf305bb 100644
--- a/data/cities/la-buisse/desjoyaux.yml
+++ b/data/cities/la-buisse/desjoyaux.yml
@@ -1,11 +1,11 @@
 id: 251738526
-type: way
+type: node
 latitude: 45.31485
 longitude: 5.62276
 postcode: "38500"
 city: La Buisse
-street: "Route de Grenoble"
-housenumber: 2143
-phone: "+33 428570010"
+street: Route de Grenoble
+housenumber: "2143"
+phone: +33 428570010
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-chambre/cooperative-laitiere-de-la-chambre.yml b/data/cities/la-chambre/cooperative-laitiere-de-la-chambre.yml
index 0ae9e5ecd..d0b97df88 100644
--- a/data/cities/la-chambre/cooperative-laitiere-de-la-chambre.yml
+++ b/data/cities/la-chambre/cooperative-laitiere-de-la-chambre.yml
@@ -1,11 +1,11 @@
 id: 182041610
-type: way
+type: node
 latitude: 45.36222
 longitude: 6.29743
 postcode: "73130"
 city: La Chambre
 street: ""
-housenumber: 710
-phone: "+33 4 79 56 00 90"
-opening_hours: "Mo-Sa 08:45-12:15,14:30-19:00; Su,PH 08:45-12:15"
-website: "https://www.coopdelachambre.fr/"
\ No newline at end of file
+housenumber: "710"
+phone: +33 4 79 56 00 90
+opening_hours: Mo-Sa 08:45-12:15,14:30-19:00; Su,PH 08:45-12:15
+website: https://www.coopdelachambre.fr/
diff --git a/data/cities/la-chapelle-dabondance/cret-beni.yml b/data/cities/la-chapelle-dabondance/cret-beni.yml
index f13b6d1fe..95e8dad79 100644
--- a/data/cities/la-chapelle-dabondance/cret-beni.yml
+++ b/data/cities/la-chapelle-dabondance/cret-beni.yml
@@ -4,8 +4,8 @@ latitude: 46.2925
 longitude: 6.78119
 postcode: "74360"
 city: La Chapelle-d'Abondance
-street: "Route du Clos"
-housenumber: 58
+street: Route du Clos
+housenumber: "58"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-chapelle-dabondance/fruitiere-de-la-chapelle-dabondance.yml b/data/cities/la-chapelle-dabondance/fruitiere-de-la-chapelle-dabondance.yml
index 617808de6..155c1c43e 100644
--- a/data/cities/la-chapelle-dabondance/fruitiere-de-la-chapelle-dabondance.yml
+++ b/data/cities/la-chapelle-dabondance/fruitiere-de-la-chapelle-dabondance.yml
@@ -1,11 +1,11 @@
 id: 666447302
-type: way
+type: node
 latitude: 46.29341
 longitude: 6.79398
 postcode: "74360"
 city: La Chapelle-d'Abondance
-street: "Route des Frasses"
-housenumber: 494
+street: Route des Frasses
+housenumber: "494"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-chapelle-dabondance/intermarche.yml b/data/cities/la-chapelle-dabondance/intermarche.yml
index c39021bcd..e70e8f60b 100644
--- a/data/cities/la-chapelle-dabondance/intermarche.yml
+++ b/data/cities/la-chapelle-dabondance/intermarche.yml
@@ -1,11 +1,11 @@
 id: 827580125
-type: way
+type: node
 latitude: 46.27753
 longitude: 6.82266
 postcode: "74360"
 city: La Chapelle-d'Abondance
-street: "Chemin des Vorges"
-housenumber: 94
+street: Chemin des Vorges
+housenumber: "94"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:15; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:15; Su 09:00-12:00
+website: ""
diff --git a/data/cities/la-chapelle-dabondance/rappes-sports.yml b/data/cities/la-chapelle-dabondance/rappes-sports.yml
index a3ec0eb13..230fe3d3c 100644
--- a/data/cities/la-chapelle-dabondance/rappes-sports.yml
+++ b/data/cities/la-chapelle-dabondance/rappes-sports.yml
@@ -4,8 +4,8 @@ latitude: 46.29607
 longitude: 6.789
 postcode: "74360"
 city: La Chapelle-d'Abondance
-street: "Route de Chevennes"
-housenumber: 
+street: Route de Chevennes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.rappes74.com/"
\ No newline at end of file
+website: https://www.rappes74.com/
diff --git a/data/cities/la-chapelle-dabondance/trincaz-sports.yml b/data/cities/la-chapelle-dabondance/trincaz-sports.yml
index 74bdcfbc6..dc429da59 100644
--- a/data/cities/la-chapelle-dabondance/trincaz-sports.yml
+++ b/data/cities/la-chapelle-dabondance/trincaz-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.79007
 postcode: "74360"
 city: La Chapelle-d'Abondance
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-chapelle-du-chatelard/la-mie-du-paysan.yml b/data/cities/la-chapelle-du-chatelard/la-mie-du-paysan.yml
index c538b37b7..4f0094614 100644
--- a/data/cities/la-chapelle-du-chatelard/la-mie-du-paysan.yml
+++ b/data/cities/la-chapelle-du-chatelard/la-mie-du-paysan.yml
@@ -4,8 +4,8 @@ latitude: 46.06854
 longitude: 5.02379
 postcode: "01240"
 city: La Chapelle-du-Châtelard
-street: "Route de Villars"
-housenumber: 112
+street: Route de Villars
+housenumber: "112"
 phone: "+33427532173"
-opening_hours: "We-Sa 06:00-13:30, 15:30-19:30; Su 06:00-12:30; Tu 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: We-Sa 06:00-13:30, 15:30-19:30; Su 06:00-12:30; Tu 15:30-19:30
+website: ""
diff --git a/data/cities/la-chapelle-en-vercors/veloplato.yml b/data/cities/la-chapelle-en-vercors/veloplato.yml
index 23620496d..e3dd7d0f3 100644
--- a/data/cities/la-chapelle-en-vercors/veloplato.yml
+++ b/data/cities/la-chapelle-en-vercors/veloplato.yml
@@ -4,8 +4,8 @@ latitude: 44.96736
 longitude: 5.41643
 postcode: "26420"
 city: La Chapelle-en-Vercors
-street: "Avenue de la Terrasse"
-housenumber: 10
+street: Avenue de la Terrasse
+housenumber: "10"
 phone: "+33469281894"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-chapelle-saint-maurice/ferme-du-ponant.yml b/data/cities/la-chapelle-saint-maurice/ferme-du-ponant.yml
index a33a8ea5a..b04c8279e 100644
--- a/data/cities/la-chapelle-saint-maurice/ferme-du-ponant.yml
+++ b/data/cities/la-chapelle-saint-maurice/ferme-du-ponant.yml
@@ -5,7 +5,7 @@ longitude: 6.14655
 postcode: "74410"
 city: La Chapelle-Saint-Maurice
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.lafermeduponant.fr/"
\ No newline at end of file
+website: https://www.lafermeduponant.fr/
diff --git a/data/cities/la-clusaz/carrefour-montagne.yml b/data/cities/la-clusaz/carrefour-montagne.yml
index f4f130159..cb508397f 100644
--- a/data/cities/la-clusaz/carrefour-montagne.yml
+++ b/data/cities/la-clusaz/carrefour-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.90507
 longitude: 6.42337
 postcode: "74220"
 city: La Clusaz
-street: "Place de l'Église"
-housenumber: 45
+street: Place de l'Église
+housenumber: "45"
 phone: ""
-opening_hours: "Mo-Sa 07:30-12:30, 15:15-19:30; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-12:30, 15:15-19:30; Su 07:30-12:30
+website: ""
diff --git a/data/cities/la-clusaz/fusalp.yml b/data/cities/la-clusaz/fusalp.yml
index 5748c7512..44d8fb9a7 100644
--- a/data/cities/la-clusaz/fusalp.yml
+++ b/data/cities/la-clusaz/fusalp.yml
@@ -4,8 +4,8 @@ latitude: 45.90598
 longitude: 6.42873
 postcode: "74220"
 city: La Clusaz
-street: "Route du Col des Aravis"
-housenumber: 389
+street: Route du Col des Aravis
+housenumber: "389"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/go-sport.yml b/data/cities/la-clusaz/go-sport.yml
index 631f8e6e7..de8318a0e 100644
--- a/data/cities/la-clusaz/go-sport.yml
+++ b/data/cities/la-clusaz/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.90641
 longitude: 6.42793
 postcode: "74220"
 city: La Clusaz
-street: "Route des Grandes Alpes"
-housenumber: 222
+street: Route des Grandes Alpes
+housenumber: "222"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:30
+website: ""
diff --git a/data/cities/la-clusaz/intersport-route-des-grandes-alpes.yml b/data/cities/la-clusaz/intersport-route-des-grandes-alpes.yml
index 22594dc71..35ad78365 100644
--- a/data/cities/la-clusaz/intersport-route-des-grandes-alpes.yml
+++ b/data/cities/la-clusaz/intersport-route-des-grandes-alpes.yml
@@ -4,8 +4,8 @@ latitude: 45.90668
 longitude: 6.42944
 postcode: "74220"
 city: La Clusaz
-street: "Route des Grandes Alpes"
-housenumber: 100
+street: Route des Grandes Alpes
+housenumber: "100"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/intersport.yml b/data/cities/la-clusaz/intersport.yml
index 0e3757354..b2c87df53 100644
--- a/data/cities/la-clusaz/intersport.yml
+++ b/data/cities/la-clusaz/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.42528
 postcode: "74220"
 city: La Clusaz
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 09:00-13:00,14:00-19:00; Fr-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 09:00-13:00,14:00-19:00; Fr-Su 09:00-19:00
+website: ""
diff --git a/data/cities/la-clusaz/le-mazot.yml b/data/cities/la-clusaz/le-mazot.yml
index bd0d9206e..7f1ea662d 100644
--- a/data/cities/la-clusaz/le-mazot.yml
+++ b/data/cities/la-clusaz/le-mazot.yml
@@ -4,8 +4,8 @@ latitude: 45.90597
 longitude: 6.42887
 postcode: "74220"
 city: La Clusaz
-street: "Route du Col des Aravis"
-housenumber: 389
+street: Route du Col des Aravis
+housenumber: "389"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/le-schuss.yml b/data/cities/la-clusaz/le-schuss.yml
index 7aa6937cd..7eede76a2 100644
--- a/data/cities/la-clusaz/le-schuss.yml
+++ b/data/cities/la-clusaz/le-schuss.yml
@@ -1,11 +1,11 @@
 id: 495914740
-type: way
+type: node
 latitude: 45.90415
 longitude: 6.42254
 postcode: "74220"
 city: La Clusaz
-street: "Pre de foire"
-housenumber: 59
+street: Pre de foire
+housenumber: "59"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/millet.yml b/data/cities/la-clusaz/millet.yml
index 1706e8121..8f4f4b469 100644
--- a/data/cities/la-clusaz/millet.yml
+++ b/data/cities/la-clusaz/millet.yml
@@ -4,8 +4,8 @@ latitude: 45.90498
 longitude: 6.42493
 postcode: "74220"
 city: La Clusaz
-street: "Place du Petit Casino"
-housenumber: 24
+street: Place du Petit Casino
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/sport-2000-route-des-grandes-alpes.yml b/data/cities/la-clusaz/sport-2000-route-des-grandes-alpes.yml
index a70da8d5c..af6211956 100644
--- a/data/cities/la-clusaz/sport-2000-route-des-grandes-alpes.yml
+++ b/data/cities/la-clusaz/sport-2000-route-des-grandes-alpes.yml
@@ -1,11 +1,11 @@
 id: 163821170
-type: way
+type: node
 latitude: 45.90656
 longitude: 6.43022
 postcode: "74220"
 city: La Clusaz
-street: "Route des Grandes Alpes"
-housenumber: 8
+street: Route des Grandes Alpes
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/sport-2000.yml b/data/cities/la-clusaz/sport-2000.yml
index 432fce9e6..22493cfcf 100644
--- a/data/cities/la-clusaz/sport-2000.yml
+++ b/data/cities/la-clusaz/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.90508
 longitude: 6.42467
 postcode: "74220"
 city: La Clusaz
-street: "Place du Petit Casino"
-housenumber: 24
+street: Place du Petit Casino
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/sport-boutique.yml b/data/cities/la-clusaz/sport-boutique.yml
index 3e458fd91..8a965e244 100644
--- a/data/cities/la-clusaz/sport-boutique.yml
+++ b/data/cities/la-clusaz/sport-boutique.yml
@@ -4,8 +4,8 @@ latitude: 45.90659
 longitude: 6.42867
 postcode: "74220"
 city: La Clusaz
-street: "Route des Grandes Alpes"
-housenumber: 176
+street: Route des Grandes Alpes
+housenumber: "176"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-clusaz/the-north-face.yml b/data/cities/la-clusaz/the-north-face.yml
index 3094e0950..f14b86518 100644
--- a/data/cities/la-clusaz/the-north-face.yml
+++ b/data/cities/la-clusaz/the-north-face.yml
@@ -4,8 +4,8 @@ latitude: 45.90642
 longitude: 6.42802
 postcode: "74220"
 city: La Clusaz
-street: "Route des Grandes Alpes"
-housenumber: 212
+street: Route des Grandes Alpes
+housenumber: "212"
 phone: ""
-opening_hours: "We-Th off; Mo-Tu,Th-Su 09:30-12:30, 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: We-Th off; Mo-Tu,Th-Su 09:30-12:30, 14:30-19:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/alizia.yml b/data/cities/la-cote-saint-andre/alizia.yml
index 24f5feb8e..bb6e7a912 100644
--- a/data/cities/la-cote-saint-andre/alizia.yml
+++ b/data/cities/la-cote-saint-andre/alizia.yml
@@ -4,8 +4,8 @@ latitude: 45.3935
 longitude: 5.25738
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 6
+street: Rue de la République
+housenumber: "6"
 phone: "+33474205156"
-opening_hours: "Tu-Sa 09:00-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/animal-land.yml b/data/cities/la-cote-saint-andre/animal-land.yml
index b0c706de7..118ad99cb 100644
--- a/data/cities/la-cote-saint-andre/animal-land.yml
+++ b/data/cities/la-cote-saint-andre/animal-land.yml
@@ -4,8 +4,8 @@ latitude: 45.39349
 longitude: 5.2608
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 60
-phone: "+33 4 74 20 60 86"
-opening_hours: "Tu-Sa 09:15-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue de la République
+housenumber: "60"
+phone: +33 4 74 20 60 86
+opening_hours: Tu-Sa 09:15-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/carre-das.yml b/data/cities/la-cote-saint-andre/carre-das.yml
index e7cb6b76a..598e97597 100644
--- a/data/cities/la-cote-saint-andre/carre-das.yml
+++ b/data/cities/la-cote-saint-andre/carre-das.yml
@@ -4,8 +4,8 @@ latitude: 45.39347
 longitude: 5.26109
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 64
-phone: "+33 4 74 20 51 88"
-opening_hours: "Mo-Sa 08:00-12:15,14:00-19:00;Su 08:00-12:00"
-website: "https://carredas.site-solocal.com/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "64"
+phone: +33 4 74 20 51 88
+opening_hours: Mo-Sa 08:00-12:15,14:00-19:00;Su 08:00-12:00
+website: https://carredas.site-solocal.com/
diff --git a/data/cities/la-cote-saint-andre/casino-rue-salpetriere.yml b/data/cities/la-cote-saint-andre/casino-rue-salpetriere.yml
index 76999ad94..b24b321e9 100644
--- a/data/cities/la-cote-saint-andre/casino-rue-salpetriere.yml
+++ b/data/cities/la-cote-saint-andre/casino-rue-salpetriere.yml
@@ -1,11 +1,11 @@
 id: 73345939
-type: way
+type: node
 latitude: 45.39209
 longitude: 5.25885
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue Salpétrière"
-housenumber: 
-phone: "+33 474206800"
-opening_hours: "Mo-Sa 08:00-19:30; Su 09:00-12:30"
-website: "https://magasins.supercasino.fr/supermarche/la-cote-saint-andre"
\ No newline at end of file
+street: Rue Salpétrière
+housenumber: ""
+phone: +33 474206800
+opening_hours: Mo-Sa 08:00-19:30; Su 09:00-12:30
+website: https://magasins.supercasino.fr/supermarche/la-cote-saint-andre
diff --git a/data/cities/la-cote-saint-andre/casino.yml b/data/cities/la-cote-saint-andre/casino.yml
index 12bcc5310..6c7eaf568 100644
--- a/data/cities/la-cote-saint-andre/casino.yml
+++ b/data/cities/la-cote-saint-andre/casino.yml
@@ -4,8 +4,8 @@ latitude: 45.3914
 longitude: 5.2586
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue Salpétrière"
-housenumber: 2
+street: Rue Salpétrière
+housenumber: "2"
 phone: "+33474206800"
 opening_hours: ""
-website: "https://www.supercasino.fr/"
\ No newline at end of file
+website: https://www.supercasino.fr/
diff --git a/data/cities/la-cote-saint-andre/copaline.yml b/data/cities/la-cote-saint-andre/copaline.yml
index 9aa32273e..33e260c48 100644
--- a/data/cities/la-cote-saint-andre/copaline.yml
+++ b/data/cities/la-cote-saint-andre/copaline.yml
@@ -4,8 +4,8 @@ latitude: 45.39336
 longitude: 5.26153
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/ddrs-informatique.yml b/data/cities/la-cote-saint-andre/ddrs-informatique.yml
index ca19ea04a..1786b2c42 100644
--- a/data/cities/la-cote-saint-andre/ddrs-informatique.yml
+++ b/data/cities/la-cote-saint-andre/ddrs-informatique.yml
@@ -4,8 +4,8 @@ latitude: 45.39424
 longitude: 5.2587
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de l'Hôtel de Ville"
-housenumber: 29
+street: Rue de l'Hôtel de Ville
+housenumber: "29"
 phone: "+33675051864"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 10:00-12:00,14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 10:00-12:00,14:00-17:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/drol-2-design.yml b/data/cities/la-cote-saint-andre/drol-2-design.yml
index 6e251206c..b16e8e4e9 100644
--- a/data/cities/la-cote-saint-andre/drol-2-design.yml
+++ b/data/cities/la-cote-saint-andre/drol-2-design.yml
@@ -4,8 +4,8 @@ latitude: 45.39351
 longitude: 5.25975
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/e-sabel-le-plaisir-de-vapoter.yml b/data/cities/la-cote-saint-andre/e-sabel-le-plaisir-de-vapoter.yml
index 487dc631b..3b705ae55 100644
--- a/data/cities/la-cote-saint-andre/e-sabel-le-plaisir-de-vapoter.yml
+++ b/data/cities/la-cote-saint-andre/e-sabel-le-plaisir-de-vapoter.yml
@@ -4,8 +4,8 @@ latitude: 45.39336
 longitude: 5.26145
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 73
+street: Rue de la République
+housenumber: "73"
 phone: "+33474569302"
-opening_hours: "Tu-Sa 09:30-12:30,14:15-19:00"
-website: "https://www.e-sabel.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30,14:15-19:00
+website: https://www.e-sabel.fr/
diff --git a/data/cities/la-cote-saint-andre/entre-elle-et-lui.yml b/data/cities/la-cote-saint-andre/entre-elle-et-lui.yml
index 9b4894472..adb4bed09 100644
--- a/data/cities/la-cote-saint-andre/entre-elle-et-lui.yml
+++ b/data/cities/la-cote-saint-andre/entre-elle-et-lui.yml
@@ -4,8 +4,8 @@ latitude: 45.39346
 longitude: 5.26144
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/frederic-moreno.yml b/data/cities/la-cote-saint-andre/frederic-moreno.yml
index 57d3d8861..3af4c615f 100644
--- a/data/cities/la-cote-saint-andre/frederic-moreno.yml
+++ b/data/cities/la-cote-saint-andre/frederic-moreno.yml
@@ -4,8 +4,8 @@ latitude: 45.39345
 longitude: 5.26177
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/funerarium-cote-saint-andre.yml b/data/cities/la-cote-saint-andre/funerarium-cote-saint-andre.yml
index 530f7963f..e12b1aa69 100644
--- a/data/cities/la-cote-saint-andre/funerarium-cote-saint-andre.yml
+++ b/data/cities/la-cote-saint-andre/funerarium-cote-saint-andre.yml
@@ -4,8 +4,8 @@ latitude: 45.38924
 longitude: 5.27184
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Avenue Maréchal Joffre"
-housenumber: 76
+street: Avenue Maréchal Joffre
+housenumber: "76"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/grain-de-beaute.yml b/data/cities/la-cote-saint-andre/grain-de-beaute.yml
index 0595c4a55..c4fb40395 100644
--- a/data/cities/la-cote-saint-andre/grain-de-beaute.yml
+++ b/data/cities/la-cote-saint-andre/grain-de-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.3934
 longitude: 5.25723
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 1
+street: Rue de la République
+housenumber: "1"
 phone: "+33474202157"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-16:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-16:30
+website: ""
diff --git a/data/cities/la-cote-saint-andre/isoline.yml b/data/cities/la-cote-saint-andre/isoline.yml
index d33a2510d..7472031db 100644
--- a/data/cities/la-cote-saint-andre/isoline.yml
+++ b/data/cities/la-cote-saint-andre/isoline.yml
@@ -4,8 +4,8 @@ latitude: 45.39339
 longitude: 5.26017
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 53
+street: Rue de la République
+housenumber: "53"
 phone: "+33474203511"
-opening_hours: "Tu-Sa 09:30-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/jouvenal.yml b/data/cities/la-cote-saint-andre/jouvenal.yml
index f92a80b7a..bfb6f7445 100644
--- a/data/cities/la-cote-saint-andre/jouvenal.yml
+++ b/data/cities/la-cote-saint-andre/jouvenal.yml
@@ -4,8 +4,8 @@ latitude: 45.39343
 longitude: 5.25867
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/km-informatique.yml b/data/cities/la-cote-saint-andre/km-informatique.yml
index 05e5c4a07..ea5673c3c 100644
--- a/data/cities/la-cote-saint-andre/km-informatique.yml
+++ b/data/cities/la-cote-saint-andre/km-informatique.yml
@@ -4,8 +4,8 @@ latitude: 45.39159
 longitude: 5.26328
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Allée Jean Jaurès"
-housenumber: 8
+street: Allée Jean Jaurès
+housenumber: "8"
 phone: "+33771742871"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 10:00-12:00,14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 10:00-12:00,14:00-17:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/krys.yml b/data/cities/la-cote-saint-andre/krys.yml
index 7c346e58b..c571dbfb7 100644
--- a/data/cities/la-cote-saint-andre/krys.yml
+++ b/data/cities/la-cote-saint-andre/krys.yml
@@ -4,8 +4,8 @@ latitude: 45.3934
 longitude: 5.25936
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/le-comptoir-arobaseco.yml b/data/cities/la-cote-saint-andre/le-comptoir-arobaseco.yml
index 76f2d1cf2..b43aa9a27 100644
--- a/data/cities/la-cote-saint-andre/le-comptoir-arobaseco.yml
+++ b/data/cities/la-cote-saint-andre/le-comptoir-arobaseco.yml
@@ -4,8 +4,8 @@ latitude: 45.39423
 longitude: 5.26144
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Place de la Halle"
-housenumber: 4
+street: Place de la Halle
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: "https://www.le-comptoirdeco.com/"
\ No newline at end of file
+website: https://www.le-comptoirdeco.com/
diff --git a/data/cities/la-cote-saint-andre/le-fournil-cotois.yml b/data/cities/la-cote-saint-andre/le-fournil-cotois.yml
index d250260c4..3d6329fd4 100644
--- a/data/cities/la-cote-saint-andre/le-fournil-cotois.yml
+++ b/data/cities/la-cote-saint-andre/le-fournil-cotois.yml
@@ -4,8 +4,8 @@ latitude: 45.39343
 longitude: 5.26224
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 84
+street: Rue de la République
+housenumber: "84"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/lingerie-coralys.yml b/data/cities/la-cote-saint-andre/lingerie-coralys.yml
index 49a01482f..97a1b4d19 100644
--- a/data/cities/la-cote-saint-andre/lingerie-coralys.yml
+++ b/data/cities/la-cote-saint-andre/lingerie-coralys.yml
@@ -4,8 +4,8 @@ latitude: 45.39352
 longitude: 5.25946
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/loka-vaisselle.yml b/data/cities/la-cote-saint-andre/loka-vaisselle.yml
index d56e22392..4def5ce11 100644
--- a/data/cities/la-cote-saint-andre/loka-vaisselle.yml
+++ b/data/cities/la-cote-saint-andre/loka-vaisselle.yml
@@ -4,8 +4,8 @@ latitude: 45.39289
 longitude: 5.25761
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue Tourtain"
-housenumber: 10
+street: Rue Tourtain
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/maison-de-la-presse.yml b/data/cities/la-cote-saint-andre/maison-de-la-presse.yml
index 264c37683..fba834195 100644
--- a/data/cities/la-cote-saint-andre/maison-de-la-presse.yml
+++ b/data/cities/la-cote-saint-andre/maison-de-la-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.39348
 longitude: 5.26094
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 62
-phone: "+33 4 74 20 27 11"
-opening_hours: "Mo 07:30-12:00; Tu-Sa 07:30-12:00,14:30-19:00; Su 08:00-12:00"
-website: "https://www.maisondelapresse.com/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "62"
+phone: +33 4 74 20 27 11
+opening_hours: Mo 07:30-12:00; Tu-Sa 07:30-12:00,14:30-19:00; Su 08:00-12:00
+website: https://www.maisondelapresse.com/
diff --git a/data/cities/la-cote-saint-andre/mode-fashion.yml b/data/cities/la-cote-saint-andre/mode-fashion.yml
index a5e502384..3def1227a 100644
--- a/data/cities/la-cote-saint-andre/mode-fashion.yml
+++ b/data/cities/la-cote-saint-andre/mode-fashion.yml
@@ -5,7 +5,7 @@ longitude: 5.2571
 postcode: "38260"
 city: La Côte-Saint-André
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/netto.yml b/data/cities/la-cote-saint-andre/netto.yml
index 86fc4ba18..55f42da3b 100644
--- a/data/cities/la-cote-saint-andre/netto.yml
+++ b/data/cities/la-cote-saint-andre/netto.yml
@@ -1,11 +1,11 @@
 id: 73546657
-type: way
+type: node
 latitude: 45.39382
 longitude: 5.25272
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Avenue Aristide Briand"
-housenumber: 45
+street: Avenue Aristide Briand
+housenumber: "45"
 phone: "+33474593649"
-opening_hours: "Mo-Th 08:30-12:30,14:15-19:15; Fr 08:30-19:15; Sa 08:00-19:00; Su 08:30-12:30"
-website: "https://magasin.netto.fr/150-netto-la-cote-st-andre"
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:30,14:15-19:15; Fr 08:30-19:15; Sa 08:00-19:00; Su 08:30-12:30
+website: https://magasin.netto.fr/150-netto-la-cote-st-andre
diff --git a/data/cities/la-cote-saint-andre/pacific-computer.yml b/data/cities/la-cote-saint-andre/pacific-computer.yml
index 20861493b..183e7a3a9 100644
--- a/data/cities/la-cote-saint-andre/pacific-computer.yml
+++ b/data/cities/la-cote-saint-andre/pacific-computer.yml
@@ -4,8 +4,8 @@ latitude: 45.3939
 longitude: 5.26076
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Place de la Halle"
-housenumber: 5
+street: Place de la Halle
+housenumber: "5"
 phone: "+33474205843"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/passion-beaute.yml b/data/cities/la-cote-saint-andre/passion-beaute.yml
index f6655b360..3425d9350 100644
--- a/data/cities/la-cote-saint-andre/passion-beaute.yml
+++ b/data/cities/la-cote-saint-andre/passion-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.39336
 longitude: 5.261
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 65
+street: Rue de la République
+housenumber: "65"
 phone: "+33474482213"
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.passionbeaute.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: https://www.passionbeaute.fr/
diff --git a/data/cities/la-cote-saint-andre/rc-boucherie.yml b/data/cities/la-cote-saint-andre/rc-boucherie.yml
index 908372328..66e638f6a 100644
--- a/data/cities/la-cote-saint-andre/rc-boucherie.yml
+++ b/data/cities/la-cote-saint-andre/rc-boucherie.yml
@@ -4,8 +4,8 @@ latitude: 45.3496
 longitude: 5.27085
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Le Rival"
-housenumber: 
+street: Le Rival
+housenumber: ""
 phone: ""
-opening_hours: "Mo,We,Sa 08:00-12:00; Tu,Th,Fr 08:00-12:00,14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo,We,Sa 08:00-12:00; Tu,Th,Fr 08:00-12:00,14:00-18:00; Su off
+website: ""
diff --git a/data/cities/la-cote-saint-andre/renault-st-andre.yml b/data/cities/la-cote-saint-andre/renault-st-andre.yml
index 211e75c3f..390484dc9 100644
--- a/data/cities/la-cote-saint-andre/renault-st-andre.yml
+++ b/data/cities/la-cote-saint-andre/renault-st-andre.yml
@@ -4,8 +4,8 @@ latitude: 45.39322
 longitude: 5.27296
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Avenue Camille Rocher"
-housenumber: 76
+street: Avenue Camille Rocher
+housenumber: "76"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-cote-saint-andre/selectour.yml b/data/cities/la-cote-saint-andre/selectour.yml
index cdddf6aef..9f51cfcd3 100644
--- a/data/cities/la-cote-saint-andre/selectour.yml
+++ b/data/cities/la-cote-saint-andre/selectour.yml
@@ -4,8 +4,8 @@ latitude: 45.39339
 longitude: 5.26053
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 59
+street: Rue de la République
+housenumber: "59"
 phone: "+33474204253"
-opening_hours: "Mo-Sa 09:30-12:30,14:00-18:30"
-website: "https://www.ailleursvoyages.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-12:30,14:00-18:30
+website: https://www.ailleursvoyages.com/
diff --git a/data/cities/la-cote-saint-andre/tif-fany.yml b/data/cities/la-cote-saint-andre/tif-fany.yml
index 631b6f69b..67b9cdf9b 100644
--- a/data/cities/la-cote-saint-andre/tif-fany.yml
+++ b/data/cities/la-cote-saint-andre/tif-fany.yml
@@ -4,8 +4,8 @@ latitude: 45.39349
 longitude: 5.25723
 postcode: "38260"
 city: La Côte-Saint-André
-street: "Rue de la République"
-housenumber: 4
+street: Rue de la République
+housenumber: "4"
 phone: "+33474205177"
-opening_hours: "Tu-Th 08:30-12:00,14:00-19:00; Fr 08:30-18:30; Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 08:30-12:00,14:00-19:00; Fr 08:30-18:30; Sa 08:00-17:00
+website: ""
diff --git a/data/cities/la-cote-saint-andre/yves-rocher.yml b/data/cities/la-cote-saint-andre/yves-rocher.yml
index 0fcdc07b9..19e764749 100644
--- a/data/cities/la-cote-saint-andre/yves-rocher.yml
+++ b/data/cities/la-cote-saint-andre/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.39354
 longitude: 5.25886
 postcode: "38260"
 city: La Côte-Saint-André
-street: "ANGLE DE LA RUE de la République (N°32) - ET de LA RUE Saint-ANDRE (N°24)"
-housenumber: 
+street: ANGLE DE LA RUE de la République (N°32) - ET de LA RUE Saint-ANDRE (N°24)
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00, 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00, 14:30-19:00
+website: ""
diff --git a/data/cities/la-daille/boraso-la-daille.yml b/data/cities/la-daille/boraso-la-daille.yml
index 2f1199133..41f7c3d71 100644
--- a/data/cities/la-daille/boraso-la-daille.yml
+++ b/data/cities/la-daille/boraso-la-daille.yml
@@ -5,7 +5,7 @@ longitude: 6.96407
 postcode: ""
 city: La Daille
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-fouillouse/a-fleur-de-pot.yml b/data/cities/la-fouillouse/a-fleur-de-pot.yml
index e375bb73b..abe120abc 100644
--- a/data/cities/la-fouillouse/a-fleur-de-pot.yml
+++ b/data/cities/la-fouillouse/a-fleur-de-pot.yml
@@ -4,8 +4,8 @@ latitude: 45.50082
 longitude: 4.31883
 postcode: "42480"
 city: La Fouillouse
-street: "Rue de la Libération"
+street: Rue de la Libération
 housenumber: 57B
 phone: "+33477340377"
 opening_hours: ""
-website: "https://www.afleurdepotjennifer.com"
\ No newline at end of file
+website: https://www.afleurdepotjennifer.com
diff --git a/data/cities/la-frette/la-gamme-paysanne.yml b/data/cities/la-frette/la-gamme-paysanne.yml
index 98669e091..d0e134bfe 100644
--- a/data/cities/la-frette/la-gamme-paysanne.yml
+++ b/data/cities/la-frette/la-gamme-paysanne.yml
@@ -5,7 +5,7 @@ longitude: 5.37057
 postcode: "38260"
 city: La Frette
 street: ""
-housenumber: 763
-phone: "+33 4 74 54 65 25"
-opening_hours: "Mo-Fr 9:00-12:30,14:30-19:00; Sa 9:00-19:00; Su 9:00-12:30"
-website: "http://www.gammepaysanne.fr/"
\ No newline at end of file
+housenumber: "763"
+phone: +33 4 74 54 65 25
+opening_hours: Mo-Fr 9:00-12:30,14:30-19:00; Sa 9:00-19:00; Su 9:00-12:30
+website: http://www.gammepaysanne.fr/
diff --git a/data/cities/la-motte-servolex/aprecial.yml b/data/cities/la-motte-servolex/aprecial.yml
index 332bc39bb..0a57b6732 100644
--- a/data/cities/la-motte-servolex/aprecial.yml
+++ b/data/cities/la-motte-servolex/aprecial.yml
@@ -4,8 +4,8 @@ latitude: 45.60148
 longitude: 5.87522
 postcode: "73290"
 city: La Motte-Servolex
-street: "Rue Lavoisier"
-housenumber: 75
-phone: "+33 966874093"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.aprecial.fr/salon-de-coiffure-aprecial/salon-coiffure-recherche/listing/aprecial-la-motte-servolex"
\ No newline at end of file
+street: Rue Lavoisier
+housenumber: "75"
+phone: +33 966874093
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.aprecial.fr/salon-de-coiffure-aprecial/salon-coiffure-recherche/listing/aprecial-la-motte-servolex
diff --git a/data/cities/la-motte-servolex/atelier-titane-grade9.yml b/data/cities/la-motte-servolex/atelier-titane-grade9.yml
index dd02d3203..6e3a9d63b 100644
--- a/data/cities/la-motte-servolex/atelier-titane-grade9.yml
+++ b/data/cities/la-motte-servolex/atelier-titane-grade9.yml
@@ -4,8 +4,8 @@ latitude: 45.59737
 longitude: 5.89094
 postcode: "73290"
 city: La Motte-Servolex
-street: "Rue de la Curiaz"
-housenumber: 386
+street: Rue de la Curiaz
+housenumber: "386"
 phone: "+33479716627"
 opening_hours: ""
-website: "https://www.ateliertitane.fr/"
\ No newline at end of file
+website: https://www.ateliertitane.fr/
diff --git a/data/cities/la-motte-servolex/chocolaterie-juliette-nevo.yml b/data/cities/la-motte-servolex/chocolaterie-juliette-nevo.yml
index 7a8db5118..e80394e40 100644
--- a/data/cities/la-motte-servolex/chocolaterie-juliette-nevo.yml
+++ b/data/cities/la-motte-servolex/chocolaterie-juliette-nevo.yml
@@ -4,8 +4,8 @@ latitude: 45.59471
 longitude: 5.87864
 postcode: "73290"
 city: La Motte-Servolex
-street: "Avenue Costa de Beauregard"
-housenumber: 260
-phone: "+33 4 79 65 34 40"
-opening_hours: "Tu-Sa 10:00-12:30,14:30-19:00"
-website: "https://www.facebook.com/Chocolaterie-Juliette-N%C3%A9vo-100320758578710/"
\ No newline at end of file
+street: Avenue Costa de Beauregard
+housenumber: "260"
+phone: +33 4 79 65 34 40
+opening_hours: Tu-Sa 10:00-12:30,14:30-19:00
+website: https://www.facebook.com/Chocolaterie-Juliette-N%C3%A9vo-100320758578710/
diff --git a/data/cities/la-motte-servolex/communaute-emmaus-chambery.yml b/data/cities/la-motte-servolex/communaute-emmaus-chambery.yml
index dc753a4e8..6d9a6fc30 100644
--- a/data/cities/la-motte-servolex/communaute-emmaus-chambery.yml
+++ b/data/cities/la-motte-servolex/communaute-emmaus-chambery.yml
@@ -1,11 +1,11 @@
 id: 878241691
-type: way
+type: node
 latitude: 45.60031
 longitude: 5.88468
 postcode: "73290"
 city: La Motte Servolex
-street: "Rue Denis Papin"
-housenumber: 405
+street: Rue Denis Papin
+housenumber: "405"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-motte-servolex/jhog.yml b/data/cities/la-motte-servolex/jhog.yml
index ca3df939b..23128324c 100644
--- a/data/cities/la-motte-servolex/jhog.yml
+++ b/data/cities/la-motte-servolex/jhog.yml
@@ -4,8 +4,8 @@ latitude: 45.63711
 longitude: 5.87543
 postcode: "73290"
 city: La Motte-Servolex
-street: "Rue Lac du Mont Cenis"
-housenumber: 3
+street: Rue Lac du Mont Cenis
+housenumber: "3"
 phone: "0632970470"
 opening_hours: ""
-website: "https://www.jhog.fr/"
\ No newline at end of file
+website: https://www.jhog.fr/
diff --git a/data/cities/la-motte-servolex/materiel-medical-de-la-source.yml b/data/cities/la-motte-servolex/materiel-medical-de-la-source.yml
index a501b5191..be78aa77a 100644
--- a/data/cities/la-motte-servolex/materiel-medical-de-la-source.yml
+++ b/data/cities/la-motte-servolex/materiel-medical-de-la-source.yml
@@ -4,8 +4,8 @@ latitude: 45.59274
 longitude: 5.87789
 postcode: "73420"
 city: La Motte-Servolex
-street: "Avenue Jean-Marie Michelier"
-housenumber: 133
-phone: "+33 4 79 65 13 30"
+street: Avenue Jean-Marie Michelier
+housenumber: "133"
+phone: +33 4 79 65 13 30
 opening_hours: ""
-website: "https://www.materiel-medical-source.fr/"
\ No newline at end of file
+website: https://www.materiel-medical-source.fr/
diff --git a/data/cities/la-motte-servolex/samse-la-motte-servolex.yml b/data/cities/la-motte-servolex/samse-la-motte-servolex.yml
index 3457fea07..85a7e5d57 100644
--- a/data/cities/la-motte-servolex/samse-la-motte-servolex.yml
+++ b/data/cities/la-motte-servolex/samse-la-motte-servolex.yml
@@ -4,8 +4,8 @@ latitude: 45.59939
 longitude: 5.88703
 postcode: "73290"
 city: La Motte-Servolex
-street: "Rue Denis Papin"
-housenumber: 50
-phone: "+33 4 79 25 11 22"
+street: Rue Denis Papin
+housenumber: "50"
+phone: +33 4 79 25 11 22
 opening_hours: ""
-website: "https://www.samse.fr/agence/samse/la-motte-servolex/59"
\ No newline at end of file
+website: https://www.samse.fr/agence/samse/la-motte-servolex/59
diff --git a/data/cities/la-motte-servolex/saveurs-campagnardes.yml b/data/cities/la-motte-servolex/saveurs-campagnardes.yml
index 5fe4be8aa..8c0252b22 100644
--- a/data/cities/la-motte-servolex/saveurs-campagnardes.yml
+++ b/data/cities/la-motte-servolex/saveurs-campagnardes.yml
@@ -4,8 +4,8 @@ latitude: 45.6021
 longitude: 5.87706
 postcode: "73290"
 city: La Motte-Servolex
-street: "Rue Denis Papin"
-housenumber: 965
+street: Rue Denis Papin
+housenumber: "965"
 phone: "+33479627110"
-opening_hours: "Tu-Fr 08:30-12:30, 15:00-19:00; Sa 08:30-19:00"
-website: "https://saveurs-campagnardes.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-12:30, 15:00-19:00; Sa 08:30-19:00
+website: https://saveurs-campagnardes.fr/
diff --git a/data/cities/la-motte-servolex/velobricolac.yml b/data/cities/la-motte-servolex/velobricolac.yml
index ba6007363..de8f643af 100644
--- a/data/cities/la-motte-servolex/velobricolac.yml
+++ b/data/cities/la-motte-servolex/velobricolac.yml
@@ -4,8 +4,8 @@ latitude: 45.63856
 longitude: 5.87088
 postcode: "73290"
 city: La Motte-Servolex
-street: "Route de Chambéry"
-housenumber: 1451
+street: Route de Chambéry
+housenumber: "1451"
 phone: ""
 opening_hours: ""
-website: "https://www.velobricolac.fr/"
\ No newline at end of file
+website: https://www.velobricolac.fr/
diff --git a/data/cities/la-mulatiere/aldi.yml b/data/cities/la-mulatiere/aldi.yml
index d26663437..efbed53e2 100644
--- a/data/cities/la-mulatiere/aldi.yml
+++ b/data/cities/la-mulatiere/aldi.yml
@@ -4,8 +4,8 @@ latitude: 45.72683
 longitude: 4.81155
 postcode: "69350"
 city: La Mulatière
-street: "Chemin de Fontanières"
-housenumber: 260
+street: Chemin de Fontanières
+housenumber: "260"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/la-mure/carrefour-express.yml b/data/cities/la-mure/carrefour-express.yml
index 18a1d050a..258dd61ff 100644
--- a/data/cities/la-mure/carrefour-express.yml
+++ b/data/cities/la-mure/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 44.9063
 longitude: 5.7865
 postcode: "38350"
 city: La Mure
-street: "Rue Bayard"
-housenumber: 4
+street: Rue Bayard
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-mure/hymy-bike.yml b/data/cities/la-mure/hymy-bike.yml
index 3157d3d44..dbfac2250 100644
--- a/data/cities/la-mure/hymy-bike.yml
+++ b/data/cities/la-mure/hymy-bike.yml
@@ -4,8 +4,8 @@ latitude: 44.90626
 longitude: 5.78767
 postcode: "38350"
 city: La Mûre
-street: "Rue des Fossés"
-housenumber: 6
+street: Rue des Fossés
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Sa 09:00-13:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-13:00, 14:00-18:00
+website: ""
diff --git a/data/cities/la-mure/intersport.yml b/data/cities/la-mure/intersport.yml
index 11ebdfa42..50490ea54 100644
--- a/data/cities/la-mure/intersport.yml
+++ b/data/cities/la-mure/intersport.yml
@@ -4,8 +4,8 @@ latitude: 44.93298
 longitude: 5.78395
 postcode: "38350"
 city: La Mure
-street: "ZI du Marais"
-housenumber: 
+street: ZI du Marais
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:30-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/la-mure/la-belle-verte.yml b/data/cities/la-mure/la-belle-verte.yml
index 8d5f901da..a4154858d 100644
--- a/data/cities/la-mure/la-belle-verte.yml
+++ b/data/cities/la-mure/la-belle-verte.yml
@@ -1,11 +1,11 @@
 id: 913664266
-type: way
+type: node
 latitude: 44.92844
 longitude: 5.77975
 postcode: "38350"
 city: La Mure
-street: "Zone Industrielle les Marais"
-housenumber: 
-phone: "+33 4 76 83 03 57"
+street: Zone Industrielle les Marais
+housenumber: ""
+phone: +33 4 76 83 03 57
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-mure/mon-epivrac.yml b/data/cities/la-mure/mon-epivrac.yml
index 09ce49ae2..c9b7b1c40 100644
--- a/data/cities/la-mure/mon-epivrac.yml
+++ b/data/cities/la-mure/mon-epivrac.yml
@@ -4,8 +4,8 @@ latitude: 44.90803
 longitude: 5.79087
 postcode: "38350"
 city: La Mure
-street: "Avenue Docteur Tagnard"
-housenumber: 18
-phone: "+33 4 76 30 49 35"
+street: Avenue Docteur Tagnard
+housenumber: "18"
+phone: +33 4 76 30 49 35
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-mure/zazou-loisirs.yml b/data/cities/la-mure/zazou-loisirs.yml
index 9f162e206..9829a55f0 100644
--- a/data/cities/la-mure/zazou-loisirs.yml
+++ b/data/cities/la-mure/zazou-loisirs.yml
@@ -4,8 +4,8 @@ latitude: 44.90611
 longitude: 5.78633
 postcode: "38350"
 city: La Mure
-street: "Place Pérouzat"
-housenumber: 
+street: Place Pérouzat
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-murette/vival.yml b/data/cities/la-murette/vival.yml
index 0abeb15c1..77b6b4f2b 100644
--- a/data/cities/la-murette/vival.yml
+++ b/data/cities/la-murette/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.38067
 longitude: 5.54034
 postcode: "38140"
 city: La Murette
-street: "Rue du Bourg"
-housenumber: 165
-phone: "+33 4 76 65 97 43"
-opening_hours: "Tu-Sa 08:15-12:30,15:30-19:30; Su 09:00-12:00"
-website: "https://magasins.vival.fr/fr/s/vival-la-murette"
\ No newline at end of file
+street: Rue du Bourg
+housenumber: "165"
+phone: +33 4 76 65 97 43
+opening_hours: Tu-Sa 08:15-12:30,15:30-19:30; Su 09:00-12:00
+website: https://magasins.vival.fr/fr/s/vival-la-murette
diff --git a/data/cities/la-pacaudiere/captif.yml b/data/cities/la-pacaudiere/captif.yml
index bb1fae61d..7df5dbfdd 100644
--- a/data/cities/la-pacaudiere/captif.yml
+++ b/data/cities/la-pacaudiere/captif.yml
@@ -1,11 +1,11 @@
 id: 366996327
-type: way
+type: node
 latitude: 46.17562
 longitude: 3.86778
 postcode: "42310"
 city: La Pacaudière
-street: "Route de Paris"
-housenumber: 
-phone: "+334 77 64 38 76"
+street: Route de Paris
+housenumber: ""
+phone: +334 77 64 38 76
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-plagne-tarentaise/sport-2000.yml b/data/cities/la-plagne-tarentaise/sport-2000.yml
index 8a5ad1faf..7ca8c92ee 100644
--- a/data/cities/la-plagne-tarentaise/sport-2000.yml
+++ b/data/cities/la-plagne-tarentaise/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.50611
 longitude: 6.68401
 postcode: "73210"
 city: La Plagne Tarentaise
-street: "Centre Commercial"
-housenumber: 
+street: Centre Commercial
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-ravoire/triumph-chambery.yml b/data/cities/la-ravoire/triumph-chambery.yml
index 3585782a8..9fc2a7998 100644
--- a/data/cities/la-ravoire/triumph-chambery.yml
+++ b/data/cities/la-ravoire/triumph-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.56476
 longitude: 5.96803
 postcode: "73490"
 city: La Ravoire
-street: "Rue du Bois de Leysse"
-housenumber: 7
-phone: "+33 4 79 33 70 96"
-opening_hours: "Tu-Sa 09:00-12:00; Tu-Fr 14:00-19:00; Sa 14:00-18:00; PH off"
-website: "https://www.triumphmotorcycles.fr/concessionnaires/france/triumph-chambery"
\ No newline at end of file
+street: Rue du Bois de Leysse
+housenumber: "7"
+phone: +33 4 79 33 70 96
+opening_hours: Tu-Sa 09:00-12:00; Tu-Fr 14:00-19:00; Sa 14:00-18:00; PH off
+website: https://www.triumphmotorcycles.fr/concessionnaires/france/triumph-chambery
diff --git a/data/cities/la-ravoire/worden.yml b/data/cities/la-ravoire/worden.yml
index c8c590312..7b1fb8f90 100644
--- a/data/cities/la-ravoire/worden.yml
+++ b/data/cities/la-ravoire/worden.yml
@@ -1,11 +1,11 @@
 id: 931975743
-type: way
+type: node
 latitude: 45.56758
 longitude: 5.96521
 postcode: "73490"
 city: La Ravoire
-street: "Rue Pierre et Marie Curie"
-housenumber: 315
+street: Rue Pierre et Marie Curie
+housenumber: "315"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-rippe/berlie-sa.yml b/data/cities/la-rippe/berlie-sa.yml
index 0076ae5c3..b6edacf4e 100644
--- a/data/cities/la-rippe/berlie-sa.yml
+++ b/data/cities/la-rippe/berlie-sa.yml
@@ -4,8 +4,8 @@ latitude: 46.38384
 longitude: 6.14552
 postcode: "1278"
 city: La Rippe
-street: "Route du Jura"
-housenumber: 23
+street: Route du Jura
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-riviere/raccoon-workshop.yml b/data/cities/la-riviere/raccoon-workshop.yml
index b69646428..b8ef4fcba 100644
--- a/data/cities/la-riviere/raccoon-workshop.yml
+++ b/data/cities/la-riviere/raccoon-workshop.yml
@@ -4,8 +4,8 @@ latitude: 45.23113
 longitude: 5.50701
 postcode: "38210"
 city: La Rivière
-street: "Chemin du Content"
-housenumber: 43
+street: Chemin du Content
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/alextrem-cycles.yml b/data/cities/la-roche-sur-foron/alextrem-cycles.yml
deleted file mode 100644
index ca7e2dd56..000000000
--- a/data/cities/la-roche-sur-foron/alextrem-cycles.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4241030992
-type: node
-latitude: 46.06739
-longitude: 6.30691
-postcode: "74800"
-city: La Roche-sur-Foron
-street: "Rue du Président Faure"
-housenumber: 229
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/la-roche-sur-foron/alpabi-boutique.yml b/data/cities/la-roche-sur-foron/alpabi-boutique.yml
index d2ecca369..5bae25149 100644
--- a/data/cities/la-roche-sur-foron/alpabi-boutique.yml
+++ b/data/cities/la-roche-sur-foron/alpabi-boutique.yml
@@ -4,8 +4,8 @@ latitude: 46.06709
 longitude: 6.31364
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Faubourg Saint-Martin"
-housenumber: 6
-phone: "+33 4 50 25 67 43"
+street: Faubourg Saint-Martin
+housenumber: "6"
+phone: +33 4 50 25 67 43
 opening_hours: ""
-website: "http://www.alpabi.org/"
\ No newline at end of file
+website: http://www.alpabi.org/
diff --git a/data/cities/la-roche-sur-foron/art-epices-et-chocolat.yml b/data/cities/la-roche-sur-foron/art-epices-et-chocolat.yml
index 19409eb77..b403acacc 100644
--- a/data/cities/la-roche-sur-foron/art-epices-et-chocolat.yml
+++ b/data/cities/la-roche-sur-foron/art-epices-et-chocolat.yml
@@ -4,8 +4,8 @@ latitude: 46.0658
 longitude: 6.31145
 postcode: "74800"
 city: La Roche Sur Foron
-street: "Rue Perrine"
-housenumber: 32
+street: Rue Perrine
+housenumber: "32"
 phone: "0450037387"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/au-langage-des-fleurs.yml b/data/cities/la-roche-sur-foron/au-langage-des-fleurs.yml
index b7329d485..f4aec5e45 100644
--- a/data/cities/la-roche-sur-foron/au-langage-des-fleurs.yml
+++ b/data/cities/la-roche-sur-foron/au-langage-des-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 46.06648
 longitude: 6.31277
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Place de la République"
-housenumber: 11
+street: Place de la République
+housenumber: "11"
 phone: "+33456300109"
-opening_hours: "Tu-Sa 09:00-12:15,14:00-19:15"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:15,14:00-19:15
+website: ""
diff --git a/data/cities/la-roche-sur-foron/biocoop.yml b/data/cities/la-roche-sur-foron/biocoop.yml
index 8592abc1b..3860a6150 100644
--- a/data/cities/la-roche-sur-foron/biocoop.yml
+++ b/data/cities/la-roche-sur-foron/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 46.06589
 longitude: 6.31108
 postcode: "74800"
 city: La Roche Sur Foron
-street: "Rue Perrine"
-housenumber: 2
-phone: "+33 4 50 25 98 18"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.aquarius-biocoop.org/"
\ No newline at end of file
+street: Rue Perrine
+housenumber: "2"
+phone: +33 4 50 25 98 18
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.aquarius-biocoop.org/
diff --git a/data/cities/la-roche-sur-foron/cache-cache.yml b/data/cities/la-roche-sur-foron/cache-cache.yml
index 68a607a04..389c6d9a4 100644
--- a/data/cities/la-roche-sur-foron/cache-cache.yml
+++ b/data/cities/la-roche-sur-foron/cache-cache.yml
@@ -4,8 +4,8 @@ latitude: 46.06674
 longitude: 6.31285
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue du Président Carnot"
-housenumber: 21
+street: Rue du Président Carnot
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/crayon-a-papier.yml b/data/cities/la-roche-sur-foron/crayon-a-papier.yml
index 2dba4fc75..707196ad2 100644
--- a/data/cities/la-roche-sur-foron/crayon-a-papier.yml
+++ b/data/cities/la-roche-sur-foron/crayon-a-papier.yml
@@ -4,8 +4,8 @@ latitude: 46.06616
 longitude: 6.31091
 postcode: "74800"
 city: La Roche Sur Foron
-street: "Rue du Président Carnot"
-housenumber: 182
+street: Rue du Président Carnot
+housenumber: "182"
 phone: "0450033525"
-opening_hours: "Tu-Fr 09:15-12:00; Sa 09:30-12:00"
-website: "https://www.crayon-a-papier.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:15-12:00; Sa 09:30-12:00
+website: https://www.crayon-a-papier.com/
diff --git a/data/cities/la-roche-sur-foron/essentielle.yml b/data/cities/la-roche-sur-foron/essentielle.yml
index c159b5728..e990f9566 100644
--- a/data/cities/la-roche-sur-foron/essentielle.yml
+++ b/data/cities/la-roche-sur-foron/essentielle.yml
@@ -4,8 +4,8 @@ latitude: 46.0661
 longitude: 6.30973
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Faubourg Saint-Bernard"
-housenumber: 101
+street: Faubourg Saint-Bernard
+housenumber: "101"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/euromaster.yml b/data/cities/la-roche-sur-foron/euromaster.yml
index 7b15b9484..6b060e78d 100644
--- a/data/cities/la-roche-sur-foron/euromaster.yml
+++ b/data/cities/la-roche-sur-foron/euromaster.yml
@@ -1,11 +1,11 @@
 id: 111115461
-type: way
+type: node
 latitude: 46.07022
 longitude: 6.30212
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Avenue Lucien Rannard"
-housenumber: 3173
-phone: "+33 4 50 03 10 46"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00"
-website: "https://centres.euromaster.fr/88-euromaster-la-roche-sur-foron-centre-auto-vl-voiture"
\ No newline at end of file
+street: Avenue Lucien Rannard
+housenumber: "3173"
+phone: +33 4 50 03 10 46
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00
+website: https://centres.euromaster.fr/88-euromaster-la-roche-sur-foron-centre-auto-vl-voiture
diff --git a/data/cities/la-roche-sur-foron/fleurs-perce-neige.yml b/data/cities/la-roche-sur-foron/fleurs-perce-neige.yml
index e3f35b576..0b38afa89 100644
--- a/data/cities/la-roche-sur-foron/fleurs-perce-neige.yml
+++ b/data/cities/la-roche-sur-foron/fleurs-perce-neige.yml
@@ -4,8 +4,8 @@ latitude: 46.06682
 longitude: 6.31297
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue du Président Carnot"
-housenumber: 9
+street: Rue du Président Carnot
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/foron-multimediarobase.yml b/data/cities/la-roche-sur-foron/foron-multimediarobase.yml
index 923eea421..d1f9de13c 100644
--- a/data/cities/la-roche-sur-foron/foron-multimediarobase.yml
+++ b/data/cities/la-roche-sur-foron/foron-multimediarobase.yml
@@ -4,8 +4,8 @@ latitude: 46.06603
 longitude: 6.3107
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Faubourg Saint-Bernard"
-housenumber: 30
-phone: "+334 50 25 89 09"
+street: Faubourg Saint-Bernard
+housenumber: "30"
+phone: +334 50 25 89 09
 opening_hours: ""
-website: "https://www.foronmultimedia.com/"
\ No newline at end of file
+website: https://www.foronmultimedia.com/
diff --git a/data/cities/la-roche-sur-foron/histoire-sans-fin.yml b/data/cities/la-roche-sur-foron/histoire-sans-fin.yml
index 4d9acde21..fc0112a11 100644
--- a/data/cities/la-roche-sur-foron/histoire-sans-fin.yml
+++ b/data/cities/la-roche-sur-foron/histoire-sans-fin.yml
@@ -4,8 +4,8 @@ latitude: 46.06651
 longitude: 6.31327
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue de Silence"
-housenumber: 47
-phone: "+33 4 50 25 41 91"
-opening_hours: "Tu-Sa 09:00-12:30,14:00-19:00"
-website: "https://librairiehistoiressansfin.com/"
\ No newline at end of file
+street: Rue de Silence
+housenumber: "47"
+phone: +33 4 50 25 41 91
+opening_hours: Tu-Sa 09:00-12:30,14:00-19:00
+website: https://librairiehistoiressansfin.com/
diff --git a/data/cities/la-roche-sur-foron/intersport.yml b/data/cities/la-roche-sur-foron/intersport.yml
index da54f26d1..315508c5e 100644
--- a/data/cities/la-roche-sur-foron/intersport.yml
+++ b/data/cities/la-roche-sur-foron/intersport.yml
@@ -1,11 +1,11 @@
 id: 111112908
-type: way
+type: node
 latitude: 46.07555
 longitude: 6.30657
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Impasse de l'Étang"
-housenumber: 93
+street: Impasse de l'Étang
+housenumber: "93"
 phone: ""
-opening_hours: "Mo-Sa 09:30-13:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-13:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/la-roche-sur-foron/l-c-coiffure.yml b/data/cities/la-roche-sur-foron/l-c-coiffure.yml
index 9b809e842..0ca3f14ce 100644
--- a/data/cities/la-roche-sur-foron/l-c-coiffure.yml
+++ b/data/cities/la-roche-sur-foron/l-c-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.06735
 longitude: 6.31216
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Avenue Jean Jaurès"
-housenumber: 28
-phone: "+33 4 50 03 03 32"
+street: Avenue Jean Jaurès
+housenumber: "28"
+phone: +33 4 50 03 03 32
 opening_hours: ""
-website: "https://www.lc-coiffure-la-roche-sur-foron.fr/"
\ No newline at end of file
+website: https://www.lc-coiffure-la-roche-sur-foron.fr/
diff --git a/data/cities/la-roche-sur-foron/la-casa-del-barbiere.yml b/data/cities/la-roche-sur-foron/la-casa-del-barbiere.yml
index 4d7233b5b..b68f65f70 100644
--- a/data/cities/la-roche-sur-foron/la-casa-del-barbiere.yml
+++ b/data/cities/la-roche-sur-foron/la-casa-del-barbiere.yml
@@ -4,8 +4,8 @@ latitude: 46.06559
 longitude: 6.31284
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue Perrine"
-housenumber: 160
+street: Rue Perrine
+housenumber: "160"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/la-cave-du-manoir.yml b/data/cities/la-roche-sur-foron/la-cave-du-manoir.yml
index 22320c850..083c776f0 100644
--- a/data/cities/la-roche-sur-foron/la-cave-du-manoir.yml
+++ b/data/cities/la-roche-sur-foron/la-cave-du-manoir.yml
@@ -4,8 +4,8 @@ latitude: 46.06608
 longitude: 6.30985
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Faubourg Saint-Bernard"
-housenumber: 81
+street: Faubourg Saint-Bernard
+housenumber: "81"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/la-ronde-des-saveurs-enilv.yml b/data/cities/la-roche-sur-foron/la-ronde-des-saveurs-enilv.yml
index 079e294ee..4426399d9 100644
--- a/data/cities/la-roche-sur-foron/la-ronde-des-saveurs-enilv.yml
+++ b/data/cities/la-roche-sur-foron/la-ronde-des-saveurs-enilv.yml
@@ -1,11 +1,11 @@
 id: 111118853
-type: way
+type: node
 latitude: 46.07137
 longitude: 6.29769
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Avenue de la Libération"
-housenumber: 990
-phone: "+33 4 50 03 44 26"
+street: Avenue de la Libération
+housenumber: "990"
+phone: +33 4 50 03 44 26
 opening_hours: ""
-website: "http://www.enilv74.org/ateliers-de-production-2/magasin/"
\ No newline at end of file
+website: http://www.enilv74.org/ateliers-de-production-2/magasin/
diff --git a/data/cities/la-roche-sur-foron/le-bazar-aux-merveilles.yml b/data/cities/la-roche-sur-foron/le-bazar-aux-merveilles.yml
index 1f63fbb3e..7b7a99849 100644
--- a/data/cities/la-roche-sur-foron/le-bazar-aux-merveilles.yml
+++ b/data/cities/la-roche-sur-foron/le-bazar-aux-merveilles.yml
@@ -4,8 +4,8 @@ latitude: 46.06604
 longitude: 6.31088
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue Carnot"
-housenumber: 182
+street: Rue Carnot
+housenumber: "182"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/le-celtique.yml b/data/cities/la-roche-sur-foron/le-celtique.yml
index 908f53fdb..17b23b848 100644
--- a/data/cities/la-roche-sur-foron/le-celtique.yml
+++ b/data/cities/la-roche-sur-foron/le-celtique.yml
@@ -4,8 +4,8 @@ latitude: 46.0672
 longitude: 6.31301
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Place de la Grenette"
-housenumber: 15
+street: Place de la Grenette
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/le-petit-casino.yml b/data/cities/la-roche-sur-foron/le-petit-casino.yml
index e8dc116b8..06aca38d2 100644
--- a/data/cities/la-roche-sur-foron/le-petit-casino.yml
+++ b/data/cities/la-roche-sur-foron/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.0662
 longitude: 6.31222
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue du Président Carnot"
-housenumber: 103
+street: Rue du Président Carnot
+housenumber: "103"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 07:30-12:30, 15:00-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 07:30-12:30, 15:00-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/la-roche-sur-foron/les-delices-de-tom.yml b/data/cities/la-roche-sur-foron/les-delices-de-tom.yml
index cd723b07f..5d95d705f 100644
--- a/data/cities/la-roche-sur-foron/les-delices-de-tom.yml
+++ b/data/cities/la-roche-sur-foron/les-delices-de-tom.yml
@@ -4,8 +4,8 @@ latitude: 46.06933
 longitude: 6.30742
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Avenue de la Libération"
-housenumber: 278
+street: Avenue de la Libération
+housenumber: "278"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/luthier.yml b/data/cities/la-roche-sur-foron/luthier.yml
index a2e0beb9d..24587526f 100644
--- a/data/cities/la-roche-sur-foron/luthier.yml
+++ b/data/cities/la-roche-sur-foron/luthier.yml
@@ -4,8 +4,8 @@ latitude: 46.0681
 longitude: 6.30484
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Avenue Jean Jaurès"
-housenumber: 609
+street: Avenue Jean Jaurès
+housenumber: "609"
 phone: "+33450258662"
 opening_hours: ""
-website: "contact@agnes.saumagne.fr"
\ No newline at end of file
+website: contact@agnes.saumagne.fr
diff --git a/data/cities/la-roche-sur-foron/mercerie-rubanbelle.yml b/data/cities/la-roche-sur-foron/mercerie-rubanbelle.yml
index 41278f0f1..71670c2ba 100644
--- a/data/cities/la-roche-sur-foron/mercerie-rubanbelle.yml
+++ b/data/cities/la-roche-sur-foron/mercerie-rubanbelle.yml
@@ -4,8 +4,8 @@ latitude: 46.06581
 longitude: 6.31215
 postcode: "74800"
 city: La Roche Sur Foron
-street: "Rue Perrine"
-housenumber: 79
+street: Rue Perrine
+housenumber: "79"
 phone: "0450030309"
 opening_hours: ""
-website: "https://rubanbelle74.fr/"
\ No newline at end of file
+website: https://rubanbelle74.fr/
diff --git a/data/cities/la-roche-sur-foron/my-eco-house-epicerie-vrac-zero-dechet.yml b/data/cities/la-roche-sur-foron/my-eco-house-epicerie-vrac-zero-dechet.yml
index 358e483de..33ac39373 100644
--- a/data/cities/la-roche-sur-foron/my-eco-house-epicerie-vrac-zero-dechet.yml
+++ b/data/cities/la-roche-sur-foron/my-eco-house-epicerie-vrac-zero-dechet.yml
@@ -4,8 +4,8 @@ latitude: 46.06718
 longitude: 6.31371
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Faubourg Saint-Martin"
-housenumber: 16
-phone: "06 64 76 79 20"
+street: Faubourg Saint-Martin
+housenumber: "16"
+phone: 06 64 76 79 20
 opening_hours: ""
-website: "https://my-ecohouse.fr/"
\ No newline at end of file
+website: https://my-ecohouse.fr/
diff --git a/data/cities/la-roche-sur-foron/optic-2000.yml b/data/cities/la-roche-sur-foron/optic-2000.yml
index 25523d34f..9549f0148 100644
--- a/data/cities/la-roche-sur-foron/optic-2000.yml
+++ b/data/cities/la-roche-sur-foron/optic-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.06754
 longitude: 6.31216
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Avenue Charles de Gaulle"
-housenumber: 25
-phone: "+33 45 003 3040"
-opening_hours: "Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:30, 14:00-18:00"
-website: "https://opticiens.optic2000.com/C01206"
\ No newline at end of file
+street: Avenue Charles de Gaulle
+housenumber: "25"
+phone: +33 45 003 3040
+opening_hours: Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:30, 14:00-18:00
+website: https://opticiens.optic2000.com/C01206
diff --git a/data/cities/la-roche-sur-foron/patachou.yml b/data/cities/la-roche-sur-foron/patachou.yml
index 3c5d63ba2..9a0c5dc5d 100644
--- a/data/cities/la-roche-sur-foron/patachou.yml
+++ b/data/cities/la-roche-sur-foron/patachou.yml
@@ -4,8 +4,8 @@ latitude: 46.07611
 longitude: 6.30531
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue de Grébelin"
-housenumber: 30
+street: Rue de Grébelin
+housenumber: "30"
 phone: "+33450142937"
-opening_hours: "Mo-Fr 05:00-19:00; Sa-Su 06:00-19:00; "
-website: ""
\ No newline at end of file
+opening_hours: 'Mo-Fr 05:00-19:00; Sa-Su 06:00-19:00; '
+website: ""
diff --git a/data/cities/la-roche-sur-foron/quincaillerie-jacquard.yml b/data/cities/la-roche-sur-foron/quincaillerie-jacquard.yml
index 41628d418..84c279f5a 100644
--- a/data/cities/la-roche-sur-foron/quincaillerie-jacquard.yml
+++ b/data/cities/la-roche-sur-foron/quincaillerie-jacquard.yml
@@ -4,8 +4,8 @@ latitude: 46.06827
 longitude: 6.30882
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Avenue Jean Jaurès"
-housenumber: 294
+street: Avenue Jean Jaurès
+housenumber: "294"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/savoie-energie.yml b/data/cities/la-roche-sur-foron/savoie-energie.yml
index 04bd18af2..b39b8f411 100644
--- a/data/cities/la-roche-sur-foron/savoie-energie.yml
+++ b/data/cities/la-roche-sur-foron/savoie-energie.yml
@@ -4,8 +4,8 @@ latitude: 46.07261
 longitude: 6.30213
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue Adhémar-Fabri"
-housenumber: 355
+street: Rue Adhémar-Fabri
+housenumber: "355"
 phone: ""
 opening_hours: ""
-website: "https://www.savoie-energie.fr/"
\ No newline at end of file
+website: https://www.savoie-energie.fr/
diff --git a/data/cities/la-roche-sur-foron/tabac-de-leglise.yml b/data/cities/la-roche-sur-foron/tabac-de-leglise.yml
index e22cbcade..353a67988 100644
--- a/data/cities/la-roche-sur-foron/tabac-de-leglise.yml
+++ b/data/cities/la-roche-sur-foron/tabac-de-leglise.yml
@@ -4,8 +4,8 @@ latitude: 46.06563
 longitude: 6.31326
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue Perrine"
-housenumber: 174
+street: Rue Perrine
+housenumber: "174"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-sur-foron/tholance-voyages.yml b/data/cities/la-roche-sur-foron/tholance-voyages.yml
index de89a6e6d..a60b39155 100644
--- a/data/cities/la-roche-sur-foron/tholance-voyages.yml
+++ b/data/cities/la-roche-sur-foron/tholance-voyages.yml
@@ -4,8 +4,8 @@ latitude: 46.06666
 longitude: 6.31274
 postcode: "74800"
 city: La Roche-sur-Foron
-street: "Rue du Président Carnot"
-housenumber: 31
+street: Rue du Président Carnot
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-roche-surforon/au-bio-vivant.yml b/data/cities/la-roche-surforon/au-bio-vivant.yml
index 9c4c84e40..0ce6b1952 100644
--- a/data/cities/la-roche-surforon/au-bio-vivant.yml
+++ b/data/cities/la-roche-surforon/au-bio-vivant.yml
@@ -1,11 +1,11 @@
 id: 314593646
-type: way
+type: node
 latitude: 46.12121
 longitude: 6.26782
 postcode: "74930"
 city: La Roche-surForon
-street: "Impasse des Contamines"
+street: Impasse des Contamines
 housenumber: 45 A
-phone: "+33 4 50 50 28 62"
+phone: +33 4 50 50 28 62
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-rochette/cyrille-et-beatrice.yml b/data/cities/la-rochette/cyrille-et-beatrice.yml
index aaadfa06f..dc9c49c43 100644
--- a/data/cities/la-rochette/cyrille-et-beatrice.yml
+++ b/data/cities/la-rochette/cyrille-et-beatrice.yml
@@ -5,7 +5,7 @@ longitude: 6.11906
 postcode: "73110"
 city: La Rochette
 street: ""
-housenumber: 41
-phone: "+33 4 79 25 50 29"
+housenumber: "41"
+phone: +33 4 79 25 50 29
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-rosiere/intersport.yml b/data/cities/la-rosiere/intersport.yml
index 0d01ac719..3ab7cc172 100644
--- a/data/cities/la-rosiere/intersport.yml
+++ b/data/cities/la-rosiere/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.86304
 postcode: "73700"
 city: La Rosière
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-rosiere/sherpa.yml b/data/cities/la-rosiere/sherpa.yml
index 850fc40e9..43eff8a8c 100644
--- a/data/cities/la-rosiere/sherpa.yml
+++ b/data/cities/la-rosiere/sherpa.yml
@@ -5,7 +5,7 @@ longitude: 6.86277
 postcode: "73700"
 city: La Rosière
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "07:30-12:30,16:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: 07:30-12:30,16:00-20:00
+website: ""
diff --git a/data/cities/la-table/le-nant-de-la-guire.yml b/data/cities/la-table/le-nant-de-la-guire.yml
index 16ae90cf7..46aba162e 100644
--- a/data/cities/la-table/le-nant-de-la-guire.yml
+++ b/data/cities/la-table/le-nant-de-la-guire.yml
@@ -4,8 +4,8 @@ latitude: 45.47347
 longitude: 6.18435
 postcode: "73110"
 city: La Table
-street: "Route de la Table au Villard"
-housenumber: 
+street: Route de la Table au Villard
+housenumber: ""
 phone: "+33479653607"
 opening_hours: ""
-website: "http://www.lenantdelaguire.com/"
\ No newline at end of file
+website: http://www.lenantdelaguire.com/
diff --git a/data/cities/la-talaudiere/a-vin-pas-des-marches.yml b/data/cities/la-talaudiere/a-vin-pas-des-marches.yml
index 3d0850493..568584eaf 100644
--- a/data/cities/la-talaudiere/a-vin-pas-des-marches.yml
+++ b/data/cities/la-talaudiere/a-vin-pas-des-marches.yml
@@ -1,11 +1,11 @@
 id: 144808530
-type: way
+type: node
 latitude: 45.48011
 longitude: 4.43035
 postcode: "42350"
 city: La Talaudière
-street: "Rue Devernoille"
-housenumber: 5
+street: Rue Devernoille
+housenumber: "5"
 phone: "+33477218227"
-opening_hours: "Tu-Sa 10:00-13:00,15:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-13:00,15:00-19:30
+website: ""
diff --git a/data/cities/la-talaudiere/boucherie-charcuterie-may.yml b/data/cities/la-talaudiere/boucherie-charcuterie-may.yml
index 28800f9b2..d68d59451 100644
--- a/data/cities/la-talaudiere/boucherie-charcuterie-may.yml
+++ b/data/cities/la-talaudiere/boucherie-charcuterie-may.yml
@@ -4,8 +4,8 @@ latitude: 45.48092
 longitude: 4.43237
 postcode: "42350"
 city: La Talaudière
-street: "Rue de la République"
-housenumber: 39
+street: Rue de la République
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-talaudiere/rouget-volailles.yml b/data/cities/la-talaudiere/rouget-volailles.yml
index 46541698d..893875b91 100644
--- a/data/cities/la-talaudiere/rouget-volailles.yml
+++ b/data/cities/la-talaudiere/rouget-volailles.yml
@@ -4,8 +4,8 @@ latitude: 45.48101
 longitude: 4.43271
 postcode: "42350"
 city: La Talaudière
-street: "Rue de la République"
-housenumber: 4
+street: Rue de la République
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-talaudiere/societe-chollet.yml b/data/cities/la-talaudiere/societe-chollet.yml
index ec2ec9376..0aef76a30 100644
--- a/data/cities/la-talaudiere/societe-chollet.yml
+++ b/data/cities/la-talaudiere/societe-chollet.yml
@@ -1,11 +1,11 @@
 id: 144810481
-type: way
+type: node
 latitude: 45.47468
 longitude: 4.4266
 postcode: "42354"
 city: La Talaudière
-street: "Impasse des Fraisses"
-housenumber: 2
+street: Impasse des Fraisses
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-terrasse/easy-riders-cafe-velo.yml b/data/cities/la-terrasse/easy-riders-cafe-velo.yml
index 6edeb8a9b..6c23dd147 100644
--- a/data/cities/la-terrasse/easy-riders-cafe-velo.yml
+++ b/data/cities/la-terrasse/easy-riders-cafe-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.31489
 longitude: 5.92427
 postcode: "38660"
 city: La Terrasse
-street: "Rue des Vergers"
-housenumber: 15
+street: Rue des Vergers
+housenumber: "15"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30,14:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30,14:30-18:00
+website: ""
diff --git a/data/cities/la-terrasse/jadore-le-the.yml b/data/cities/la-terrasse/jadore-le-the.yml
index 489b6b4f8..fe9e93f65 100644
--- a/data/cities/la-terrasse/jadore-le-the.yml
+++ b/data/cities/la-terrasse/jadore-le-the.yml
@@ -4,8 +4,8 @@ latitude: 45.31443
 longitude: 5.92377
 postcode: "38660"
 city: La Terrasse
-street: "Rue des Vergers"
-housenumber: 5
-phone: "+33 458 00 80 01"
-opening_hours: "Tu-Fr 14:00-18:30"
-website: "https://www.jadore-le-the.com/"
\ No newline at end of file
+street: Rue des Vergers
+housenumber: "5"
+phone: +33 458 00 80 01
+opening_hours: Tu-Fr 14:00-18:30
+website: https://www.jadore-le-the.com/
diff --git a/data/cities/la-terrasse/les-fees-maison.yml b/data/cities/la-terrasse/les-fees-maison.yml
index 6a2e37e11..8e759456b 100644
--- a/data/cities/la-terrasse/les-fees-maison.yml
+++ b/data/cities/la-terrasse/les-fees-maison.yml
@@ -4,8 +4,8 @@ latitude: 45.31486
 longitude: 5.92409
 postcode: ""
 city: La Terrasse
-street: "Avenue du Dauphiné"
-housenumber: 90
+street: Avenue du Dauphiné
+housenumber: "90"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-tour/aux-delices-de-la-tour.yml b/data/cities/la-tour/aux-delices-de-la-tour.yml
index 7bf4c344e..a72697be1 100644
--- a/data/cities/la-tour/aux-delices-de-la-tour.yml
+++ b/data/cities/la-tour/aux-delices-de-la-tour.yml
@@ -1,11 +1,11 @@
 id: 224912257
-type: way
+type: node
 latitude: 46.13219
 longitude: 6.43106
 postcode: "74250"
 city: La Tour
-street: "Route des Charmottes"
-housenumber: 135
-phone: "33 4 50 35 86 29"
-opening_hours: "Tu-Sa 06:00-13:00, 16:00-19:00; Su 06:30-13:00, 16:00-19:00; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+street: Route des Charmottes
+housenumber: "135"
+phone: 33 4 50 35 86 29
+opening_hours: Tu-Sa 06:00-13:00, 16:00-19:00; Su 06:30-13:00, 16:00-19:00; Su 06:30-13:00
+website: ""
diff --git a/data/cities/la-tour/laurcoiffure.yml b/data/cities/la-tour/laurcoiffure.yml
index 81f5a82f8..9fefbc86a 100644
--- a/data/cities/la-tour/laurcoiffure.yml
+++ b/data/cities/la-tour/laurcoiffure.yml
@@ -5,7 +5,7 @@ longitude: 6.41122
 postcode: "74250"
 city: La Tour
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-tour/lhaute-entique.yml b/data/cities/la-tour/lhaute-entique.yml
index 4231db92d..efd506998 100644
--- a/data/cities/la-tour/lhaute-entique.yml
+++ b/data/cities/la-tour/lhaute-entique.yml
@@ -1,11 +1,11 @@
 id: 224911716
-type: way
+type: node
 latitude: 46.13277
 longitude: 6.43015
 postcode: "74250"
 city: La Tour
-street: "rue du Lavoir"
-housenumber: 40
-phone: "+33 4 50 43 08 58"
-opening_hours: "Ma-Sa 08:30-12:30,16:30-19:00"
-website: ""
\ No newline at end of file
+street: rue du Lavoir
+housenumber: "40"
+phone: +33 4 50 43 08 58
+opening_hours: Ma-Sa 08:30-12:30,16:30-19:00
+website: ""
diff --git a/data/cities/la-toussuire/le-floral.yml b/data/cities/la-toussuire/le-floral.yml
index c39eb0a99..f5cd34fc2 100644
--- a/data/cities/la-toussuire/le-floral.yml
+++ b/data/cities/la-toussuire/le-floral.yml
@@ -4,8 +4,8 @@ latitude: 45.25675
 longitude: 6.25849
 postcode: "73300"
 city: La Toussuire
-street: "Résidence L OUILLON"
-housenumber: 
+street: Résidence L OUILLON
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-tronche/alexandre-chenu-rue-jean-de-la-fontaine.yml b/data/cities/la-tronche/alexandre-chenu-rue-jean-de-la-fontaine.yml
index f97f07f2d..f1a98b99e 100644
--- a/data/cities/la-tronche/alexandre-chenu-rue-jean-de-la-fontaine.yml
+++ b/data/cities/la-tronche/alexandre-chenu-rue-jean-de-la-fontaine.yml
@@ -4,8 +4,8 @@ latitude: 45.20227
 longitude: 5.75359
 postcode: "38700"
 city: La Tronche
-street: "Rue Jean de la Fontaine"
-housenumber: 6
+street: Rue Jean de la Fontaine
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 07:00-13:00,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-13:00,15:00-19:00
+website: ""
diff --git a/data/cities/la-tronche/alexandre-chenu.yml b/data/cities/la-tronche/alexandre-chenu.yml
index c5a08517a..409ac303b 100644
--- a/data/cities/la-tronche/alexandre-chenu.yml
+++ b/data/cities/la-tronche/alexandre-chenu.yml
@@ -4,8 +4,8 @@ latitude: 45.20228
 longitude: 5.75362
 postcode: "38700"
 city: La Tronche
-street: "Rue Jean de la Fontaine"
-housenumber: 6
+street: Rue Jean de la Fontaine
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 07:00-13:00,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-13:00,15:00-19:00
+website: ""
diff --git a/data/cities/la-tronche/decathlon.yml b/data/cities/la-tronche/decathlon.yml
index 40983b4c1..b58540dca 100644
--- a/data/cities/la-tronche/decathlon.yml
+++ b/data/cities/la-tronche/decathlon.yml
@@ -1,11 +1,11 @@
 id: 150133809
-type: way
+type: node
 latitude: 45.19804
 longitude: 5.7503
 postcode: "38700"
 city: La Tronche
-street: "Avenue du Grand Sablon"
-housenumber: 5
+street: Avenue du Grand Sablon
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: ""
diff --git a/data/cities/la-tronche/espace-velo.yml b/data/cities/la-tronche/espace-velo.yml
index 3e5828d53..861eab837 100644
--- a/data/cities/la-tronche/espace-velo.yml
+++ b/data/cities/la-tronche/espace-velo.yml
@@ -1,11 +1,11 @@
 id: 150134140
-type: way
+type: node
 latitude: 45.19874
 longitude: 5.75368
 postcode: "38700"
 city: La Tronche
-street: "Boulevard de la Chantourne"
-housenumber: 18
+street: Boulevard de la Chantourne
+housenumber: "18"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:30,14:30-19:00; Sa 10:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30,14:30-19:00; Sa 10:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/la-tronche/la-grignetta.yml b/data/cities/la-tronche/la-grignetta.yml
index 03a615dbd..4271305bd 100644
--- a/data/cities/la-tronche/la-grignetta.yml
+++ b/data/cities/la-tronche/la-grignetta.yml
@@ -4,8 +4,8 @@ latitude: 45.20695
 longitude: 5.74532
 postcode: "38700"
 city: La Tronche
-street: "Grande Rue"
-housenumber: 41
-phone: "+33 4 76 89 64 68"
-opening_hours: "Mo-Sa 08:00-19:30; Su 08:30-19:30"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "41"
+phone: +33 4 76 89 64 68
+opening_hours: Mo-Sa 08:00-19:30; Su 08:30-19:30
+website: ""
diff --git a/data/cities/la-tronche/liberte.yml b/data/cities/la-tronche/liberte.yml
index 00ee86674..2ad0cfb6f 100644
--- a/data/cities/la-tronche/liberte.yml
+++ b/data/cities/la-tronche/liberte.yml
@@ -4,8 +4,8 @@ latitude: 45.20334
 longitude: 5.73604
 postcode: "38700"
 city: La Tronche
-street: "Grande Rue"
-housenumber: 102
-phone: "+33 6 84 43 50 71"
-opening_hours: "Mo-Su 06:30-21:00"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "102"
+phone: +33 6 84 43 50 71
+opening_hours: Mo-Su 06:30-21:00
+website: ""
diff --git a/data/cities/la-tronche/maison-rafa.yml b/data/cities/la-tronche/maison-rafa.yml
index f5155ee1c..234ef9731 100644
--- a/data/cities/la-tronche/maison-rafa.yml
+++ b/data/cities/la-tronche/maison-rafa.yml
@@ -4,8 +4,8 @@ latitude: 45.20715
 longitude: 5.74545
 postcode: "38700"
 city: La Tronche
-street: "Grande Rue"
-housenumber: 20
+street: Grande Rue
+housenumber: "20"
 phone: ""
-opening_hours: "Tu-Fr 08:30-13:00, 15:30-19:30; Sa 08:30-13:00, 15:30-19:00"
-website: "https://fr.linkedin.com/company/maison-rafa"
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-13:00, 15:30-19:30; Sa 08:30-13:00, 15:30-19:00
+website: https://fr.linkedin.com/company/maison-rafa
diff --git a/data/cities/la-tronche/midas.yml b/data/cities/la-tronche/midas.yml
index 6a2dcc643..c691d01e5 100644
--- a/data/cities/la-tronche/midas.yml
+++ b/data/cities/la-tronche/midas.yml
@@ -4,8 +4,8 @@ latitude: 45.20088
 longitude: 5.75741
 postcode: "38700"
 city: La Tronche
-street: "Boulevard de la Chantourne"
-housenumber: 6
-phone: "+33 4 76 90 79 50"
-opening_hours: "Mo-Fr 08:00-19:00; Sa 08:00-17:00"
-website: "https://www.midas.fr/"
\ No newline at end of file
+street: Boulevard de la Chantourne
+housenumber: "6"
+phone: +33 4 76 90 79 50
+opening_hours: Mo-Fr 08:00-19:00; Sa 08:00-17:00
+website: https://www.midas.fr/
diff --git a/data/cities/la-tronche/mirabelle-primeur.yml b/data/cities/la-tronche/mirabelle-primeur.yml
index 95449f35c..817e7a2e4 100644
--- a/data/cities/la-tronche/mirabelle-primeur.yml
+++ b/data/cities/la-tronche/mirabelle-primeur.yml
@@ -4,8 +4,8 @@ latitude: 45.20717
 longitude: 5.74524
 postcode: "38700"
 city: La Tronche
-street: "Grande Rue"
-housenumber: 20
-phone: "+33 4 76 59 30 58"
-opening_hours: "Tu-Sa 07:30-13:00, 16:00-19:30; Su 08:30-13:00"
-website: "https://www.facebook.com/mirabelle.latronche"
\ No newline at end of file
+street: Grande Rue
+housenumber: "20"
+phone: +33 4 76 59 30 58
+opening_hours: Tu-Sa 07:30-13:00, 16:00-19:30; Su 08:30-13:00
+website: https://www.facebook.com/mirabelle.latronche
diff --git a/data/cities/la-tronche/onlyvape.yml b/data/cities/la-tronche/onlyvape.yml
index b7c76eafe..dd685461a 100644
--- a/data/cities/la-tronche/onlyvape.yml
+++ b/data/cities/la-tronche/onlyvape.yml
@@ -4,8 +4,8 @@ latitude: 45.20715
 longitude: 5.74449
 postcode: "38700"
 city: La Tronche
-street: "Grande Rue"
-housenumber: 30
+street: Grande Rue
+housenumber: "30"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 10:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 10:00-18:00
+website: ""
diff --git a/data/cities/la-tronche/scoupe-coiffure.yml b/data/cities/la-tronche/scoupe-coiffure.yml
index 28db62aa7..762704f3d 100644
--- a/data/cities/la-tronche/scoupe-coiffure.yml
+++ b/data/cities/la-tronche/scoupe-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.20219
 longitude: 5.75343
 postcode: "38700"
 city: La Tronche
-street: "Rue Jean de la Fontaine"
-housenumber: 6
+street: Rue Jean de la Fontaine
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Th 08:30-12:00,14:00-18:30; Fr 08:30-18:00; Sa 08:30-16:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 08:30-12:00,14:00-18:30; Fr 08:30-18:00; Sa 08:30-16:30
+website: ""
diff --git a/data/cities/la-tronche/tout-clean.yml b/data/cities/la-tronche/tout-clean.yml
index 7c4d0ef88..456b8d320 100644
--- a/data/cities/la-tronche/tout-clean.yml
+++ b/data/cities/la-tronche/tout-clean.yml
@@ -4,8 +4,8 @@ latitude: 45.20221
 longitude: 5.75347
 postcode: "38700"
 city: La Tronche
-street: "Rue Jean de la Fontaine"
-housenumber: 6
+street: Rue Jean de la Fontaine
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Sa 08:00-12:00; Tu-Fr 14:00-19:00; Sa 14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-12:00; Tu-Fr 14:00-19:00; Sa 14:00-17:00
+website: ""
diff --git a/data/cities/la-valla-en-gier/epicerie-primeur.yml b/data/cities/la-valla-en-gier/epicerie-primeur.yml
index 539006ea0..8aa15c4ca 100644
--- a/data/cities/la-valla-en-gier/epicerie-primeur.yml
+++ b/data/cities/la-valla-en-gier/epicerie-primeur.yml
@@ -4,8 +4,8 @@ latitude: 45.41675
 longitude: 4.51593
 postcode: "42131"
 city: La Valla-en-Gier
-street: "Impasse de la Cour"
-housenumber: 1
-phone: "+33 6 67 66 90 12"
-opening_hours: "Mo-Su 07:30-13:30"
-website: ""
\ No newline at end of file
+street: Impasse de la Cour
+housenumber: "1"
+phone: +33 6 67 66 90 12
+opening_hours: Mo-Su 07:30-13:30
+website: ""
diff --git a/data/cities/la-valla-en-gier/le-salon-de-virginie.yml b/data/cities/la-valla-en-gier/le-salon-de-virginie.yml
index 3c10c213e..221e70535 100644
--- a/data/cities/la-valla-en-gier/le-salon-de-virginie.yml
+++ b/data/cities/la-valla-en-gier/le-salon-de-virginie.yml
@@ -4,8 +4,8 @@ latitude: 45.41651
 longitude: 4.51571
 postcode: "42131"
 city: La Valla-en-Gier
-street: "Place de la Mairie"
-housenumber: 3
-phone: "+33 4 77 20 01 15"
+street: Place de la Mairie
+housenumber: "3"
+phone: +33 4 77 20 01 15
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/la-vernaz/les-gorges-du-pont-du-diable-route-des-grandes-alpes.yml b/data/cities/la-vernaz/les-gorges-du-pont-du-diable-route-des-grandes-alpes.yml
index 7a9aae652..54aec82aa 100644
--- a/data/cities/la-vernaz/les-gorges-du-pont-du-diable-route-des-grandes-alpes.yml
+++ b/data/cities/la-vernaz/les-gorges-du-pont-du-diable-route-des-grandes-alpes.yml
@@ -4,8 +4,9 @@ latitude: 46.30449
 longitude: 6.61589
 postcode: "74200"
 city: La Vernaz
-street: "Route des Grandes Alpes"
-housenumber: 205
+street: Route des Grandes Alpes
+housenumber: "205"
 phone: ""
-opening_hours: "Jan-Mar,Oct-Dec off; Apr-Jun,Sep 10:00-12:00, 14:00-17:00; Jul-Aug 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Jan-Mar,Oct-Dec off; Apr-Jun,Sep 10:00-12:00, 14:00-17:00; Jul-Aug
+    09:00-18:00
+website: ""
diff --git a/data/cities/la-vernaz/les-gorges-du-pont-du-diable.yml b/data/cities/la-vernaz/les-gorges-du-pont-du-diable.yml
index a34421ed8..7a863f469 100644
--- a/data/cities/la-vernaz/les-gorges-du-pont-du-diable.yml
+++ b/data/cities/la-vernaz/les-gorges-du-pont-du-diable.yml
@@ -4,8 +4,8 @@ latitude: 46.30437
 longitude: 6.61594
 postcode: "74200"
 city: La Vernaz
-street: "Route des Grandes Alpes"
-housenumber: 205
+street: Route des Grandes Alpes
+housenumber: "205"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lagnieu/maison-de-la-presse.yml b/data/cities/lagnieu/maison-de-la-presse.yml
index 102802d29..e3dc48de3 100644
--- a/data/cities/lagnieu/maison-de-la-presse.yml
+++ b/data/cities/lagnieu/maison-de-la-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.90269
 longitude: 5.34849
 postcode: "01150"
 city: Lagnieu
-street: "Place de la Liberté"
-housenumber: 29
+street: Place de la Liberté
+housenumber: "29"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/laissaud/gresy.yml b/data/cities/laissaud/gresy.yml
index 638e28b44..61ce48b7d 100644
--- a/data/cities/laissaud/gresy.yml
+++ b/data/cities/laissaud/gresy.yml
@@ -4,8 +4,8 @@ latitude: 45.44557
 longitude: 6.03452
 postcode: "73800"
 city: Laissaud
-street: "Rue du Stade"
-housenumber: 79
-phone: "+33 6 76 00 18 88"
-opening_hours: "Tu-Sa 10:00-12:30,14:00-18:00"
-website: "https://www.gresy.fr"
\ No newline at end of file
+street: Rue du Stade
+housenumber: "79"
+phone: +33 6 76 00 18 88
+opening_hours: Tu-Sa 10:00-12:30,14:00-18:00
+website: https://www.gresy.fr
diff --git a/data/cities/lalley/vival.yml b/data/cities/lalley/vival.yml
index 4980f0a9a..e0a4a27df 100644
--- a/data/cities/lalley/vival.yml
+++ b/data/cities/lalley/vival.yml
@@ -4,8 +4,8 @@ latitude: 44.75893
 longitude: 5.67599
 postcode: "38930"
 city: Lalley
-street: "Route de la Gare"
-housenumber: 77
+street: Route de la Gare
+housenumber: "77"
 phone: "+33476347403"
-opening_hours: "Mo-Sa 08:30-12:00, 15:30-19:30; Su 08:30-12:00"
-website: "https://magasins.vival.fr/fr/vival-lalley"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:00, 15:30-19:30; Su 08:30-12:00
+website: https://magasins.vival.fr/fr/vival-lalley
diff --git a/data/cities/lalpe-dhuez/alpe-sports.yml b/data/cities/lalpe-dhuez/alpe-sports.yml
index 8ca8bca7d..9ef9c50b1 100644
--- a/data/cities/lalpe-dhuez/alpe-sports.yml
+++ b/data/cities/lalpe-dhuez/alpe-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.09675
 longitude: 6.07027
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Rue du Pic Blanc"
-housenumber: 80
+street: Rue du Pic Blanc
+housenumber: "80"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/altitude-sports-pied-des-pistes.yml b/data/cities/lalpe-dhuez/altitude-sports-pied-des-pistes.yml
index 0c69af828..38757b4db 100644
--- a/data/cities/lalpe-dhuez/altitude-sports-pied-des-pistes.yml
+++ b/data/cities/lalpe-dhuez/altitude-sports-pied-des-pistes.yml
@@ -4,8 +4,8 @@ latitude: 45.09711
 longitude: 6.07019
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Rue du Pic Blanc"
-housenumber: 132
+street: Rue du Pic Blanc
+housenumber: "132"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/concept.yml b/data/cities/lalpe-dhuez/concept.yml
index 371332663..e07c18d08 100644
--- a/data/cities/lalpe-dhuez/concept.yml
+++ b/data/cities/lalpe-dhuez/concept.yml
@@ -4,8 +4,8 @@ latitude: 45.09011
 longitude: 6.07619
 postcode: "38750"
 city: l'Alpe d'Huez
-street: "Centre Commercial les Bergers"
-housenumber: 
+street: Centre Commercial les Bergers
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://gosportmontagne.com/location-de-ski/alpe-dhuez/concept/"
\ No newline at end of file
+website: https://gosportmontagne.com/location-de-ski/alpe-dhuez/concept/
diff --git a/data/cities/lalpe-dhuez/cycles-huez.yml b/data/cities/lalpe-dhuez/cycles-huez.yml
index ca093e2aa..54d955600 100644
--- a/data/cities/lalpe-dhuez/cycles-huez.yml
+++ b/data/cities/lalpe-dhuez/cycles-huez.yml
@@ -4,8 +4,8 @@ latitude: 45.09045
 longitude: 6.06432
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Place Joseph Paganon"
-housenumber: 
+street: Place Joseph Paganon
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/cyrils-sports-skimium.yml b/data/cities/lalpe-dhuez/cyrils-sports-skimium.yml
index efd54c18e..f62b3584e 100644
--- a/data/cities/lalpe-dhuez/cyrils-sports-skimium.yml
+++ b/data/cities/lalpe-dhuez/cyrils-sports-skimium.yml
@@ -4,8 +4,8 @@ latitude: 45.0898
 longitude: 6.07691
 postcode: "38750"
 city: l'Alpe d'Huez
-street: "Centre Commercial les berges"
-housenumber: 179
+street: Centre Commercial les Berges
+housenumber: "179"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/inter-sport.yml b/data/cities/lalpe-dhuez/inter-sport.yml
index c7f3795c7..1383d30f8 100644
--- a/data/cities/lalpe-dhuez/inter-sport.yml
+++ b/data/cities/lalpe-dhuez/inter-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.09341
 longitude: 6.06782
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Route du Signal"
-housenumber: 540
+street: Route du Signal
+housenumber: "540"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/nevada-sports.yml b/data/cities/lalpe-dhuez/nevada-sports.yml
index b048ef136..9c755df59 100644
--- a/data/cities/lalpe-dhuez/nevada-sports.yml
+++ b/data/cities/lalpe-dhuez/nevada-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.09265
 longitude: 6.07107
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Avenue de l'Etendard"
-housenumber: 217
+street: Avenue de l'Etendard
+housenumber: "217"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/new-kids.yml b/data/cities/lalpe-dhuez/new-kids.yml
index 7e4cdc08e..d26ac9133 100644
--- a/data/cities/lalpe-dhuez/new-kids.yml
+++ b/data/cities/lalpe-dhuez/new-kids.yml
@@ -4,8 +4,8 @@ latitude: 45.09135
 longitude: 6.06814
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Avenue des Jeux"
-housenumber: 136
+street: Avenue des Jeux
+housenumber: "136"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/puding-sas.yml b/data/cities/lalpe-dhuez/puding-sas.yml
index 3a97c25c0..5dfcec23b 100644
--- a/data/cities/lalpe-dhuez/puding-sas.yml
+++ b/data/cities/lalpe-dhuez/puding-sas.yml
@@ -4,8 +4,8 @@ latitude: 45.09284
 longitude: 6.06472
 postcode: "38750"
 city: l'Alpe d'Huez
-street: "Route du Signal"
-housenumber: 285
+street: Route du Signal
+housenumber: "285"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/rocky-sport-2000-leclose.yml b/data/cities/lalpe-dhuez/rocky-sport-2000-leclose.yml
index 0cfbe842b..52f621139 100644
--- a/data/cities/lalpe-dhuez/rocky-sport-2000-leclose.yml
+++ b/data/cities/lalpe-dhuez/rocky-sport-2000-leclose.yml
@@ -4,8 +4,8 @@ latitude: 45.08795
 longitude: 6.06772
 postcode: "38750"
 city: l'Alpe d'Huez
-street: "Rue du 93e R.A.M."
-housenumber: 524
+street: Rue du 93e R.A.M.
+housenumber: "524"
 phone: "+33476806302"
 opening_hours: ""
-website: "http://www.rocky-sports.com/"
\ No newline at end of file
+website: http://www.rocky-sports.com/
diff --git a/data/cities/lalpe-dhuez/ski-republic.yml b/data/cities/lalpe-dhuez/ski-republic.yml
index 44f78c30c..6ec7926d4 100644
--- a/data/cities/lalpe-dhuez/ski-republic.yml
+++ b/data/cities/lalpe-dhuez/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 45.09683
 longitude: 6.06959
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Rue du Pic Blanc"
-housenumber: 105
+street: Rue du Pic Blanc
+housenumber: "105"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/sport-2000-jeannot-sports.yml b/data/cities/lalpe-dhuez/sport-2000-jeannot-sports.yml
index fb40a5965..c84f7b53a 100644
--- a/data/cities/lalpe-dhuez/sport-2000-jeannot-sports.yml
+++ b/data/cities/lalpe-dhuez/sport-2000-jeannot-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.09613
 longitude: 6.0705
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Rue de Fontbelle"
-housenumber: 7
+street: Rue de Fontbelle
+housenumber: "7"
 phone: ""
-opening_hours: "08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: 08:30-19:00
+website: ""
diff --git a/data/cities/lalpe-dhuez/sport-2000-ze-shop.yml b/data/cities/lalpe-dhuez/sport-2000-ze-shop.yml
index 643d3d873..e9b9fd7d8 100644
--- a/data/cities/lalpe-dhuez/sport-2000-ze-shop.yml
+++ b/data/cities/lalpe-dhuez/sport-2000-ze-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.09059
 longitude: 6.06483
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Place Joseph Paganon"
-housenumber: 
+street: Place Joseph Paganon
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lalpe-dhuez/trek-bicycle-store-lalpe-dhuez.yml b/data/cities/lalpe-dhuez/trek-bicycle-store-lalpe-dhuez.yml
index 08b6abdd6..c989e7e0d 100644
--- a/data/cities/lalpe-dhuez/trek-bicycle-store-lalpe-dhuez.yml
+++ b/data/cities/lalpe-dhuez/trek-bicycle-store-lalpe-dhuez.yml
@@ -4,8 +4,8 @@ latitude: 45.09062
 longitude: 6.06472
 postcode: "38750"
 city: L'Alpe d'Huez
-street: "Route d'Huez"
-housenumber: 
+street: Route d'Huez
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lamastre/garage-des-stades-rue-ferdinand-herold.yml b/data/cities/lamastre/garage-des-stades-rue-ferdinand-herold.yml
index cbdc0c730..737442531 100644
--- a/data/cities/lamastre/garage-des-stades-rue-ferdinand-herold.yml
+++ b/data/cities/lamastre/garage-des-stades-rue-ferdinand-herold.yml
@@ -4,8 +4,8 @@ latitude: 44.98319
 longitude: 4.57217
 postcode: "07270"
 city: Lamastre
-street: "Rue Ferdinand Hérold"
+street: Rue Ferdinand Hérold
 housenumber: 50 bis
-phone: "+33 4 75 06 49 91-"
+phone: +33 4 75 06 49 91-
 opening_hours: ""
-website: "https://garagedesstades-lamastre.fr/"
\ No newline at end of file
+website: https://garagedesstades-lamastre.fr/
diff --git a/data/cities/lamastre/garage-des-stades.yml b/data/cities/lamastre/garage-des-stades.yml
index 3e2433c5a..4016a5a64 100644
--- a/data/cities/lamastre/garage-des-stades.yml
+++ b/data/cities/lamastre/garage-des-stades.yml
@@ -4,8 +4,8 @@ latitude: 44.98343
 longitude: 4.57206
 postcode: "07270"
 city: Lamastre
-street: "Rue Ferdinand Hérold"
-housenumber: 48
-phone: "+33 4 75 06 49 91-"
+street: Rue Ferdinand Hérold
+housenumber: "48"
+phone: +33 4 75 06 49 91-
 opening_hours: ""
-website: "https://garagedesstades-lamastre.fr/"
\ No newline at end of file
+website: https://garagedesstades-lamastre.fr/
diff --git a/data/cities/lanarce/hautes-terres.yml b/data/cities/lanarce/hautes-terres.yml
index 1a3bbfa23..b224458dc 100644
--- a/data/cities/lanarce/hautes-terres.yml
+++ b/data/cities/lanarce/hautes-terres.yml
@@ -4,8 +4,8 @@ latitude: 44.72799
 longitude: 4.00723
 postcode: "07660"
 city: Lanarce
-street: "Route d'Aubenas"
-housenumber: 221
+street: Route d'Aubenas
+housenumber: "221"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lanarce/la-boutique-des-paysans.yml b/data/cities/lanarce/la-boutique-des-paysans.yml
index e960079fc..4a68cf09a 100644
--- a/data/cities/lanarce/la-boutique-des-paysans.yml
+++ b/data/cities/lanarce/la-boutique-des-paysans.yml
@@ -4,8 +4,8 @@ latitude: 44.74438
 longitude: 3.99599
 postcode: "07660"
 city: Lanarce
-street: "Route du Puy"
-housenumber: 2476
-phone: "+33 4 66 69 42 45"
+street: Route du Puy
+housenumber: "2476"
+phone: +33 4 66 69 42 45
 opening_hours: ""
-website: "https://boutique-paysans-bio.com/"
\ No newline at end of file
+website: https://boutique-paysans-bio.com/
diff --git a/data/cities/lanarce/la-mie-ardechoise.yml b/data/cities/lanarce/la-mie-ardechoise.yml
index 7b554d888..6dbf5cf5d 100644
--- a/data/cities/lanarce/la-mie-ardechoise.yml
+++ b/data/cities/lanarce/la-mie-ardechoise.yml
@@ -4,8 +4,8 @@ latitude: 44.72621
 longitude: 4.0076
 postcode: "07660"
 city: Lanarce
-street: "Route d'Aubenas"
-housenumber: 447
+street: Route d'Aubenas
+housenumber: "447"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lanarce/puzzi.yml b/data/cities/lanarce/puzzi.yml
index 59e6c8db8..bb1af2d23 100644
--- a/data/cities/lanarce/puzzi.yml
+++ b/data/cities/lanarce/puzzi.yml
@@ -4,8 +4,8 @@ latitude: 44.72879
 longitude: 4.00613
 postcode: "07660"
 city: Lanarce
-street: "Route d'Aubenas"
-housenumber: 109
-phone: "+33 4 66 69 44 79"
+street: Route d'Aubenas
+housenumber: "109"
+phone: +33 4 66 69 44 79
 opening_hours: ""
-website: "https://www.charcuterie-puzzi.fr/"
\ No newline at end of file
+website: https://www.charcuterie-puzzi.fr/
diff --git a/data/cities/landry/sport-2000.yml b/data/cities/landry/sport-2000.yml
index f371b8e2d..5123d0724 100644
--- a/data/cities/landry/sport-2000.yml
+++ b/data/cities/landry/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.55576
 longitude: 6.76193
 postcode: "73210"
 city: Landry
-street: "Centre Commercial de Vallandry"
-housenumber: 
+street: Centre Commercial de Vallandry
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 09:00-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/landry/van-trotteur.yml b/data/cities/landry/van-trotteur.yml
index 6e12a88ee..e89b184ba 100644
--- a/data/cities/landry/van-trotteur.yml
+++ b/data/cities/landry/van-trotteur.yml
@@ -5,7 +5,7 @@ longitude: 6.73376
 postcode: "73210"
 city: Landry
 street: ""
-housenumber: 477
-phone: "+33 6 09 33 06 67‬"
+housenumber: "477"
+phone: +33 6 09 33 06 67‬
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lans-en-vercors/aventure-nordique.yml b/data/cities/lans-en-vercors/aventure-nordique.yml
index 3fdc901ea..4fce92182 100644
--- a/data/cities/lans-en-vercors/aventure-nordique.yml
+++ b/data/cities/lans-en-vercors/aventure-nordique.yml
@@ -4,8 +4,8 @@ latitude: 45.12536
 longitude: 5.57664
 postcode: "38250"
 city: Lans-en-Vercors
-street: "route de Villard"
-housenumber: 586
+street: Route de Villard
+housenumber: "586"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/lans-en-vercors/extrem-evasion.yml b/data/cities/lans-en-vercors/extrem-evasion.yml
index 9b1885e4d..2d587d4ec 100644
--- a/data/cities/lans-en-vercors/extrem-evasion.yml
+++ b/data/cities/lans-en-vercors/extrem-evasion.yml
@@ -4,8 +4,8 @@ latitude: 45.12769
 longitude: 5.59224
 postcode: "38250"
 city: Lans-en-Vercors
-street: "Avenue Léopold Fabre"
-housenumber: 897
+street: Avenue Léopold Fabre
+housenumber: "897"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lanslebourg/cooperative-laitiere-haute-maurienne-vanoise-lanslebourg.yml b/data/cities/lanslebourg/cooperative-laitiere-haute-maurienne-vanoise-lanslebourg.yml
index 533021b01..6a595583b 100644
--- a/data/cities/lanslebourg/cooperative-laitiere-haute-maurienne-vanoise-lanslebourg.yml
+++ b/data/cities/lanslebourg/cooperative-laitiere-haute-maurienne-vanoise-lanslebourg.yml
@@ -1,11 +1,11 @@
 id: 131216838
-type: way
+type: node
 latitude: 45.28477
 longitude: 6.87766
 postcode: "73480"
 city: Lanslebourg
 street: ""
-housenumber: 36
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: "https://www.coophautemaurienne.fr/"
\ No newline at end of file
+website: https://www.coophautemaurienne.fr/
diff --git a/data/cities/lanslevillard/intersport-rue-du-burel.yml b/data/cities/lanslevillard/intersport-rue-du-burel.yml
index b51adfec5..a029cbb6d 100644
--- a/data/cities/lanslevillard/intersport-rue-du-burel.yml
+++ b/data/cities/lanslevillard/intersport-rue-du-burel.yml
@@ -4,8 +4,8 @@ latitude: 45.29163
 longitude: 6.92021
 postcode: "73480"
 city: Lanslevillard
-street: "Rue du Burel"
-housenumber: 
+street: Rue du Burel
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lanslevillard/intersport.yml b/data/cities/lanslevillard/intersport.yml
index 77ffcfb00..4b12d724d 100644
--- a/data/cities/lanslevillard/intersport.yml
+++ b/data/cities/lanslevillard/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.91138
 postcode: "73480"
 city: Lanslevillard
 street: ""
-housenumber: 32
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lapeyrouse/ferme-des-alouettes.yml b/data/cities/lapeyrouse/ferme-des-alouettes.yml
index 1469e1a16..b590f73b5 100644
--- a/data/cities/lapeyrouse/ferme-des-alouettes.yml
+++ b/data/cities/lapeyrouse/ferme-des-alouettes.yml
@@ -5,7 +5,7 @@ longitude: 4.96053
 postcode: "01330"
 city: Lapeyrouse
 street: ""
-housenumber: 
+housenumber: ""
 phone: "+33474981661"
 opening_hours: ""
-website: "https://lameuhh.fr/ferme-des-alouettes/"
\ No newline at end of file
+website: https://lameuhh.fr/ferme-des-alouettes/
diff --git a/data/cities/larajasse/au-delice-du-pain.yml b/data/cities/larajasse/au-delice-du-pain.yml
index 82cc73b2c..3988394d5 100644
--- a/data/cities/larajasse/au-delice-du-pain.yml
+++ b/data/cities/larajasse/au-delice-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 45.61414
 longitude: 4.49998
 postcode: "69590"
 city: Larajasse
-street: "Place de la Mairie"
-housenumber: 56
+street: Place de la Mairie
+housenumber: "56"
 phone: "+33478445343"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/larajasse/au-petit-marche.yml b/data/cities/larajasse/au-petit-marche.yml
index e3b820025..efbbc3823 100644
--- a/data/cities/larajasse/au-petit-marche.yml
+++ b/data/cities/larajasse/au-petit-marche.yml
@@ -4,8 +4,9 @@ latitude: 45.61333
 longitude: 4.50055
 postcode: "69590"
 city: Larajasse
-street: "Route des Grands Sapins"
-housenumber: 
+street: Route des Grands Sapins
+housenumber: ""
 phone: "+33478190618"
-opening_hours: "Mo 07:30-12:30,16:00-19:00; Tu 07:30-12:30,14:30-19:00; Th-Sa 07:30-19:00; Su 07:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 07:30-12:30,16:00-19:00; Tu 07:30-12:30,14:30-19:00; Th-Sa 07:30-19:00;
+    Su 07:30-12:00
+website: ""
diff --git a/data/cities/larajasse/garage-janoray.yml b/data/cities/larajasse/garage-janoray.yml
index e2c463c33..7557f1372 100644
--- a/data/cities/larajasse/garage-janoray.yml
+++ b/data/cities/larajasse/garage-janoray.yml
@@ -4,8 +4,8 @@ latitude: 45.61616
 longitude: 4.49684
 postcode: "69590"
 city: Larajasse
-street: "Route du Marronnier"
-housenumber: 280
+street: Route du Marronnier
+housenumber: "280"
 phone: "+33478484288"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/larajasse/garage-rf-services.yml b/data/cities/larajasse/garage-rf-services.yml
index baf0669bd..8c5791b56 100644
--- a/data/cities/larajasse/garage-rf-services.yml
+++ b/data/cities/larajasse/garage-rf-services.yml
@@ -4,8 +4,8 @@ latitude: 45.60255
 longitude: 4.52215
 postcode: "69590"
 city: Larajasse
-street: "Route de l'Indépendance"
-housenumber: 221
+street: Route de l'Indépendance
+housenumber: "221"
 phone: "+33478563637"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/larajasse/tout-en-nuances.yml b/data/cities/larajasse/tout-en-nuances.yml
index 3a3183681..79d58eab8 100644
--- a/data/cities/larajasse/tout-en-nuances.yml
+++ b/data/cities/larajasse/tout-en-nuances.yml
@@ -4,8 +4,8 @@ latitude: 45.61404
 longitude: 4.50003
 postcode: "69590"
 city: Larajasse
-street: "Place de la Mairie"
-housenumber: 48
+street: Place de la Mairie
+housenumber: "48"
 phone: "+33478190023"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/larbresle/au-bon-vapoteur.yml b/data/cities/larbresle/au-bon-vapoteur.yml
index 5969e6dff..566f8f224 100644
--- a/data/cities/larbresle/au-bon-vapoteur.yml
+++ b/data/cities/larbresle/au-bon-vapoteur.yml
@@ -4,8 +4,8 @@ latitude: 45.82586
 longitude: 4.60877
 postcode: "69210"
 city: L'Arbresle
-street: "Rue Claude Terrasse"
-housenumber: 1264
+street: Rue Claude Terrasse
+housenumber: "1264"
 phone: ""
-opening_hours: "Tu-Sa 09:30-15:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-15:00
+website: ""
diff --git a/data/cities/larbresle/chriscoiffure.yml b/data/cities/larbresle/chriscoiffure.yml
index 42adf2d47..f9d8d76ad 100644
--- a/data/cities/larbresle/chriscoiffure.yml
+++ b/data/cities/larbresle/chriscoiffure.yml
@@ -1,11 +1,11 @@
 id: 135834720
-type: way
+type: node
 latitude: 45.8363
 longitude: 4.61719
 postcode: "69210"
 city: L'Arbresle
-street: "Rue Pierre Brossolette"
-housenumber: 29
-phone: "+33 4 74 26 72 92"
-opening_hours: "Mo,Tu,Th,Fr 09:00-19:00; We 09:00-18:30; Sa 08:30-17:30"
-website: "https://www.facebook.com/chriscoiffurearbresle"
\ No newline at end of file
+street: Rue Pierre Brossolette
+housenumber: "29"
+phone: +33 4 74 26 72 92
+opening_hours: Mo,Tu,Th,Fr 09:00-19:00; We 09:00-18:30; Sa 08:30-17:30
+website: https://www.facebook.com/chriscoiffurearbresle
diff --git a/data/cities/larbresle/gifi.yml b/data/cities/larbresle/gifi.yml
index cfa97ab55..c2622b75e 100644
--- a/data/cities/larbresle/gifi.yml
+++ b/data/cities/larbresle/gifi.yml
@@ -4,8 +4,8 @@ latitude: 45.82595
 longitude: 4.60807
 postcode: "69210"
 city: L'Arbresle
-street: "Route de Sain Bel"
-housenumber: 243
+street: Route de Sain Bel
+housenumber: "243"
 phone: "+33474011423"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://magasins.gifi.fr/decoration/l-arbresle/0000010112"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://magasins.gifi.fr/decoration/l-arbresle/0000010112
diff --git a/data/cities/larbresle/intersport.yml b/data/cities/larbresle/intersport.yml
index 986de528e..c782fe97f 100644
--- a/data/cities/larbresle/intersport.yml
+++ b/data/cities/larbresle/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.82538
 longitude: 4.60731
 postcode: "69210"
 city: L'Arbresle
-street: "Rue des Martinets"
-housenumber: 
+street: Rue des Martinets
+housenumber: ""
 phone: "+33482538899"
-opening_hours: "Mo-Fr 10:00-19:00; Sa 09:30-19:00"
-website: "https://www.intersport.fr/Rhône-69/L'ARBRESLE-69210/INTERSPORT-L'ARBRESLE/00547_000/"
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:00; Sa 09:30-19:00
+website: https://www.intersport.fr/Rhône-69/L'ARBRESLE-69210/INTERSPORT-L'ARBRESLE/00547_000/
diff --git a/data/cities/larbresle/la-pepite-verte.yml b/data/cities/larbresle/la-pepite-verte.yml
index cc5e603e2..abaac28e6 100644
--- a/data/cities/larbresle/la-pepite-verte.yml
+++ b/data/cities/larbresle/la-pepite-verte.yml
@@ -4,8 +4,8 @@ latitude: 45.83482
 longitude: 4.61834
 postcode: "69210"
 city: L'Arbresle
-street: "Avenue Pierre Semard"
-housenumber: 2
+street: Avenue Pierre Semard
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: "https://lapepiteverte.com/"
\ No newline at end of file
+website: https://lapepiteverte.com/
diff --git a/data/cities/larbresle/la-vie-claire.yml b/data/cities/larbresle/la-vie-claire.yml
index 2846072be..590cef8e2 100644
--- a/data/cities/larbresle/la-vie-claire.yml
+++ b/data/cities/larbresle/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 45.82559
 longitude: 4.60699
 postcode: "69210"
 city: L'Arbresle
-street: "Rue des Martinets"
-housenumber: 35
-phone: "+33 4 37 58 05 61"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://magasins.lavieclaire.com/lavieclaire/fr/boutique/france/auvergne-rhone-alpes/rhone/l-arbresle/l-arbresle/282?"
\ No newline at end of file
+street: Rue des Martinets
+housenumber: "35"
+phone: +33 4 37 58 05 61
+opening_hours: Mo-Sa 09:30-19:00
+website: https://magasins.lavieclaire.com/lavieclaire/fr/boutique/france/auvergne-rhone-alpes/rhone/l-arbresle/l-arbresle/282?
diff --git a/data/cities/larbresle/mr-bricolage.yml b/data/cities/larbresle/mr-bricolage.yml
index cc097760b..b3c3c078d 100644
--- a/data/cities/larbresle/mr-bricolage.yml
+++ b/data/cities/larbresle/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 135834087
-type: way
+type: node
 latitude: 45.82579
 longitude: 4.60575
 postcode: "69210"
 city: L'Arbresle
-street: "Route de Sain Bel"
-housenumber: 366
+street: Route de Sain Bel
+housenumber: "366"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/larbresle/terres-lyonnaises.yml b/data/cities/larbresle/terres-lyonnaises.yml
index ce8a52895..c17e41ce1 100644
--- a/data/cities/larbresle/terres-lyonnaises.yml
+++ b/data/cities/larbresle/terres-lyonnaises.yml
@@ -4,8 +4,8 @@ latitude: 45.82581
 longitude: 4.60862
 postcode: "69210"
 city: L'Arbresle
-street: "Rue Claude Terrasse"
-housenumber: 
+street: Rue Claude Terrasse
+housenumber: ""
 phone: "+334478343088"
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.sicoly.fr/le-magasin-terres-lyonnaises-6"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.sicoly.fr/le-magasin-terres-lyonnaises-6
diff --git a/data/cities/lay/boulangerie-jacquetton.yml b/data/cities/lay/boulangerie-jacquetton.yml
index 3bb34cf49..576c0ed74 100644
--- a/data/cities/lay/boulangerie-jacquetton.yml
+++ b/data/cities/lay/boulangerie-jacquetton.yml
@@ -4,8 +4,8 @@ latitude: 45.95627
 longitude: 4.21952
 postcode: "42470"
 city: Lay
-street: "Grand Rue"
-housenumber: 1
+street: Grand Rue
+housenumber: "1"
 phone: "+33477647929"
-opening_hours: "Mo-Sa 07:30-13:00,16:00-19:00; Tu 07:30-13:00; We off; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-13:00,16:00-19:00; Tu 07:30-13:00; We off; Su 07:30-12:30
+website: ""
diff --git a/data/cities/lay/les-chevres-de-la-forest.yml b/data/cities/lay/les-chevres-de-la-forest.yml
index e4a94afbc..9bbaee8b1 100644
--- a/data/cities/lay/les-chevres-de-la-forest.yml
+++ b/data/cities/lay/les-chevres-de-la-forest.yml
@@ -4,8 +4,8 @@ latitude: 45.95551
 longitude: 4.21351
 postcode: "42470"
 city: Lay
-street: "Chemin de la Mine"
-housenumber: 69
+street: Chemin de la Mine
+housenumber: "69"
 phone: "+33953457161"
-opening_hours: "17:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: 17:30-19:30
+website: ""
diff --git a/data/cities/lay/salon-raph-a-elle-et-lui.yml b/data/cities/lay/salon-raph-a-elle-et-lui.yml
index ef116fb09..7c3832d52 100644
--- a/data/cities/lay/salon-raph-a-elle-et-lui.yml
+++ b/data/cities/lay/salon-raph-a-elle-et-lui.yml
@@ -4,8 +4,8 @@ latitude: 45.95627
 longitude: 4.21973
 postcode: "42470"
 city: Lay
-street: "Rue du Point du Jour"
-housenumber: 6
+street: Rue du Point du Jour
+housenumber: "6"
 phone: "+33981811239"
-opening_hours: "Mo,Th 08:45-12:00,14:00-18:00; Tu,Fr 08:45-12:00,14:00-19:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Th 08:45-12:00,14:00-18:00; Tu,Fr 08:45-12:00,14:00-19:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/le-bessat/boulangerie-abrial-montmartin.yml b/data/cities/le-bessat/boulangerie-abrial-montmartin.yml
index 9416bf733..cffc7913a 100644
--- a/data/cities/le-bessat/boulangerie-abrial-montmartin.yml
+++ b/data/cities/le-bessat/boulangerie-abrial-montmartin.yml
@@ -4,8 +4,8 @@ latitude: 45.36865
 longitude: 4.51634
 postcode: "42660"
 city: Le Bessat
-street: "Rue du Féria"
-housenumber: 2
+street: Rue du Féria
+housenumber: "2"
 phone: "+33477204064"
 opening_hours: ""
-website: "https://www.boulangerie-abrial.com/"
\ No newline at end of file
+website: https://www.boulangerie-abrial.com/
diff --git a/data/cities/le-bessat/le-bessat-gourmand.yml b/data/cities/le-bessat/le-bessat-gourmand.yml
index d595196cb..5cbfc6f55 100644
--- a/data/cities/le-bessat/le-bessat-gourmand.yml
+++ b/data/cities/le-bessat/le-bessat-gourmand.yml
@@ -4,8 +4,8 @@ latitude: 45.3683
 longitude: 4.51709
 postcode: "42660"
 city: Le Bessat
-street: "Route de Chaubouret"
-housenumber: 5
+street: Route de Chaubouret
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-We 08:30-12:30,15:00-19:00; Fr-Sa 8:30-12:30,15:00-19:00; Su 8:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We 08:30-12:30,15:00-19:00; Fr-Sa 8:30-12:30,15:00-19:00; Su 8:30-12:30
+website: ""
diff --git a/data/cities/le-bourg-doisans/23-avenue.yml b/data/cities/le-bourg-doisans/23-avenue.yml
index a46faee7b..953e0ef55 100644
--- a/data/cities/le-bourg-doisans/23-avenue.yml
+++ b/data/cities/le-bourg-doisans/23-avenue.yml
@@ -4,8 +4,8 @@ latitude: 45.05491
 longitude: 6.02971
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Avenue de la République"
-housenumber: 23
+street: Avenue de la République
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-bourg-doisans/all-4-mountain.yml b/data/cities/le-bourg-doisans/all-4-mountain.yml
index 2d17ba1ce..5b81b19dc 100644
--- a/data/cities/le-bourg-doisans/all-4-mountain.yml
+++ b/data/cities/le-bourg-doisans/all-4-mountain.yml
@@ -4,8 +4,8 @@ latitude: 45.05462
 longitude: 6.03191
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 63
+street: Rue Général de Gaulle
+housenumber: "63"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-bourg-doisans/alpha-bike.yml b/data/cities/le-bourg-doisans/alpha-bike.yml
index 0e92abf69..89a7a6e8e 100644
--- a/data/cities/le-bourg-doisans/alpha-bike.yml
+++ b/data/cities/le-bourg-doisans/alpha-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.05437
 longitude: 6.03093
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 32
+street: Rue Général de Gaulle
+housenumber: "32"
 phone: ""
-opening_hours: "We,Fr,Sa 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: We,Fr,Sa 14:00-18:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/alpoptique.yml b/data/cities/le-bourg-doisans/alpoptique.yml
index 25d96a5b4..cf5d261e1 100644
--- a/data/cities/le-bourg-doisans/alpoptique.yml
+++ b/data/cities/le-bourg-doisans/alpoptique.yml
@@ -4,8 +4,8 @@ latitude: 45.05466
 longitude: 6.03139
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 41
+street: Rue Général de Gaulle
+housenumber: "41"
 phone: ""
-opening_hours: "Tu-Fr 10:00-13:00,14:00-18:30; Sa 09:00-14:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-13:00,14:00-18:30; Sa 09:00-14:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/bijoux-boheme.yml b/data/cities/le-bourg-doisans/bijoux-boheme.yml
index 0dc629e30..cf07b4120 100644
--- a/data/cities/le-bourg-doisans/bijoux-boheme.yml
+++ b/data/cities/le-bourg-doisans/bijoux-boheme.yml
@@ -4,8 +4,8 @@ latitude: 45.05417
 longitude: 6.02961
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 16
-phone: "+33 6 87 59 85 64"
-opening_hours: "Tu-Sa 10:30-12:30,15:00-19:00"
-website: "https://www.facebook.com/francoise.coindre"
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "16"
+phone: +33 6 87 59 85 64
+opening_hours: Tu-Sa 10:30-12:30,15:00-19:00
+website: https://www.facebook.com/francoise.coindre
diff --git a/data/cities/le-bourg-doisans/bike-store-21-avenue-de-la-gare.yml b/data/cities/le-bourg-doisans/bike-store-21-avenue-de-la-gare.yml
index 0aa8ce465..de751f4ef 100644
--- a/data/cities/le-bourg-doisans/bike-store-21-avenue-de-la-gare.yml
+++ b/data/cities/le-bourg-doisans/bike-store-21-avenue-de-la-gare.yml
@@ -4,8 +4,8 @@ latitude: 45.05972
 longitude: 6.02772
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Avenue de la Gare"
-housenumber: 312
+street: Avenue de la Gare
+housenumber: "312"
 phone: ""
-opening_hours: "Mo-Su 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-18:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/bike-store-21.yml b/data/cities/le-bourg-doisans/bike-store-21.yml
index 158fe8ad2..ddb59d0d5 100644
--- a/data/cities/le-bourg-doisans/bike-store-21.yml
+++ b/data/cities/le-bourg-doisans/bike-store-21.yml
@@ -4,8 +4,8 @@ latitude: 45.05478
 longitude: 6.03233
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Avenue Aristide Briand"
-housenumber: 28
+street: Avenue Aristide Briand
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Su 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-18:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/bleack-bike-et-ski.yml b/data/cities/le-bourg-doisans/bleack-bike-et-ski.yml
index 4db9f84a9..8f19f6893 100644
--- a/data/cities/le-bourg-doisans/bleack-bike-et-ski.yml
+++ b/data/cities/le-bourg-doisans/bleack-bike-et-ski.yml
@@ -4,8 +4,8 @@ latitude: 45.05523
 longitude: 6.03332
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Avenue Aristide Briand"
-housenumber: 106
+street: Avenue Aristide Briand
+housenumber: "106"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-bourg-doisans/christel-lagarrigue-luthier.yml b/data/cities/le-bourg-doisans/christel-lagarrigue-luthier.yml
index 8897e5de5..8caed78b5 100644
--- a/data/cities/le-bourg-doisans/christel-lagarrigue-luthier.yml
+++ b/data/cities/le-bourg-doisans/christel-lagarrigue-luthier.yml
@@ -4,8 +4,8 @@ latitude: 45.05403
 longitude: 6.02937
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 31
-phone: "+33 6 78 68 36 28"
-opening_hours: "Mo-Sa 08:30-18:30"
-website: "https://chritellagarrigueluthier.site-solocal.com/"
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "31"
+phone: +33 6 78 68 36 28
+opening_hours: Mo-Sa 08:30-18:30
+website: https://chritellagarrigueluthier.site-solocal.com/
diff --git a/data/cities/le-bourg-doisans/coquelicot-oisans.yml b/data/cities/le-bourg-doisans/coquelicot-oisans.yml
index d068893cc..321fdf3ba 100644
--- a/data/cities/le-bourg-doisans/coquelicot-oisans.yml
+++ b/data/cities/le-bourg-doisans/coquelicot-oisans.yml
@@ -4,8 +4,8 @@ latitude: 45.05467
 longitude: 6.03204
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Avenue Aristide Briand"
-housenumber: 10
-phone: "+33 476800224"
-opening_hours: "Tu-Fr 09:00-12:00, 14:30-18:00;Su 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Avenue Aristide Briand
+housenumber: "10"
+phone: +33 476800224
+opening_hours: Tu-Fr 09:00-12:00, 14:30-18:00;Su 09:00-12:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/cycles-et-sports.yml b/data/cities/le-bourg-doisans/cycles-et-sports.yml
index c5ab0721f..29632ab38 100644
--- a/data/cities/le-bourg-doisans/cycles-et-sports.yml
+++ b/data/cities/le-bourg-doisans/cycles-et-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.05462
 longitude: 6.03124
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 35
+street: Rue Général de Gaulle
+housenumber: "35"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/eureka.yml b/data/cities/le-bourg-doisans/eureka.yml
index 38b921adf..1e94b174f 100644
--- a/data/cities/le-bourg-doisans/eureka.yml
+++ b/data/cities/le-bourg-doisans/eureka.yml
@@ -4,8 +4,8 @@ latitude: 45.05405
 longitude: 6.02952
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 27
-phone: "+33 4 76 79 06 79"
-opening_hours: "Sep 15-Jun 15 Tu-Sa 08:00-12:00,15:00-19:00; Jun 16-Sep 14 08:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "27"
+phone: +33 4 76 79 06 79
+opening_hours: Sep 15-Jun 15 Tu-Sa 08:00-12:00,15:00-19:00; Jun 16-Sep 14 08:00-19:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/genevieve-coiffure.yml b/data/cities/le-bourg-doisans/genevieve-coiffure.yml
index a50fef038..2742d0eec 100644
--- a/data/cities/le-bourg-doisans/genevieve-coiffure.yml
+++ b/data/cities/le-bourg-doisans/genevieve-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.05423
 longitude: 6.02986
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 4
-phone: "+33 4 76 80 01 83"
-opening_hours: "Tu-Fr 08:30-11:30, 14:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "4"
+phone: +33 4 76 80 01 83
+opening_hours: Tu-Fr 08:30-11:30, 14:00-18:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/la-fromagerie-du-bourg.yml b/data/cities/le-bourg-doisans/la-fromagerie-du-bourg.yml
index 95ce3f14f..91b62d4cd 100644
--- a/data/cities/le-bourg-doisans/la-fromagerie-du-bourg.yml
+++ b/data/cities/le-bourg-doisans/la-fromagerie-du-bourg.yml
@@ -4,8 +4,8 @@ latitude: 45.05425
 longitude: 6.03043
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 14
+street: Rue Général de Gaulle
+housenumber: "14"
 phone: ""
-opening_hours: "Jul 1-Aug 31 Tu,Th-Sa 08:30-19:00; Tu,Th-Sa 08:30-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Jul 1-Aug 31 Tu,Th-Sa 08:30-19:00; Tu,Th-Sa 08:30-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/labicicletta-fr.yml b/data/cities/le-bourg-doisans/labicicletta-fr.yml
index dd85482b2..829a656d6 100644
--- a/data/cities/le-bourg-doisans/labicicletta-fr.yml
+++ b/data/cities/le-bourg-doisans/labicicletta-fr.yml
@@ -4,8 +4,8 @@ latitude: 45.05392
 longitude: 6.0301
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Enerst Graziotti"
-housenumber: 6
+street: Rue Enerst Graziotti
+housenumber: "6"
 phone: "+33476795268"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-13:00"
-website: "https://www.labicicletta.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-13:00
+website: https://www.labicicletta.fr/
diff --git a/data/cities/le-bourg-doisans/le-fontenoy.yml b/data/cities/le-bourg-doisans/le-fontenoy.yml
index 78e9524e8..18d765b3e 100644
--- a/data/cities/le-bourg-doisans/le-fontenoy.yml
+++ b/data/cities/le-bourg-doisans/le-fontenoy.yml
@@ -4,8 +4,8 @@ latitude: 45.05438
 longitude: 6.03006
 postcode: "38520"
 city: Le bourg-d'Oisans
-street: "Avenue de la République"
-housenumber: 6
+street: Avenue de la République
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-bourg-doisans/le-verre-de-terre.yml b/data/cities/le-bourg-doisans/le-verre-de-terre.yml
index 59bcb693e..3d51c09fb 100644
--- a/data/cities/le-bourg-doisans/le-verre-de-terre.yml
+++ b/data/cities/le-bourg-doisans/le-verre-de-terre.yml
@@ -4,8 +4,8 @@ latitude: 45.05401
 longitude: 6.02922
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 39
-phone: "+33 6 07 88 36 40"
-opening_hours: "We-Sa 10:00-12:30,15:00-18:00"
-website: "https://leverredeterre.wixsite.com/atelier"
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "39"
+phone: +33 6 07 88 36 40
+opening_hours: We-Sa 10:00-12:30,15:00-18:00
+website: https://leverredeterre.wixsite.com/atelier
diff --git a/data/cities/le-bourg-doisans/louna.yml b/data/cities/le-bourg-doisans/louna.yml
index 7c0d91667..570b4bcce 100644
--- a/data/cities/le-bourg-doisans/louna.yml
+++ b/data/cities/le-bourg-doisans/louna.yml
@@ -4,8 +4,8 @@ latitude: 45.05435
 longitude: 6.03073
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 26
+street: Rue Général de Gaulle
+housenumber: "26"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:00,14:30-18:30; Sa 09:30-12:30,14:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:00,14:30-18:30; Sa 09:30-12:30,14:30-18:00
+website: ""
diff --git a/data/cities/le-bourg-doisans/maison-de-la-route-des-savoir-faire-de-loisans.yml b/data/cities/le-bourg-doisans/maison-de-la-route-des-savoir-faire-de-loisans.yml
index a1de20318..97aa029e7 100644
--- a/data/cities/le-bourg-doisans/maison-de-la-route-des-savoir-faire-de-loisans.yml
+++ b/data/cities/le-bourg-doisans/maison-de-la-route-des-savoir-faire-de-loisans.yml
@@ -4,8 +4,10 @@ latitude: 45.05407
 longitude: 6.02962
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 19
-phone: "+33 6 31 37 93 34"
-opening_hours: "Jan 01-May 15 Th-Fr 10:00-12:00,14:00-17:00; Sa 9:30-13:00; May 16-Jun 30 Tu-Fr 10:00-12:00,14:00-17:00; Sa 9:30-13:00; Jul 01-Sep 30 Mo-Sa 9:00-12:00,16:00-19:00; Nov 6-Dec 31 Th-Sa"
-website: "http://msfoisans.fr"
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "19"
+phone: +33 6 31 37 93 34
+opening_hours: Jan 01-May 15 Th-Fr 10:00-12:00,14:00-17:00; Sa 9:30-13:00; May 16-Jun
+    30 Tu-Fr 10:00-12:00,14:00-17:00; Sa 9:30-13:00; Jul 01-Sep 30 Mo-Sa 9:00-12:00,16:00-19:00;
+    Nov 6-Dec 31 Th-Sa
+website: http://msfoisans.fr
diff --git a/data/cities/le-bourg-doisans/oisans-informatique.yml b/data/cities/le-bourg-doisans/oisans-informatique.yml
index 6150f95f8..39595dcdc 100644
--- a/data/cities/le-bourg-doisans/oisans-informatique.yml
+++ b/data/cities/le-bourg-doisans/oisans-informatique.yml
@@ -4,8 +4,8 @@ latitude: 45.05416
 longitude: 6.02957
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 18
-phone: "+33 6 82 42 99 88"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://oisans-informatique.com/"
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "18"
+phone: +33 6 82 42 99 88
+opening_hours: Mo-Sa 09:00-19:00
+website: https://oisans-informatique.com/
diff --git a/data/cities/le-bourg-doisans/optique-la-meije.yml b/data/cities/le-bourg-doisans/optique-la-meije.yml
index 1af170081..b2cbf3f55 100644
--- a/data/cities/le-bourg-doisans/optique-la-meije.yml
+++ b/data/cities/le-bourg-doisans/optique-la-meije.yml
@@ -4,8 +4,8 @@ latitude: 45.05449
 longitude: 6.03091
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 23
+street: Rue Général de Gaulle
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-bourg-doisans/terroirs-de-loisans.yml b/data/cities/le-bourg-doisans/terroirs-de-loisans.yml
index f6883993c..2ad8e42de 100644
--- a/data/cities/le-bourg-doisans/terroirs-de-loisans.yml
+++ b/data/cities/le-bourg-doisans/terroirs-de-loisans.yml
@@ -4,8 +4,8 @@ latitude: 45.05423
 longitude: 6.03036
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Général de Gaulle"
-housenumber: 12
+street: Rue Général de Gaulle
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-bourg-doisans/toudoux-doisans.yml b/data/cities/le-bourg-doisans/toudoux-doisans.yml
index 04f895005..21c4f511b 100644
--- a/data/cities/le-bourg-doisans/toudoux-doisans.yml
+++ b/data/cities/le-bourg-doisans/toudoux-doisans.yml
@@ -4,8 +4,8 @@ latitude: 45.05394
 longitude: 6.02904
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue Docteur Daday"
-housenumber: 3
-phone: "+33 6 77 96 29 96"
-opening_hours: "Mo-Fr 09:00-12:00,13:30-18:30; Sa 09:00-13:30"
-website: "https://www.facebook.com/toudouxdoisans"
\ No newline at end of file
+street: Rue Docteur Daday
+housenumber: "3"
+phone: +33 6 77 96 29 96
+opening_hours: Mo-Fr 09:00-12:00,13:30-18:30; Sa 09:00-13:30
+website: https://www.facebook.com/toudouxdoisans
diff --git a/data/cities/le-bourg-doisans/uchronia-tattoo.yml b/data/cities/le-bourg-doisans/uchronia-tattoo.yml
index 6c912dd61..516c5c5a1 100644
--- a/data/cities/le-bourg-doisans/uchronia-tattoo.yml
+++ b/data/cities/le-bourg-doisans/uchronia-tattoo.yml
@@ -4,8 +4,8 @@ latitude: 45.05413
 longitude: 6.02942
 postcode: "38520"
 city: Le Bourg-d'Oisans
-street: "Rue de Viennois"
-housenumber: 26
-phone: "+33 6 48 91 10 92"
-opening_hours: "Fr-Sa 14:30-17:00 || Sur Rendez-vous"
-website: "https://uchroniatattoo.fr/"
\ No newline at end of file
+street: Rue de Viennois
+housenumber: "26"
+phone: +33 6 48 91 10 92
+opening_hours: Fr-Sa 14:30-17:00 || "Sur Rendez-vous"
+website: https://uchroniatattoo.fr/
diff --git a/data/cities/le-bourget-du-lac/arcarde-optique.yml b/data/cities/le-bourget-du-lac/arcarde-optique.yml
index cc6ddb131..ff87aebab 100644
--- a/data/cities/le-bourget-du-lac/arcarde-optique.yml
+++ b/data/cities/le-bourget-du-lac/arcarde-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.64873
 longitude: 5.85935
 postcode: "73370"
 city: Le Bourget-du-Lac
-street: "Rue des Écoles"
-housenumber: 80
-phone: "+33 4 79 25 27 90"
-opening_hours: "Tu-Fr 09:00-12:30,14:30-19:00; Mo 14:30-19:00; Sa 10:00-12:30"
-website: ""
\ No newline at end of file
+street: Rue des Écoles
+housenumber: "80"
+phone: +33 4 79 25 27 90
+opening_hours: Tu-Fr 09:00-12:30,14:30-19:00; Mo 14:30-19:00; Sa 10:00-12:30
+website: ""
diff --git a/data/cities/le-bourget-du-lac/boucherie-du-prieure.yml b/data/cities/le-bourget-du-lac/boucherie-du-prieure.yml
index 30c2247b6..a2dcdb264 100644
--- a/data/cities/le-bourget-du-lac/boucherie-du-prieure.yml
+++ b/data/cities/le-bourget-du-lac/boucherie-du-prieure.yml
@@ -4,8 +4,8 @@ latitude: 45.64704
 longitude: 5.86017
 postcode: "73370"
 city: Le Bourget-du-Lac
-street: "Place de l'Église"
-housenumber: 7
+street: Place de l'Église
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-bourget-du-lac/drivet-bateaux.yml b/data/cities/le-bourget-du-lac/drivet-bateaux.yml
index a9cfe4302..2804048b2 100644
--- a/data/cities/le-bourget-du-lac/drivet-bateaux.yml
+++ b/data/cities/le-bourget-du-lac/drivet-bateaux.yml
@@ -4,8 +4,8 @@ latitude: 45.65259
 longitude: 5.86026
 postcode: "73370"
 city: Le Bourget-du-Lac
-street: "Boulevard du Lac"
-housenumber: 440
-phone: "+33 4 79 25 01 78"
+street: Boulevard du Lac
+housenumber: "440"
+phone: +33 4 79 25 01 78
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/5-7-autos.yml b/data/cities/le-chambon-feugerolles/5-7-autos.yml
index 61afa6a33..86ac8a141 100644
--- a/data/cities/le-chambon-feugerolles/5-7-autos.yml
+++ b/data/cities/le-chambon-feugerolles/5-7-autos.yml
@@ -4,8 +4,8 @@ latitude: 45.39375
 longitude: 4.3008
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la Malafolie"
-housenumber: 41
+street: Rue de la Malafolie
+housenumber: "41"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/amt-service-autos.yml b/data/cities/le-chambon-feugerolles/amt-service-autos.yml
index 8eebb6943..9d7852e37 100644
--- a/data/cities/le-chambon-feugerolles/amt-service-autos.yml
+++ b/data/cities/le-chambon-feugerolles/amt-service-autos.yml
@@ -4,8 +4,8 @@ latitude: 45.3952
 longitude: 4.31109
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la République"
-housenumber: 114
-phone: "+33 4 77 56 22 61"
+street: Rue de la République
+housenumber: "114"
+phone: +33 4 77 56 22 61
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/au-panier-garni.yml b/data/cities/le-chambon-feugerolles/au-panier-garni.yml
index f4c081c74..494d49113 100644
--- a/data/cities/le-chambon-feugerolles/au-panier-garni.yml
+++ b/data/cities/le-chambon-feugerolles/au-panier-garni.yml
@@ -4,8 +4,8 @@ latitude: 45.39646
 longitude: 4.32531
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Place Jean Jaurès"
-housenumber: 15
-phone: "+33 9 86 78 39 84"
+street: Place Jean Jaurès
+housenumber: "15"
+phone: +33 9 86 78 39 84
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/aux-mille-plaisirs.yml b/data/cities/le-chambon-feugerolles/aux-mille-plaisirs.yml
index d937441ce..8ca3e87bb 100644
--- a/data/cities/le-chambon-feugerolles/aux-mille-plaisirs.yml
+++ b/data/cities/le-chambon-feugerolles/aux-mille-plaisirs.yml
@@ -4,8 +4,8 @@ latitude: 45.39686
 longitude: 4.32663
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Place Claudinon Giraudet"
-housenumber: 2
-phone: "+33 4 77 89 12 50"
+street: Place Claudinon Giraudet
+housenumber: "2"
+phone: +33 4 77 89 12 50
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/barbe-noire.yml b/data/cities/le-chambon-feugerolles/barbe-noire.yml
index 574cc0558..8eebf1034 100644
--- a/data/cities/le-chambon-feugerolles/barbe-noire.yml
+++ b/data/cities/le-chambon-feugerolles/barbe-noire.yml
@@ -4,8 +4,8 @@ latitude: 45.39602
 longitude: 4.32375
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la République"
-housenumber: 5
+street: Rue de la République
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/boucherie-charcuterie-brun.yml b/data/cities/le-chambon-feugerolles/boucherie-charcuterie-brun.yml
index bcaa6b9c9..740d18cf6 100644
--- a/data/cities/le-chambon-feugerolles/boucherie-charcuterie-brun.yml
+++ b/data/cities/le-chambon-feugerolles/boucherie-charcuterie-brun.yml
@@ -4,8 +4,8 @@ latitude: 45.39655
 longitude: 4.32805
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 28
-phone: "+33 4 77 61 02 42"
+street: Rue Gambetta
+housenumber: "28"
+phone: +33 4 77 61 02 42
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/boucherie-du-chambon.yml b/data/cities/le-chambon-feugerolles/boucherie-du-chambon.yml
index 6886add78..6ef70badf 100644
--- a/data/cities/le-chambon-feugerolles/boucherie-du-chambon.yml
+++ b/data/cities/le-chambon-feugerolles/boucherie-du-chambon.yml
@@ -4,8 +4,8 @@ latitude: 45.39604
 longitude: 4.32396
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la République"
-housenumber: 1
-phone: "+33 4 27 77 54 47"
+street: Rue de la République
+housenumber: "1"
+phone: +33 4 27 77 54 47
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/boulangerie-patisserie-mandon.yml b/data/cities/le-chambon-feugerolles/boulangerie-patisserie-mandon.yml
index b39511c4e..f64b48038 100644
--- a/data/cities/le-chambon-feugerolles/boulangerie-patisserie-mandon.yml
+++ b/data/cities/le-chambon-feugerolles/boulangerie-patisserie-mandon.yml
@@ -4,8 +4,8 @@ latitude: 45.39626
 longitude: 4.32694
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 16
-phone: "+33 4 77 61 03 55"
+street: Rue Gambetta
+housenumber: "16"
+phone: +33 4 77 61 03 55
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/carosserie-nicolas.yml b/data/cities/le-chambon-feugerolles/carosserie-nicolas.yml
index 9a4999444..b6d23a519 100644
--- a/data/cities/le-chambon-feugerolles/carosserie-nicolas.yml
+++ b/data/cities/le-chambon-feugerolles/carosserie-nicolas.yml
@@ -4,8 +4,8 @@ latitude: 45.39477
 longitude: 4.31695
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Impasse des Platanes"
-housenumber: 9
-phone: "+33 4 77 56 69 27"
+street: Impasse des Platanes
+housenumber: "9"
+phone: +33 4 77 56 69 27
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/carrefour-market.yml b/data/cities/le-chambon-feugerolles/carrefour-market.yml
index a0cca6766..6a484010d 100644
--- a/data/cities/le-chambon-feugerolles/carrefour-market.yml
+++ b/data/cities/le-chambon-feugerolles/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 45.3967
 longitude: 4.32277
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Émile Zola"
-housenumber: 5
-phone: "+33 4 77 40 02 59"
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:30"
-website: "https://www.carrefour.fr/"
\ No newline at end of file
+street: Rue Émile Zola
+housenumber: "5"
+phone: +33 4 77 40 02 59
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:30
+website: https://www.carrefour.fr/
diff --git a/data/cities/le-chambon-feugerolles/chambonhair.yml b/data/cities/le-chambon-feugerolles/chambonhair.yml
index b7560495c..4061a77f0 100644
--- a/data/cities/le-chambon-feugerolles/chambonhair.yml
+++ b/data/cities/le-chambon-feugerolles/chambonhair.yml
@@ -4,8 +4,8 @@ latitude: 45.3962
 longitude: 4.32615
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 8
-phone: "+33 4 77 61 30 11"
+street: Rue Gambetta
+housenumber: "8"
+phone: +33 4 77 61 30 11
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/coeur-de-graine.yml b/data/cities/le-chambon-feugerolles/coeur-de-graine.yml
index ff2e378e7..7d44055bb 100644
--- a/data/cities/le-chambon-feugerolles/coeur-de-graine.yml
+++ b/data/cities/le-chambon-feugerolles/coeur-de-graine.yml
@@ -4,8 +4,8 @@ latitude: 45.396
 longitude: 4.32328
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la République"
-housenumber: 9
+street: Rue de la République
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/cordonnerie-philippe.yml b/data/cities/le-chambon-feugerolles/cordonnerie-philippe.yml
index bc7ea0f32..8c7f2c35a 100644
--- a/data/cities/le-chambon-feugerolles/cordonnerie-philippe.yml
+++ b/data/cities/le-chambon-feugerolles/cordonnerie-philippe.yml
@@ -4,8 +4,8 @@ latitude: 45.39695
 longitude: 4.32676
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Grenette"
-housenumber: 2
-phone: "+33 4 77 61 01 98"
+street: Rue Grenette
+housenumber: "2"
+phone: +33 4 77 61 01 98
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/creactifs.yml b/data/cities/le-chambon-feugerolles/creactifs.yml
index 5f3776906..cbf30203f 100644
--- a/data/cities/le-chambon-feugerolles/creactifs.yml
+++ b/data/cities/le-chambon-feugerolles/creactifs.yml
@@ -4,8 +4,8 @@ latitude: 45.39633
 longitude: 4.32587
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 3
+street: Rue Gambetta
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/crocq-nature.yml b/data/cities/le-chambon-feugerolles/crocq-nature.yml
index 6b09638a6..b715800dd 100644
--- a/data/cities/le-chambon-feugerolles/crocq-nature.yml
+++ b/data/cities/le-chambon-feugerolles/crocq-nature.yml
@@ -4,8 +4,8 @@ latitude: 45.39652
 longitude: 4.32671
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue François Patouillard"
-housenumber: 2
-phone: "+33 4 77 61 37 93"
+street: Rue François Patouillard
+housenumber: "2"
+phone: +33 4 77 61 37 93
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/didier-coiffure.yml b/data/cities/le-chambon-feugerolles/didier-coiffure.yml
index d598be402..30b5192b2 100644
--- a/data/cities/le-chambon-feugerolles/didier-coiffure.yml
+++ b/data/cities/le-chambon-feugerolles/didier-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.39608
 longitude: 4.32444
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Place Jean Jaurès"
-housenumber: 1
-phone: "+33 4 77 61 06 37"
+street: Place Jean Jaurès
+housenumber: "1"
+phone: +33 4 77 61 06 37
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/distinxion.yml b/data/cities/le-chambon-feugerolles/distinxion.yml
index 1f98bc7c8..7d2166d7f 100644
--- a/data/cities/le-chambon-feugerolles/distinxion.yml
+++ b/data/cities/le-chambon-feugerolles/distinxion.yml
@@ -4,8 +4,8 @@ latitude: 45.39487
 longitude: 4.30695
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la République"
-housenumber: 136
+street: Rue de la République
+housenumber: "136"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/elixir-destockage.yml b/data/cities/le-chambon-feugerolles/elixir-destockage.yml
index 55334317f..8f392a99a 100644
--- a/data/cities/le-chambon-feugerolles/elixir-destockage.yml
+++ b/data/cities/le-chambon-feugerolles/elixir-destockage.yml
@@ -4,8 +4,8 @@ latitude: 45.39669
 longitude: 4.3286
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 38
+street: Rue Gambetta
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/essentiel-buro.yml b/data/cities/le-chambon-feugerolles/essentiel-buro.yml
index 542e45b9f..d77f3d9b2 100644
--- a/data/cities/le-chambon-feugerolles/essentiel-buro.yml
+++ b/data/cities/le-chambon-feugerolles/essentiel-buro.yml
@@ -4,8 +4,8 @@ latitude: 45.39648
 longitude: 4.32774
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 22
-phone: "+33 9 81 32 51 61"
+street: Rue Gambetta
+housenumber: "22"
+phone: +33 9 81 32 51 61
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/fromagerie-sotton.yml b/data/cities/le-chambon-feugerolles/fromagerie-sotton.yml
index 606b02451..9ce550f0b 100644
--- a/data/cities/le-chambon-feugerolles/fromagerie-sotton.yml
+++ b/data/cities/le-chambon-feugerolles/fromagerie-sotton.yml
@@ -4,8 +4,8 @@ latitude: 45.3966
 longitude: 4.32824
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 32
-phone: "+33 4 77 56 59 83"
+street: Rue Gambetta
+housenumber: "32"
+phone: +33 4 77 56 59 83
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/garage-carbone.yml b/data/cities/le-chambon-feugerolles/garage-carbone.yml
index bc7181d58..9b7cd8dbc 100644
--- a/data/cities/le-chambon-feugerolles/garage-carbone.yml
+++ b/data/cities/le-chambon-feugerolles/garage-carbone.yml
@@ -4,8 +4,8 @@ latitude: 45.39637
 longitude: 4.33259
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de l'Europe"
-housenumber: 3
+street: Rue de l'Europe
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/garage-de-la-gare.yml b/data/cities/le-chambon-feugerolles/garage-de-la-gare.yml
index c4f41f7ee..d91937b59 100644
--- a/data/cities/le-chambon-feugerolles/garage-de-la-gare.yml
+++ b/data/cities/le-chambon-feugerolles/garage-de-la-gare.yml
@@ -4,8 +4,8 @@ latitude: 45.3953
 longitude: 4.32179
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Bouzerand"
-housenumber: 1
+street: Rue Bouzerand
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/garage-jcs.yml b/data/cities/le-chambon-feugerolles/garage-jcs.yml
index 86bee1775..97f361570 100644
--- a/data/cities/le-chambon-feugerolles/garage-jcs.yml
+++ b/data/cities/le-chambon-feugerolles/garage-jcs.yml
@@ -4,8 +4,8 @@ latitude: 45.39291
 longitude: 4.31934
 postcode: "42500"
 city: Le Chambon Feugerolles
-street: "Allée du Grand Pré"
-housenumber: 4
+street: Allée du Grand Pré
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/herve-optique.yml b/data/cities/le-chambon-feugerolles/herve-optique.yml
index 423027d4c..48aceedea 100644
--- a/data/cities/le-chambon-feugerolles/herve-optique.yml
+++ b/data/cities/le-chambon-feugerolles/herve-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.39666
 longitude: 4.3278
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 25
-phone: "+33 4 77 61 85 24"
+street: Rue Gambetta
+housenumber: "25"
+phone: +33 4 77 61 85 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/institut-ambre.yml b/data/cities/le-chambon-feugerolles/institut-ambre.yml
index ff46aff82..4fcb2f50d 100644
--- a/data/cities/le-chambon-feugerolles/institut-ambre.yml
+++ b/data/cities/le-chambon-feugerolles/institut-ambre.yml
@@ -4,8 +4,8 @@ latitude: 45.39662
 longitude: 4.32676
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue François Patouillard"
-housenumber: 1
-phone: "+33 4 77 61 74 89"
+street: Rue François Patouillard
+housenumber: "1"
+phone: +33 4 77 61 74 89
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/institut-cap-beaute.yml b/data/cities/le-chambon-feugerolles/institut-cap-beaute.yml
index 67b1d0ffc..5a8f65c80 100644
--- a/data/cities/le-chambon-feugerolles/institut-cap-beaute.yml
+++ b/data/cities/le-chambon-feugerolles/institut-cap-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.39608
 longitude: 4.32437
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Place Jean Jaurès"
-housenumber: 1
+street: Place Jean Jaurès
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/isis-toilettage.yml b/data/cities/le-chambon-feugerolles/isis-toilettage.yml
index fd20b4a57..0efebd326 100644
--- a/data/cities/le-chambon-feugerolles/isis-toilettage.yml
+++ b/data/cities/le-chambon-feugerolles/isis-toilettage.yml
@@ -4,8 +4,8 @@ latitude: 45.39727
 longitude: 4.32889
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Jules Michelet"
-housenumber: 1
-phone: "+33 4 77 56 25 36"
+street: Rue Jules Michelet
+housenumber: "1"
+phone: +33 4 77 56 25 36
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/kiki-fruits.yml b/data/cities/le-chambon-feugerolles/kiki-fruits.yml
index ec670f048..fce8af861 100644
--- a/data/cities/le-chambon-feugerolles/kiki-fruits.yml
+++ b/data/cities/le-chambon-feugerolles/kiki-fruits.yml
@@ -4,8 +4,8 @@ latitude: 45.39669
 longitude: 4.32791
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 27
-phone: "+33 4 77 56 86 00"
+street: Rue Gambetta
+housenumber: "27"
+phone: +33 4 77 56 86 00
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/la-meche-folle.yml b/data/cities/le-chambon-feugerolles/la-meche-folle.yml
index 2dce84f04..c698f475a 100644
--- a/data/cities/le-chambon-feugerolles/la-meche-folle.yml
+++ b/data/cities/le-chambon-feugerolles/la-meche-folle.yml
@@ -4,8 +4,8 @@ latitude: 45.39714
 longitude: 4.32313
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Émile Zola"
-housenumber: 42
-phone: "+33 4 77 61 03 80"
+street: Rue Émile Zola
+housenumber: "42"
+phone: +33 4 77 61 03 80
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/latelier-de-steph.yml b/data/cities/le-chambon-feugerolles/latelier-de-steph.yml
index f5a6ec692..efa88dde5 100644
--- a/data/cities/le-chambon-feugerolles/latelier-de-steph.yml
+++ b/data/cities/le-chambon-feugerolles/latelier-de-steph.yml
@@ -4,8 +4,8 @@ latitude: 45.38484
 longitude: 4.30722
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Place des Cévennes"
-housenumber: 3
-phone: "+33 4 77 61 73 25"
+street: Place des Cévennes
+housenumber: "3"
+phone: +33 4 77 61 73 25
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/le-marigny.yml b/data/cities/le-chambon-feugerolles/le-marigny.yml
index 387f11e48..b2c1f8231 100644
--- a/data/cities/le-chambon-feugerolles/le-marigny.yml
+++ b/data/cities/le-chambon-feugerolles/le-marigny.yml
@@ -4,8 +4,8 @@ latitude: 45.39673
 longitude: 4.32879
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 
-phone: "+33 4 77 61 83 56"
+street: Rue Gambetta
+housenumber: ""
+phone: +33 4 77 61 83 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/ledelweiss.yml b/data/cities/le-chambon-feugerolles/ledelweiss.yml
index 00e27d88c..3e0c76701 100644
--- a/data/cities/le-chambon-feugerolles/ledelweiss.yml
+++ b/data/cities/le-chambon-feugerolles/ledelweiss.yml
@@ -4,8 +4,8 @@ latitude: 45.39653
 longitude: 4.32796
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 26
-phone: "+33 4 77 89 33 58"
+street: Rue Gambetta
+housenumber: "26"
+phone: +33 4 77 89 33 58
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/lena-rose.yml b/data/cities/le-chambon-feugerolles/lena-rose.yml
index 01b8b3e7d..ac0ad15d2 100644
--- a/data/cities/le-chambon-feugerolles/lena-rose.yml
+++ b/data/cities/le-chambon-feugerolles/lena-rose.yml
@@ -4,8 +4,8 @@ latitude: 45.39726
 longitude: 4.32364
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Émile Zola"
-housenumber: 38
+street: Rue Émile Zola
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/lepi-dor.yml b/data/cities/le-chambon-feugerolles/lepi-dor.yml
index c0a5b2699..b4b5fe966 100644
--- a/data/cities/le-chambon-feugerolles/lepi-dor.yml
+++ b/data/cities/le-chambon-feugerolles/lepi-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.39617
 longitude: 4.32579
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 4
+street: Rue Gambetta
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/les-amis-de-lhomme.yml b/data/cities/le-chambon-feugerolles/les-amis-de-lhomme.yml
index dfcad6add..94bbe6a25 100644
--- a/data/cities/le-chambon-feugerolles/les-amis-de-lhomme.yml
+++ b/data/cities/le-chambon-feugerolles/les-amis-de-lhomme.yml
@@ -4,8 +4,8 @@ latitude: 45.39723
 longitude: 4.32351
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Émile Zola"
-housenumber: 38
+street: Rue Émile Zola
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/metamorphose-coiffure.yml b/data/cities/le-chambon-feugerolles/metamorphose-coiffure.yml
index 52a4c7792..1a470be7d 100644
--- a/data/cities/le-chambon-feugerolles/metamorphose-coiffure.yml
+++ b/data/cities/le-chambon-feugerolles/metamorphose-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.39709
 longitude: 4.32701
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Grenette"
-housenumber: 4
-phone: "+33 4 77 61 02 35"
+street: Rue Grenette
+housenumber: "4"
+phone: +33 4 77 61 02 35
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/meubles-peyron.yml b/data/cities/le-chambon-feugerolles/meubles-peyron.yml
index 4877ce776..85ef40248 100644
--- a/data/cities/le-chambon-feugerolles/meubles-peyron.yml
+++ b/data/cities/le-chambon-feugerolles/meubles-peyron.yml
@@ -4,8 +4,8 @@ latitude: 45.39467
 longitude: 4.30601
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la République"
-housenumber: 138
-phone: "+33 4 77 61 04 24"
+street: Rue de la République
+housenumber: "138"
+phone: +33 4 77 61 04 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/mk-autos.yml b/data/cities/le-chambon-feugerolles/mk-autos.yml
index e739ac944..9a1b77b27 100644
--- a/data/cities/le-chambon-feugerolles/mk-autos.yml
+++ b/data/cities/le-chambon-feugerolles/mk-autos.yml
@@ -4,8 +4,8 @@ latitude: 45.39393
 longitude: 4.30247
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la Malafolie"
-housenumber: 19
+street: Rue de la Malafolie
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/ondaine-carrosserie.yml b/data/cities/le-chambon-feugerolles/ondaine-carrosserie.yml
index 22d9f38d4..18617099d 100644
--- a/data/cities/le-chambon-feugerolles/ondaine-carrosserie.yml
+++ b/data/cities/le-chambon-feugerolles/ondaine-carrosserie.yml
@@ -4,8 +4,8 @@ latitude: 45.39886
 longitude: 4.34355
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue James Jackson"
-housenumber: 60
-phone: "+33 4 77 61 05 90"
+street: Rue James Jackson
+housenumber: "60"
+phone: +33 4 77 61 05 90
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/ondaine-destock.yml b/data/cities/le-chambon-feugerolles/ondaine-destock.yml
index 0dbe12093..f211d5752 100644
--- a/data/cities/le-chambon-feugerolles/ondaine-destock.yml
+++ b/data/cities/le-chambon-feugerolles/ondaine-destock.yml
@@ -4,8 +4,8 @@ latitude: 45.39538
 longitude: 4.31279
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la République"
-housenumber: 100
+street: Rue de la République
+housenumber: "100"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/optique-gagnaire.yml b/data/cities/le-chambon-feugerolles/optique-gagnaire.yml
index 6ce1ec5b8..0f1843de9 100644
--- a/data/cities/le-chambon-feugerolles/optique-gagnaire.yml
+++ b/data/cities/le-chambon-feugerolles/optique-gagnaire.yml
@@ -4,8 +4,8 @@ latitude: 45.39638
 longitude: 4.32667
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 13
-phone: "+33 4 77 89 22 65"
+street: Rue Gambetta
+housenumber: "13"
+phone: +33 4 77 89 22 65
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/pfg.yml b/data/cities/le-chambon-feugerolles/pfg.yml
index ff35e006b..ed6ac646b 100644
--- a/data/cities/le-chambon-feugerolles/pfg.yml
+++ b/data/cities/le-chambon-feugerolles/pfg.yml
@@ -4,8 +4,8 @@ latitude: 45.39651
 longitude: 4.32786
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 24
-phone: "+33 4 77 61 04 65"
+street: Rue Gambetta
+housenumber: "24"
+phone: +33 4 77 61 04 65
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/pieces-autos-express-42.yml b/data/cities/le-chambon-feugerolles/pieces-autos-express-42.yml
index 2d0f3b261..d1acc0c33 100644
--- a/data/cities/le-chambon-feugerolles/pieces-autos-express-42.yml
+++ b/data/cities/le-chambon-feugerolles/pieces-autos-express-42.yml
@@ -4,8 +4,8 @@ latitude: 45.39342
 longitude: 4.29769
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue de la Malafolie"
-housenumber: 73
+street: Rue de la Malafolie
+housenumber: "73"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/proxi.yml b/data/cities/le-chambon-feugerolles/proxi.yml
index bff3378b6..66315ecbc 100644
--- a/data/cities/le-chambon-feugerolles/proxi.yml
+++ b/data/cities/le-chambon-feugerolles/proxi.yml
@@ -5,7 +5,7 @@ longitude: 4.32393
 postcode: "42500"
 city: Le Chambon-Feugerolles
 street: ""
-housenumber: 12
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/pulsat.yml b/data/cities/le-chambon-feugerolles/pulsat.yml
index 042dadd28..e8b8b430b 100644
--- a/data/cities/le-chambon-feugerolles/pulsat.yml
+++ b/data/cities/le-chambon-feugerolles/pulsat.yml
@@ -4,8 +4,8 @@ latitude: 45.39622
 longitude: 4.32655
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 12
-phone: "+33 4 77 61 96 56"
+street: Rue Gambetta
+housenumber: "12"
+phone: +33 4 77 61 96 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/salon-admiratif.yml b/data/cities/le-chambon-feugerolles/salon-admiratif.yml
index 339320242..671f2a4f2 100644
--- a/data/cities/le-chambon-feugerolles/salon-admiratif.yml
+++ b/data/cities/le-chambon-feugerolles/salon-admiratif.yml
@@ -4,8 +4,8 @@ latitude: 45.39643
 longitude: 4.32685
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue François Patouillard"
-housenumber: 2
-phone: "+33 4 77 61 86 01"
+street: Rue François Patouillard
+housenumber: "2"
+phone: +33 4 77 61 86 01
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/studio-gonnet.yml b/data/cities/le-chambon-feugerolles/studio-gonnet.yml
index 47f219a6d..b709c67f2 100644
--- a/data/cities/le-chambon-feugerolles/studio-gonnet.yml
+++ b/data/cities/le-chambon-feugerolles/studio-gonnet.yml
@@ -4,8 +4,8 @@ latitude: 45.39674
 longitude: 4.32812
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Gambetta"
-housenumber: 29
-phone: "+33 4 77 61 03 95"
+street: Rue Gambetta
+housenumber: "29"
+phone: +33 4 77 61 03 95
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chambon-feugerolles/une-fleur-une-histoire.yml b/data/cities/le-chambon-feugerolles/une-fleur-une-histoire.yml
index ab462263b..038c54254 100644
--- a/data/cities/le-chambon-feugerolles/une-fleur-une-histoire.yml
+++ b/data/cities/le-chambon-feugerolles/une-fleur-une-histoire.yml
@@ -4,8 +4,8 @@ latitude: 45.39732
 longitude: 4.32751
 postcode: "42500"
 city: Le Chambon-Feugerolles
-street: "Rue Thomas"
-housenumber: 29
-phone: "+33 4 77 83 60 90"
+street: Rue Thomas
+housenumber: "29"
+phone: +33 4 77 83 60 90
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-champ-pres-froges/garage-peugeot-scaringella-automobile.yml b/data/cities/le-champ-pres-froges/garage-peugeot-scaringella-automobile.yml
index 02100ce30..37e414070 100644
--- a/data/cities/le-champ-pres-froges/garage-peugeot-scaringella-automobile.yml
+++ b/data/cities/le-champ-pres-froges/garage-peugeot-scaringella-automobile.yml
@@ -1,11 +1,11 @@
 id: 63585086
-type: way
+type: node
 latitude: 45.28032
 longitude: 5.93198
 postcode: "38190"
 city: Le Champ-près-Froges
-street: "Route de Savoie"
-housenumber: 71
+street: Route de Savoie
+housenumber: "71"
 phone: "+33476714749"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:30
+website: ""
diff --git a/data/cities/le-champ-pres-froges/les-miroirs-de-julie.yml b/data/cities/le-champ-pres-froges/les-miroirs-de-julie.yml
index b07e3a18b..0984d0edf 100644
--- a/data/cities/le-champ-pres-froges/les-miroirs-de-julie.yml
+++ b/data/cities/le-champ-pres-froges/les-miroirs-de-julie.yml
@@ -4,8 +4,8 @@ latitude: 45.27459
 longitude: 5.92562
 postcode: "38190"
 city: Le Champ-près-Froges
-street: "Rue de la République"
-housenumber: 50
+street: Rue de la République
+housenumber: "50"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-champ-pres-froges/tabac-maison-de-la-vap.yml b/data/cities/le-champ-pres-froges/tabac-maison-de-la-vap.yml
index 41d95baef..3384f17c6 100644
--- a/data/cities/le-champ-pres-froges/tabac-maison-de-la-vap.yml
+++ b/data/cities/le-champ-pres-froges/tabac-maison-de-la-vap.yml
@@ -4,8 +4,8 @@ latitude: 45.27447
 longitude: 5.92552
 postcode: "38190"
 city: Le Champ-près-Froges
-street: "Rue de la République"
-housenumber: 34
+street: Rue de la République
+housenumber: "34"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chatelard/carrefour-contact.yml b/data/cities/le-chatelard/carrefour-contact.yml
index a0654f1a2..4c434e16b 100644
--- a/data/cities/le-chatelard/carrefour-contact.yml
+++ b/data/cities/le-chatelard/carrefour-contact.yml
@@ -1,11 +1,11 @@
 id: 180895309
-type: way
+type: node
 latitude: 45.68844
 longitude: 6.13517
 postcode: "73630"
 city: Le Châtelard
-street: "Avenue Denis Thermes"
-housenumber: 
-phone: "+33 4 79 88 08 80"
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/contact-le-chatelard"
\ No newline at end of file
+street: Avenue Denis Thermes
+housenumber: ""
+phone: +33 4 79 88 08 80
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/contact-le-chatelard
diff --git a/data/cities/le-chatelard/ultim-auto.yml b/data/cities/le-chatelard/ultim-auto.yml
index 082759336..e3be01dbc 100644
--- a/data/cities/le-chatelard/ultim-auto.yml
+++ b/data/cities/le-chatelard/ultim-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.68812
 longitude: 6.13559
 postcode: "73630"
 city: Le Châtelard
-street: "Avenue Denis Therme"
-housenumber: 
-phone: "+33 4 79 61 45 62"
+street: Avenue Denis Therme
+housenumber: ""
+phone: +33 4 79 61 45 62
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-cheylard/intermarche-super.yml b/data/cities/le-cheylard/intermarche-super.yml
index 2742f5275..45d26b0bd 100644
--- a/data/cities/le-cheylard/intermarche-super.yml
+++ b/data/cities/le-cheylard/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 150505646
-type: way
+type: node
 latitude: 44.91314
 longitude: 4.44264
 postcode: "07160"
 city: Le Cheylard
-street: "Allée des Vergers"
-housenumber: 
+street: Allée des Vergers
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-cheylard/station-u.yml b/data/cities/le-cheylard/station-u.yml
index f2311bcea..6415de78f 100644
--- a/data/cities/le-cheylard/station-u.yml
+++ b/data/cities/le-cheylard/station-u.yml
@@ -4,8 +4,8 @@ latitude: 44.9117
 longitude: 4.4409
 postcode: "07160"
 city: Le Cheylard
-street: "Chemin de Lapra"
-housenumber: 
+street: Chemin de Lapra
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/le-cheylard/super-u.yml b/data/cities/le-cheylard/super-u.yml
index 9dc555d61..496ffd16e 100644
--- a/data/cities/le-cheylard/super-u.yml
+++ b/data/cities/le-cheylard/super-u.yml
@@ -1,11 +1,11 @@
 id: 183116178
-type: way
+type: node
 latitude: 44.91193
 longitude: 4.44062
 postcode: "07160"
 city: Le Cheylard
-street: "Chemin de Lapra"
-housenumber: 
-phone: "+33 4 75 29 74 44"
-opening_hours: "Mo-Th 08:00-19:30; Fr 08:00-20:00; Sa 08:00-19:30"
-website: "https://www.magasins-u.com/magasin/superu-lecheylard"
\ No newline at end of file
+street: Chemin de Lapra
+housenumber: ""
+phone: +33 4 75 29 74 44
+opening_hours: Mo-Th 08:00-19:30; Fr 08:00-20:00; Sa 08:00-19:30
+website: https://www.magasins-u.com/magasin/superu-lecheylard
diff --git a/data/cities/le-cheylas/gaec-du-verger-des-iles.yml b/data/cities/le-cheylas/gaec-du-verger-des-iles.yml
index a4b3fcfcd..423ae44d6 100644
--- a/data/cities/le-cheylas/gaec-du-verger-des-iles.yml
+++ b/data/cities/le-cheylas/gaec-du-verger-des-iles.yml
@@ -4,8 +4,8 @@ latitude: 45.36748
 longitude: 5.98791
 postcode: "38570"
 city: Le Cheylas
-street: "Route du Bouchet"
-housenumber: 70
-phone: "+33 4 76 13 23 88"
-opening_hours: "Mo,Tu,We,Fr,Sa 10:00-12:00,15:00-19:00; Th 15:00-19:00"
-website: "http://gaecduvergerdesiles.weebly.com/"
\ No newline at end of file
+street: Route du Bouchet
+housenumber: "70"
+phone: +33 4 76 13 23 88
+opening_hours: Mo,Tu,We,Fr,Sa 10:00-12:00,15:00-19:00; Th 15:00-19:00
+website: http://gaecduvergerdesiles.weebly.com/
diff --git a/data/cities/le-cheylas/grain-de-beaute.yml b/data/cities/le-cheylas/grain-de-beaute.yml
index 7122b6bcd..83189e7b3 100644
--- a/data/cities/le-cheylas/grain-de-beaute.yml
+++ b/data/cities/le-cheylas/grain-de-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.36972
 longitude: 5.99311
 postcode: "38570"
 city: Le Cheylas
-street: "Rue du Vieux Moulin"
-housenumber: 124
+street: Rue du Vieux Moulin
+housenumber: "124"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-cheylas/guyom-tattoo-station.yml b/data/cities/le-cheylas/guyom-tattoo-station.yml
index e66fc0072..cb3390798 100644
--- a/data/cities/le-cheylas/guyom-tattoo-station.yml
+++ b/data/cities/le-cheylas/guyom-tattoo-station.yml
@@ -4,8 +4,8 @@ latitude: 45.37193
 longitude: 5.99141
 postcode: "38570"
 city: Le Cheylas
-street: "Rue des Commerces"
-housenumber: 6
-phone: "+33 9 84 07 76 59"
-opening_hours: "Tu-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-12:00, 14:00-16:00"
-website: ""
\ No newline at end of file
+street: Rue des Commerces
+housenumber: "6"
+phone: +33 9 84 07 76 59
+opening_hours: Tu-Fr 10:00-12:00, 14:00-19:00; Sa 10:00-12:00, 14:00-16:00
+website: ""
diff --git a/data/cities/le-cheylas/tabac-presse.yml b/data/cities/le-cheylas/tabac-presse.yml
index b095018f5..a351adbc3 100644
--- a/data/cities/le-cheylas/tabac-presse.yml
+++ b/data/cities/le-cheylas/tabac-presse.yml
@@ -1,11 +1,11 @@
 id: 1088466420
-type: way
+type: node
 latitude: 45.37215
 longitude: 5.99131
 postcode: "38570"
 city: Le Cheylas
-street: "Rue des Commerces"
-housenumber: 24
+street: Rue des Commerces
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-chinaillon/go-sport-montagne.yml b/data/cities/le-chinaillon/go-sport-montagne.yml
index 0008414b1..0bdf96f8c 100644
--- a/data/cities/le-chinaillon/go-sport-montagne.yml
+++ b/data/cities/le-chinaillon/go-sport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.97391
 longitude: 6.45459
 postcode: "74910"
 city: Le Chinaillon
-street: "Route du Chinaillon"
-housenumber: 6961
+street: Route du Chinaillon
+housenumber: "6961"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/le-collet-dallevard/intersport-2.yml b/data/cities/le-collet-dallevard/intersport-2.yml
index 84e68aec0..3d757fdb0 100644
--- a/data/cities/le-collet-dallevard/intersport-2.yml
+++ b/data/cities/le-collet-dallevard/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.1278
 postcode: "38580"
 city: Le Collet d'Allevard
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-collet-dallevard/intersport-le-chamois.yml b/data/cities/le-collet-dallevard/intersport-le-chamois.yml
index 510508f1f..c9228ecf1 100644
--- a/data/cities/le-collet-dallevard/intersport-le-chamois.yml
+++ b/data/cities/le-collet-dallevard/intersport-le-chamois.yml
@@ -5,7 +5,7 @@ longitude: 6.10784
 postcode: "38580"
 city: Le Collet d'Allevard
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-collet-dallevard/intersport.yml b/data/cities/le-collet-dallevard/intersport.yml
index de08d029e..15f466e2d 100644
--- a/data/cities/le-collet-dallevard/intersport.yml
+++ b/data/cities/le-collet-dallevard/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.10806
 postcode: "38580"
 city: Le Collet d'Allevard
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-corbier/ski-republic.yml b/data/cities/le-corbier/ski-republic.yml
index 98ef14903..2f3086603 100644
--- a/data/cities/le-corbier/ski-republic.yml
+++ b/data/cities/le-corbier/ski-republic.yml
@@ -5,7 +5,7 @@ longitude: 6.27362
 postcode: "73300"
 city: Le Corbier
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 08:30-12:00,16:00-19:00; Fr-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:00,16:00-19:00; Fr-Su 08:30-19:00
+website: ""
diff --git a/data/cities/le-coteau/amelisez-vous.yml b/data/cities/le-coteau/amelisez-vous.yml
index ac5604805..9137f822d 100644
--- a/data/cities/le-coteau/amelisez-vous.yml
+++ b/data/cities/le-coteau/amelisez-vous.yml
@@ -4,8 +4,8 @@ latitude: 46.03091
 longitude: 4.08311
 postcode: "42120"
 city: Le Coteau
-street: "Avenue de LA LIBERATION"
-housenumber: 17
+street: Avenue de LA LIBERATION
+housenumber: "17"
 phone: ""
-opening_hours: "Tu 09:00-12:00, 14:00-17:30; We-Fr 09:00-19:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 09:00-12:00, 14:00-17:30; We-Fr 09:00-19:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/le-coteau/avia.yml b/data/cities/le-coteau/avia.yml
index 94acf758b..7a7a9d587 100644
--- a/data/cities/le-coteau/avia.yml
+++ b/data/cities/le-coteau/avia.yml
@@ -4,8 +4,8 @@ latitude: 46.01051
 longitude: 4.09699
 postcode: "42120"
 city: Le Coteau
-street: "Boulevard Charles de Gaulle"
-housenumber: 52
+street: Boulevard Charles de Gaulle
+housenumber: "52"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/le-coteau/ben-run-ben-rando.yml b/data/cities/le-coteau/ben-run-ben-rando.yml
index 0e6dff61a..106edf3c0 100644
--- a/data/cities/le-coteau/ben-run-ben-rando.yml
+++ b/data/cities/le-coteau/ben-run-ben-rando.yml
@@ -4,8 +4,8 @@ latitude: 46.0286
 longitude: 4.08342
 postcode: "42120"
 city: Le Coteau
-street: "Rue Saint-Marc"
-housenumber: 
-phone: "+33 9 80 66 25 05"
-opening_hours: "Tu, Th 09:00-12:00, 14:00-19:00; We, Fr, Sa 09:00- 19:00"
-website: "https://benrun.fr/"
\ No newline at end of file
+street: Rue Saint-Marc
+housenumber: ""
+phone: +33 9 80 66 25 05
+opening_hours: Tu, Th 09:00-12:00, 14:00-19:00; We, Fr, Sa 09:00- 19:00
+website: https://benrun.fr/
diff --git a/data/cities/le-coteau/gifi.yml b/data/cities/le-coteau/gifi.yml
index 2d171912f..ebc87c05b 100644
--- a/data/cities/le-coteau/gifi.yml
+++ b/data/cities/le-coteau/gifi.yml
@@ -5,7 +5,7 @@ longitude: 4.09612
 postcode: "42120"
 city: Le Coteau
 street: ""
-housenumber: 40
-phone: "+33 4 77 67 69 63"
+housenumber: "40"
+phone: +33 4 77 67 69 63
 opening_hours: ""
-website: "https://magasins.gifi.fr"
\ No newline at end of file
+website: https://magasins.gifi.fr
diff --git a/data/cities/le-fontanil-cornillon/boissons-du-monde.yml b/data/cities/le-fontanil-cornillon/boissons-du-monde.yml
index e737a0adf..b938a50d4 100644
--- a/data/cities/le-fontanil-cornillon/boissons-du-monde.yml
+++ b/data/cities/le-fontanil-cornillon/boissons-du-monde.yml
@@ -4,8 +4,8 @@ latitude: 45.24834
 longitude: 5.66145
 postcode: "38120"
 city: Le Fontanil-Cornillon
-street: "Rue de la Verrerie"
-housenumber: 1
-phone: "+33 4 76 75 51 53"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.boissonsdumonde.fr/"
\ No newline at end of file
+street: Rue de la Verrerie
+housenumber: "1"
+phone: +33 4 76 75 51 53
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.boissonsdumonde.fr/
diff --git a/data/cities/le-grand-bornand/aux-comptoirs-des-alpes.yml b/data/cities/le-grand-bornand/aux-comptoirs-des-alpes.yml
index dbda4827c..a702012d4 100644
--- a/data/cities/le-grand-bornand/aux-comptoirs-des-alpes.yml
+++ b/data/cities/le-grand-bornand/aux-comptoirs-des-alpes.yml
@@ -4,8 +4,8 @@ latitude: 45.94232
 longitude: 6.42704
 postcode: "74450"
 city: Le Grand-Bornand
-street: "Route du Chinaillon"
-housenumber: 22
-phone: "+33 4 50 44 09 17"
-opening_hours: "Mo-Su 08:30-19:00"
-website: "https://auxcomptoirsdesalpes.fr/"
\ No newline at end of file
+street: Route du Chinaillon
+housenumber: "22"
+phone: +33 4 50 44 09 17
+opening_hours: Mo-Su 08:30-19:00
+website: https://auxcomptoirsdesalpes.fr/
diff --git a/data/cities/le-grand-bornand/ferme-vieux-village-chez-brigitte.yml b/data/cities/le-grand-bornand/ferme-vieux-village-chez-brigitte.yml
index ef9870ba8..acd79c14f 100644
--- a/data/cities/le-grand-bornand/ferme-vieux-village-chez-brigitte.yml
+++ b/data/cities/le-grand-bornand/ferme-vieux-village-chez-brigitte.yml
@@ -4,8 +4,8 @@ latitude: 45.97219
 longitude: 6.44826
 postcode: "75450"
 city: Le Grand Bornand
-street: "Route du Vieux Village"
-housenumber: 355
+street: Route du Vieux Village
+housenumber: "355"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-grand-bornand/go-sport-montagne.yml b/data/cities/le-grand-bornand/go-sport-montagne.yml
index d3ecc480f..b2d183cea 100644
--- a/data/cities/le-grand-bornand/go-sport-montagne.yml
+++ b/data/cities/le-grand-bornand/go-sport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.97353
 longitude: 6.45587
 postcode: "74450"
 city: Le Grand-Bornand
-street: "Route de l'envers du Chinaillon"
-housenumber: 1401
+street: Route de l'envers du Chinaillon
+housenumber: "1401"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/le-grand-bornand/guy-pessey-sports.yml b/data/cities/le-grand-bornand/guy-pessey-sports.yml
index f6b4cb0f7..c13e3f068 100644
--- a/data/cities/le-grand-bornand/guy-pessey-sports.yml
+++ b/data/cities/le-grand-bornand/guy-pessey-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.96908
 longitude: 6.45039
 postcode: "74450"
 city: LE GRAND BORNAND
-street: "l'Envers du Chinaillon"
-housenumber: 740
+street: l'Envers du Chinaillon
+housenumber: "740"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-grand-bornand/intersport-2.yml b/data/cities/le-grand-bornand/intersport-2.yml
index 5c3f0b3f2..e3331909a 100644
--- a/data/cities/le-grand-bornand/intersport-2.yml
+++ b/data/cities/le-grand-bornand/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.42369
 postcode: "74450"
 city: Le Grand-Bornand
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-grand-bornand/intersport-route-du-chinaillon.yml b/data/cities/le-grand-bornand/intersport-route-du-chinaillon.yml
index 9acb6cd42..719b05e4e 100644
--- a/data/cities/le-grand-bornand/intersport-route-du-chinaillon.yml
+++ b/data/cities/le-grand-bornand/intersport-route-du-chinaillon.yml
@@ -4,8 +4,8 @@ latitude: 45.9727
 longitude: 6.4511
 postcode: "74450"
 city: Le Grand Bornand
-street: "Route du Chinaillon"
-housenumber: 
-phone: "+33  4 50 27 01 21"
-opening_hours: "Dec-Mar 08:30-19:00; Jun-Sep 09:30-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+street: Route du Chinaillon
+housenumber: ""
+phone: +33  4 50 27 01 21
+opening_hours: Dec-Mar 08:30-19:00; Jun-Sep 09:30-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/le-grand-bornand/intersport.yml b/data/cities/le-grand-bornand/intersport.yml
index 0b1dfb47e..214be05b7 100644
--- a/data/cities/le-grand-bornand/intersport.yml
+++ b/data/cities/le-grand-bornand/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.94319
 longitude: 6.43579
 postcode: "74450"
 city: Le Grand-Bornand
-street: "Voie communale du Pont de suze"
-housenumber: 11
+street: Voie communale du Pont de suze
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-grand-bornand/la-colombiere.yml b/data/cities/le-grand-bornand/la-colombiere.yml
index c1e06f70e..dc2738f8d 100644
--- a/data/cities/le-grand-bornand/la-colombiere.yml
+++ b/data/cities/le-grand-bornand/la-colombiere.yml
@@ -1,11 +1,11 @@
 id: 39173940
-type: way
+type: node
 latitude: 45.99237
 longitude: 6.47539
 postcode: ""
 city: Le Grand-Bornand
-street: "Route du Col de la Colombiére"
-housenumber: 7086
+street: Route du Col de la Colombiére
+housenumber: "7086"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-grand-bornand/maroly-sport.yml b/data/cities/le-grand-bornand/maroly-sport.yml
index 58b8e026f..6b1f15967 100644
--- a/data/cities/le-grand-bornand/maroly-sport.yml
+++ b/data/cities/le-grand-bornand/maroly-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.97518
 longitude: 6.45829
 postcode: "74450"
 city: Le Grand-Bornand
-street: "Chinaillon"
-housenumber: 7287
+street: Chinaillon
+housenumber: "7287"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-grand-bornand/patisserie-boulangerie-maison-betemps.yml b/data/cities/le-grand-bornand/patisserie-boulangerie-maison-betemps.yml
index bee738975..49ef38ee5 100644
--- a/data/cities/le-grand-bornand/patisserie-boulangerie-maison-betemps.yml
+++ b/data/cities/le-grand-bornand/patisserie-boulangerie-maison-betemps.yml
@@ -4,8 +4,8 @@ latitude: 45.94225
 longitude: 6.42689
 postcode: "74450"
 city: Le Grand-Bornand
-street: "Route du Chinaillon"
-housenumber: 40
-phone: "+33 4 50 02 20 03"
-opening_hours: "Mo-Su 06:30-19:00"
-website: ""
\ No newline at end of file
+street: Route du Chinaillon
+housenumber: "40"
+phone: +33 4 50 02 20 03
+opening_hours: Mo-Su 06:30-19:00
+website: ""
diff --git a/data/cities/le-grand-bornand/reves-dhiver.yml b/data/cities/le-grand-bornand/reves-dhiver.yml
index 51d085ed3..12485de03 100644
--- a/data/cities/le-grand-bornand/reves-dhiver.yml
+++ b/data/cities/le-grand-bornand/reves-dhiver.yml
@@ -4,8 +4,8 @@ latitude: 45.9739
 longitude: 6.45815
 postcode: "74450"
 city: Le Grand-Bornand
-street: "Route de l'Envers du Chinaillon"
-housenumber: 1586
+street: Route de l'Envers du Chinaillon
+housenumber: "1586"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-grand-bornand/sherpa-route-de-la-vallee-du-bouchet.yml b/data/cities/le-grand-bornand/sherpa-route-de-la-vallee-du-bouchet.yml
index a653e2ec7..36bcd8495 100644
--- a/data/cities/le-grand-bornand/sherpa-route-de-la-vallee-du-bouchet.yml
+++ b/data/cities/le-grand-bornand/sherpa-route-de-la-vallee-du-bouchet.yml
@@ -4,8 +4,8 @@ latitude: 45.94239
 longitude: 6.42837
 postcode: "74450"
 city: Le Grand Bornand
-street: "Route de la Vallée du Bouchet"
-housenumber: 6
+street: Route de la Vallée du Bouchet
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Su 08:00-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-12:30, 15:00-19:00
+website: ""
diff --git a/data/cities/le-grand-bornand/sherpa.yml b/data/cities/le-grand-bornand/sherpa.yml
index cd0728290..cc1cfa28e 100644
--- a/data/cities/le-grand-bornand/sherpa.yml
+++ b/data/cities/le-grand-bornand/sherpa.yml
@@ -4,8 +4,9 @@ latitude: 45.97376
 longitude: 6.45385
 postcode: "74450"
 city: Le Grand Bornand
-street: "Route du Chinaillon"
-housenumber: 6903
+street: Route du Chinaillon
+housenumber: "6903"
 phone: ""
-opening_hours: "Dec 20-Mar 23 Mo-Su 07:30-13:00, 15:00-19:30; Jun 27-Aug 30 Mo-Su 07:30-12:30, 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Dec 20-Mar 23 Mo-Su 07:30-13:00, 15:00-19:30; Jun 27-Aug 30 Mo-Su 07:30-12:30,
+    15:30-19:30
+website: ""
diff --git a/data/cities/le-grand-bornand/spar.yml b/data/cities/le-grand-bornand/spar.yml
index 3e787f52a..42a16c039 100644
--- a/data/cities/le-grand-bornand/spar.yml
+++ b/data/cities/le-grand-bornand/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.94167
 longitude: 6.42602
 postcode: "74450"
 city: Le Grand-Bornand
-street: "Route de Villavit"
-housenumber: 
+street: Route de Villavit
+housenumber: ""
 phone: ""
-opening_hours: "Mo 15:30-19:30; Tu-Sa 07:30-12:30, 15:30-19:30; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 15:30-19:30; Tu-Sa 07:30-12:30, 15:30-19:30; Su 07:30-12:30
+website: ""
diff --git a/data/cities/le-grand-bornand/sport-alp.yml b/data/cities/le-grand-bornand/sport-alp.yml
index c84fb5685..8ea4ee542 100644
--- a/data/cities/le-grand-bornand/sport-alp.yml
+++ b/data/cities/le-grand-bornand/sport-alp.yml
@@ -4,8 +4,8 @@ latitude: 45.94179
 longitude: 6.43961
 postcode: ""
 city: Le Grand Bornand
-street: "Chemin de Suize"
-housenumber: 17
+street: Chemin de Suize
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-lac-dissarles/gineys.yml b/data/cities/le-lac-dissarles/gineys.yml
index 3ec844fb8..22752bcf2 100644
--- a/data/cities/le-lac-dissarles/gineys.yml
+++ b/data/cities/le-lac-dissarles/gineys.yml
@@ -4,8 +4,8 @@ latitude: 44.82015
 longitude: 4.0622
 postcode: "07470"
 city: Le Lac-d'Issarlès
-street: "Avenue du Lac"
-housenumber: 394
+street: Avenue du Lac
+housenumber: "394"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-lac-dissarles/lafont.yml b/data/cities/le-lac-dissarles/lafont.yml
index 691c3e1d8..3bc67d770 100644
--- a/data/cities/le-lac-dissarles/lafont.yml
+++ b/data/cities/le-lac-dissarles/lafont.yml
@@ -4,8 +4,8 @@ latitude: 44.81949
 longitude: 4.06288
 postcode: "07470"
 city: Le Lac-d'Issarlès
-street: "Avenue du Lac"
-housenumber: 465
+street: Avenue du Lac
+housenumber: "465"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-lac-dissarles/vival.yml b/data/cities/le-lac-dissarles/vival.yml
index 88f763073..44500f4dc 100644
--- a/data/cities/le-lac-dissarles/vival.yml
+++ b/data/cities/le-lac-dissarles/vival.yml
@@ -4,8 +4,8 @@ latitude: 44.82118
 longitude: 4.0605
 postcode: "07470"
 city: Le Lac-d'Issarlès
-street: "Place Léopold Teyssier"
-housenumber: 34
+street: Place Léopold Teyssier
+housenumber: "34"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-monestier-du-percy/la-foret-des-possibles.yml b/data/cities/le-monestier-du-percy/la-foret-des-possibles.yml
index 7e4458f90..d64807653 100644
--- a/data/cities/le-monestier-du-percy/la-foret-des-possibles.yml
+++ b/data/cities/le-monestier-du-percy/la-foret-des-possibles.yml
@@ -4,8 +4,8 @@ latitude: 44.78203
 longitude: 5.62587
 postcode: "38930"
 city: Le Monestier-du-Percy
-street: "Chemin des Boucharens"
-housenumber: 368
+street: Chemin des Boucharens
+housenumber: "368"
 phone: ""
 opening_hours: ""
-website: "https://www.laforetdespossibles.com/"
\ No newline at end of file
+website: https://www.laforetdespossibles.com/
diff --git a/data/cities/le-passage/esprit-du-pain.yml b/data/cities/le-passage/esprit-du-pain.yml
index 2b9f91e22..df74d5437 100644
--- a/data/cities/le-passage/esprit-du-pain.yml
+++ b/data/cities/le-passage/esprit-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 45.5222
 longitude: 5.52264
 postcode: "38490"
 city: Le Passage
-street: "Chemin des Villettes"
-housenumber: 17
+street: Chemin des Villettes
+housenumber: "17"
 phone: ""
-opening_hours: "We 17:00-19:00; Sa 09:00:12:30"
-website: "https://esprit-du-pain.business.site/"
\ No newline at end of file
+opening_hours: We 17:00-19:00; Sa 09:00:12:30
+website: https://esprit-du-pain.business.site/
diff --git a/data/cities/le-peage-de-roussillon/le-mussi.yml b/data/cities/le-peage-de-roussillon/le-mussi.yml
index a256b4502..8eb754bce 100644
--- a/data/cities/le-peage-de-roussillon/le-mussi.yml
+++ b/data/cities/le-peage-de-roussillon/le-mussi.yml
@@ -1,11 +1,11 @@
 id: 158706171
-type: way
+type: node
 latitude: 45.37727
 longitude: 4.7975
 postcode: "38550"
 city: Le Péage-de-Roussillon
-street: "Rue Bellefontaine"
-housenumber: 
-phone: "+33 4 74 86 75 51"
-opening_hours: "Tu-Sa 09:00-19:00"
-website: "https://www.facebook.com/Le-Mussi-1531924673722388/"
\ No newline at end of file
+street: Rue Bellefontaine
+housenumber: ""
+phone: +33 4 74 86 75 51
+opening_hours: Tu-Sa 09:00-19:00
+website: https://www.facebook.com/Le-Mussi-1531924673722388/
diff --git a/data/cities/le-plantay/boutique-de-labbaye.yml b/data/cities/le-plantay/boutique-de-labbaye.yml
index cb6de2299..53b1856a2 100644
--- a/data/cities/le-plantay/boutique-de-labbaye.yml
+++ b/data/cities/le-plantay/boutique-de-labbaye.yml
@@ -4,8 +4,8 @@ latitude: 46.03757
 longitude: 5.0944
 postcode: "01330"
 city: Le Plantay
-street: "Route de l'Abbaye"
-housenumber: 1600
+street: Route de l'Abbaye
+housenumber: "1600"
 phone: ""
-opening_hours: "Mo,We-Mo 10:00-11:45,15:00-18:00; Su 10:00-11:15,15:00-18:00"
-website: "https://www.chemin-neuf.fr/fr/pres-de-chez-toi/abbayes/abbaye-des-dombes"
\ No newline at end of file
+opening_hours: Mo,We-Mo 10:00-11:45,15:00-18:00; Su 10:00-11:15,15:00-18:00
+website: https://www.chemin-neuf.fr/fr/pres-de-chez-toi/abbayes/abbaye-des-dombes
diff --git a/data/cities/le-pont-de-beauvoisin/alain-afflelou.yml b/data/cities/le-pont-de-beauvoisin/alain-afflelou.yml
index fed11c7ec..89931958e 100644
--- a/data/cities/le-pont-de-beauvoisin/alain-afflelou.yml
+++ b/data/cities/le-pont-de-beauvoisin/alain-afflelou.yml
@@ -1,11 +1,11 @@
 id: 1149938374
-type: way
+type: node
 latitude: 45.52929
 longitude: 5.68853
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "Avenue du Baron de Crousaz"
-housenumber: 
+street: Avenue du Baron de Crousaz
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/avenir-moto.yml b/data/cities/le-pont-de-beauvoisin/avenir-moto.yml
index 9923aea3b..5e51e0c74 100644
--- a/data/cities/le-pont-de-beauvoisin/avenir-moto.yml
+++ b/data/cities/le-pont-de-beauvoisin/avenir-moto.yml
@@ -4,8 +4,8 @@ latitude: 45.53098
 longitude: 5.68741
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "Avenue Jean Jaurès"
-housenumber: 
+street: Avenue Jean Jaurès
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/borea.yml b/data/cities/le-pont-de-beauvoisin/borea.yml
index 1b1f9c30b..5209af3e8 100644
--- a/data/cities/le-pont-de-beauvoisin/borea.yml
+++ b/data/cities/le-pont-de-beauvoisin/borea.yml
@@ -4,8 +4,10 @@ latitude: 45.52993
 longitude: 5.68501
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "La Baronnie"
-housenumber: 
-phone: "09 86 66 76 77"
-opening_hours: "Dimanche: 06:00 - 20:00   Lundi: 06:00 - 20:00   Mardi: 06:00 - 20:00   Mercredi: 06:00 - 20:00   Jeudi: 06:00 - 20:00   Vendredi: 06:00 - 20:00   Samedi: 06:00 - 20:00"
-website: ""
\ No newline at end of file
+street: La Baronnie
+housenumber: ""
+phone: 09 86 66 76 77
+opening_hours: 'Dimanche: 06:00 - 20:00   Lundi: 06:00 - 20:00   Mardi: 06:00 - 20:00   Mercredi:
+    06:00 - 20:00   Jeudi: 06:00 - 20:00   Vendredi: 06:00 - 20:00   Samedi: 06:00
+    - 20:00'
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/e-leclerc.yml b/data/cities/le-pont-de-beauvoisin/e-leclerc.yml
index 9ca3d2aa9..a7c25091a 100644
--- a/data/cities/le-pont-de-beauvoisin/e-leclerc.yml
+++ b/data/cities/le-pont-de-beauvoisin/e-leclerc.yml
@@ -1,11 +1,11 @@
 id: 43728368
-type: way
+type: node
 latitude: 45.5379
 longitude: 5.64682
 postcode: "38480"
 city: Le Pont-de-Beauvoisin
-street: "Chemin de Clermont"
-housenumber: 200
-phone: "+33 4 76 91 76 20"
+street: Chemin de Clermont
+housenumber: "200"
+phone: +33 4 76 91 76 20
 opening_hours: ""
-website: "http://www.e-leclerc.com/pont-de-beauvoisin"
\ No newline at end of file
+website: http://www.e-leclerc.com/pont-de-beauvoisin
diff --git a/data/cities/le-pont-de-beauvoisin/generale-doptique.yml b/data/cities/le-pont-de-beauvoisin/generale-doptique.yml
index ed4851b76..6bc46b1f7 100644
--- a/data/cities/le-pont-de-beauvoisin/generale-doptique.yml
+++ b/data/cities/le-pont-de-beauvoisin/generale-doptique.yml
@@ -4,8 +4,10 @@ latitude: 45.53135
 longitude: 5.68608
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "Avenue Jean Jaurès"
-housenumber: 
+street: Avenue Jean Jaurès
+housenumber: ""
 phone: "0476556542"
-opening_hours: "lundi 14:00-18:30  mardi 09:30-12:00 14:00-18:30  mercredi 09:30-12:00 14:00-18:30  jeudi 09:30-12:00 14:00-18:30  vendredi 09:30-12:00 14:00-18:30  samedi 09:30-12:30 14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: lundi 14:00-18:30  mardi 09:30-12:00 14:00-18:30  mercredi 09:30-12:00
+    14:00-18:30  jeudi 09:30-12:00 14:00-18:30  vendredi 09:30-12:00 14:00-18:30  samedi
+    09:30-12:30 14:00-18:30
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/gifi.yml b/data/cities/le-pont-de-beauvoisin/gifi.yml
index cf2362821..f113e9e03 100644
--- a/data/cities/le-pont-de-beauvoisin/gifi.yml
+++ b/data/cities/le-pont-de-beauvoisin/gifi.yml
@@ -4,8 +4,8 @@ latitude: 45.53068
 longitude: 5.68396
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "Avenue Jean Jaurès"
-housenumber: 314
+street: Avenue Jean Jaurès
+housenumber: "314"
 phone: "+33476321794"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/hyper-u.yml b/data/cities/le-pont-de-beauvoisin/hyper-u.yml
index 7d9c1738f..5e651d393 100644
--- a/data/cities/le-pont-de-beauvoisin/hyper-u.yml
+++ b/data/cities/le-pont-de-beauvoisin/hyper-u.yml
@@ -4,8 +4,8 @@ latitude: 45.52942
 longitude: 5.6909
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "Lieu-dit l'Écurée"
-housenumber: 
+street: Lieu-dit l'Écurée
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 8:30-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 8:30-12:15
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/maison-de-la-baguette.yml b/data/cities/le-pont-de-beauvoisin/maison-de-la-baguette.yml
index f3089af6e..150557089 100644
--- a/data/cities/le-pont-de-beauvoisin/maison-de-la-baguette.yml
+++ b/data/cities/le-pont-de-beauvoisin/maison-de-la-baguette.yml
@@ -4,8 +4,8 @@ latitude: 45.53603
 longitude: 5.67144
 postcode: "38480"
 city: Le Pont-de-Beauvoisin
-street: "Rue Alexandre Dumas"
-housenumber: 32
+street: Rue Alexandre Dumas
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/marche-aux-affaires.yml b/data/cities/le-pont-de-beauvoisin/marche-aux-affaires.yml
index aa8d76b24..11a0dbea9 100644
--- a/data/cities/le-pont-de-beauvoisin/marche-aux-affaires.yml
+++ b/data/cities/le-pont-de-beauvoisin/marche-aux-affaires.yml
@@ -4,8 +4,8 @@ latitude: 45.53071
 longitude: 5.68548
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "ZI de la Baronnie"
-housenumber: 
-phone: "09 53 09 03 47"
-opening_hours: "Mo-Su 09:00-12:00 14:00-19:00"
-website: ""
\ No newline at end of file
+street: ZI de la Baronnie
+housenumber: ""
+phone: 09 53 09 03 47
+opening_hours: Mo-Su 09:00-12:00 14:00-19:00
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/prestaphone.yml b/data/cities/le-pont-de-beauvoisin/prestaphone.yml
index 0c4d86c3f..470fd6af5 100644
--- a/data/cities/le-pont-de-beauvoisin/prestaphone.yml
+++ b/data/cities/le-pont-de-beauvoisin/prestaphone.yml
@@ -4,8 +4,8 @@ latitude: 45.53176
 longitude: 5.68161
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "Avenue Jean Jaurès ZI La Baronnie"
-housenumber: 
+street: Avenue Jean Jaurès ZI La Baronnie
+housenumber: ""
 phone: "+33981251293"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-beauvoisin/rapid-pare-brise.yml b/data/cities/le-pont-de-beauvoisin/rapid-pare-brise.yml
index 815405d26..5bf831322 100644
--- a/data/cities/le-pont-de-beauvoisin/rapid-pare-brise.yml
+++ b/data/cities/le-pont-de-beauvoisin/rapid-pare-brise.yml
@@ -4,8 +4,8 @@ latitude: 45.53125
 longitude: 5.68761
 postcode: "73330"
 city: Le Pont-de-Beauvoisin
-street: "Zone d'Activité de la Baronnie"
-housenumber: 
-phone: "+33 6 13 77 81 09"
-opening_hours: "Mo-Fr 8:00-12:00, 14:00-18:30; Fr 8:00-12:00; PH off"
-website: "https://www.rapidparebrise-le-pont-de-beauvoisin.fr/"
\ No newline at end of file
+street: Zone d'Activité de la Baronnie
+housenumber: ""
+phone: +33 6 13 77 81 09
+opening_hours: Mo-Fr 8:00-12:00, 14:00-18:30; Fr 8:00-12:00; PH off
+website: https://www.rapidparebrise-le-pont-de-beauvoisin.fr/
diff --git a/data/cities/le-pont-de-beauvoisin/samse.yml b/data/cities/le-pont-de-beauvoisin/samse.yml
index f5150a934..26e46f440 100644
--- a/data/cities/le-pont-de-beauvoisin/samse.yml
+++ b/data/cities/le-pont-de-beauvoisin/samse.yml
@@ -1,5 +1,5 @@
 id: 238771309
-type: way
+type: node
 latitude: 45.53073
 longitude: 5.68873
 postcode: "73330"
@@ -8,4 +8,4 @@ street: ""
 housenumber: 5521F
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-claix/acrp-automobiles.yml b/data/cities/le-pont-de-claix/acrp-automobiles.yml
index 41743343e..8d2cfd46d 100644
--- a/data/cities/le-pont-de-claix/acrp-automobiles.yml
+++ b/data/cities/le-pont-de-claix/acrp-automobiles.yml
@@ -4,8 +4,8 @@ latitude: 45.13793
 longitude: 5.69541
 postcode: "38800"
 city: Le Pont-de-Claix
-street: "Rue Denis Papin"
-housenumber: 23
+street: Rue Denis Papin
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-claix/douceurs-et-chocolat.yml b/data/cities/le-pont-de-claix/douceurs-et-chocolat.yml
index a0cfd0f52..82bac2645 100644
--- a/data/cities/le-pont-de-claix/douceurs-et-chocolat.yml
+++ b/data/cities/le-pont-de-claix/douceurs-et-chocolat.yml
@@ -4,8 +4,8 @@ latitude: 45.12342
 longitude: 5.69828
 postcode: "38800"
 city: Le Pont-de-Claix
-street: "Place du 8 Mai 1945"
-housenumber: 8
-phone: "+33 4 76 98 08 49"
-opening_hours: "Tu-Sa 05:00-19:30; Su 06:00-19:30"
-website: ""
\ No newline at end of file
+street: Place du 8 Mai 1945
+housenumber: "8"
+phone: +33 4 76 98 08 49
+opening_hours: Tu-Sa 05:00-19:30; Su 06:00-19:30
+website: ""
diff --git a/data/cities/le-pont-de-claix/du-moulin-aux-traditions.yml b/data/cities/le-pont-de-claix/du-moulin-aux-traditions.yml
index e00393d9e..433d63584 100644
--- a/data/cities/le-pont-de-claix/du-moulin-aux-traditions.yml
+++ b/data/cities/le-pont-de-claix/du-moulin-aux-traditions.yml
@@ -4,8 +4,8 @@ latitude: 45.1369
 longitude: 5.70148
 postcode: "38800"
 city: Le Pont-de-Claix
-street: "Cours Saint-André"
-housenumber: 73
+street: Cours Saint-André
+housenumber: "73"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-claix/langle-du-fumeur.yml b/data/cities/le-pont-de-claix/langle-du-fumeur.yml
index 3135c7f38..7da13ef0a 100644
--- a/data/cities/le-pont-de-claix/langle-du-fumeur.yml
+++ b/data/cities/le-pont-de-claix/langle-du-fumeur.yml
@@ -4,8 +4,8 @@ latitude: 45.12331
 longitude: 5.69764
 postcode: "38800"
 city: Le Pont-de-Claix
-street: "Place du 8 Mai 1945"
-housenumber: 1
+street: Place du 8 Mai 1945
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-pont-de-claix/nickel.yml b/data/cities/le-pont-de-claix/nickel.yml
index 41ac6ec72..1c7ef42b9 100644
--- a/data/cities/le-pont-de-claix/nickel.yml
+++ b/data/cities/le-pont-de-claix/nickel.yml
@@ -4,8 +4,8 @@ latitude: 45.12366
 longitude: 5.69979
 postcode: "38800"
 city: Le Pont-de-Claix
-street: "Rue de Stalingrad"
-housenumber: 22
-phone: "+33 7 60 75 20 02"
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+street: Rue de Stalingrad
+housenumber: "22"
+phone: +33 7 60 75 20 02
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/le-pont-de-claix/tabac-presse-le-saint-andre.yml b/data/cities/le-pont-de-claix/tabac-presse-le-saint-andre.yml
index c1b1878df..a65d455d2 100644
--- a/data/cities/le-pont-de-claix/tabac-presse-le-saint-andre.yml
+++ b/data/cities/le-pont-de-claix/tabac-presse-le-saint-andre.yml
@@ -4,8 +4,8 @@ latitude: 45.13679
 longitude: 5.70144
 postcode: "38800"
 city: Le Pont-de-Claix
-street: "Cours Saint-André"
-housenumber: 73
+street: Cours Saint-André
+housenumber: "73"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-teil/netto.yml b/data/cities/le-teil/netto.yml
index f030e0ac0..89f155db0 100644
--- a/data/cities/le-teil/netto.yml
+++ b/data/cities/le-teil/netto.yml
@@ -1,11 +1,11 @@
 id: 91103224
-type: way
+type: node
 latitude: 44.55257
 longitude: 4.68802
 postcode: "07400"
 city: Le Teil
-street: "Rue Louis Lacrotte"
-housenumber: 14
-phone: "+33 4 75 49 04 46"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: "https://magasin.netto.fr/18-netto-le-teil"
\ No newline at end of file
+street: Rue Louis Lacrotte
+housenumber: "14"
+phone: +33 4 75 49 04 46
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: https://magasin.netto.fr/18-netto-le-teil
diff --git a/data/cities/le-touvet/alpins-wheel.yml b/data/cities/le-touvet/alpins-wheel.yml
index 1690a24ca..1c57ec0a6 100644
--- a/data/cities/le-touvet/alpins-wheel.yml
+++ b/data/cities/le-touvet/alpins-wheel.yml
@@ -4,8 +4,8 @@ latitude: 45.34142
 longitude: 5.94327
 postcode: "38660"
 city: Le Touvet
-street: "Chemin des Pins"
-housenumber: 150
+street: Chemin des Pins
+housenumber: "150"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-touvet/cycloide.yml b/data/cities/le-touvet/cycloide.yml
index 8eee836fa..1a03c15f3 100644
--- a/data/cities/le-touvet/cycloide.yml
+++ b/data/cities/le-touvet/cycloide.yml
@@ -4,8 +4,8 @@ latitude: 45.35879
 longitude: 5.95151
 postcode: "38660"
 city: Le Touvet
-street: "Grande Rue"
-housenumber: 726
+street: Grande Rue
+housenumber: "726"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/le-touvet/gresy.yml b/data/cities/le-touvet/gresy.yml
index 8893d0ee7..20a404c5c 100644
--- a/data/cities/le-touvet/gresy.yml
+++ b/data/cities/le-touvet/gresy.yml
@@ -4,8 +4,8 @@ latitude: 45.36188
 longitude: 5.96156
 postcode: "38660"
 city: Le Touvet
-street: "Rue de Bresson"
-housenumber: 
-phone: "+33 6 76 00 18 88"
-opening_hours: "Mo 14:00-18:00; Tu-Sa 09:30-18:00"
-website: "https://www.gresy.fr/"
\ No newline at end of file
+street: Rue de Bresson
+housenumber: ""
+phone: +33 6 76 00 18 88
+opening_hours: Mo 14:00-18:00; Tu-Sa 09:30-18:00
+website: https://www.gresy.fr/
diff --git a/data/cities/le-touvet/intermarche.yml b/data/cities/le-touvet/intermarche.yml
index 5c16a13cb..8f60c7d3f 100644
--- a/data/cities/le-touvet/intermarche.yml
+++ b/data/cities/le-touvet/intermarche.yml
@@ -1,11 +1,11 @@
 id: 118982843
-type: way
+type: node
 latitude: 45.35955
 longitude: 5.95688
 postcode: "38660"
 city: Le Touvet
 street: ""
-housenumber: 
-phone: "+33 4 76 08 50 06"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 76 08 50 06
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/le-versoud/inter-caves.yml b/data/cities/le-versoud/inter-caves.yml
index 70565ef05..c514c5ca9 100644
--- a/data/cities/le-versoud/inter-caves.yml
+++ b/data/cities/le-versoud/inter-caves.yml
@@ -1,11 +1,11 @@
 id: 318081092
-type: way
+type: node
 latitude: 45.21177
 longitude: 5.85735
 postcode: "38420"
 city: Le Versoud
-street: "Route de Grenoble"
-housenumber: 143
+street: Route de Grenoble
+housenumber: "143"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30, 15:00-19:00"
-website: "http://leversoud.intercaves.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30, 15:00-19:00
+website: http://leversoud.intercaves.fr/
diff --git a/data/cities/leigneux/le-clos-de-chozieux.yml b/data/cities/leigneux/le-clos-de-chozieux.yml
index 28751504d..55efcc2f8 100644
--- a/data/cities/leigneux/le-clos-de-chozieux.yml
+++ b/data/cities/leigneux/le-clos-de-chozieux.yml
@@ -4,8 +4,8 @@ latitude: 45.74005
 longitude: 4.00669
 postcode: "42130"
 city: Leigneux
-street: "Lieu-dit Chozieux"
-housenumber: 
-phone: "+33 4 77 24 38 54"
+street: Lieu-dit Chozieux
+housenumber: ""
+phone: +33 4 77 24 38 54
 opening_hours: ""
-website: "http://www.vins-cotes-forez.com/"
\ No newline at end of file
+website: http://www.vins-cotes-forez.com/
diff --git a/data/cities/lentigny/au-hibou-diplome.yml b/data/cities/lentigny/au-hibou-diplome.yml
index 373205b5e..d6a270f51 100644
--- a/data/cities/lentigny/au-hibou-diplome.yml
+++ b/data/cities/lentigny/au-hibou-diplome.yml
@@ -4,8 +4,8 @@ latitude: 45.99254
 longitude: 3.98242
 postcode: "42155"
 city: Lentigny
-street: "Rue des Orchidées"
-housenumber: 102
+street: Rue des Orchidées
+housenumber: "102"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentigny/carrosserie-christophe-fernandes.yml b/data/cities/lentigny/carrosserie-christophe-fernandes.yml
index cbc4eae33..05fe378f0 100644
--- a/data/cities/lentigny/carrosserie-christophe-fernandes.yml
+++ b/data/cities/lentigny/carrosserie-christophe-fernandes.yml
@@ -1,11 +1,11 @@
 id: 376044441
-type: way
+type: node
 latitude: 45.98431
 longitude: 3.96564
 postcode: "42155"
 city: Lentigny
-street: "Route de Villemontais"
-housenumber: 
+street: Route de Villemontais
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentigny/france-rurale.yml b/data/cities/lentigny/france-rurale.yml
index 8cc5a6d3b..2b5bac104 100644
--- a/data/cities/lentigny/france-rurale.yml
+++ b/data/cities/lentigny/france-rurale.yml
@@ -4,8 +4,8 @@ latitude: 45.9933
 longitude: 3.98438
 postcode: "42155"
 city: Lentigny
-street: "Rue de la Bruyère"
-housenumber: 595
+street: Rue de la Bruyère
+housenumber: "595"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentigny/institut-guinot.yml b/data/cities/lentigny/institut-guinot.yml
index 597c573ee..3b25a27ed 100644
--- a/data/cities/lentigny/institut-guinot.yml
+++ b/data/cities/lentigny/institut-guinot.yml
@@ -4,8 +4,8 @@ latitude: 45.99335
 longitude: 3.98401
 postcode: "42155"
 city: Lentigny
-street: "Rue de la Bruyère"
-housenumber: 595
+street: Rue de la Bruyère
+housenumber: "595"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentigny/lhexagone.yml b/data/cities/lentigny/lhexagone.yml
index 038a1ab50..41df9a56e 100644
--- a/data/cities/lentigny/lhexagone.yml
+++ b/data/cities/lentigny/lhexagone.yml
@@ -4,8 +4,8 @@ latitude: 45.99154
 longitude: 3.97362
 postcode: "42155"
 city: Lentigny
-street: "Rue des Sapins"
-housenumber: 700
+street: Rue des Sapins
+housenumber: "700"
 phone: "+33477621729"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentigny/studio-2.yml b/data/cities/lentigny/studio-2.yml
index bb736eecb..f22555c0b 100644
--- a/data/cities/lentigny/studio-2.yml
+++ b/data/cities/lentigny/studio-2.yml
@@ -4,8 +4,8 @@ latitude: 45.9933
 longitude: 3.98415
 postcode: "42155"
 city: Lentigny
-street: "Rue de la Bruyère"
-housenumber: 595
+street: Rue de la Bruyère
+housenumber: "595"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentilly/aloe-coiffure.yml b/data/cities/lentilly/aloe-coiffure.yml
index e07057d92..57dc2b0b8 100644
--- a/data/cities/lentilly/aloe-coiffure.yml
+++ b/data/cities/lentilly/aloe-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 45.81946
 longitude: 4.66182
 postcode: "69210"
 city: Lentilly
-street: "Place de l'Église"
-housenumber: 12
+street: Place de l'Église
+housenumber: "12"
 phone: "+33474018774"
-opening_hours: "Tu 08:30-12:00,13:30-18:30; Th 08:30-18:30; Sa 08:30-15:30; Fr 08:30-19:00; We 08:30-12:00"
-website: "http://aloecoiffure.fr"
\ No newline at end of file
+opening_hours: Tu 08:30-12:00,13:30-18:30; Th 08:30-18:30; Sa 08:30-15:30; Fr 08:30-19:00;
+    We 08:30-12:00
+website: http://aloecoiffure.fr
diff --git a/data/cities/lentilly/coeur-village.yml b/data/cities/lentilly/coeur-village.yml
index ecd5568ac..e7b515fae 100644
--- a/data/cities/lentilly/coeur-village.yml
+++ b/data/cities/lentilly/coeur-village.yml
@@ -1,11 +1,11 @@
 id: 130466301
-type: way
+type: node
 latitude: 45.8196
 longitude: 4.66305
 postcode: "69210"
 city: Lentilly
-street: "Rue des Écoles"
-housenumber: 1
+street: Rue des Écoles
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentilly/nadege-coiffure.yml b/data/cities/lentilly/nadege-coiffure.yml
index f54b37f22..e717dbd40 100644
--- a/data/cities/lentilly/nadege-coiffure.yml
+++ b/data/cities/lentilly/nadege-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 45.81992
 longitude: 4.66335
 postcode: "69210"
 city: Lentilly
-street: "Rue des Écoles"
-housenumber: 2
+street: Rue des Écoles
+housenumber: "2"
 phone: "+33474017726"
-opening_hours: "Mo 13:30-18:30; Tu,We 08:30-12:00,13:30-18:30; Th 08:30-12:00; Fr 08:30-18:00; Sa 08:00-15:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 13:30-18:30; Tu,We 08:30-12:00,13:30-18:30; Th 08:30-12:00; Fr 08:30-18:00;
+    Sa 08:00-15:00
+website: ""
diff --git a/data/cities/lentilly/que-du-bonheur.yml b/data/cities/lentilly/que-du-bonheur.yml
index 523df94f3..de71ba184 100644
--- a/data/cities/lentilly/que-du-bonheur.yml
+++ b/data/cities/lentilly/que-du-bonheur.yml
@@ -4,8 +4,8 @@ latitude: 45.81931
 longitude: 4.66287
 postcode: "69210"
 city: Lentilly
-street: "Rue de la Mairie"
-housenumber: 1
+street: Rue de la Mairie
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lentilly/vival.yml b/data/cities/lentilly/vival.yml
index 89a79a72b..2e63766c5 100644
--- a/data/cities/lentilly/vival.yml
+++ b/data/cities/lentilly/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.81944
 longitude: 4.66281
 postcode: "69210"
 city: Lentilly
-street: "Place de l'Église"
-housenumber: 1
+street: Place de l'Église
+housenumber: "1"
 phone: "+33474013421"
-opening_hours: "Mo-Sa 07:30-19:30; Su 08:00-12:00"
-website: "https://magasins.vival.fr/fr/vival-lentilly"
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-19:30; Su 08:00-12:00
+website: https://magasins.vival.fr/fr/vival-lentilly
diff --git a/data/cities/les-abrets-en-dauphine/imaginhair.yml b/data/cities/les-abrets-en-dauphine/imaginhair.yml
index 73082e54c..7aec7cfbf 100644
--- a/data/cities/les-abrets-en-dauphine/imaginhair.yml
+++ b/data/cities/les-abrets-en-dauphine/imaginhair.yml
@@ -4,8 +4,8 @@ latitude: 45.53204
 longitude: 5.58803
 postcode: "38490"
 city: Les Abrets-en-Dauphiné
-street: "Impasse Richard Burrial"
-housenumber: 22
-phone: "+33 4 76 05 10 98"
-opening_hours: "09:00-18:30"
-website: ""
\ No newline at end of file
+street: Impasse Richard Burrial
+housenumber: "22"
+phone: +33 4 76 05 10 98
+opening_hours: 09:00-18:30
+website: ""
diff --git a/data/cities/les-abrets-en-dauphine/mado-et-ludwick.yml b/data/cities/les-abrets-en-dauphine/mado-et-ludwick.yml
index c5b6987b3..26586c385 100644
--- a/data/cities/les-abrets-en-dauphine/mado-et-ludwick.yml
+++ b/data/cities/les-abrets-en-dauphine/mado-et-ludwick.yml
@@ -4,8 +4,8 @@ latitude: 45.53604
 longitude: 5.58588
 postcode: "38490"
 city: Les Abrets-en-Dauphiné
-street: "Rue Gambetta"
-housenumber: 142
-phone: "+33 4 76 32 16 65"
-opening_hours: "09:30-19:00"
-website: ""
\ No newline at end of file
+street: Rue Gambetta
+housenumber: "142"
+phone: +33 4 76 32 16 65
+opening_hours: 09:30-19:00
+website: ""
diff --git a/data/cities/les-allues/sports-1600.yml b/data/cities/les-allues/sports-1600.yml
index 4142f8dec..3684fd08c 100644
--- a/data/cities/les-allues/sports-1600.yml
+++ b/data/cities/les-allues/sports-1600.yml
@@ -4,8 +4,8 @@ latitude: 45.40064
 longitude: 6.57018
 postcode: "73550"
 city: Les Allues
-street: "Route de l'Altiport"
-housenumber: 717
-phone: "04 79 08 51 45"
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Route de l'Altiport
+housenumber: "717"
+phone: 04 79 08 51 45
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/les-arcs-1950/freeride.yml b/data/cities/les-arcs-1950/freeride.yml
index 3bbfc1c2a..00feae2c5 100644
--- a/data/cities/les-arcs-1950/freeride.yml
+++ b/data/cities/les-arcs-1950/freeride.yml
@@ -5,7 +5,7 @@ longitude: 6.82679
 postcode: "73700"
 city: Les Arcs 1950
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-arcs-1950/intersport.yml b/data/cities/les-arcs-1950/intersport.yml
index 228ac1d2d..a268a1da6 100644
--- a/data/cities/les-arcs-1950/intersport.yml
+++ b/data/cities/les-arcs-1950/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.82787
 postcode: "73700"
 city: Les Arcs 1950
 street: ""
-housenumber: 
+housenumber: ""
 phone: "+33479085671"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-arcs-1950/le-manoir-ski-service.yml b/data/cities/les-arcs-1950/le-manoir-ski-service.yml
index 8ad4261ab..affa8e970 100644
--- a/data/cities/les-arcs-1950/le-manoir-ski-service.yml
+++ b/data/cities/les-arcs-1950/le-manoir-ski-service.yml
@@ -4,8 +4,8 @@ latitude: 45.57332
 longitude: 6.82781
 postcode: "73700"
 city: Les Arcs 1950
-street: "Rue de la Piste des Étoiles"
-housenumber: 206
+street: Rue de la Piste des Étoiles
+housenumber: "206"
 phone: ""
-opening_hours: "Fr-Mo 08:30-19:30; Tu-Th 08:30-13:00, 14:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Fr-Mo 08:30-19:30; Tu-Th 08:30-13:00, 14:00-19:30
+website: ""
diff --git a/data/cities/les-arcs-1950/precision-ski.yml b/data/cities/les-arcs-1950/precision-ski.yml
index f54efa364..926cf74e9 100644
--- a/data/cities/les-arcs-1950/precision-ski.yml
+++ b/data/cities/les-arcs-1950/precision-ski.yml
@@ -5,7 +5,7 @@ longitude: 6.82704
 postcode: "73700"
 city: Les Arcs 1950
 street: ""
-housenumber: 
-phone: "+33 4 79 41 96 31"
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 79 41 96 31
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/les-arcs-1950/spirit-sports.yml b/data/cities/les-arcs-1950/spirit-sports.yml
index 152b0abef..aaa8e80d2 100644
--- a/data/cities/les-arcs-1950/spirit-sports.yml
+++ b/data/cities/les-arcs-1950/spirit-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.57273
 longitude: 6.82777
 postcode: "73700"
 city: Les Arcs 1950
-street: "Rue de la Piste des Étoiles"
-housenumber: 142
-phone: "+33 4 79 22 27 13"
+street: Rue de la Piste des Étoiles
+housenumber: "142"
+phone: +33 4 79 22 27 13
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-belleville/go-sport.yml b/data/cities/les-belleville/go-sport.yml
index 3364b2137..383a09bd4 100644
--- a/data/cities/les-belleville/go-sport.yml
+++ b/data/cities/les-belleville/go-sport.yml
@@ -5,7 +5,7 @@ longitude: 6.54738
 postcode: "73440"
 city: Les belleville
 street: ""
-housenumber: 486
+housenumber: "486"
 phone: ""
-opening_hours: "Mo-Fr 08:30-13:00, 15:30-19:00; Sa-Su 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-13:00, 15:30-19:00; Sa-Su 08:30-20:00
+website: ""
diff --git a/data/cities/les-belleville/goitschel-sports-skiset.yml b/data/cities/les-belleville/goitschel-sports-skiset.yml
index 56ae913e6..1b6ddd766 100644
--- a/data/cities/les-belleville/goitschel-sports-skiset.yml
+++ b/data/cities/les-belleville/goitschel-sports-skiset.yml
@@ -4,8 +4,8 @@ latitude: 45.29831
 longitude: 6.58245
 postcode: "73440"
 city: Les Belleville
-street: "Place de Caron - Val Thorens"
-housenumber: 
-phone: "+33 4 79 00 04 21"
+street: Place de Caron - Val Thorens
+housenumber: ""
+phone: +33 4 79 00 04 21
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-belleville/intersport-front-de-neige.yml b/data/cities/les-belleville/intersport-front-de-neige.yml
index 73466a1ba..af0382494 100644
--- a/data/cities/les-belleville/intersport-front-de-neige.yml
+++ b/data/cities/les-belleville/intersport-front-de-neige.yml
@@ -4,8 +4,8 @@ latitude: 45.37658
 longitude: 6.50411
 postcode: "73440"
 city: Les belleville
-street: "Rue du cochet"
-housenumber: 
+street: Rue du cochet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-carroz-d-araches/go-sport.yml b/data/cities/les-carroz-d-araches/go-sport.yml
index 5b5aa85b4..ff90ed894 100644
--- a/data/cities/les-carroz-d-araches/go-sport.yml
+++ b/data/cities/les-carroz-d-araches/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.02552
 longitude: 6.63934
 postcode: "74300"
 city: Les Carroz d araches
-street: "Route des Moulins"
-housenumber: 61
+street: Route des Moulins
+housenumber: "61"
 phone: ""
-opening_hours: "Mo-Su 08:30-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-12:30, 15:00-19:00
+website: ""
diff --git a/data/cities/les-cheres/piqure-de-rappel.yml b/data/cities/les-cheres/piqure-de-rappel.yml
index f9f21834b..cd98913c8 100644
--- a/data/cities/les-cheres/piqure-de-rappel.yml
+++ b/data/cities/les-cheres/piqure-de-rappel.yml
@@ -4,8 +4,8 @@ latitude: 45.88982
 longitude: 4.7427
 postcode: "69380"
 city: Les Chères
-street: "Place de l'Église"
-housenumber: 12
+street: Place de l'Église
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Fr 14:00-19:00; Sa 14:00-18:00"
-website: "https://www.piqurederappel.net/"
\ No newline at end of file
+opening_hours: Mo-Fr 14:00-19:00; Sa 14:00-18:00
+website: https://www.piqurederappel.net/
diff --git a/data/cities/les-cheres/sublimhair.yml b/data/cities/les-cheres/sublimhair.yml
index 990743d2a..aa1ee0841 100644
--- a/data/cities/les-cheres/sublimhair.yml
+++ b/data/cities/les-cheres/sublimhair.yml
@@ -4,8 +4,8 @@ latitude: 45.88944
 longitude: 4.74305
 postcode: "69380"
 city: Les Chères
-street: "Route Nationale 6"
-housenumber: 47
+street: Route Nationale 6
+housenumber: "47"
 phone: "+33474268476"
-opening_hours: "Mo 09:00-14:00; Tu-Sa 09:00-18:00; We off"
-website: "https://www.planity.com/sublim-hair-69380-les-cheres"
\ No newline at end of file
+opening_hours: Mo 09:00-14:00; Tu-Sa 09:00-18:00; We off
+website: https://www.planity.com/sublim-hair-69380-les-cheres
diff --git a/data/cities/les-coches/ski-republic.yml b/data/cities/les-coches/ski-republic.yml
index 8aa32afc0..14bfadfa5 100644
--- a/data/cities/les-coches/ski-republic.yml
+++ b/data/cities/les-coches/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 45.55489
 longitude: 6.72725
 postcode: "73210"
 city: Les Coches
-street: "Place des commerces"
-housenumber: 
+street: Place des commerces
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-contamines-montjoie/les-sabotdance-fromagerie.yml b/data/cities/les-contamines-montjoie/les-sabotdance-fromagerie.yml
index 8d525ac51..ad7297407 100644
--- a/data/cities/les-contamines-montjoie/les-sabotdance-fromagerie.yml
+++ b/data/cities/les-contamines-montjoie/les-sabotdance-fromagerie.yml
@@ -4,8 +4,8 @@ latitude: 45.79935
 longitude: 6.71924
 postcode: ""
 city: Les Contamines-Montjoie
-street: "Route de Notre-Dame-de-la-Gorge"
-housenumber: 
+street: Route de Notre-Dame-de-la-Gorge
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-contamines-montjoie/sherpa.yml b/data/cities/les-contamines-montjoie/sherpa.yml
index b802f41ce..a9769182d 100644
--- a/data/cities/les-contamines-montjoie/sherpa.yml
+++ b/data/cities/les-contamines-montjoie/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 45.81121
 longitude: 6.7242
 postcode: "74170"
 city: Les Contamines-Montjoie
-street: "Allée des Côtes du Lay"
-housenumber: 33
+street: Allée des Côtes du Lay
+housenumber: "33"
 phone: ""
-opening_hours: "Mo-Su 07:30-13:00, 15:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-13:00, 15:00-20:00
+website: ""
diff --git a/data/cities/les-contamines-montjoie/vanille-givree.yml b/data/cities/les-contamines-montjoie/vanille-givree.yml
index 5160c1faa..1179257b7 100644
--- a/data/cities/les-contamines-montjoie/vanille-givree.yml
+++ b/data/cities/les-contamines-montjoie/vanille-givree.yml
@@ -4,8 +4,8 @@ latitude: 45.823
 longitude: 6.72703
 postcode: "74170"
 city: Les Contamines-Montjoie
-street: "route des Saint Gervais"
-housenumber: 40
-phone: "+33 450 967 669"
-opening_hours: "Mo-Fr 07:00-19:00"
-website: ""
\ No newline at end of file
+street: route des Saint Gervais
+housenumber: "40"
+phone: +33 450 967 669
+opening_hours: Mo-Fr 07:00-19:00
+website: ""
diff --git a/data/cities/les-deserts/tresors-des-alpes.yml b/data/cities/les-deserts/tresors-des-alpes.yml
index 8965b5402..74cc9145c 100644
--- a/data/cities/les-deserts/tresors-des-alpes.yml
+++ b/data/cities/les-deserts/tresors-des-alpes.yml
@@ -4,8 +4,8 @@ latitude: 45.64462
 longitude: 5.9844
 postcode: "73230"
 city: Les Déserts
-street: "Rue Centrale de La Féclaz"
-housenumber: 274
-phone: "04 79 33 76 60"
+street: Rue Centrale de La Féclaz
+housenumber: "274"
+phone: 04 79 33 76 60
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/aalborg-sports.yml b/data/cities/les-deux-alpes/aalborg-sports.yml
index d1f676bae..c982d228f 100644
--- a/data/cities/les-deux-alpes/aalborg-sports.yml
+++ b/data/cities/les-deux-alpes/aalborg-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.12493
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 5
-phone: "+33 9 66 13 70 88"
+housenumber: "5"
+phone: +33 9 66 13 70 88
 opening_hours: ""
-website: "http://www.aalborg-sports.com/"
\ No newline at end of file
+website: http://www.aalborg-sports.com/
diff --git a/data/cities/les-deux-alpes/aquarelle.yml b/data/cities/les-deux-alpes/aquarelle.yml
index 55bc9b8af..7e40d1d84 100644
--- a/data/cities/les-deux-alpes/aquarelle.yml
+++ b/data/cities/les-deux-alpes/aquarelle.yml
@@ -5,7 +5,7 @@ longitude: 6.12527
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 2
-phone: "+33 4 76 79 87 57"
+housenumber: "2"
+phone: +33 4 76 79 87 57
 opening_hours: ""
-website: "http://www.institut-aquarelle.fr/"
\ No newline at end of file
+website: http://www.institut-aquarelle.fr/
diff --git a/data/cities/les-deux-alpes/atelier-du-snowboard.yml b/data/cities/les-deux-alpes/atelier-du-snowboard.yml
index 255b1abd5..7a9c26f4c 100644
--- a/data/cities/les-deux-alpes/atelier-du-snowboard.yml
+++ b/data/cities/les-deux-alpes/atelier-du-snowboard.yml
@@ -4,8 +4,8 @@ latitude: 45.01109
 longitude: 6.1251
 postcode: "38860"
 city: Les Deux Alpes
-street: "Rue des Sagnes"
-housenumber: 11
+street: Rue des Sagnes
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/billabong-superwhite.yml b/data/cities/les-deux-alpes/billabong-superwhite.yml
index bf1372877..0fbea8557 100644
--- a/data/cities/les-deux-alpes/billabong-superwhite.yml
+++ b/data/cities/les-deux-alpes/billabong-superwhite.yml
@@ -5,7 +5,7 @@ longitude: 6.12327
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 88
+housenumber: "88"
 phone: ""
 opening_hours: ""
-website: "http://location-ski-les2alpes.com/accueil"
\ No newline at end of file
+website: http://location-ski-les2alpes.com/accueil
diff --git a/data/cities/les-deux-alpes/camp-dbase.yml b/data/cities/les-deux-alpes/camp-dbase.yml
index ddbeab009..509e3a690 100644
--- a/data/cities/les-deux-alpes/camp-dbase.yml
+++ b/data/cities/les-deux-alpes/camp-dbase.yml
@@ -4,8 +4,8 @@ latitude: 45.00538
 longitude: 6.12437
 postcode: "38860"
 city: Les Deux Alpes
-street: "Rue des Vikings"
-housenumber: 7
-phone: "+33 4 76 80 51 11"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://www.location-skis-les2alpes.com/"
\ No newline at end of file
+street: Rue des Vikings
+housenumber: "7"
+phone: +33 4 76 80 51 11
+opening_hours: Mo-Su 08:30-19:30
+website: https://www.location-skis-les2alpes.com/
diff --git a/data/cities/les-deux-alpes/coing-sports.yml b/data/cities/les-deux-alpes/coing-sports.yml
index 43eba6af4..4a0bb7e03 100644
--- a/data/cities/les-deux-alpes/coing-sports.yml
+++ b/data/cities/les-deux-alpes/coing-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.12396
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 41
-phone: "+33 4 76 79 06 54"
+housenumber: "41"
+phone: +33 4 76 79 06 54
 opening_hours: ""
-website: "https://coing-sports.business.site/"
\ No newline at end of file
+website: https://coing-sports.business.site/
diff --git a/data/cities/les-deux-alpes/go-sport-montagne-dode-sports.yml b/data/cities/les-deux-alpes/go-sport-montagne-dode-sports.yml
index c84077f4a..67e2857d2 100644
--- a/data/cities/les-deux-alpes/go-sport-montagne-dode-sports.yml
+++ b/data/cities/les-deux-alpes/go-sport-montagne-dode-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.01
 longitude: 6.12448
 postcode: "38860"
 city: Les Deux Alpes
-street: "Place des Deux Alpes"
-housenumber: 
-phone: "+33 4 76 80 54 73"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://www.dodesports.com/"
\ No newline at end of file
+street: Place des Deux Alpes
+housenumber: ""
+phone: +33 4 76 80 54 73
+opening_hours: Mo-Su 08:30-19:30
+website: https://www.dodesports.com/
diff --git a/data/cities/les-deux-alpes/go-sport-montagne-schuss-sports.yml b/data/cities/les-deux-alpes/go-sport-montagne-schuss-sports.yml
index c224ed846..b0ad061e2 100644
--- a/data/cities/les-deux-alpes/go-sport-montagne-schuss-sports.yml
+++ b/data/cities/les-deux-alpes/go-sport-montagne-schuss-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.12148
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 4
-phone: "+33 4 76 80 50 98"
-opening_hours: "Mo-Su 08:30-20:00"
-website: "https://gosportmontagne.com/location-de-ski/les-deux-alpes/schuss-sports/"
\ No newline at end of file
+housenumber: "4"
+phone: +33 4 76 80 50 98
+opening_hours: Mo-Su 08:30-20:00
+website: https://gosportmontagne.com/location-de-ski/les-deux-alpes/schuss-sports/
diff --git a/data/cities/les-deux-alpes/hors-limites.yml b/data/cities/les-deux-alpes/hors-limites.yml
index 02a5d2c17..49c4628f5 100644
--- a/data/cities/les-deux-alpes/hors-limites.yml
+++ b/data/cities/les-deux-alpes/hors-limites.yml
@@ -5,7 +5,7 @@ longitude: 6.12129
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 1
-phone: "+33 4 76 80 99 76"
+housenumber: "1"
+phone: +33 4 76 80 99 76
 opening_hours: ""
-website: "http://www.horslimites-2alpes.com/"
\ No newline at end of file
+website: http://www.horslimites-2alpes.com/
diff --git a/data/cities/les-deux-alpes/intersport-2.yml b/data/cities/les-deux-alpes/intersport-2.yml
index 59803dc5b..add9b3be6 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
+website: ""
diff --git a/data/cities/les-deux-alpes/intersport-cabourg.yml b/data/cities/les-deux-alpes/intersport-cabourg.yml
index 1586841cc..dbe706a84 100644
--- a/data/cities/les-deux-alpes/intersport-cabourg.yml
+++ b/data/cities/les-deux-alpes/intersport-cabourg.yml
@@ -4,8 +4,8 @@ latitude: 45.00682
 longitude: 6.12322
 postcode: "38860"
 city: Les Deux Alpes
-street: "Rue des Vikings"
-housenumber: 19
-phone: "+33 4 76 80 51 86"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://www.intersport-rent.fr/rent/page/pack.aspx?magasin=1058"
\ No newline at end of file
+street: Rue des Vikings
+housenumber: "19"
+phone: +33 4 76 80 51 86
+opening_hours: Mo-Su 08:30-19:30
+website: https://www.intersport-rent.fr/rent/page/pack.aspx?magasin=1058
diff --git a/data/cities/les-deux-alpes/intersport-rue-du-rouchas.yml b/data/cities/les-deux-alpes/intersport-rue-du-rouchas.yml
index aabc058ab..18867c220 100644
--- a/data/cities/les-deux-alpes/intersport-rue-du-rouchas.yml
+++ b/data/cities/les-deux-alpes/intersport-rue-du-rouchas.yml
@@ -4,8 +4,8 @@ latitude: 45.00612
 longitude: 6.11827
 postcode: "38860"
 city: Les Deux Alpes
-street: "Rue du Rouchas"
-housenumber: 
+street: Rue du Rouchas
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/intersport.yml b/data/cities/les-deux-alpes/intersport.yml
index d6a6e1ea7..922bd8fd6 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
+website: ""
diff --git a/data/cities/les-deux-alpes/jm-sports.yml b/data/cities/les-deux-alpes/jm-sports.yml
index 2af1efc74..13495197d 100644
--- a/data/cities/les-deux-alpes/jm-sports.yml
+++ b/data/cities/les-deux-alpes/jm-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.0186
 longitude: 6.12988
 postcode: "38860"
 city: Les Deux Alpes
-street: "Grande Place"
-housenumber: 
-phone: "+33 4 76 11 01 02"
+street: Grande Place
+housenumber: ""
+phone: +33 4 76 11 01 02
 opening_hours: ""
-website: "https://www.jm-sports.com/"
\ No newline at end of file
+website: https://www.jm-sports.com/
diff --git a/data/cities/les-deux-alpes/laverie-du-village-1800.yml b/data/cities/les-deux-alpes/laverie-du-village-1800.yml
index 926c955cc..4070db45a 100644
--- a/data/cities/les-deux-alpes/laverie-du-village-1800.yml
+++ b/data/cities/les-deux-alpes/laverie-du-village-1800.yml
@@ -5,7 +5,7 @@ longitude: 6.12933
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 17
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/le-jandri.yml b/data/cities/les-deux-alpes/le-jandri.yml
index cbbda60d3..cb035981b 100644
--- a/data/cities/les-deux-alpes/le-jandri.yml
+++ b/data/cities/les-deux-alpes/le-jandri.yml
@@ -5,7 +5,7 @@ longitude: 6.12496
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 24
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/le-montagnard-gourmand.yml b/data/cities/les-deux-alpes/le-montagnard-gourmand.yml
index b031f1578..821f82aa4 100644
--- a/data/cities/les-deux-alpes/le-montagnard-gourmand.yml
+++ b/data/cities/les-deux-alpes/le-montagnard-gourmand.yml
@@ -6,6 +6,6 @@ postcode: "38860"
 city: Les Deux Alpes
 street: ""
 housenumber: 7/9
-phone: "+33 4 76 79 23 74"
+phone: +33 4 76 79 23 74
 opening_hours: ""
-website: "https://www.facebook.com/saslemontagnardgourmand"
\ No newline at end of file
+website: https://www.facebook.com/saslemontagnardgourmand
diff --git a/data/cities/les-deux-alpes/le-perce-neige.yml b/data/cities/les-deux-alpes/le-perce-neige.yml
index b7d30d141..f7627160d 100644
--- a/data/cities/les-deux-alpes/le-perce-neige.yml
+++ b/data/cities/les-deux-alpes/le-perce-neige.yml
@@ -5,7 +5,7 @@ longitude: 6.12206
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 115
+housenumber: "115"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/le-salon-de-severine.yml b/data/cities/les-deux-alpes/le-salon-de-severine.yml
index 786fbcce5..7dc49b185 100644
--- a/data/cities/les-deux-alpes/le-salon-de-severine.yml
+++ b/data/cities/les-deux-alpes/le-salon-de-severine.yml
@@ -5,7 +5,7 @@ longitude: 6.12434
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 27
-phone: "+33 4 76 79 25 63"
+housenumber: "27"
+phone: +33 4 76 79 25 63
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/le-vieux-chalet.yml b/data/cities/les-deux-alpes/le-vieux-chalet.yml
index 5e5cd7561..dc5e7d4dc 100644
--- a/data/cities/les-deux-alpes/le-vieux-chalet.yml
+++ b/data/cities/les-deux-alpes/le-vieux-chalet.yml
@@ -6,6 +6,6 @@ postcode: "38860"
 city: Les Deux Alpes
 street: ""
 housenumber: 85 bis
-phone: "+33 4 76 79 02 56"
+phone: +33 4 76 79 02 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/magic-sport.yml b/data/cities/les-deux-alpes/magic-sport.yml
index 36ce8f42e..9b1ff0466 100644
--- a/data/cities/les-deux-alpes/magic-sport.yml
+++ b/data/cities/les-deux-alpes/magic-sport.yml
@@ -5,7 +5,7 @@ longitude: 6.12314
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 73
-phone: "+33 4 76 79 22 53"
+housenumber: "73"
+phone: +33 4 76 79 22 53
 opening_hours: ""
-website: "http://www.magicsport.fr/"
\ No newline at end of file
+website: http://www.magicsport.fr/
diff --git a/data/cities/les-deux-alpes/maison-de-la-presse.yml b/data/cities/les-deux-alpes/maison-de-la-presse.yml
index 68267b51a..bd51310e0 100644
--- a/data/cities/les-deux-alpes/maison-de-la-presse.yml
+++ b/data/cities/les-deux-alpes/maison-de-la-presse.yml
@@ -5,7 +5,7 @@ longitude: 6.12261
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 96
+housenumber: "96"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-deux-alpes/milou-sport.yml b/data/cities/les-deux-alpes/milou-sport.yml
index ef022397f..9f3e05b66 100644
--- a/data/cities/les-deux-alpes/milou-sport.yml
+++ b/data/cities/les-deux-alpes/milou-sport.yml
@@ -5,7 +5,7 @@ longitude: 6.12232
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 126
-phone: "+33 4 76 80 50 42"
+housenumber: "126"
+phone: +33 4 76 80 50 42
 opening_hours: ""
-website: "https://www.location-ski-deux-alpes.fr/"
\ No newline at end of file
+website: https://www.location-ski-deux-alpes.fr/
diff --git a/data/cities/les-deux-alpes/noel-sports.yml b/data/cities/les-deux-alpes/noel-sports.yml
index 2a25d18a9..4b3e90724 100644
--- a/data/cities/les-deux-alpes/noel-sports.yml
+++ b/data/cities/les-deux-alpes/noel-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.12283
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 92
-phone: "+33 4 76 79 21 84"
+housenumber: "92"
+phone: +33 4 76 79 21 84
 opening_hours: ""
-website: "http://www.noelsports-les2alpes.com/"
\ No newline at end of file
+website: http://www.noelsports-les2alpes.com/
diff --git a/data/cities/les-deux-alpes/sherpa.yml b/data/cities/les-deux-alpes/sherpa.yml
index d8d69505e..aa17827d2 100644
--- a/data/cities/les-deux-alpes/sherpa.yml
+++ b/data/cities/les-deux-alpes/sherpa.yml
@@ -5,7 +5,7 @@ longitude: 6.12141
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 10
-phone: "+33 4 76 79 22 13"
+housenumber: "10"
+phone: +33 4 76 79 22 13
 opening_hours: ""
-website: "https://www.sherpa.net/trouver-un-magasin/votre-magasin-sherpa/38-isere/deux-alpes-les-venosc/118"
\ No newline at end of file
+website: https://www.sherpa.net/trouver-un-magasin/votre-magasin-sherpa/38-isere/deux-alpes-les-venosc/118
diff --git a/data/cities/les-deux-alpes/ski-extreme.yml b/data/cities/les-deux-alpes/ski-extreme.yml
index 5600e6ffc..4c7eea3db 100644
--- a/data/cities/les-deux-alpes/ski-extreme.yml
+++ b/data/cities/les-deux-alpes/ski-extreme.yml
@@ -5,7 +5,7 @@ longitude: 6.12226
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 102
-phone: "+33 4 76 79 09 48"
-opening_hours: "Mo-Fr 09:00-12:30,14:30-19:30; Sa,Su 08:30-19:30"
-website: "https://www.location-ski-les2alpes.fr/"
\ No newline at end of file
+housenumber: "102"
+phone: +33 4 76 79 09 48
+opening_hours: Mo-Fr 09:00-12:30,14:30-19:30; Sa,Su 08:30-19:30
+website: https://www.location-ski-les2alpes.fr/
diff --git a/data/cities/les-deux-alpes/skimium-carrel-sports.yml b/data/cities/les-deux-alpes/skimium-carrel-sports.yml
index c15ec2d6d..8a0972810 100644
--- a/data/cities/les-deux-alpes/skimium-carrel-sports.yml
+++ b/data/cities/les-deux-alpes/skimium-carrel-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.12148
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 103
-phone: "+33 4 76 11 38 46"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://www.skimium.fr/store/carrel-sports-523"
\ No newline at end of file
+housenumber: "103"
+phone: +33 4 76 11 38 46
+opening_hours: Mo-Su 08:30-19:30
+website: https://www.skimium.fr/store/carrel-sports-523
diff --git a/data/cities/les-deux-alpes/skimium-sl-sports.yml b/data/cities/les-deux-alpes/skimium-sl-sports.yml
index c1fe947ae..960256eab 100644
--- a/data/cities/les-deux-alpes/skimium-sl-sports.yml
+++ b/data/cities/les-deux-alpes/skimium-sl-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.1302
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 
-phone: "+33 4 76 79 94 26"
+housenumber: ""
+phone: +33 4 76 79 94 26
 opening_hours: ""
-website: "https://www.skimium.fr/store/sl-sports-103"
\ No newline at end of file
+website: https://www.skimium.fr/store/sl-sports-103
diff --git a/data/cities/les-deux-alpes/skimium-sport-emotion-diable.yml b/data/cities/les-deux-alpes/skimium-sport-emotion-diable.yml
index b2106631d..09c1ffeba 100644
--- a/data/cities/les-deux-alpes/skimium-sport-emotion-diable.yml
+++ b/data/cities/les-deux-alpes/skimium-sport-emotion-diable.yml
@@ -5,7 +5,7 @@ longitude: 6.1227
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 2
-phone: "+33 4 58 00 32 80"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://www.skimium.fr/store/sport-emotion-diable-524"
\ No newline at end of file
+housenumber: "2"
+phone: +33 4 58 00 32 80
+opening_hours: Mo-Su 08:30-19:30
+website: https://www.skimium.fr/store/sport-emotion-diable-524
diff --git a/data/cities/les-deux-alpes/skimium-sport-emotion-venosc.yml b/data/cities/les-deux-alpes/skimium-sport-emotion-venosc.yml
index 6373f37b6..e094b273c 100644
--- a/data/cities/les-deux-alpes/skimium-sport-emotion-venosc.yml
+++ b/data/cities/les-deux-alpes/skimium-sport-emotion-venosc.yml
@@ -5,7 +5,7 @@ longitude: 6.1218
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 112
-phone: "+33 4 76 80 52 40"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://www.skimium.fr/store/sport-emotion-venosc-525"
\ No newline at end of file
+housenumber: "112"
+phone: +33 4 76 80 52 40
+opening_hours: Mo-Su 08:30-19:30
+website: https://www.skimium.fr/store/sport-emotion-venosc-525
diff --git a/data/cities/les-deux-alpes/skiset-hibernatus.yml b/data/cities/les-deux-alpes/skiset-hibernatus.yml
index d3f22a836..fa6a8a630 100644
--- a/data/cities/les-deux-alpes/skiset-hibernatus.yml
+++ b/data/cities/les-deux-alpes/skiset-hibernatus.yml
@@ -5,7 +5,7 @@ longitude: 6.12208
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 116
-phone: "+33 4 76 80 52 89"
+housenumber: "116"
+phone: +33 4 76 80 52 89
 opening_hours: ""
-website: "http://hibernatus-les2alpes.com/"
\ No newline at end of file
+website: http://hibernatus-les2alpes.com/
diff --git a/data/cities/les-deux-alpes/skiset-sports-village-1800.yml b/data/cities/les-deux-alpes/skiset-sports-village-1800.yml
index b358388a7..4f9399cbe 100644
--- a/data/cities/les-deux-alpes/skiset-sports-village-1800.yml
+++ b/data/cities/les-deux-alpes/skiset-sports-village-1800.yml
@@ -4,8 +4,8 @@ latitude: 45.01899
 longitude: 6.12942
 postcode: "38860"
 city: Les Deux Alpes
-street: "Place des Écrins"
-housenumber: 
-phone: "+33 4 76 79 50 88"
-opening_hours: "Mo-Fr 09:00-19:00; Sa,Su 08:30-19:30"
-website: "https://www.skiset.com/station-ski/les-deux-alpes/magasins/sports-village-1"
\ No newline at end of file
+street: Place des Écrins
+housenumber: ""
+phone: +33 4 76 79 50 88
+opening_hours: Mo-Fr 09:00-19:00; Sa,Su 08:30-19:30
+website: https://www.skiset.com/station-ski/les-deux-alpes/magasins/sports-village-1
diff --git a/data/cities/les-deux-alpes/sport-2000-fl-sport.yml b/data/cities/les-deux-alpes/sport-2000-fl-sport.yml
index 1d98b78d1..85b687efb 100644
--- a/data/cities/les-deux-alpes/sport-2000-fl-sport.yml
+++ b/data/cities/les-deux-alpes/sport-2000-fl-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.01767
 longitude: 6.12998
 postcode: "38860"
 city: Les Deux Alpes
-street: "Place des Arcades"
-housenumber: 
-phone: "+33 4 76 79 09 63"
+street: Place des Arcades
+housenumber: ""
+phone: +33 4 76 79 09 63
 opening_hours: ""
-website: "https://flsport.sport2000.fr/fr/"
\ No newline at end of file
+website: https://flsport.sport2000.fr/fr/
diff --git a/data/cities/les-deux-alpes/sport-2000-jacques-sports.yml b/data/cities/les-deux-alpes/sport-2000-jacques-sports.yml
index eaa49243e..a4b37a807 100644
--- a/data/cities/les-deux-alpes/sport-2000-jacques-sports.yml
+++ b/data/cities/les-deux-alpes/sport-2000-jacques-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.00564
 longitude: 6.12446
 postcode: "38860"
 city: Les Deux Alpes
-street: "Rue des Vikings"
-housenumber: 11
-phone: "+33 4 76 80 53 56"
+street: Rue des Vikings
+housenumber: "11"
+phone: +33 4 76 80 53 56
 opening_hours: ""
-website: "https://www.jacques-sports.com/magasin-sport-2-alpes-2.html"
\ No newline at end of file
+website: https://www.jacques-sports.com/magasin-sport-2-alpes-2.html
diff --git a/data/cities/les-deux-alpes/sport-2000-la-skirie.yml b/data/cities/les-deux-alpes/sport-2000-la-skirie.yml
index b52ac28ab..5f6630bb9 100644
--- a/data/cities/les-deux-alpes/sport-2000-la-skirie.yml
+++ b/data/cities/les-deux-alpes/sport-2000-la-skirie.yml
@@ -5,7 +5,7 @@ longitude: 6.12494
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 70
-phone: "+33 4 76 79 22 25"
-opening_hours: "Mo-Su 08:00-19:30"
-website: "https://www.laskirie.com/"
\ No newline at end of file
+housenumber: "70"
+phone: +33 4 76 79 22 25
+opening_hours: Mo-Su 08:00-19:30
+website: https://www.laskirie.com/
diff --git a/data/cities/les-deux-alpes/u-express-les-deux-alpes.yml b/data/cities/les-deux-alpes/u-express-les-deux-alpes.yml
index 690205d6d..1cab12938 100644
--- a/data/cities/les-deux-alpes/u-express-les-deux-alpes.yml
+++ b/data/cities/les-deux-alpes/u-express-les-deux-alpes.yml
@@ -5,7 +5,7 @@ longitude: 6.12439
 postcode: "38860"
 city: Les Deux Alpes
 street: ""
-housenumber: 57
-phone: "+33 4 76 79 58 63"
-opening_hours: "Mo-Su 07:00-21:00"
-website: ""
\ No newline at end of file
+housenumber: "57"
+phone: +33 4 76 79 58 63
+opening_hours: Mo-Su 07:00-21:00
+website: ""
diff --git a/data/cities/les-deux-alpes/venosc-sports.yml b/data/cities/les-deux-alpes/venosc-sports.yml
index c4451b07b..1d4709530 100644
--- a/data/cities/les-deux-alpes/venosc-sports.yml
+++ b/data/cities/les-deux-alpes/venosc-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.00439
 longitude: 6.12113
 postcode: "38860"
 city: Les Deux Alpes
-street: "Place de l'Alpe de Venosc"
-housenumber: 5
-phone: "+33 4 76 79 52 38"
+street: Place de l'Alpe de Venosc
+housenumber: "5"
+phone: +33 4 76 79 52 38
 opening_hours: ""
-website: "https://www.venosc-sports.com/"
\ No newline at end of file
+website: https://www.venosc-sports.com/
diff --git a/data/cities/les-deux-alpes/volcom.yml b/data/cities/les-deux-alpes/volcom.yml
index 2298d8530..17bf95e3a 100644
--- a/data/cities/les-deux-alpes/volcom.yml
+++ b/data/cities/les-deux-alpes/volcom.yml
@@ -8,4 +8,4 @@ street: ""
 housenumber: 88 bis
 phone: ""
 opening_hours: ""
-website: "https://www.volcom.fr/"
\ No newline at end of file
+website: https://www.volcom.fr/
diff --git a/data/cities/les-echelles/bauden-racing-cars.yml b/data/cities/les-echelles/bauden-racing-cars.yml
index e81aa7002..9a194cc62 100644
--- a/data/cities/les-echelles/bauden-racing-cars.yml
+++ b/data/cities/les-echelles/bauden-racing-cars.yml
@@ -1,11 +1,11 @@
 id: 202877062
-type: way
+type: node
 latitude: 45.44266
 longitude: 5.74389
 postcode: "73360"
 city: Les Echelles
-street: "Rue du Guibaud"
-housenumber: 96
+street: Rue du Guibaud
+housenumber: "96"
 phone: ""
 opening_hours: ""
-website: "https://www.bauden-racing-cars.fr/"
\ No newline at end of file
+website: https://www.bauden-racing-cars.fr/
diff --git a/data/cities/les-echets/e-leclerc-drive.yml b/data/cities/les-echets/e-leclerc-drive.yml
index 45dabc494..bc6423b38 100644
--- a/data/cities/les-echets/e-leclerc-drive.yml
+++ b/data/cities/les-echets/e-leclerc-drive.yml
@@ -5,7 +5,7 @@ longitude: 4.9133
 postcode: "01700"
 city: Les Échets
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00
+website: ""
diff --git a/data/cities/les-echets/garage-calderoni.yml b/data/cities/les-echets/garage-calderoni.yml
index 419102a76..bf4e97e21 100644
--- a/data/cities/les-echets/garage-calderoni.yml
+++ b/data/cities/les-echets/garage-calderoni.yml
@@ -4,8 +4,8 @@ latitude: 45.86586
 longitude: 4.91416
 postcode: "01700"
 city: Les Échets
-street: "Rue de la Dombes"
-housenumber: 530
+street: Rue de la Dombes
+housenumber: "530"
 phone: "+33478540157"
-opening_hours: "Mo-Sa 09:00-18:00"
-website: "http://www.garage-calderoni.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-18:00
+website: http://www.garage-calderoni.com/
diff --git a/data/cities/les-eparres/ferme-de-la-grangere.yml b/data/cities/les-eparres/ferme-de-la-grangere.yml
index c3a78bad6..d3ac05571 100644
--- a/data/cities/les-eparres/ferme-de-la-grangere.yml
+++ b/data/cities/les-eparres/ferme-de-la-grangere.yml
@@ -1,11 +1,12 @@
 id: 222911343
-type: way
+type: node
 latitude: 45.54248
 longitude: 5.30441
 postcode: "38300"
 city: Les Éparres
-street: "Route du Village"
-housenumber: 1600
-phone: "+33 9 82 20 83 57"
-opening_hours: "Tu 09:00-11:00; We 17:00-18:00; Th 09:00-11:00,17:00-18:00, Fr 09:00-12:00,16:30-18:30, Sa 09:00-12:00, Su 09:30-11:30"
-website: "https://www.bienvenue-a-la-ferme.com/auvergnerhonealpes/isere/les-eparres/ferme/ferme-de-la-grangere/392864"
\ No newline at end of file
+street: Route du Village
+housenumber: "1600"
+phone: +33 9 82 20 83 57
+opening_hours: Tu 09:00-11:00; We 17:00-18:00; Th 09:00-11:00,17:00-18:00, Fr 09:00-12:00,16:30-18:30,
+    Sa 09:00-12:00, Su 09:30-11:30
+website: https://www.bienvenue-a-la-ferme.com/auvergnerhonealpes/isere/les-eparres/ferme/ferme-de-la-grangere/392864
diff --git a/data/cities/les-gets/arpin.yml b/data/cities/les-gets/arpin.yml
index 487ac0584..c5c919b47 100644
--- a/data/cities/les-gets/arpin.yml
+++ b/data/cities/les-gets/arpin.yml
@@ -4,8 +4,8 @@ latitude: 46.15918
 longitude: 6.67023
 postcode: "74260"
 city: Les Gets
-street: "Chemin de Carry"
-housenumber: 
+street: Chemin de Carry
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-gets/berthet-sports-les-gets.yml b/data/cities/les-gets/berthet-sports-les-gets.yml
index 2f0c0e5ee..ccdba7f36 100644
--- a/data/cities/les-gets/berthet-sports-les-gets.yml
+++ b/data/cities/les-gets/berthet-sports-les-gets.yml
@@ -4,8 +4,8 @@ latitude: 46.15807
 longitude: 6.669
 postcode: "74260"
 city: Les Gets
-street: "Route du Front de Neige"
-housenumber: 168
-phone: "+33 4 50 79 73 55"
+street: Route du Front de Neige
+housenumber: "168"
+phone: +33 4 50 79 73 55
 opening_hours: ""
-website: "https://www.berthet-sports.com/"
\ No newline at end of file
+website: https://www.berthet-sports.com/
diff --git a/data/cities/les-gets/carrefour-montagne-les-gets.yml b/data/cities/les-gets/carrefour-montagne-les-gets.yml
index 206bd7a42..91daf4496 100644
--- a/data/cities/les-gets/carrefour-montagne-les-gets.yml
+++ b/data/cities/les-gets/carrefour-montagne-les-gets.yml
@@ -4,8 +4,8 @@ latitude: 46.15742
 longitude: 6.66708
 postcode: "74260"
 city: Les Gets
-street: "Rue du Centre"
-housenumber: 548
+street: Rue du Centre
+housenumber: "548"
 phone: ""
-opening_hours: "Dec-Apr Mo-Su 08:00-20:00; Jul-Aug Mo-Su 8:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Dec-Apr Mo-Su 08:00-20:00; Jul-Aug Mo-Su 8:00-20:00
+website: ""
diff --git a/data/cities/les-gets/delavay-sports-sarl.yml b/data/cities/les-gets/delavay-sports-sarl.yml
index 8357f7d3e..97b6b7225 100644
--- a/data/cities/les-gets/delavay-sports-sarl.yml
+++ b/data/cities/les-gets/delavay-sports-sarl.yml
@@ -4,8 +4,8 @@ latitude: 46.15735
 longitude: 6.66751
 postcode: "74260"
 city: Les Gets
-street: "Rue du Centre"
-housenumber: 523
+street: Rue du Centre
+housenumber: "523"
 phone: ""
 opening_hours: ""
-website: "https://www.delavaysports.com/"
\ No newline at end of file
+website: https://www.delavaysports.com/
diff --git a/data/cities/les-gets/evasion-sports.yml b/data/cities/les-gets/evasion-sports.yml
index bd10aa093..3196243d0 100644
--- a/data/cities/les-gets/evasion-sports.yml
+++ b/data/cities/les-gets/evasion-sports.yml
@@ -4,8 +4,8 @@ latitude: 46.16031
 longitude: 6.67045
 postcode: ""
 city: Les Gets
-street: "Rue de Pressenage"
-housenumber: 16
+street: Rue de Pressenage
+housenumber: "16"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,15:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,15:00-18:00
+website: ""
diff --git a/data/cities/les-gets/garage-de-la-colombiere.yml b/data/cities/les-gets/garage-de-la-colombiere.yml
index 2fb52472c..9d69a88a1 100644
--- a/data/cities/les-gets/garage-de-la-colombiere.yml
+++ b/data/cities/les-gets/garage-de-la-colombiere.yml
@@ -1,11 +1,11 @@
 id: 218149049
-type: way
+type: node
 latitude: 46.16187
 longitude: 6.67268
 postcode: "74260"
 city: Les Gets
-street: "Route des Grandes Alpes"
-housenumber: 2917
+street: Route des Grandes Alpes
+housenumber: "2917"
 phone: ""
 opening_hours: ""
-website: "https://www.garagedelacolombiere.com/"
\ No newline at end of file
+website: https://www.garagedelacolombiere.com/
diff --git a/data/cities/les-gets/intersport.yml b/data/cities/les-gets/intersport.yml
index 3ecae6618..26fc8e023 100644
--- a/data/cities/les-gets/intersport.yml
+++ b/data/cities/les-gets/intersport.yml
@@ -4,8 +4,8 @@ latitude: 46.15679
 longitude: 6.66773
 postcode: "74260"
 city: Les Gets
-street: "Route du Front de Neige"
-housenumber: 344
+street: Route du Front de Neige
+housenumber: "344"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-gets/jordans-sports.yml b/data/cities/les-gets/jordans-sports.yml
index 510a94f06..edcf52fb5 100644
--- a/data/cities/les-gets/jordans-sports.yml
+++ b/data/cities/les-gets/jordans-sports.yml
@@ -4,8 +4,8 @@ latitude: 46.15828
 longitude: 6.66924
 postcode: "74260"
 city: Les Gets
-street: "Route du Front de Neige"
-housenumber: 413
+street: Route du Front de Neige
+housenumber: "413"
 phone: ""
-opening_hours: "Mo-Su 08:15-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:15-19:00
+website: ""
diff --git a/data/cities/les-gets/luge-4-saisons.yml b/data/cities/les-gets/luge-4-saisons.yml
index 52412efec..9e5495544 100644
--- a/data/cities/les-gets/luge-4-saisons.yml
+++ b/data/cities/les-gets/luge-4-saisons.yml
@@ -4,8 +4,8 @@ latitude: 46.14885
 longitude: 6.65738
 postcode: "74260"
 city: Les Gets
-street: "Route des Pesses"
-housenumber: 537
+street: Route des Pesses
+housenumber: "537"
 phone: ""
-opening_hours: "Mo-Su 11:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 11:00-19:00
+website: ""
diff --git a/data/cities/les-gets/perrieres-ski.yml b/data/cities/les-gets/perrieres-ski.yml
index 1e381fd0e..be5e13c04 100644
--- a/data/cities/les-gets/perrieres-ski.yml
+++ b/data/cities/les-gets/perrieres-ski.yml
@@ -4,8 +4,8 @@ latitude: 46.15086
 longitude: 6.65826
 postcode: "74260"
 city: Les Gets
-street: "Route du Front de Neige"
-housenumber: 1365
-phone: "+33 4 50 79 06 91"
-opening_hours: "08:00-12:00; 14:00-18:00"
-website: "https://www.perrieres.ski/"
\ No newline at end of file
+street: Route du Front de Neige
+housenumber: "1365"
+phone: +33 4 50 79 06 91
+opening_hours: 08:00-12:00; 14:00-18:00
+website: https://www.perrieres.ski/
diff --git a/data/cities/les-gets/sherpa.yml b/data/cities/les-gets/sherpa.yml
index 8b899e38e..a972f4a3f 100644
--- a/data/cities/les-gets/sherpa.yml
+++ b/data/cities/les-gets/sherpa.yml
@@ -4,8 +4,9 @@ latitude: 46.14866
 longitude: 6.65591
 postcode: "74260"
 city: Les Gets
-street: "Route des Grandes Alpes"
-housenumber: 927
+street: Route des Grandes Alpes
+housenumber: "927"
 phone: ""
-opening_hours: "07:00-12:30, 15:00-19:30; Apr-Jun,Sep-Nov Mo-Tu,Fr-Sa 07:30-12:30, 15:00-19:30; We,Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: 07:00-12:30, 15:00-19:30; Apr-Jun,Sep-Nov Mo-Tu,Fr-Sa 07:30-12:30,
+    15:00-19:30; We,Su 07:30-12:30
+website: ""
diff --git a/data/cities/les-gets/skilove.yml b/data/cities/les-gets/skilove.yml
index 0864589dc..7e3ed7291 100644
--- a/data/cities/les-gets/skilove.yml
+++ b/data/cities/les-gets/skilove.yml
@@ -4,8 +4,8 @@ latitude: 46.1587
 longitude: 6.66838
 postcode: "74260"
 city: Les Gets
-street: "Rue de la Forge"
-housenumber: 18
-phone: "+33 4 50 79 73 37"
+street: Rue de la Forge
+housenumber: "18"
+phone: +33 4 50 79 73 37
 opening_hours: ""
-website: "https://www.skilove.fr/"
\ No newline at end of file
+website: https://www.skilove.fr/
diff --git a/data/cities/les-houches/atelier-creatif.yml b/data/cities/les-houches/atelier-creatif.yml
index 84d9227f5..4644ccc8b 100644
--- a/data/cities/les-houches/atelier-creatif.yml
+++ b/data/cities/les-houches/atelier-creatif.yml
@@ -4,8 +4,8 @@ latitude: 45.89107
 longitude: 6.79892
 postcode: "74310"
 city: Les Houches
-street: "Rue de l'Église"
-housenumber: 141
+street: Rue de l'Église
+housenumber: "141"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-houches/aux-armes-de-savoie.yml b/data/cities/les-houches/aux-armes-de-savoie.yml
index b3a026c74..2023e5230 100644
--- a/data/cities/les-houches/aux-armes-de-savoie.yml
+++ b/data/cities/les-houches/aux-armes-de-savoie.yml
@@ -4,8 +4,8 @@ latitude: 45.88992
 longitude: 6.7891
 postcode: "74310"
 city: Les Houches
-street: "Place de la Fruitière"
-housenumber: 72
+street: Place de la Fruitière
+housenumber: "72"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-houches/balmat-sport.yml b/data/cities/les-houches/balmat-sport.yml
index 707afcb7f..e637e6bc5 100644
--- a/data/cities/les-houches/balmat-sport.yml
+++ b/data/cities/les-houches/balmat-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.89479
 longitude: 6.78228
 postcode: "74310"
 city: Les Houches
-street: "Place du Prarion"
-housenumber: 92
+street: Place du Prarion
+housenumber: "92"
 phone: ""
-opening_hours: "Mo-Su 8:30-19:00"
-website: "https://balmat-sport.fr/"
\ No newline at end of file
+opening_hours: Mo-Su 8:30-19:00
+website: https://balmat-sport.fr/
diff --git a/data/cities/les-houches/battendier-sports.yml b/data/cities/les-houches/battendier-sports.yml
index e8d48086b..bd5ebc47b 100644
--- a/data/cities/les-houches/battendier-sports.yml
+++ b/data/cities/les-houches/battendier-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.89483
 longitude: 6.7821
 postcode: "74310"
 city: Les Houches
-street: "Place du Prarion"
-housenumber: 108
-phone: "+33 4 50 54 42 95"
+street: Place du Prarion
+housenumber: "108"
+phone: +33 4 50 54 42 95
 opening_hours: ""
-website: "https://www.battendier-sports.com/"
\ No newline at end of file
+website: https://www.battendier-sports.com/
diff --git a/data/cities/les-houches/cachat-sport.yml b/data/cities/les-houches/cachat-sport.yml
index d5b812087..917fbbad7 100644
--- a/data/cities/les-houches/cachat-sport.yml
+++ b/data/cities/les-houches/cachat-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.8898
 longitude: 6.78878
 postcode: "74310"
 city: Les Houches
-street: "Place de la Fruitière"
-housenumber: 79
-phone: "+33 4 50 54 50 21"
-opening_hours: "Mo-Su 07:30-19:00"
-website: "https://www.cachat-sport.fr/"
\ No newline at end of file
+street: Place de la Fruitière
+housenumber: "79"
+phone: +33 4 50 54 50 21
+opening_hours: Mo-Su 07:30-19:00
+website: https://www.cachat-sport.fr/
diff --git a/data/cities/les-houches/carrefour-contact.yml b/data/cities/les-houches/carrefour-contact.yml
index 6ae0e3037..adba93858 100644
--- a/data/cities/les-houches/carrefour-contact.yml
+++ b/data/cities/les-houches/carrefour-contact.yml
@@ -4,8 +4,8 @@ latitude: 45.88943
 longitude: 6.79809
 postcode: "74310"
 city: Les Houches
-street: "Place de la Mairie"
-housenumber: 32
+street: Place de la Mairie
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:00-13:00
+website: ""
diff --git a/data/cities/les-houches/cyprien-sports.yml b/data/cities/les-houches/cyprien-sports.yml
index c8ebf603f..32ea6fe0c 100644
--- a/data/cities/les-houches/cyprien-sports.yml
+++ b/data/cities/les-houches/cyprien-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.88944
 longitude: 6.79321
 postcode: "74310"
 city: Les Houches
-street: "Rue de l'Essert"
-housenumber: 244
+street: Rue de l'Essert
+housenumber: "244"
 phone: ""
-opening_hours: "Mo-Su 8:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 8:30-19:00
+website: ""
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..8ff536f0f
--- /dev/null
+++ b/data/cities/les-houches/eric-jacquier-rue-du-mont-blanc.yml
@@ -0,0 +1,11 @@
+id: 9527735194
+type: node
+latitude: 45.89033
+longitude: 6.79811
+postcode: "74310"
+city: Les Houches
+street: Rue du Mont Blanc
+housenumber: "106"
+phone: ""
+opening_hours: Mo-Su 06:00-12:30, 15:00-19:00
+website: ""
diff --git a/data/cities/les-houches/eric-jacquier.yml b/data/cities/les-houches/eric-jacquier.yml
index cb7f45fc0..27916248f 100644
--- a/data/cities/les-houches/eric-jacquier.yml
+++ b/data/cities/les-houches/eric-jacquier.yml
@@ -1,11 +1,11 @@
-id: 9527735194
+id: 9525402299
 type: node
-latitude: 45.89033
-longitude: 6.79811
+latitude: 45.89004
+longitude: 6.78902
 postcode: "74310"
 city: Les Houches
-street: "Rue du Mont Blanc"
-housenumber: 106
+street: Route des Trabets
+housenumber: "94"
 phone: ""
-opening_hours: "Mo-Su 06:00-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: ""
+website: ""
diff --git a/data/cities/les-houches/go-sport-montagne.yml b/data/cities/les-houches/go-sport-montagne.yml
index 845790f39..bf5787e59 100644
--- a/data/cities/les-houches/go-sport-montagne.yml
+++ b/data/cities/les-houches/go-sport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.89132
 longitude: 6.79878
 postcode: "74310"
 city: Les Houches
-street: "Rue de l'Église"
-housenumber: 160
+street: Rue de l'Église
+housenumber: "160"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/les-houches/intersport.yml b/data/cities/les-houches/intersport.yml
index 47b6bd9c9..efc70f457 100644
--- a/data/cities/les-houches/intersport.yml
+++ b/data/cities/les-houches/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.88955
 longitude: 6.78954
 postcode: "74310"
 city: Les Houches
-street: "Place de la Fruitière"
-housenumber: 31
+street: Place de la Fruitière
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-houches/la-ferme-du-mont-blanc.yml b/data/cities/les-houches/la-ferme-du-mont-blanc.yml
index 9f58d864d..a70146b70 100644
--- a/data/cities/les-houches/la-ferme-du-mont-blanc.yml
+++ b/data/cities/les-houches/la-ferme-du-mont-blanc.yml
@@ -4,8 +4,8 @@ latitude: 45.88917
 longitude: 6.7963
 postcode: "74310"
 city: Les Houches
-street: "Rue de l'Essert"
-housenumber: 11
-phone: "+33 6 81 07 35 64"
-opening_hours: "Mo-Su 8:30-19:30"
-website: ""
\ No newline at end of file
+street: Rue de l'Essert
+housenumber: "11"
+phone: +33 6 81 07 35 64
+opening_hours: Mo-Su 8:30-19:30
+website: ""
diff --git a/data/cities/les-houches/la-fruitiere.yml b/data/cities/les-houches/la-fruitiere.yml
index 31a9e5cb8..5f1c83c69 100644
--- a/data/cities/les-houches/la-fruitiere.yml
+++ b/data/cities/les-houches/la-fruitiere.yml
@@ -4,8 +4,8 @@ latitude: 45.88999
 longitude: 6.78904
 postcode: "74310"
 city: Les Houches
-street: "Place de la Fruitière"
-housenumber: 88
-phone: "+33 4 50 54 53 89"
+street: Place de la Fruitière
+housenumber: "88"
+phone: +33 4 50 54 53 89
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-houches/makebelo.yml b/data/cities/les-houches/makebelo.yml
index 8cf99fc6e..127851c53 100644
--- a/data/cities/les-houches/makebelo.yml
+++ b/data/cities/les-houches/makebelo.yml
@@ -4,8 +4,8 @@ latitude: 45.88947
 longitude: 6.79749
 postcode: "74310"
 city: Les Houches
-street: "Place de la Mairie"
-housenumber: 53
+street: Place de la Mairie
+housenumber: "53"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-houches/sport-2000.yml b/data/cities/les-houches/sport-2000.yml
index dc31019d4..ea2f65ba0 100644
--- a/data/cities/les-houches/sport-2000.yml
+++ b/data/cities/les-houches/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.88983
 longitude: 6.78944
 postcode: "74310"
 city: Les Houches
-street: "Place du téléphérique de Bellevue"
-housenumber: 
-phone: "+33 4 50 96 17 97"
-opening_hours: "Mo 8:00-12:00, 13:00-18:00; Tu-Su 8:30-12:30, 13:30-18:30"
-website: "https://leshouches.sport2000.fr/fr/magasins/1020-sport-2000-bellevue-sports"
\ No newline at end of file
+street: Place du téléphérique de Bellevue
+housenumber: ""
+phone: +33 4 50 96 17 97
+opening_hours: Mo 8:00-12:00, 13:00-18:00; Tu-Su 8:30-12:30, 13:30-18:30
+website: https://leshouches.sport2000.fr/fr/magasins/1020-sport-2000-bellevue-sports
diff --git a/data/cities/les-houches/sport-spirit.yml b/data/cities/les-houches/sport-spirit.yml
index 4bcdd78d0..01536a426 100644
--- a/data/cities/les-houches/sport-spirit.yml
+++ b/data/cities/les-houches/sport-spirit.yml
@@ -4,8 +4,8 @@ latitude: 45.88951
 longitude: 6.79757
 postcode: "74310"
 city: Les Houches
-street: "Place de la Mairie"
-housenumber: 51
+street: Place de la Mairie
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: "http://www.sport-spirit74.com/"
\ No newline at end of file
+website: http://www.sport-spirit74.com/
diff --git a/data/cities/les-houches/super-u.yml b/data/cities/les-houches/super-u.yml
index 1eb032bc2..f69f0887a 100644
--- a/data/cities/les-houches/super-u.yml
+++ b/data/cities/les-houches/super-u.yml
@@ -1,11 +1,11 @@
 id: 89486502
-type: way
+type: node
 latitude: 45.89583
 longitude: 6.80984
 postcode: "74310"
 city: Les Houches
-street: "Avenue des Alpages"
-housenumber: 965
-phone: "+33 4 50 55 51 70"
+street: Avenue des Alpages
+housenumber: "965"
+phone: +33 4 50 55 51 70
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-marches/les-marches.yml b/data/cities/les-marches/les-marches.yml
index 8e9bc1684..13c583ed8 100644
--- a/data/cities/les-marches/les-marches.yml
+++ b/data/cities/les-marches/les-marches.yml
@@ -4,8 +4,9 @@ latitude: 45.49956
 longitude: 6.00009
 postcode: "73800"
 city: Les Marches
-street: "Place de la Mairie"
-housenumber: 62
+street: Place de la Mairie
+housenumber: "62"
 phone: ""
-opening_hours: "Mo-We,Fr 07:00-12:30,15:15-19:00; Th 07:00-12:15; Sa 07:30-12:30,15:15-18:00; Su 08:00-12:00; PH off; 2024 May 19 08:00-12:00; 2024 May 20 off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr 07:00-12:30,15:15-19:00; Th 07:00-12:15; Sa 07:30-12:30,15:15-18:00;
+    Su 08:00-12:00; PH off; 2024 May 19 08:00-12:00; 2024 May 20 off
+website: ""
diff --git a/data/cities/les-marches/les-petits-plats.yml b/data/cities/les-marches/les-petits-plats.yml
index c4043b172..5a00d7a56 100644
--- a/data/cities/les-marches/les-petits-plats.yml
+++ b/data/cities/les-marches/les-petits-plats.yml
@@ -4,8 +4,8 @@ latitude: 45.49943
 longitude: 6.00009
 postcode: ""
 city: Les Marches
-street: "Place de la Mairie"
-housenumber: 50
-phone: "+33 6 49 80 91 09"
-opening_hours: "Tu-Sa 09:00-12:30,16:00-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+street: Place de la Mairie
+housenumber: "50"
+phone: +33 6 49 80 91 09
+opening_hours: Tu-Sa 09:00-12:30,16:00-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/les-marches/salon-effervescence.yml b/data/cities/les-marches/salon-effervescence.yml
index 0db93c8b2..2be3453f7 100644
--- a/data/cities/les-marches/salon-effervescence.yml
+++ b/data/cities/les-marches/salon-effervescence.yml
@@ -4,8 +4,9 @@ latitude: 45.49938
 longitude: 6.0001
 postcode: ""
 city: Les Marches
-street: "Place de la Mairie"
-housenumber: 44
+street: Place de la Mairie
+housenumber: "44"
 phone: ""
-opening_hours: "Su off; Mo 09:00-18:00; Tu 09:00-19:00; We 09:00-15:00; Th 09:00-19:00; Fr 09:00-18:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Su off; Mo 09:00-18:00; Tu 09:00-19:00; We 09:00-15:00; Th 09:00-19:00;
+    Fr 09:00-18:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/les-menuires/la-godille.yml b/data/cities/les-menuires/la-godille.yml
index 5c74182dc..9703676c3 100644
--- a/data/cities/les-menuires/la-godille.yml
+++ b/data/cities/les-menuires/la-godille.yml
@@ -4,8 +4,8 @@ latitude: 45.32326
 longitude: 6.53761
 postcode: "73440"
 city: Les Ménuires
-street: "La Croisette"
-housenumber: 
+street: La Croisette
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-menuires/rosael-sports.yml b/data/cities/les-menuires/rosael-sports.yml
index 7352db28a..2bc767c5d 100644
--- a/data/cities/les-menuires/rosael-sports.yml
+++ b/data/cities/les-menuires/rosael-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.29999
 longitude: 6.58063
 postcode: "73440"
 city: les menuires
-street: "Quartier REBERTY 2000"
-housenumber: 
+street: Quartier REBERTY 2000
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-menuires/ski-service-sport2000.yml b/data/cities/les-menuires/ski-service-sport2000.yml
index 8ca59b807..7579619ed 100644
--- a/data/cities/les-menuires/ski-service-sport2000.yml
+++ b/data/cities/les-menuires/ski-service-sport2000.yml
@@ -4,8 +4,8 @@ latitude: 45.32007
 longitude: 6.5373
 postcode: "73440"
 city: Les Ménuires
-street: "Les Fontanettes (rue Basse)"
-housenumber: 
+street: Les Fontanettes (rue Basse)
+housenumber: ""
 phone: "+33479006899"
 opening_hours: ""
-website: "https://ski-service-les-menuires.fr"
\ No newline at end of file
+website: https://ski-service-les-menuires.fr
diff --git a/data/cities/les-menuires/sport-2000.yml b/data/cities/les-menuires/sport-2000.yml
index 8efa4ddd3..c797858d4 100644
--- a/data/cities/les-menuires/sport-2000.yml
+++ b/data/cities/les-menuires/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.31498
 longitude: 6.54083
 postcode: "73440"
 city: Les Menuires
-street: "Centre Commercial Les Bruyères"
-housenumber: 
+street: Centre Commercial Les Bruyères
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-menuires/twinner.yml b/data/cities/les-menuires/twinner.yml
index 9b27d3267..9ad4930fb 100644
--- a/data/cities/les-menuires/twinner.yml
+++ b/data/cities/les-menuires/twinner.yml
@@ -4,8 +4,8 @@ latitude: 45.31955
 longitude: 6.53777
 postcode: "73440"
 city: Les Ménuires
-street: "Les Fontanettes (rue Haute)"
-housenumber: 
+street: Les Fontanettes (rue Haute)
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-olmes/mondovelo-les-olmes.yml b/data/cities/les-olmes/mondovelo-les-olmes.yml
index 16c1c2d41..79af7ddfe 100644
--- a/data/cities/les-olmes/mondovelo-les-olmes.yml
+++ b/data/cities/les-olmes/mondovelo-les-olmes.yml
@@ -4,8 +4,8 @@ latitude: 45.8874
 longitude: 4.51708
 postcode: "69490"
 city: Les Olmes
-street: "Actipole des olmes"
-housenumber: 
+street: Actipole des olmes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-roches-de-condrieu/rusty-motorcycle.yml b/data/cities/les-roches-de-condrieu/rusty-motorcycle.yml
index b160e688c..0d664110f 100644
--- a/data/cities/les-roches-de-condrieu/rusty-motorcycle.yml
+++ b/data/cities/les-roches-de-condrieu/rusty-motorcycle.yml
@@ -5,7 +5,7 @@ longitude: 4.76621
 postcode: "38370"
 city: Les Roches-de-Condrieu
 street: ""
-housenumber: 16
+housenumber: "16"
 phone: "+33474851337"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00"
-website: "https://www.rustymotorcycle.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00
+website: https://www.rustymotorcycle.com/
diff --git a/data/cities/les-saisies/skiset.yml b/data/cities/les-saisies/skiset.yml
index 3596b97b9..edfd0fc5f 100644
--- a/data/cities/les-saisies/skiset.yml
+++ b/data/cities/les-saisies/skiset.yml
@@ -4,8 +4,8 @@ latitude: 45.7592
 longitude: 6.53771
 postcode: "73620"
 city: Les Saisies
-street: "Avenue des Cimes"
-housenumber: 
+street: Avenue des Cimes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/les-villards-sur-thones/intermarche.yml b/data/cities/les-villards-sur-thones/intermarche.yml
index 619b91a99..e250822d7 100644
--- a/data/cities/les-villards-sur-thones/intermarche.yml
+++ b/data/cities/les-villards-sur-thones/intermarche.yml
@@ -1,11 +1,11 @@
 id: 827585517
-type: way
+type: node
 latitude: 45.9086
 longitude: 6.36425
 postcode: "74230"
 city: Les Villards-sur-Thones
-street: "Route des Perrils"
-housenumber: 100
+street: Route des Perrils
+housenumber: "100"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:15; Sa 09:00-19:13; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:15; Sa 09:00-19:13; Su off
+website: ""
diff --git a/data/cities/lescheraines/a-lheure-du-the.yml b/data/cities/lescheraines/a-lheure-du-the.yml
index 6a671a011..37d77acf5 100644
--- a/data/cities/lescheraines/a-lheure-du-the.yml
+++ b/data/cities/lescheraines/a-lheure-du-the.yml
@@ -5,7 +5,7 @@ longitude: 6.10767
 postcode: "73340"
 city: Lescheraines
 street: ""
-housenumber: 
-phone: "+33 6 87 34 32 00"
+housenumber: ""
+phone: +33 6 87 34 32 00
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lescheraines/c2e-cablage.yml b/data/cities/lescheraines/c2e-cablage.yml
index 7e9858be2..91be6f1bd 100644
--- a/data/cities/lescheraines/c2e-cablage.yml
+++ b/data/cities/lescheraines/c2e-cablage.yml
@@ -4,8 +4,8 @@ latitude: 45.71891
 longitude: 6.10564
 postcode: "73340"
 city: Lescheraines
-street: "La Madeleine"
-housenumber: 
-phone: "+33 4 79 63 31 64"
+street: La Madeleine
+housenumber: ""
+phone: +33 4 79 63 31 64
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lescheraines/cattin-freres.yml b/data/cities/lescheraines/cattin-freres.yml
index 93bbcb51b..982745f79 100644
--- a/data/cities/lescheraines/cattin-freres.yml
+++ b/data/cities/lescheraines/cattin-freres.yml
@@ -5,7 +5,7 @@ longitude: 6.10608
 postcode: "73340"
 city: Lescheraines
 street: ""
-housenumber: 
-phone: "+33 4 79 63 39 41"
+housenumber: ""
+phone: +33 4 79 63 39 41
 opening_hours: ""
-website: "http://www.cattin-freres.fr"
\ No newline at end of file
+website: http://www.cattin-freres.fr
diff --git a/data/cities/lescheraines/cooperative-laitiere-de-lescheraines.yml b/data/cities/lescheraines/cooperative-laitiere-de-lescheraines.yml
index 0190493a1..7aa9190e9 100644
--- a/data/cities/lescheraines/cooperative-laitiere-de-lescheraines.yml
+++ b/data/cities/lescheraines/cooperative-laitiere-de-lescheraines.yml
@@ -1,11 +1,11 @@
 id: 181371355
-type: way
+type: node
 latitude: 45.70672
 longitude: 6.10071
 postcode: "73340"
 city: Lescheraines
-street: "Fromagerie de Lescheraines"
-housenumber: 
-phone: "+33 4 79 63 30 37"
-opening_hours: "Mo-Su 09:30-12:00,15:00-19:00"
-website: "https://www.fromageriedelescheraines.fr"
\ No newline at end of file
+street: Fromagerie de Lescheraines
+housenumber: ""
+phone: +33 4 79 63 30 37
+opening_hours: Mo-Su 09:30-12:00,15:00-19:00
+website: https://www.fromageriedelescheraines.fr
diff --git a/data/cities/lescheraines/croc-bauges.yml b/data/cities/lescheraines/croc-bauges.yml
index 59cbd99a7..21db86b9a 100644
--- a/data/cities/lescheraines/croc-bauges.yml
+++ b/data/cities/lescheraines/croc-bauges.yml
@@ -4,8 +4,8 @@ latitude: 45.71941
 longitude: 6.10593
 postcode: "73340"
 city: Lescheraines
-street: "30 impasse du Nant d'Orange"
-housenumber: 
-phone: "+33 4 79 34 23 52"
-opening_hours: "Tu-We, Fr-Sa 08:30-12:30, 14:30-19:30; Th 10:30-12:30, 14:30-19:30"
-website: "www.biobauges.org"
\ No newline at end of file
+street: 30 impasse du Nant d'Orange
+housenumber: ""
+phone: +33 4 79 34 23 52
+opening_hours: Tu-We, Fr-Sa 08:30-12:30, 14:30-19:30; Th 10:30-12:30, 14:30-19:30
+website: www.biobauges.org
diff --git a/data/cities/lescheraines/darvey.yml b/data/cities/lescheraines/darvey.yml
index 53525be5b..28d06a327 100644
--- a/data/cities/lescheraines/darvey.yml
+++ b/data/cities/lescheraines/darvey.yml
@@ -4,8 +4,8 @@ latitude: 45.71798
 longitude: 6.10772
 postcode: "73340"
 city: Lescheraines
-street: "Rue La Madeleine"
-housenumber: 
-phone: "+33 4 79 63 31 22"
+street: Rue La Madeleine
+housenumber: ""
+phone: +33 4 79 63 31 22
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lescheraines/forme-actives.yml b/data/cities/lescheraines/forme-actives.yml
index 5808e5e91..33e8a76e4 100644
--- a/data/cities/lescheraines/forme-actives.yml
+++ b/data/cities/lescheraines/forme-actives.yml
@@ -5,7 +5,7 @@ longitude: 6.1084
 postcode: "73340"
 city: Lescheraines
 street: ""
-housenumber: 
-phone: "+33 4 79 63 83 18"
+housenumber: ""
+phone: +33 4 79 63 83 18
 opening_hours: ""
-website: "https://www.formesactives.fr"
\ No newline at end of file
+website: https://www.formesactives.fr
diff --git a/data/cities/lescheraines/les-ti-kdo.yml b/data/cities/lescheraines/les-ti-kdo.yml
index 4fd8b1325..94f40c3b1 100644
--- a/data/cities/lescheraines/les-ti-kdo.yml
+++ b/data/cities/lescheraines/les-ti-kdo.yml
@@ -4,8 +4,8 @@ latitude: 45.71012
 longitude: 6.10663
 postcode: "73340"
 city: Lescheraines
-street: "Lotissement la Fenaison"
-housenumber: 
-phone: "+33 7 60 59 61 55"
+street: Lotissement la Fenaison
+housenumber: ""
+phone: +33 7 60 59 61 55
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lescheraines/pompes-sefan.yml b/data/cities/lescheraines/pompes-sefan.yml
index c0df83c18..427931f74 100644
--- a/data/cities/lescheraines/pompes-sefan.yml
+++ b/data/cities/lescheraines/pompes-sefan.yml
@@ -5,7 +5,7 @@ longitude: 6.10171
 postcode: "73340"
 city: Lescheraines
 street: ""
-housenumber: 
-phone: "+33 4 79 34 47 52"
+housenumber: ""
+phone: +33 4 79 34 47 52
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lescheraines/soam.yml b/data/cities/lescheraines/soam.yml
index cb9b7d903..853236bde 100644
--- a/data/cities/lescheraines/soam.yml
+++ b/data/cities/lescheraines/soam.yml
@@ -4,8 +4,8 @@ latitude: 45.70731
 longitude: 6.10629
 postcode: "73340"
 city: Lescheraines
-street: "Route des Croës"
-housenumber: 1177
-phone: "+33 6 17 98 69 10"
+street: Route des Croës
+housenumber: "1177"
+phone: +33 6 17 98 69 10
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lescheraines/sport-bike-tech.yml b/data/cities/lescheraines/sport-bike-tech.yml
index bfcc2a9b5..f24b89336 100644
--- a/data/cities/lescheraines/sport-bike-tech.yml
+++ b/data/cities/lescheraines/sport-bike-tech.yml
@@ -4,8 +4,8 @@ latitude: 45.71933
 longitude: 6.10667
 postcode: "73340"
 city: Lescheraines
-street: "Route de Plan de Bauges"
-housenumber: 
-phone: "+33 6 86 02 28 35"
-opening_hours: "Mo-Sa 09:00-12:00 & 15:00-18:00"
-website: "https://baugesbikeacademie.fr/"
\ No newline at end of file
+street: Route de Plan de Bauges
+housenumber: ""
+phone: +33 6 86 02 28 35
+opening_hours: Mo-Sa 09:00-12:00 & 15:00-18:00
+website: https://baugesbikeacademie.fr/
diff --git a/data/cities/lescheroux/gite-ainnimo.yml b/data/cities/lescheroux/gite-ainnimo.yml
index 244dd6343..290f824c4 100644
--- a/data/cities/lescheroux/gite-ainnimo.yml
+++ b/data/cities/lescheroux/gite-ainnimo.yml
@@ -4,8 +4,8 @@ latitude: 46.39818
 longitude: 5.13932
 postcode: "01540"
 city: LESCHEROUX
-street: "Veyriat"
-housenumber: 
-phone: "+33 6 50 14 13 94"
+street: Veyriat
+housenumber: ""
+phone: +33 6 50 14 13 94
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/letra/lhair-du-vent.yml b/data/cities/letra/lhair-du-vent.yml
index 988f38793..50d8fd635 100644
--- a/data/cities/letra/lhair-du-vent.yml
+++ b/data/cities/letra/lhair-du-vent.yml
@@ -4,8 +4,8 @@ latitude: 45.96203
 longitude: 4.52512
 postcode: "69620"
 city: Létra
-street: "Impasse de la Salle des Fêtes"
-housenumber: 39
+street: Impasse de la Salle des Fêtes
+housenumber: "39"
 phone: "+33474719618"
-opening_hours: "Tu-Fr 09:00-19:00; Th 14:00-21:00; Sa 09:00-15:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Th 14:00-21:00; Sa 09:00-15:00
+website: ""
diff --git a/data/cities/letra/oedoria.yml b/data/cities/letra/oedoria.yml
index 426b7feac..147ca4931 100644
--- a/data/cities/letra/oedoria.yml
+++ b/data/cities/letra/oedoria.yml
@@ -4,8 +4,8 @@ latitude: 45.95672
 longitude: 4.52393
 postcode: "69620"
 city: Létra
-street: "Montée du Bourg"
-housenumber: 16
+street: Montée du Bourg
+housenumber: "16"
 phone: "+33474715860"
 opening_hours: ""
-website: "https://www.oedoria.com/"
\ No newline at end of file
+website: https://www.oedoria.com/
diff --git a/data/cities/lhorme/aldi.yml b/data/cities/lhorme/aldi.yml
index 5f1ebeb71..a511d842a 100644
--- a/data/cities/lhorme/aldi.yml
+++ b/data/cities/lhorme/aldi.yml
@@ -4,8 +4,8 @@ latitude: 45.48797
 longitude: 4.54445
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 4
+street: Avenue Pasteur
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/antidote-chouchouteve-you.yml b/data/cities/lhorme/antidote-chouchouteve-you.yml
index 771549a2a..1ea5c6304 100644
--- a/data/cities/lhorme/antidote-chouchouteve-you.yml
+++ b/data/cities/lhorme/antidote-chouchouteve-you.yml
@@ -4,8 +4,8 @@ latitude: 45.48344
 longitude: 4.53255
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 40
-phone: "+33 6 26 07 60 11"
+street: Avenue Pasteur
+housenumber: "40"
+phone: +33 6 26 07 60 11
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/au-bien-etre-du-petit-menager-abpm.yml b/data/cities/lhorme/au-bien-etre-du-petit-menager-abpm.yml
index 15b319b68..2224fec39 100644
--- a/data/cities/lhorme/au-bien-etre-du-petit-menager-abpm.yml
+++ b/data/cities/lhorme/au-bien-etre-du-petit-menager-abpm.yml
@@ -4,8 +4,8 @@ latitude: 45.4833
 longitude: 4.53209
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 40
-phone: "+33 4 77 22 91 70"
+street: Avenue Pasteur
+housenumber: "40"
+phone: +33 4 77 22 91 70
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/au-ble-dor.yml b/data/cities/lhorme/au-ble-dor.yml
index 2f93afe38..cea7ec66b 100644
--- a/data/cities/lhorme/au-ble-dor.yml
+++ b/data/cities/lhorme/au-ble-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.48318
 longitude: 4.54181
 postcode: "42152"
 city: L'Horme
-street: "Boulevard Saint-Paul"
-housenumber: 11
+street: Boulevard Saint-Paul
+housenumber: "11"
 phone: ""
-opening_hours: "Tu-Su 06:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 06:30-18:30
+website: ""
diff --git a/data/cities/lhorme/bella-hair.yml b/data/cities/lhorme/bella-hair.yml
index caaf89965..0382b59f6 100644
--- a/data/cities/lhorme/bella-hair.yml
+++ b/data/cities/lhorme/bella-hair.yml
@@ -4,8 +4,8 @@ latitude: 45.4859
 longitude: 4.54212
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 43
+street: Avenue Pasteur
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/centralgarage-du-gier.yml b/data/cities/lhorme/centralgarage-du-gier.yml
index aca0301ab..3759e3a95 100644
--- a/data/cities/lhorme/centralgarage-du-gier.yml
+++ b/data/cities/lhorme/centralgarage-du-gier.yml
@@ -4,8 +4,8 @@ latitude: 45.48807
 longitude: 4.54804
 postcode: "42152"
 city: L'Horme
-street: "Rue du Quartier Moulin"
-housenumber: 9
-phone: "+33 4 77 22 28 47"
+street: Rue du Quartier Moulin
+housenumber: "9"
+phone: +33 4 77 22 28 47
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/coriolis-telecom.yml b/data/cities/lhorme/coriolis-telecom.yml
index e8ba6103a..a080d3713 100644
--- a/data/cities/lhorme/coriolis-telecom.yml
+++ b/data/cities/lhorme/coriolis-telecom.yml
@@ -4,8 +4,8 @@ latitude: 45.48351
 longitude: 4.53501
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 81
-phone: "+33 4 77 22 14 89"
+street: Avenue Pasteur
+housenumber: "81"
+phone: +33 4 77 22 14 89
 opening_hours: ""
-website: "http://www.coriolis.com/"
\ No newline at end of file
+website: http://www.coriolis.com/
diff --git a/data/cities/lhorme/delta-auomobile.yml b/data/cities/lhorme/delta-auomobile.yml
index 24bc5a6d0..fd21ac8c7 100644
--- a/data/cities/lhorme/delta-auomobile.yml
+++ b/data/cities/lhorme/delta-auomobile.yml
@@ -4,8 +4,8 @@ latitude: 45.4836
 longitude: 4.53046
 postcode: "42152"
 city: L'Horme
-street: "Rue du Garat"
-housenumber: 16
+street: Rue du Garat
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/escale-vegetale.yml b/data/cities/lhorme/escale-vegetale.yml
index 15a8b43b3..b0b16d915 100644
--- a/data/cities/lhorme/escale-vegetale.yml
+++ b/data/cities/lhorme/escale-vegetale.yml
@@ -4,8 +4,8 @@ latitude: 45.48333
 longitude: 4.5322
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 40
-phone: "+33 4 77 22 33 44"
+street: Avenue Pasteur
+housenumber: "40"
+phone: +33 4 77 22 33 44
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/etincelles-de-couleurs.yml b/data/cities/lhorme/etincelles-de-couleurs.yml
index 19d3230ae..df62ff821 100644
--- a/data/cities/lhorme/etincelles-de-couleurs.yml
+++ b/data/cities/lhorme/etincelles-de-couleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.48654
 longitude: 4.54351
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 35
+street: Avenue Pasteur
+housenumber: "35"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/garage-auto-david.yml b/data/cities/lhorme/garage-auto-david.yml
index 10e1fa6fe..1da23107b 100644
--- a/data/cities/lhorme/garage-auto-david.yml
+++ b/data/cities/lhorme/garage-auto-david.yml
@@ -4,8 +4,8 @@ latitude: 45.48774
 longitude: 4.54561
 postcode: "42152"
 city: L'Horme
-street: "Rue des Platanes"
-housenumber: 1
+street: Rue des Platanes
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/herve-decombe.yml b/data/cities/lhorme/herve-decombe.yml
index 0413cb157..91423c6d1 100644
--- a/data/cities/lhorme/herve-decombe.yml
+++ b/data/cities/lhorme/herve-decombe.yml
@@ -4,8 +4,8 @@ latitude: 45.48664
 longitude: 4.54375
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 33
+street: Avenue Pasteur
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/intermarche.yml b/data/cities/lhorme/intermarche.yml
index a707bd539..0039b1a45 100644
--- a/data/cities/lhorme/intermarche.yml
+++ b/data/cities/lhorme/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.49135
 longitude: 4.55621
 postcode: "42152"
 city: L'Horme
-street: "Avenue Berthelot"
-housenumber: 38
+street: Avenue Berthelot
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/latelier-des-lilas.yml b/data/cities/lhorme/latelier-des-lilas.yml
index 88f123c71..b563dfb30 100644
--- a/data/cities/lhorme/latelier-des-lilas.yml
+++ b/data/cities/lhorme/latelier-des-lilas.yml
@@ -4,8 +4,8 @@ latitude: 45.4836
 longitude: 4.53514
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 81
+street: Avenue Pasteur
+housenumber: "81"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/lhorme-primeur.yml b/data/cities/lhorme/lhorme-primeur.yml
index d88fd795b..32677d4ce 100644
--- a/data/cities/lhorme/lhorme-primeur.yml
+++ b/data/cities/lhorme/lhorme-primeur.yml
@@ -4,8 +4,8 @@ latitude: 45.48414
 longitude: 4.5368
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 79
+street: Avenue Pasteur
+housenumber: "79"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/maison-decline.yml b/data/cities/lhorme/maison-decline.yml
index 3147ce491..c0297dc55 100644
--- a/data/cities/lhorme/maison-decline.yml
+++ b/data/cities/lhorme/maison-decline.yml
@@ -4,8 +4,8 @@ latitude: 45.48669
 longitude: 4.54385
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 31
+street: Avenue Pasteur
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/medor-et-compagnie.yml b/data/cities/lhorme/medor-et-compagnie.yml
index 113d25968..2f6a1e87c 100644
--- a/data/cities/lhorme/medor-et-compagnie.yml
+++ b/data/cities/lhorme/medor-et-compagnie.yml
@@ -4,8 +4,8 @@ latitude: 45.4828
 longitude: 4.53143
 postcode: "42152"
 city: L'Horme
-street: "Rue du Garat"
-housenumber: 7
+street: Rue du Garat
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/picard.yml b/data/cities/lhorme/picard.yml
index af34338c6..0de101009 100644
--- a/data/cities/lhorme/picard.yml
+++ b/data/cities/lhorme/picard.yml
@@ -4,8 +4,8 @@ latitude: 45.48318
 longitude: 4.53208
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 40
-phone: "+33 4 77 22 77 61"
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: "https://magasins.picard.fr/879-picard-st-chamond"
\ No newline at end of file
+street: Avenue Pasteur
+housenumber: "40"
+phone: +33 4 77 22 77 61
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: https://magasins.picard.fr/879-picard-st-chamond
diff --git a/data/cities/lhorme/raphael-patte.yml b/data/cities/lhorme/raphael-patte.yml
index 9a20ba4ff..924fef781 100644
--- a/data/cities/lhorme/raphael-patte.yml
+++ b/data/cities/lhorme/raphael-patte.yml
@@ -4,8 +4,8 @@ latitude: 45.48353
 longitude: 4.53509
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 81
+street: Avenue Pasteur
+housenumber: "81"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/salon-thierry.yml b/data/cities/lhorme/salon-thierry.yml
index 59ada9483..68bcc301e 100644
--- a/data/cities/lhorme/salon-thierry.yml
+++ b/data/cities/lhorme/salon-thierry.yml
@@ -4,8 +4,8 @@ latitude: 45.48415
 longitude: 4.53955
 postcode: "42152"
 city: L'Horme
-street: "Cours Marin"
-housenumber: 44
-phone: "+33 4 77 31 41 27"
+street: Cours Marin
+housenumber: "44"
+phone: +33 4 77 31 41 27
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/serrurerie-metallerie-du-gier.yml b/data/cities/lhorme/serrurerie-metallerie-du-gier.yml
index 4728ff837..67449e4dc 100644
--- a/data/cities/lhorme/serrurerie-metallerie-du-gier.yml
+++ b/data/cities/lhorme/serrurerie-metallerie-du-gier.yml
@@ -4,8 +4,8 @@ latitude: 45.48367
 longitude: 4.53243
 postcode: "42152"
 city: L'Horme
-street: "Rue du Garat"
-housenumber: 10
+street: Rue du Garat
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/super-u.yml b/data/cities/lhorme/super-u.yml
index 4aff93f1f..e311e4046 100644
--- a/data/cities/lhorme/super-u.yml
+++ b/data/cities/lhorme/super-u.yml
@@ -1,11 +1,11 @@
 id: 122571891
-type: way
+type: node
 latitude: 45.48363
 longitude: 4.53275
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
+street: Avenue Pasteur
 housenumber: 38TER
-phone: "+33 4 77 22 51 86"
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: "https://www.magasins-u.com/magasin/superu-lhorme"
\ No newline at end of file
+phone: +33 4 77 22 51 86
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: https://www.magasins-u.com/magasin/superu-lhorme
diff --git a/data/cities/lhorme/tabac-presse-loto.yml b/data/cities/lhorme/tabac-presse-loto.yml
index fb29f053c..563317b19 100644
--- a/data/cities/lhorme/tabac-presse-loto.yml
+++ b/data/cities/lhorme/tabac-presse-loto.yml
@@ -4,8 +4,8 @@ latitude: 45.48703
 longitude: 4.54465
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 19
+street: Avenue Pasteur
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/tereva.yml b/data/cities/lhorme/tereva.yml
index 2bb77805c..8ebfa05ca 100644
--- a/data/cities/lhorme/tereva.yml
+++ b/data/cities/lhorme/tereva.yml
@@ -4,8 +4,8 @@ latitude: 45.48841
 longitude: 4.54699
 postcode: "42152"
 city: L'Horme
-street: "Avenue Berthelot"
-housenumber: 3
+street: Avenue Berthelot
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lhorme/thomas-sograma-materiaux-de-construction.yml b/data/cities/lhorme/thomas-sograma-materiaux-de-construction.yml
index 317ee9a99..c0f720d6f 100644
--- a/data/cities/lhorme/thomas-sograma-materiaux-de-construction.yml
+++ b/data/cities/lhorme/thomas-sograma-materiaux-de-construction.yml
@@ -4,8 +4,8 @@ latitude: 45.48853
 longitude: 4.54659
 postcode: "42152"
 city: L'Horme
-street: "Avenue Berthelot"
-housenumber: 3
+street: Avenue Berthelot
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 07:00-12:00,13:30-18:00, Sa 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-12:00,13:30-18:00, Sa 08:00-12:00
+website: ""
diff --git a/data/cities/lhorme/youucoiff.yml b/data/cities/lhorme/youucoiff.yml
index 4e3247b1d..c2a94c04e 100644
--- a/data/cities/lhorme/youucoiff.yml
+++ b/data/cities/lhorme/youucoiff.yml
@@ -4,8 +4,8 @@ latitude: 45.4865
 longitude: 4.54342
 postcode: "42152"
 city: L'Horme
-street: "Avenue Pasteur"
-housenumber: 37
+street: Avenue Pasteur
+housenumber: "37"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/liergues/lattrapefleurs.yml b/data/cities/liergues/lattrapefleurs.yml
index 08f2eea4e..8382074ac 100644
--- a/data/cities/liergues/lattrapefleurs.yml
+++ b/data/cities/liergues/lattrapefleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.96973
 longitude: 4.66344
 postcode: "69400"
 city: Liergues
-street: "Montée Saint-Eloi"
-housenumber: 430
+street: Montée Saint-Eloi
+housenumber: "430"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/limas/moto-racing-service.yml b/data/cities/limas/moto-racing-service.yml
index 01a372740..cf22901ad 100644
--- a/data/cities/limas/moto-racing-service.yml
+++ b/data/cities/limas/moto-racing-service.yml
@@ -4,8 +4,9 @@ latitude: 45.97719
 longitude: 4.71884
 postcode: "69400"
 city: Limas
-street: "Rue des Chantiers du Beaujolais"
-housenumber: 157
-phone: "+33 952520510"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su,Mo,PH off"
-website: "http://www.motoracingservice.fr"
\ No newline at end of file
+street: Rue des Chantiers du Beaujolais
+housenumber: "157"
+phone: +33 952520510
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su,Mo,PH
+    off
+website: http://www.motoracingservice.fr
diff --git a/data/cities/limas/velonaute.yml b/data/cities/limas/velonaute.yml
index 57b4e92c9..3a054fd51 100644
--- a/data/cities/limas/velonaute.yml
+++ b/data/cities/limas/velonaute.yml
@@ -4,8 +4,8 @@ latitude: 45.97649
 longitude: 4.71699
 postcode: "69400"
 city: Limas
-street: "Rue Henri Depagneux"
-housenumber: 80
+street: Rue Henri Depagneux
+housenumber: "80"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/limonest/decathlon-limonest.yml b/data/cities/limonest/decathlon-limonest.yml
index 669b91ae8..c523aa075 100644
--- a/data/cities/limonest/decathlon-limonest.yml
+++ b/data/cities/limonest/decathlon-limonest.yml
@@ -1,11 +1,11 @@
 id: 40905957
-type: way
+type: node
 latitude: 45.82253
 longitude: 4.76742
 postcode: "69760"
 city: Limonest
-street: "Chemin des Tuileries"
-housenumber: 
+street: Chemin des Tuileries
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: "https://www.decathlon.fr/fr/store?store_id=PS_105"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: https://www.decathlon.fr/fr/store?store_id=PS_105
diff --git a/data/cities/lisle-dabeau/go-sport-bike.yml b/data/cities/lisle-dabeau/go-sport-bike.yml
index 373e9a979..60ccf0410 100644
--- a/data/cities/lisle-dabeau/go-sport-bike.yml
+++ b/data/cities/lisle-dabeau/go-sport-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.61569
 longitude: 5.22414
 postcode: "38080"
 city: L'Isle-d'Abeau
-street: "Zac de Saint-Hubert"
-housenumber: 
+street: Zac de Saint-Hubert
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.go-sport.com/stores?lang=default#/stores/1870-CYCLE"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.go-sport.com/stores?lang=default#/stores/1870-CYCLE
diff --git a/data/cities/lisle-dabeau/go-sport.yml b/data/cities/lisle-dabeau/go-sport.yml
index f1813953a..81fab4666 100644
--- a/data/cities/lisle-dabeau/go-sport.yml
+++ b/data/cities/lisle-dabeau/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.61563
 longitude: 5.22411
 postcode: "38080"
 city: L'Isle-d'Abeau
-street: "ZAC de Saint-Hubert"
-housenumber: 
+street: ZAC de Saint-Hubert
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.go-sport.com/stores?lang=default#/stores/1870"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.go-sport.com/stores?lang=default#/stores/1870
diff --git a/data/cities/lisle-dabeau/intersport.yml b/data/cities/lisle-dabeau/intersport.yml
index cce980272..9d2dd2c4b 100644
--- a/data/cities/lisle-dabeau/intersport.yml
+++ b/data/cities/lisle-dabeau/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.61364
 longitude: 5.22992
 postcode: "38080"
 city: L'Isle-d'Abeau
-street: "Rue des Sayes"
-housenumber: 16
+street: Rue des Sayes
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/lisle-dabeau/le-fournisle.yml b/data/cities/lisle-dabeau/le-fournisle.yml
index 757982f9b..cdc26b3d3 100644
--- a/data/cities/lisle-dabeau/le-fournisle.yml
+++ b/data/cities/lisle-dabeau/le-fournisle.yml
@@ -4,8 +4,8 @@ latitude: 45.62277
 longitude: 5.23139
 postcode: "38080"
 city: L'Isle-d'Abeau
-street: "Place Gabriel Péri"
-housenumber: 5
+street: Place Gabriel Péri
+housenumber: "5"
 phone: "+33474270379"
-opening_hours: "Tu-Fr 06:30-19:00; Sa 06:00-18:00; Su 07:00-13:00; PH 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:30-19:00; Sa 06:00-18:00; Su 07:00-13:00; PH 07:00-13:00
+website: ""
diff --git a/data/cities/lissieu/bouton-dor.yml b/data/cities/lissieu/bouton-dor.yml
index f737c5ac3..e27d630b9 100644
--- a/data/cities/lissieu/bouton-dor.yml
+++ b/data/cities/lissieu/bouton-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.86476
 longitude: 4.74252
 postcode: "69380"
 city: Lissieu
-street: "Route Nationale 6"
-housenumber: 78
+street: Route Nationale 6
+housenumber: "78"
 phone: "+33472548885"
-opening_hours: "Mo 10:00-19:30; Tu-Fr 09:00-19:30; Sa 08:30-19:30; Su 09:00-12:30"
-website: "http://www.bouton-or-fleuriste.fr/"
\ No newline at end of file
+opening_hours: Mo 10:00-19:30; Tu-Fr 09:00-19:30; Sa 08:30-19:30; Su 09:00-12:30
+website: http://www.bouton-or-fleuriste.fr/
diff --git a/data/cities/loisin/claude-vinet.yml b/data/cities/loisin/claude-vinet.yml
index 720951562..d7cc9d712 100644
--- a/data/cities/loisin/claude-vinet.yml
+++ b/data/cities/loisin/claude-vinet.yml
@@ -1,11 +1,11 @@
 id: 893806513
-type: way
+type: node
 latitude: 46.26832
 longitude: 6.31603
 postcode: "74140"
 city: Loisin
-street: "Route de Bons-en-Chablais"
-housenumber: 80
+street: Route de Bons-en-Chablais
+housenumber: "80"
 phone: ""
-opening_hours: "Mo-Th 08:00-12:00, 13:30-18:30; Fr 07:30-12:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:00-12:00, 13:30-18:30; Fr 07:30-12:00; Sa-Su off
+website: ""
diff --git a/data/cities/loisin/gifi.yml b/data/cities/loisin/gifi.yml
index 128620244..3fd4f581e 100644
--- a/data/cities/loisin/gifi.yml
+++ b/data/cities/loisin/gifi.yml
@@ -1,11 +1,11 @@
 id: 270449564
-type: way
+type: node
 latitude: 46.27595
 longitude: 6.3125
 postcode: "74140"
 city: Loisin
-street: "Route des Penets"
-housenumber: 775
+street: Route des Penets
+housenumber: "775"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/loisin/guion-automobiles.yml b/data/cities/loisin/guion-automobiles.yml
index 9890d26e1..b65105c87 100644
--- a/data/cities/loisin/guion-automobiles.yml
+++ b/data/cities/loisin/guion-automobiles.yml
@@ -1,11 +1,11 @@
 id: 316877980
-type: way
+type: node
 latitude: 46.26847
 longitude: 6.31615
 postcode: "74140"
 city: Loisin
-street: "Route de Bons-en-Chablais"
-housenumber: 140
+street: Route de Bons-en-Chablais
+housenumber: "140"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:15, 13:00-18:15; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:15, 13:00-18:15; Sa-Su off
+website: ""
diff --git a/data/cities/loisin/kunz-pressing.yml b/data/cities/loisin/kunz-pressing.yml
index 99ad68060..eb2dea1f1 100644
--- a/data/cities/loisin/kunz-pressing.yml
+++ b/data/cities/loisin/kunz-pressing.yml
@@ -4,8 +4,8 @@ latitude: 46.26955
 longitude: 6.3164
 postcode: "74140"
 city: Loisin
-street: "Route de Machilly"
-housenumber: 
+street: Route de Machilly
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/loisin/super-u.yml b/data/cities/loisin/super-u.yml
index 40daeac16..7f1853231 100644
--- a/data/cities/loisin/super-u.yml
+++ b/data/cities/loisin/super-u.yml
@@ -1,11 +1,11 @@
 id: 42137299
-type: way
+type: node
 latitude: 46.26972
 longitude: 6.31602
 postcode: "74140"
 city: Loisin
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/longechenal/chez-gwen.yml b/data/cities/longechenal/chez-gwen.yml
index 8c8d1b3e7..6b70be86d 100644
--- a/data/cities/longechenal/chez-gwen.yml
+++ b/data/cities/longechenal/chez-gwen.yml
@@ -4,8 +4,9 @@ latitude: 45.41832
 longitude: 5.34743
 postcode: "38690"
 city: Longechenal
-street: "Rue de la Soierie"
-housenumber: 10
+street: Rue de la Soierie
+housenumber: "10"
 phone: ""
-opening_hours: "Mo,Tu,Th 07:30-12:00,16:00-19:00; Fr,Sa 07:30-12:00,16:00-20:00; Du 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th 07:30-12:00,16:00-19:00; Fr,Sa 07:30-12:00,16:00-20:00; Du
+    08:30-12:00
+website: ""
diff --git a/data/cities/loriol-sur-drome/a-travers-champs.yml b/data/cities/loriol-sur-drome/a-travers-champs.yml
index 283b52080..e908212d7 100644
--- a/data/cities/loriol-sur-drome/a-travers-champs.yml
+++ b/data/cities/loriol-sur-drome/a-travers-champs.yml
@@ -4,8 +4,8 @@ latitude: 44.74085
 longitude: 4.80582
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Chemin de Bras de Zil"
-housenumber: 70
+street: Chemin de Bras de Zil
+housenumber: "70"
 phone: "+33475552785"
-opening_hours: "We-Th,Sa 09:00-12:30; Tu,Fr 09:00-12:30,15:00-19:00"
-website: "https://www.facebook.com/atraverschamps.loriol/"
\ No newline at end of file
+opening_hours: We-Th,Sa 09:00-12:30; Tu,Fr 09:00-12:30,15:00-19:00
+website: https://www.facebook.com/atraverschamps.loriol/
diff --git a/data/cities/loriol-sur-drome/cbd-loriol-26.yml b/data/cities/loriol-sur-drome/cbd-loriol-26.yml
index e4e2221c7..caaf8c93d 100644
--- a/data/cities/loriol-sur-drome/cbd-loriol-26.yml
+++ b/data/cities/loriol-sur-drome/cbd-loriol-26.yml
@@ -4,8 +4,8 @@ latitude: 44.7575
 longitude: 4.83673
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Impasse du Midi"
-housenumber: 
+street: Impasse du Midi
+housenumber: ""
 phone: "0674309916"
-opening_hours: "Tu-Fr 17:00-21:00; Sa 17:00-00:00"
-website: "https://cbdloriol26.eatbu.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 17:00-21:00; Sa 17:00-00:00
+website: https://cbdloriol26.eatbu.com/
diff --git a/data/cities/loriol-sur-drome/first-stop-pneu26.yml b/data/cities/loriol-sur-drome/first-stop-pneu26.yml
index 69bf8b8b9..996bb2401 100644
--- a/data/cities/loriol-sur-drome/first-stop-pneu26.yml
+++ b/data/cities/loriol-sur-drome/first-stop-pneu26.yml
@@ -4,8 +4,8 @@ latitude: 44.72966
 longitude: 4.8091
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Chemin de Fouillas"
-housenumber: 
-phone: "04 75 85 53 49"
-opening_hours: "Mo-Fr 09:00-12:00,13:30-18:00"
-website: ""
\ No newline at end of file
+street: Chemin de Fouillas
+housenumber: ""
+phone: 04 75 85 53 49
+opening_hours: Mo-Fr 09:00-12:00,13:30-18:00
+website: ""
diff --git a/data/cities/loriol-sur-drome/generale-doptique.yml b/data/cities/loriol-sur-drome/generale-doptique.yml
index 7bde1f55b..9bbb9036f 100644
--- a/data/cities/loriol-sur-drome/generale-doptique.yml
+++ b/data/cities/loriol-sur-drome/generale-doptique.yml
@@ -1,11 +1,11 @@
 id: 71556935
-type: way
+type: node
 latitude: 44.75985
 longitude: 4.83735
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Allée des Crozes"
-housenumber: 
+street: Allée des Crozes
+housenumber: ""
 phone: "0475806347"
-opening_hours: "Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/loriol-sur-drome/gitem.yml b/data/cities/loriol-sur-drome/gitem.yml
index 4ff21298e..5480d45a3 100644
--- a/data/cities/loriol-sur-drome/gitem.yml
+++ b/data/cities/loriol-sur-drome/gitem.yml
@@ -4,8 +4,8 @@ latitude: 44.75503
 longitude: 4.82706
 postcode: "26270"
 city: Loriol sur Drome
-street: "Avenue de la République"
-housenumber: 1
+street: Avenue de la République
+housenumber: "1"
 phone: "0475855851"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/loriol-sur-drome/la-boutic-fleurie.yml b/data/cities/loriol-sur-drome/la-boutic-fleurie.yml
index 539338845..f7b8b9048 100644
--- a/data/cities/loriol-sur-drome/la-boutic-fleurie.yml
+++ b/data/cities/loriol-sur-drome/la-boutic-fleurie.yml
@@ -4,8 +4,8 @@ latitude: 44.75244
 longitude: 4.82093
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Avenue de la République"
-housenumber: 83
-phone: "+33 4 75 85 52 26"
-opening_hours: "Mo-Sa 08:45-12:15, Tu-Sa 14:30-19:15, Su 09:30-12:00"
-website: "https://www.labouticfleurie.fr"
\ No newline at end of file
+street: Avenue de la République
+housenumber: "83"
+phone: +33 4 75 85 52 26
+opening_hours: Mo-Sa 08:45-12:15, Tu-Sa 14:30-19:15, Su 09:30-12:00
+website: https://www.labouticfleurie.fr
diff --git a/data/cities/loriol-sur-drome/loriol-coiffure.yml b/data/cities/loriol-sur-drome/loriol-coiffure.yml
index 9575e0328..cf3fcb0ff 100644
--- a/data/cities/loriol-sur-drome/loriol-coiffure.yml
+++ b/data/cities/loriol-sur-drome/loriol-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 44.75112
 longitude: 4.82066
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Avenue de la République"
-housenumber: 123
-phone: "+33 4 75 61 36 36"
-opening_hours: "Tu-Fr 07:15-12:00, Sa 07:00-16:00, Tu 13:30-19:00, We 13:30-18:00, Th 13:30-16:00, Fr 13:30-19:00"
-website: ""
\ No newline at end of file
+street: Avenue de la République
+housenumber: "123"
+phone: +33 4 75 61 36 36
+opening_hours: Tu-Fr 07:15-12:00, Sa 07:00-16:00, Tu 13:30-19:00, We 13:30-18:00,
+    Th 13:30-16:00, Fr 13:30-19:00
+website: ""
diff --git a/data/cities/loriol-sur-drome/miss-barber.yml b/data/cities/loriol-sur-drome/miss-barber.yml
index 16638eaa1..22ea62ccd 100644
--- a/data/cities/loriol-sur-drome/miss-barber.yml
+++ b/data/cities/loriol-sur-drome/miss-barber.yml
@@ -4,8 +4,8 @@ latitude: 44.75282
 longitude: 4.82274
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Avenue de la République"
-housenumber: 55
+street: Avenue de la République
+housenumber: "55"
 phone: "0988046317"
-opening_hours: "Mo-Tu 09:30-19:00; Th-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu 09:30-19:00; Th-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/loriol-sur-drome/multi-services-fournier-dominique.yml b/data/cities/loriol-sur-drome/multi-services-fournier-dominique.yml
index 9d0df9dbc..689730258 100644
--- a/data/cities/loriol-sur-drome/multi-services-fournier-dominique.yml
+++ b/data/cities/loriol-sur-drome/multi-services-fournier-dominique.yml
@@ -4,8 +4,8 @@ latitude: 44.7585
 longitude: 4.83689
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Allée des Crozes"
-housenumber: 
+street: Allée des Crozes
+housenumber: ""
 phone: "0475855770"
-opening_hours: "Tu-Fr 09:00-18:30; Sa 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-18:30; Sa 09:00-17:00
+website: ""
diff --git a/data/cities/loriol-sur-drome/pascal-coste.yml b/data/cities/loriol-sur-drome/pascal-coste.yml
index dd312afe9..be9c49e7e 100644
--- a/data/cities/loriol-sur-drome/pascal-coste.yml
+++ b/data/cities/loriol-sur-drome/pascal-coste.yml
@@ -4,8 +4,8 @@ latitude: 44.75855
 longitude: 4.837
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Allée des Crozes"
-housenumber: 
+street: Allée des Crozes
+housenumber: ""
 phone: "0475613486"
-opening_hours: "Mo-Sa 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00
+website: ""
diff --git a/data/cities/loriol-sur-drome/passion-beaute.yml b/data/cities/loriol-sur-drome/passion-beaute.yml
index 8b8a9f254..8ce7b7566 100644
--- a/data/cities/loriol-sur-drome/passion-beaute.yml
+++ b/data/cities/loriol-sur-drome/passion-beaute.yml
@@ -4,8 +4,8 @@ latitude: 44.75869
 longitude: 4.83732
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Allée des Crozes"
-housenumber: 
-phone: "04 75 83 76 65"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+street: Allée des Crozes
+housenumber: ""
+phone: 04 75 83 76 65
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/loriol-sur-drome/salon-le-xv.yml b/data/cities/loriol-sur-drome/salon-le-xv.yml
index cfd0fd402..54ecd91eb 100644
--- a/data/cities/loriol-sur-drome/salon-le-xv.yml
+++ b/data/cities/loriol-sur-drome/salon-le-xv.yml
@@ -4,8 +4,8 @@ latitude: 44.75265
 longitude: 4.82147
 postcode: "26270"
 city: Loriol-sur-Drôme
-street: "Avenue de la République"
-housenumber: 71
-phone: "04 75 79 10 74"
-opening_hours: "Tu-Th 07:00-12:00,14:00-19:00; Fr 07:00-16:00; Sa 07:00-19:00; "
-website: ""
\ No newline at end of file
+street: Avenue de la République
+housenumber: "71"
+phone: 04 75 79 10 74
+opening_hours: 'Tu-Th 07:00-12:00,14:00-19:00; Fr 07:00-16:00; Sa 07:00-19:00; '
+website: ""
diff --git a/data/cities/lozanne/carosserie-var.yml b/data/cities/lozanne/carosserie-var.yml
index efe33da85..69c5e490e 100644
--- a/data/cities/lozanne/carosserie-var.yml
+++ b/data/cities/lozanne/carosserie-var.yml
@@ -1,11 +1,11 @@
 id: 136475238
-type: way
+type: node
 latitude: 45.85777
 longitude: 4.6963
 postcode: "69380"
 city: Lozanne
-street: "Chemin de la Rivière"
-housenumber: 
+street: Chemin de la Rivière
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lozanne/grand-frais.yml b/data/cities/lozanne/grand-frais.yml
index eb056c197..58fd02c39 100644
--- a/data/cities/lozanne/grand-frais.yml
+++ b/data/cities/lozanne/grand-frais.yml
@@ -1,11 +1,11 @@
 id: 136474815
-type: way
+type: node
 latitude: 45.85608
 longitude: 4.69557
 postcode: "69380"
 city: Lozanne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lozanne/lidl.yml b/data/cities/lozanne/lidl.yml
index 906dd0951..2869d3b1b 100644
--- a/data/cities/lozanne/lidl.yml
+++ b/data/cities/lozanne/lidl.yml
@@ -1,11 +1,11 @@
 id: 136476491
-type: way
+type: node
 latitude: 45.85526
 longitude: 4.69169
 postcode: "69380"
 city: Lozanne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lozanne/magnolisa.yml b/data/cities/lozanne/magnolisa.yml
index 4cf9966a8..b677d1e96 100644
--- a/data/cities/lozanne/magnolisa.yml
+++ b/data/cities/lozanne/magnolisa.yml
@@ -4,8 +4,8 @@ latitude: 45.85531
 longitude: 4.67978
 postcode: "69380"
 city: Lozanne
-street: "Rue du Pont"
-housenumber: 13
+street: Rue du Pont
+housenumber: "13"
 phone: "+33478430733"
-opening_hours: "Tu-Sa 09:30-12:30,15:00-19:00; Su 09:30-12:30"
-website: "https://magnolisa.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30,15:00-19:00; Su 09:30-12:30
+website: https://magnolisa.fr/
diff --git a/data/cities/lozanne/marche-aux-affaires.yml b/data/cities/lozanne/marche-aux-affaires.yml
index ed3aa58d4..f409af79e 100644
--- a/data/cities/lozanne/marche-aux-affaires.yml
+++ b/data/cities/lozanne/marche-aux-affaires.yml
@@ -1,11 +1,11 @@
 id: 136475325
-type: way
+type: node
 latitude: 45.85572
 longitude: 4.6912
 postcode: "69380"
 city: Lozanne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lozanne/mondovelo.yml b/data/cities/lozanne/mondovelo.yml
index 57b193858..794e55f42 100644
--- a/data/cities/lozanne/mondovelo.yml
+++ b/data/cities/lozanne/mondovelo.yml
@@ -4,8 +4,8 @@ latitude: 45.85543
 longitude: 4.68438
 postcode: "69380"
 city: Lozanne
-street: "Route de Lyon"
-housenumber: 333
-phone: "+33 4 72 48 99 73"
-opening_hours: "Mo-Sa09:00-12:00,14:00-19:00"
-website: "https://www.mondovelo.fr/magasins/140-mondovelo-lozanne"
\ No newline at end of file
+street: Route de Lyon
+housenumber: "333"
+phone: +33 4 72 48 99 73
+opening_hours: Mo-Sa09:00-12:00,14:00-19:00
+website: https://www.mondovelo.fr/magasins/140-mondovelo-lozanne
diff --git a/data/cities/lozanne/so-bio.yml b/data/cities/lozanne/so-bio.yml
index 94bb24037..105ff629a 100644
--- a/data/cities/lozanne/so-bio.yml
+++ b/data/cities/lozanne/so-bio.yml
@@ -4,8 +4,8 @@ latitude: 45.85532
 longitude: 4.68724
 postcode: "69380"
 city: Lozanne
-street: "Rue de l'Entreprise"
-housenumber: 108
-phone: "+33 4 72 20 99 90"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.sobio.fr/magasin/so-bio-lozanne"
\ No newline at end of file
+street: Rue de l'Entreprise
+housenumber: "108"
+phone: +33 4 72 20 99 90
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.sobio.fr/magasin/so-bio-lozanne
diff --git a/data/cities/luc-en-diois/epicerie-la-milpa.yml b/data/cities/luc-en-diois/epicerie-la-milpa.yml
index 3990f1f78..9ee56faf5 100644
--- a/data/cities/luc-en-diois/epicerie-la-milpa.yml
+++ b/data/cities/luc-en-diois/epicerie-la-milpa.yml
@@ -4,8 +4,8 @@ latitude: 44.61488
 longitude: 5.45254
 postcode: "26310"
 city: Luc-en-Diois
-street: "Grande Rue"
-housenumber: 99
-phone: "04 75 22 39 67"
-opening_hours: "Ouvert du mardi au samedi de 8h30 à 12h30 et de 15h30 à 19h"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "99"
+phone: 04 75 22 39 67
+opening_hours: Ouvert du mardi au samedi de 8h30 à 12h30 et de 15h30 à 19h
+website: ""
diff --git a/data/cities/lucenay/aux-pains-dantan.yml b/data/cities/lucenay/aux-pains-dantan.yml
index c8ffd1f2d..111e68348 100644
--- a/data/cities/lucenay/aux-pains-dantan.yml
+++ b/data/cities/lucenay/aux-pains-dantan.yml
@@ -4,8 +4,8 @@ latitude: 45.91328
 longitude: 4.70296
 postcode: "69480"
 city: Lucenay
-street: "Route d'Anse"
-housenumber: 114
+street: Route d'Anse
+housenumber: "114"
 phone: "+33987091632"
-opening_hours: "Tu-Fr 06:00-13:00,15:30-19:30; Sa 06:00-13:00,16:00-19:00; Su 06:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:00-13:00,15:30-19:30; Sa 06:00-13:00,16:00-19:00; Su 06:00-12:30
+website: ""
diff --git a/data/cities/lucenay/coeur-de-ferme.yml b/data/cities/lucenay/coeur-de-ferme.yml
index 34bb70607..6cb4095f3 100644
--- a/data/cities/lucenay/coeur-de-ferme.yml
+++ b/data/cities/lucenay/coeur-de-ferme.yml
@@ -4,8 +4,8 @@ latitude: 45.91723
 longitude: 4.70627
 postcode: "69480"
 city: Lucenay
-street: "Rue du Stade"
-housenumber: 554
+street: Rue du Stade
+housenumber: "554"
 phone: "+33474071793"
-opening_hours: "We-Sa 08:30-12:30,15:00-19:00; Su 09:00-12:30"
-website: "http://www.coeurdeferme.com"
\ No newline at end of file
+opening_hours: We-Sa 08:30-12:30,15:00-19:00; Su 09:00-12:30
+website: http://www.coeurdeferme.com
diff --git a/data/cities/lucenay/etincelle-color.yml b/data/cities/lucenay/etincelle-color.yml
index e865145ca..ab3585f3f 100644
--- a/data/cities/lucenay/etincelle-color.yml
+++ b/data/cities/lucenay/etincelle-color.yml
@@ -4,8 +4,8 @@ latitude: 45.91312
 longitude: 4.70121
 postcode: "69480"
 city: Lucenay
-street: "Place de l'Église"
-housenumber: 
+street: Place de l'Église
+housenumber: ""
 phone: "+33474099436"
-opening_hours: "Tu-Th 09:00-12:00,13:30-18:30; Fr 09:00-18:30; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-12:00,13:30-18:30; Fr 09:00-18:30; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/lucenay/institut-des-pierres-dorees.yml b/data/cities/lucenay/institut-des-pierres-dorees.yml
index 49f99984a..c4ccf77b2 100644
--- a/data/cities/lucenay/institut-des-pierres-dorees.yml
+++ b/data/cities/lucenay/institut-des-pierres-dorees.yml
@@ -4,8 +4,8 @@ latitude: 45.91322
 longitude: 4.7012
 postcode: "69480"
 city: Lucenay
-street: "La Ruelle"
-housenumber: 12
+street: La Ruelle
+housenumber: "12"
 phone: "+33474037721"
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-16:00"
-website: "https://www.linstitutdespierresdorees.com"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-16:00
+website: https://www.linstitutdespierresdorees.com
diff --git a/data/cities/lucinges/courant-dhair.yml b/data/cities/lucinges/courant-dhair.yml
index 81dd26ff6..113ed8f0c 100644
--- a/data/cities/lucinges/courant-dhair.yml
+++ b/data/cities/lucinges/courant-dhair.yml
@@ -4,8 +4,8 @@ latitude: 46.19062
 longitude: 6.31857
 postcode: ""
 city: Lucinges
-street: "Place de l'Église"
-housenumber: 73
+street: Place de l'Église
+housenumber: "73"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lucinges/la-boutique-postale.yml b/data/cities/lucinges/la-boutique-postale.yml
index 1932bad57..010f467e4 100644
--- a/data/cities/lucinges/la-boutique-postale.yml
+++ b/data/cities/lucinges/la-boutique-postale.yml
@@ -4,8 +4,8 @@ latitude: 46.19049
 longitude: 6.31823
 postcode: ""
 city: Lucinges
-street: "Place de l'Église"
-housenumber: 47
+street: Place de l'Église
+housenumber: "47"
 phone: ""
-opening_hours: "Mo-Sa 08:30-12:30, 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:30, 15:30-19:30
+website: ""
diff --git a/data/cities/lucinges/latelier-damelie.yml b/data/cities/lucinges/latelier-damelie.yml
index dad72f1c7..5431efa67 100644
--- a/data/cities/lucinges/latelier-damelie.yml
+++ b/data/cities/lucinges/latelier-damelie.yml
@@ -4,8 +4,8 @@ latitude: 46.19048
 longitude: 6.31722
 postcode: "74380"
 city: Lucinges
-street: "Chemin des Jardins"
-housenumber: 35
-phone: "+33 637670408"
-opening_hours: "Mo-Fr 09:00-17:00; Sa 09:00-12:30"
-website: ""
\ No newline at end of file
+street: Chemin des Jardins
+housenumber: "35"
+phone: +33 637670408
+opening_hours: Mo-Fr 09:00-17:00; Sa 09:00-12:30
+website: ""
diff --git a/data/cities/lucinges/les-delices-de-jeanne-et-mateo.yml b/data/cities/lucinges/les-delices-de-jeanne-et-mateo.yml
index e4c500923..f8be8002c 100644
--- a/data/cities/lucinges/les-delices-de-jeanne-et-mateo.yml
+++ b/data/cities/lucinges/les-delices-de-jeanne-et-mateo.yml
@@ -4,8 +4,8 @@ latitude: 46.19052
 longitude: 6.31865
 postcode: "74380"
 city: Lucinges
-street: "Place de l'Église"
-housenumber: 81
+street: Place de l'Église
+housenumber: "81"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 06:30-19:00; Su 06:30-13:30"
-website: "https://lesdelicesdejeanneetmateo.eatbu.com/?lang=fr"
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 06:30-19:00; Su 06:30-13:30
+website: https://lesdelicesdejeanneetmateo.eatbu.com/?lang=fr
diff --git a/data/cities/lugrin/intermarche.yml b/data/cities/lugrin/intermarche.yml
index 172e9b67f..1ab274140 100644
--- a/data/cities/lugrin/intermarche.yml
+++ b/data/cities/lugrin/intermarche.yml
@@ -1,11 +1,11 @@
 id: 66851320
-type: way
+type: node
 latitude: 46.40026
 longitude: 6.65438
 postcode: "74500"
 city: Lugrin
-street: "Avenue du Stade"
-housenumber: 
+street: Avenue du Stade
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:15; Su 08:30-11:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:15; Su 08:30-11:45
+website: ""
diff --git a/data/cities/lugrin/mad-style.yml b/data/cities/lugrin/mad-style.yml
index 8453ddf9b..f15af069e 100644
--- a/data/cities/lugrin/mad-style.yml
+++ b/data/cities/lugrin/mad-style.yml
@@ -5,7 +5,7 @@ longitude: 6.66607
 postcode: ""
 city: Lugrin
 street: ""
-housenumber: 12
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lugrin/pecherie-jacquier-fabien.yml b/data/cities/lugrin/pecherie-jacquier-fabien.yml
index e44ce6706..62fe1f64c 100644
--- a/data/cities/lugrin/pecherie-jacquier-fabien.yml
+++ b/data/cities/lugrin/pecherie-jacquier-fabien.yml
@@ -4,8 +4,8 @@ latitude: 46.40461
 longitude: 6.65881
 postcode: "74500"
 city: Lugrin
-street: "Route Nationale"
-housenumber: 51
+street: Route Nationale
+housenumber: "51"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:30,14:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:30,14:00-18:30; Su off
+website: ""
diff --git a/data/cities/lullin/boucherie-traiteur-decorzent.yml b/data/cities/lullin/boucherie-traiteur-decorzent.yml
index dbb3224b0..de03fded6 100644
--- a/data/cities/lullin/boucherie-traiteur-decorzent.yml
+++ b/data/cities/lullin/boucherie-traiteur-decorzent.yml
@@ -4,8 +4,8 @@ latitude: 46.28341
 longitude: 6.52181
 postcode: "74470"
 city: Lullin
-street: "Rue du Bourg"
-housenumber: 
+street: Rue du Bourg
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30,15:00-19:00; Su 07:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,15:00-19:00; Su 07:30-12:00
+website: ""
diff --git a/data/cities/lullin/carrefour-express.yml b/data/cities/lullin/carrefour-express.yml
index b52b82ba5..f67e3a560 100644
--- a/data/cities/lullin/carrefour-express.yml
+++ b/data/cities/lullin/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 46.28324
 longitude: 6.52124
 postcode: "74470"
 city: Lullin
-street: "Allée du Fumoir"
-housenumber: 97
+street: Allée du Fumoir
+housenumber: "97"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:30, 14:30-19:30; Su 08:30-13:00"
-website: "https://www.carrefour.fr/magasin/express-lullin"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30, 14:30-19:30; Su 08:30-13:00
+website: https://www.carrefour.fr/magasin/express-lullin
diff --git a/data/cities/lullin/tabac-presse-lullinois.yml b/data/cities/lullin/tabac-presse-lullinois.yml
index 08b29ec19..9e612489e 100644
--- a/data/cities/lullin/tabac-presse-lullinois.yml
+++ b/data/cities/lullin/tabac-presse-lullinois.yml
@@ -4,8 +4,8 @@ latitude: 46.28351
 longitude: 6.52189
 postcode: "74470"
 city: Lullin
-street: "Rue du Bourg"
-housenumber: 
+street: Rue du Bourg
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30
+website: ""
diff --git a/data/cities/lully/royal-viandes.yml b/data/cities/lully/royal-viandes.yml
index cca5e9f5f..287f1ff1b 100644
--- a/data/cities/lully/royal-viandes.yml
+++ b/data/cities/lully/royal-viandes.yml
@@ -1,11 +1,11 @@
 id: 1209330609
-type: way
+type: node
 latitude: 46.29118
 longitude: 6.40791
 postcode: "74890"
 city: Lully
-street: "Route des Esserts"
-housenumber: 95
+street: Route des Esserts
+housenumber: "95"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lully/vt-carrosserie.yml b/data/cities/lully/vt-carrosserie.yml
index 89eecfc3a..1a7692b96 100644
--- a/data/cities/lully/vt-carrosserie.yml
+++ b/data/cities/lully/vt-carrosserie.yml
@@ -1,11 +1,11 @@
 id: 1275225846
-type: way
+type: node
 latitude: 46.28636
 longitude: 6.4182
 postcode: "74890"
 city: Lully
-street: "Route de Vaudalon"
-housenumber: 5
+street: Route de Vaudalon
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lumbin/air-et-aventure.yml b/data/cities/lumbin/air-et-aventure.yml
index aca6599ae..816466387 100644
--- a/data/cities/lumbin/air-et-aventure.yml
+++ b/data/cities/lumbin/air-et-aventure.yml
@@ -4,8 +4,8 @@ latitude: 45.30238
 longitude: 5.90834
 postcode: "38660"
 city: Lumbin
-street: "Chemin des Longs Prés"
-housenumber: 283
+street: Chemin des Longs Prés
+housenumber: "283"
 phone: "+33476924346"
-opening_hours: "Tu-Fr 10:00-12:30,13:30-18:00; Mo 10:30-12:30,13:30-18:00"
-website: "https://www.airetaventure.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:30,13:30-18:00; Mo 10:30-12:30,13:30-18:00
+website: https://www.airetaventure.com/
diff --git a/data/cities/lupe/dumoulin-produits-delices.yml b/data/cities/lupe/dumoulin-produits-delices.yml
index c18c596be..421a2a837 100644
--- a/data/cities/lupe/dumoulin-produits-delices.yml
+++ b/data/cities/lupe/dumoulin-produits-delices.yml
@@ -4,8 +4,8 @@ latitude: 45.36852
 longitude: 4.69571
 postcode: "42520"
 city: Lupé
-street: "Route de Maclas"
-housenumber: 443
+street: Route de Maclas
+housenumber: "443"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lussas/la-lussassoise.yml b/data/cities/lussas/la-lussassoise.yml
index 2260a39d5..9ecf67580 100644
--- a/data/cities/lussas/la-lussassoise.yml
+++ b/data/cities/lussas/la-lussassoise.yml
@@ -5,7 +5,7 @@ longitude: 4.47249
 postcode: ""
 city: Lussas
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/luzinay/boulangerie-simon.yml b/data/cities/luzinay/boulangerie-simon.yml
index 131a05773..5e66fddae 100644
--- a/data/cities/luzinay/boulangerie-simon.yml
+++ b/data/cities/luzinay/boulangerie-simon.yml
@@ -5,7 +5,7 @@ longitude: 4.95718
 postcode: "38200"
 city: Luzinay
 street: ""
-housenumber: 65
+housenumber: "65"
 phone: "+33954981014"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/6th-barbershop-coiffeur-homme-lyon.yml b/data/cities/lyon/6th-barbershop-coiffeur-homme-lyon.yml
index 9583c4911..85abc13b3 100644
--- a/data/cities/lyon/6th-barbershop-coiffeur-homme-lyon.yml
+++ b/data/cities/lyon/6th-barbershop-coiffeur-homme-lyon.yml
@@ -4,8 +4,8 @@ latitude: 45.75494
 longitude: 4.86751
 postcode: "69003"
 city: Lyon
-street: "rue Turbil"
-housenumber: 48
+street: rue Turbil
+housenumber: "48"
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: ""
diff --git a/data/cities/lyon/8-o-velo.yml b/data/cities/lyon/8-o-velo.yml
index 1c74b9088..eaf74b5f6 100644
--- a/data/cities/lyon/8-o-velo.yml
+++ b/data/cities/lyon/8-o-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.73727
 longitude: 4.86246
 postcode: "69008"
 city: Lyon
-street: "Rue Villon"
-housenumber: 95
+street: Rue Villon
+housenumber: "95"
 phone: ""
-opening_hours: "Tu-We 14:00-19:00; Fr 14:00-16:00; Sa 10:00-13:00,14:00-19:00"
-website: "https://www.janus-france.org"
\ No newline at end of file
+opening_hours: Tu-We 14:00-19:00; Fr 14:00-16:00; Sa 10:00-13:00,14:00-19:00
+website: https://www.janus-france.org
diff --git a/data/cities/lyon/algerie-ferries.yml b/data/cities/lyon/algerie-ferries.yml
index 982e43b46..7f870b0e8 100644
--- a/data/cities/lyon/algerie-ferries.yml
+++ b/data/cities/lyon/algerie-ferries.yml
@@ -4,8 +4,8 @@ latitude: 45.76024
 longitude: 4.84488
 postcode: "69003"
 city: Lyon
-street: "Rue Servient"
-housenumber: 37
+street: Rue Servient
+housenumber: "37"
 phone: ""
-opening_hours: "Mo-Sa 09:00-15:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-15:00
+website: ""
diff --git a/data/cities/lyon/apple-store.yml b/data/cities/lyon/apple-store.yml
index f3d62a436..9e7767806 100644
--- a/data/cities/lyon/apple-store.yml
+++ b/data/cities/lyon/apple-store.yml
@@ -4,8 +4,8 @@ latitude: 45.74122
 longitude: 4.81629
 postcode: "69002"
 city: Lyon
-street: "Cours Charlemagne"
-housenumber: 112
-phone: "+33 4 37 23 15 00"
-opening_hours: "Mo-Sa 10:00-20:00"
-website: "https://www.apple.com/fr/retail/confluence/"
\ No newline at end of file
+street: Cours Charlemagne
+housenumber: "112"
+phone: +33 4 37 23 15 00
+opening_hours: Mo-Sa 10:00-20:00
+website: https://www.apple.com/fr/retail/confluence/
diff --git a/data/cities/lyon/assia.yml b/data/cities/lyon/assia.yml
index 909ec3ad0..1a2eec7a5 100644
--- a/data/cities/lyon/assia.yml
+++ b/data/cities/lyon/assia.yml
@@ -4,8 +4,8 @@ latitude: 45.76643
 longitude: 4.84161
 postcode: "69006"
 city: Lyon
-street: "Quai Général Sarrail"
-housenumber: 6
-phone: "+33 4 72 45 58 18"
+street: Quai Général Sarrail
+housenumber: "6"
+phone: +33 4 72 45 58 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/atelier-du-quai.yml b/data/cities/lyon/atelier-du-quai.yml
index 80727ab61..a14c400af 100644
--- a/data/cities/lyon/atelier-du-quai.yml
+++ b/data/cities/lyon/atelier-du-quai.yml
@@ -4,8 +4,8 @@ latitude: 45.76663
 longitude: 4.84158
 postcode: "69006"
 city: Lyon
-street: "Quai Général Sarrail"
-housenumber: 5
-phone: "+33 4 72 41 84 38"
+street: Quai Général Sarrail
+housenumber: "5"
+phone: +33 4 72 41 84 38
 opening_hours: ""
-website: "https://www.atelierduquai.com/"
\ No newline at end of file
+website: https://www.atelierduquai.com/
diff --git a/data/cities/lyon/auchan-supermarche.yml b/data/cities/lyon/auchan-supermarche.yml
index 3bd28aa14..c756e2fd4 100644
--- a/data/cities/lyon/auchan-supermarche.yml
+++ b/data/cities/lyon/auchan-supermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.73749
 longitude: 4.83619
 postcode: "69007"
 city: Lyon
-street: "Place Antoinette Fouque"
-housenumber: 1
-phone: "+33 4 37 65 38 80"
-opening_hours: "Mo-Sa 08:30-21:00; Su 08:30-12:30"
-website: "https://www.auchan.fr/magasins/supermarche-lyon-gerland/sl-1295"
\ No newline at end of file
+street: Place Antoinette Fouque
+housenumber: "1"
+phone: +33 4 37 65 38 80
+opening_hours: Mo-Sa 08:30-21:00; Su 08:30-12:30
+website: https://www.auchan.fr/magasins/supermarche-lyon-gerland/sl-1295
diff --git a/data/cities/lyon/audition-conseil.yml b/data/cities/lyon/audition-conseil.yml
index 4134631ea..6ac9bbda7 100644
--- a/data/cities/lyon/audition-conseil.yml
+++ b/data/cities/lyon/audition-conseil.yml
@@ -4,8 +4,8 @@ latitude: 45.73196
 longitude: 4.86598
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 83
-phone: "+33 4 28 70 75 02"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00"
-website: "https://www.auditionconseil.fr/"
\ No newline at end of file
+street: Boulevard des États-Unis
+housenumber: "83"
+phone: +33 4 28 70 75 02
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:00
+website: https://www.auditionconseil.fr/
diff --git a/data/cities/lyon/auto-ollier.yml b/data/cities/lyon/auto-ollier.yml
index 9eb6d0fa9..8f41c3aca 100644
--- a/data/cities/lyon/auto-ollier.yml
+++ b/data/cities/lyon/auto-ollier.yml
@@ -4,8 +4,8 @@ latitude: 45.75211
 longitude: 4.83841
 postcode: "69007"
 city: Lyon
-street: "Rue Cavenne"
-housenumber: 33
+street: Rue Cavenne
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/baralinge-rue-de-saint-cyr.yml b/data/cities/lyon/baralinge-rue-de-saint-cyr.yml
index 6db7eed6e..748c4aa1c 100644
--- a/data/cities/lyon/baralinge-rue-de-saint-cyr.yml
+++ b/data/cities/lyon/baralinge-rue-de-saint-cyr.yml
@@ -4,8 +4,8 @@ latitude: 45.78051
 longitude: 4.80709
 postcode: "69009"
 city: Lyon
-street: "Rue de Saint-Cyr"
-housenumber: 41
-phone: "+33 9 53 52 39 64"
-opening_hours: "Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue de Saint-Cyr
+housenumber: "41"
+phone: +33 9 53 52 39 64
+opening_hours: Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/lyon/baralinge.yml b/data/cities/lyon/baralinge.yml
index a520f8096..c867bebe9 100644
--- a/data/cities/lyon/baralinge.yml
+++ b/data/cities/lyon/baralinge.yml
@@ -4,8 +4,8 @@ latitude: 45.753
 longitude: 4.83174
 postcode: "69002"
 city: Lyon
-street: "Rue de la Charité"
-housenumber: 21
-phone: "+33 4 78 29 79 78"
-opening_hours: "Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-12:00,14:00-19:00"
-website: "https://www.baralinge.com/"
\ No newline at end of file
+street: Rue de la Charité
+housenumber: "21"
+phone: +33 4 78 29 79 78
+opening_hours: Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-12:00,14:00-19:00
+website: https://www.baralinge.com/
diff --git a/data/cities/lyon/biocoop.yml b/data/cities/lyon/biocoop.yml
index f2d01521c..9f8895751 100644
--- a/data/cities/lyon/biocoop.yml
+++ b/data/cities/lyon/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 45.76416
 longitude: 4.85811
 postcode: "69006"
 city: Lyon
-street: "Rue Waldeck-Rousseau"
-housenumber: 68
-phone: "+33 4 78 26 65 88"
-opening_hours: "Mo-Su 08:30-19:30; PH 09:30-14:00,16:00-19:30"
-website: "https://www.biocoop.fr/magasins-bio/Trouver-mon-magasin-Biocoop/Auvergne-Rhone-Alpes/Rhone/BIOCOOP-BROTTEAUX"
\ No newline at end of file
+street: Rue Waldeck-Rousseau
+housenumber: "68"
+phone: +33 4 78 26 65 88
+opening_hours: Mo-Su 08:30-19:30; PH 09:30-14:00,16:00-19:30
+website: https://www.biocoop.fr/magasins-bio/Trouver-mon-magasin-Biocoop/Auvergne-Rhone-Alpes/Rhone/BIOCOOP-BROTTEAUX
diff --git a/data/cities/lyon/boucherie-des-etats.yml b/data/cities/lyon/boucherie-des-etats.yml
index 6360a5c72..4219fa016 100644
--- a/data/cities/lyon/boucherie-des-etats.yml
+++ b/data/cities/lyon/boucherie-des-etats.yml
@@ -4,8 +4,8 @@ latitude: 45.7321
 longitude: 4.86508
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 78
-phone: "+33 4 82 33 33 80"
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+street: Boulevard des États-Unis
+housenumber: "78"
+phone: +33 4 82 33 33 80
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/lyon/boulangerie-sintra.yml b/data/cities/lyon/boulangerie-sintra.yml
index eba254625..e28d7f67f 100644
--- a/data/cities/lyon/boulangerie-sintra.yml
+++ b/data/cities/lyon/boulangerie-sintra.yml
@@ -4,8 +4,8 @@ latitude: 45.73397
 longitude: 4.83953
 postcode: "69007"
 city: Lyon
-street: "Rue de Gerland"
-housenumber: 125
+street: Rue de Gerland
+housenumber: "125"
 phone: ""
-opening_hours: "Mo-Fr 06:30-19:30; Sa 07:00-14:00"
-website: "https://boulangerie-sintra-lyon.eatbu.com/?lang=fr"
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-19:30; Sa 07:00-14:00
+website: https://boulangerie-sintra-lyon.eatbu.com/?lang=fr
diff --git a/data/cities/lyon/cabesto.yml b/data/cities/lyon/cabesto.yml
index 17765623f..ef83f54fd 100644
--- a/data/cities/lyon/cabesto.yml
+++ b/data/cities/lyon/cabesto.yml
@@ -4,8 +4,8 @@ latitude: 45.76732
 longitude: 4.8492
 postcode: "69006"
 city: Lyon
-street: "Rue Boileau"
-housenumber: 102
-phone: "+33 4 37 24 22 23"
-opening_hours: "Tu-Fr 11:00-14:00,15:00-19:00; Sa 11:00-19:00"
-website: "https://www.cabesto.com/fr/verticalite"
\ No newline at end of file
+street: Rue Boileau
+housenumber: "102"
+phone: +33 4 37 24 22 23
+opening_hours: Tu-Fr 11:00-14:00,15:00-19:00; Sa 11:00-19:00
+website: https://www.cabesto.com/fr/verticalite
diff --git a/data/cities/lyon/carrefour-city-rue-louise.yml b/data/cities/lyon/carrefour-city-rue-louise.yml
index 2a4c5cc0d..281ea0817 100644
--- a/data/cities/lyon/carrefour-city-rue-louise.yml
+++ b/data/cities/lyon/carrefour-city-rue-louise.yml
@@ -4,8 +4,8 @@ latitude: 45.75017
 longitude: 4.88545
 postcode: "69003"
 city: Lyon
-street: "Rue Louise"
-housenumber: 10
-phone: "+33 472127442"
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/city-lyon-louise"
\ No newline at end of file
+street: Rue Louise
+housenumber: "10"
+phone: +33 472127442
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/city-lyon-louise
diff --git a/data/cities/lyon/carrefour-city.yml b/data/cities/lyon/carrefour-city.yml
index 99b8cc790..381c4b1e2 100644
--- a/data/cities/lyon/carrefour-city.yml
+++ b/data/cities/lyon/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.76508
 longitude: 4.83609
 postcode: "69002"
 city: Lyon
-street: "Rue de la République"
-housenumber: 17
+street: Rue de la République
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/city-lyon-republique"
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/city-lyon-republique
diff --git a/data/cities/lyon/carrosserie-des-etats-unis.yml b/data/cities/lyon/carrosserie-des-etats-unis.yml
index 6b929a991..cf1121d5a 100644
--- a/data/cities/lyon/carrosserie-des-etats-unis.yml
+++ b/data/cities/lyon/carrosserie-des-etats-unis.yml
@@ -4,8 +4,8 @@ latitude: 45.72537
 longitude: 4.87472
 postcode: "69008"
 city: Lyon
-street: "Rue Jules Valensaut"
-housenumber: 30
-phone: "+33 4 78 76 24 37"
-opening_hours: "Mo-Th 08:00-12:00,13:30-17:30; Fr 08:00-12:00,13:30-16:30"
-website: "https://www.axial.org/nos-carrossiers-axial/carrosserie-des-etats-unis"
\ No newline at end of file
+street: Rue Jules Valensaut
+housenumber: "30"
+phone: +33 4 78 76 24 37
+opening_hours: Mo-Th 08:00-12:00,13:30-17:30; Fr 08:00-12:00,13:30-16:30
+website: https://www.axial.org/nos-carrossiers-axial/carrosserie-des-etats-unis
diff --git a/data/cities/lyon/cavavin-croix-rousse.yml b/data/cities/lyon/cavavin-croix-rousse.yml
index 8363865f5..65b3a1cf3 100644
--- a/data/cities/lyon/cavavin-croix-rousse.yml
+++ b/data/cities/lyon/cavavin-croix-rousse.yml
@@ -4,8 +4,8 @@ latitude: 45.77627
 longitude: 4.833
 postcode: "69004"
 city: Lyon
-street: "Rue du Mail"
-housenumber: 1
-phone: "+33 4 78 49 78 07"
-opening_hours: "Tu-Th 9:30-13:00, 14:30-19:30; Fr-Sa 9:30-19:30; Su 09:30-13:00"
-website: ""
\ No newline at end of file
+street: Rue du Mail
+housenumber: "1"
+phone: +33 4 78 49 78 07
+opening_hours: Tu-Th 9:30-13:00, 14:30-19:30; Fr-Sa 9:30-19:30; Su 09:30-13:00
+website: ""
diff --git a/data/cities/lyon/cedre-rouge.yml b/data/cities/lyon/cedre-rouge.yml
index 1ebcccd84..6fb5251f9 100644
--- a/data/cities/lyon/cedre-rouge.yml
+++ b/data/cities/lyon/cedre-rouge.yml
@@ -4,8 +4,8 @@ latitude: 45.7798
 longitude: 4.8071
 postcode: "69009"
 city: Lyon
-street: "Rue de Saint-Cyr"
-housenumber: 37
+street: Rue de Saint-Cyr
+housenumber: "37"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:30,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:30,13:30-19:00
+website: ""
diff --git a/data/cities/lyon/celine-bussy.yml b/data/cities/lyon/celine-bussy.yml
index 0c427c0b2..03d85d7ae 100644
--- a/data/cities/lyon/celine-bussy.yml
+++ b/data/cities/lyon/celine-bussy.yml
@@ -4,8 +4,8 @@ latitude: 45.76799
 longitude: 4.80684
 postcode: "69009"
 city: Lyon
-street: "Avenue René Cassin"
+street: Avenue René Cassin
 housenumber: 69C
-phone: "+33 6 89 36 48 32"
+phone: +33 6 89 36 48 32
 opening_hours: ""
-website: "https://www.chaussure-de-danse.com/"
\ No newline at end of file
+website: https://www.chaussure-de-danse.com/
diff --git a/data/cities/lyon/cerimonia.yml b/data/cities/lyon/cerimonia.yml
index 527eea404..1d0199bd6 100644
--- a/data/cities/lyon/cerimonia.yml
+++ b/data/cities/lyon/cerimonia.yml
@@ -4,8 +4,8 @@ latitude: 45.75549
 longitude: 4.84387
 postcode: "69003"
 city: Lyon
-street: "Rue Paul Bert"
-housenumber: 
+street: Rue Paul Bert
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/chez-jules.yml b/data/cities/lyon/chez-jules.yml
index 134e1f34c..5a5ca5ff3 100644
--- a/data/cities/lyon/chez-jules.yml
+++ b/data/cities/lyon/chez-jules.yml
@@ -4,8 +4,8 @@ latitude: 45.73721
 longitude: 4.83686
 postcode: "69007"
 city: Lyon
-street: "Avenue Jean Jaurès"
-housenumber: 182
-phone: "+33 4 78 96 01 38"
-opening_hours: "Mo-Sa 06:30-20:00; Su,PH 07:00-19:00"
-website: "https://www.boulangeriechezjules.fr/"
\ No newline at end of file
+street: Avenue Jean Jaurès
+housenumber: "182"
+phone: +33 4 78 96 01 38
+opening_hours: Mo-Sa 06:30-20:00; Su,PH 07:00-19:00
+website: https://www.boulangeriechezjules.fr/
diff --git a/data/cities/lyon/chez_lisounette.yml b/data/cities/lyon/chez_lisounette.yml
index 93954af32..502eb48b1 100644
--- a/data/cities/lyon/chez_lisounette.yml
+++ b/data/cities/lyon/chez_lisounette.yml
@@ -4,8 +4,8 @@ latitude: 45.76107
 longitude: 4.83205
 postcode: "69002"
 city: Lyon
-street: "Rue de l'Ancienne Préfecture"
-housenumber: 4
+street: Rue de l'Ancienne Préfecture
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/coiff8.yml b/data/cities/lyon/coiff8.yml
index 925ca3592..bdcdde7e8 100644
--- a/data/cities/lyon/coiff8.yml
+++ b/data/cities/lyon/coiff8.yml
@@ -4,8 +4,8 @@ latitude: 45.7254
 longitude: 4.88117
 postcode: "69008"
 city: Lyon
-street: "Avenue Paul Santy"
-housenumber: 184
+street: Avenue Paul Santy
+housenumber: "184"
 phone: "+33478016820"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/cycletic-cafe-velo.yml b/data/cities/lyon/cycletic-cafe-velo.yml
index 10569ae6a..cf7dad2ce 100644
--- a/data/cities/lyon/cycletic-cafe-velo.yml
+++ b/data/cities/lyon/cycletic-cafe-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.76362
 longitude: 4.86451
 postcode: "69003"
 city: Lyon
-street: "Cours Lafayette"
-housenumber: 250
-phone: "07 71 26 57 80"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.cycletic.fr/"
\ No newline at end of file
+street: Cours Lafayette
+housenumber: "250"
+phone: 07 71 26 57 80
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.cycletic.fr/
diff --git a/data/cities/lyon/daestore.yml b/data/cities/lyon/daestore.yml
index facc0cf0a..e7a58e77c 100644
--- a/data/cities/lyon/daestore.yml
+++ b/data/cities/lyon/daestore.yml
@@ -4,8 +4,8 @@ latitude: 45.75243
 longitude: 4.83125
 postcode: "69002"
 city: Lyon
-street: "Rue de la Charité"
-housenumber: 46
+street: Rue de la Charité
+housenumber: "46"
 phone: ""
-opening_hours: "Tu-Sa 11:00-19:00"
-website: "https://daestore.com/"
\ No newline at end of file
+opening_hours: Tu-Sa 11:00-19:00
+website: https://daestore.com/
diff --git a/data/cities/lyon/detente-coiffure.yml b/data/cities/lyon/detente-coiffure.yml
index 0cc70d5be..393706df9 100644
--- a/data/cities/lyon/detente-coiffure.yml
+++ b/data/cities/lyon/detente-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.72643
 longitude: 4.88034
 postcode: "69008"
 city: Lyon
-street: "Avenue Paul Santy"
-housenumber: 133
-phone: "+33 9 87 50 74 49"
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Paul Santy
+housenumber: "133"
+phone: +33 9 87 50 74 49
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/lyon/divina-sposa.yml b/data/cities/lyon/divina-sposa.yml
index 38b7120cc..8a499a4fe 100644
--- a/data/cities/lyon/divina-sposa.yml
+++ b/data/cities/lyon/divina-sposa.yml
@@ -4,8 +4,8 @@ latitude: 45.75539
 longitude: 4.8435
 postcode: "69003"
 city: Lyon
-street: "Rue Paul Bert"
-housenumber: 
+street: Rue Paul Bert
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/emmas-coffee.yml b/data/cities/lyon/emmas-coffee.yml
index 87b086c89..b13834802 100644
--- a/data/cities/lyon/emmas-coffee.yml
+++ b/data/cities/lyon/emmas-coffee.yml
@@ -4,8 +4,8 @@ latitude: 45.77574
 longitude: 4.80105
 postcode: "69009"
 city: Lyon
-street: "Rue Marietton"
-housenumber: 65
+street: Rue Marietton
+housenumber: "65"
 phone: ""
-opening_hours: "Mo-Fr 07:00-19:30; Sa 08:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-19:30; Sa 08:00-19:30
+website: ""
diff --git a/data/cities/lyon/fixetmove.yml b/data/cities/lyon/fixetmove.yml
index fed881568..ee0a32602 100644
--- a/data/cities/lyon/fixetmove.yml
+++ b/data/cities/lyon/fixetmove.yml
@@ -4,8 +4,8 @@ latitude: 45.75694
 longitude: 4.83301
 postcode: "69002"
 city: Lyon
-street: "Place Bellecour"
-housenumber: 
-phone: "+33.7 82 88 01 61"
-opening_hours: "Mo-Fr 10:00-13:00,14:00-18:00; Sa,Su 10:00-18:00"
-website: "https://fixandmove.fr/"
\ No newline at end of file
+street: Place Bellecour
+housenumber: ""
+phone: +33.7 82 88 01 61
+opening_hours: Mo-Fr 10:00-13:00,14:00-18:00; Sa,Su 10:00-18:00
+website: https://fixandmove.fr/
diff --git a/data/cities/lyon/gandi-moto.yml b/data/cities/lyon/gandi-moto.yml
index 256f8cb7c..41a3ed680 100644
--- a/data/cities/lyon/gandi-moto.yml
+++ b/data/cities/lyon/gandi-moto.yml
@@ -4,8 +4,8 @@ latitude: 45.72397
 longitude: 4.8736
 postcode: "69008"
 city: Lyon
-street: "Avenue Viviani"
+street: Avenue Viviani
 housenumber: 35 ter
-phone: "+33 4 78 76 44 35"
-opening_hours: "Tu-Fr 09:00-12:00,13:00-18:00; Sa 09:00-12:00,13:00-17:00"
-website: "https://www.gandi-moto.fr"
\ No newline at end of file
+phone: +33 4 78 76 44 35
+opening_hours: Tu-Fr 09:00-12:00,13:00-18:00; Sa 09:00-12:00,13:00-17:00
+website: https://www.gandi-moto.fr
diff --git a/data/cities/lyon/garage-il-primo.yml b/data/cities/lyon/garage-il-primo.yml
index fc668cb85..7b41523e2 100644
--- a/data/cities/lyon/garage-il-primo.yml
+++ b/data/cities/lyon/garage-il-primo.yml
@@ -4,8 +4,8 @@ latitude: 45.77076
 longitude: 4.85871
 postcode: "69006"
 city: Lyon
-street: "Boulevard Stalingrad"
-housenumber: 161
-phone: "+33 4 37 42 09 90"
-opening_hours: "Mo-Fr 08:00-12:30,13:30-19:00; Sa 08:00-12:00"
-website: ""
\ No newline at end of file
+street: Boulevard Stalingrad
+housenumber: "161"
+phone: +33 4 37 42 09 90
+opening_hours: Mo-Fr 08:00-12:30,13:30-19:00; Sa 08:00-12:00
+website: ""
diff --git a/data/cities/lyon/hema.yml b/data/cities/lyon/hema.yml
index 7053ab631..8d6860a26 100644
--- a/data/cities/lyon/hema.yml
+++ b/data/cities/lyon/hema.yml
@@ -4,8 +4,8 @@ latitude: 45.76102
 longitude: 4.83636
 postcode: "69002"
 city: Lyon
-street: "Rue de la République"
-housenumber: 53
-phone: "+33 4 72 16 10 61"
-opening_hours: "Mo-Fr 10:00-19:00; Sa 09:30-19:30"
-website: "https://www.hema.fr/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "53"
+phone: +33 4 72 16 10 61
+opening_hours: Mo-Fr 10:00-19:00; Sa 09:30-19:30
+website: https://www.hema.fr/
diff --git a/data/cities/lyon/hypercacher.yml b/data/cities/lyon/hypercacher.yml
index 62c0c11c5..3aaf6edaa 100644
--- a/data/cities/lyon/hypercacher.yml
+++ b/data/cities/lyon/hypercacher.yml
@@ -4,8 +4,8 @@ latitude: 45.76102
 longitude: 4.87138
 postcode: "69003"
 city: Lyon
-street: "Rue Claudius Pionchon"
-housenumber: 17
-phone: "+33 4 78 85 00 80"
-opening_hours: "Mo-Th 08:30-20:00; Fr 08:30-15:00; Su 09:00-14:00"
-website: ""
\ No newline at end of file
+street: Rue Claudius Pionchon
+housenumber: "17"
+phone: +33 4 78 85 00 80
+opening_hours: Mo-Th 08:30-20:00; Fr 08:30-15:00; Su 09:00-14:00
+website: ""
diff --git a/data/cities/lyon/institut-art-de-la-beaute.yml b/data/cities/lyon/institut-art-de-la-beaute.yml
index 3f151ae91..4fa1f95fb 100644
--- a/data/cities/lyon/institut-art-de-la-beaute.yml
+++ b/data/cities/lyon/institut-art-de-la-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.72569
 longitude: 4.88067
 postcode: "69008"
 city: Lyon
-street: "Avenue Paul Santy"
-housenumber: 180
-phone: "+33 4 78 75 53 67"
+street: Avenue Paul Santy
+housenumber: "180"
+phone: +33 4 78 75 53 67
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/jardin-fleuri.yml b/data/cities/lyon/jardin-fleuri.yml
index 2f19141cb..56059a887 100644
--- a/data/cities/lyon/jardin-fleuri.yml
+++ b/data/cities/lyon/jardin-fleuri.yml
@@ -1,11 +1,11 @@
 id: 125209762
-type: way
+type: node
 latitude: 45.76355
 longitude: 4.80054
 postcode: "69009"
 city: Lyon
-street: "Avenue Barthélémy Buyer"
-housenumber: 140
-phone: "+33 4 78 25 44 27"
+street: Avenue Barthélémy Buyer
+housenumber: "140"
+phone: +33 4 78 25 44 27
 opening_hours: ""
-website: "http://www.jardinerie-lyon.fr/"
\ No newline at end of file
+website: http://www.jardinerie-lyon.fr/
diff --git a/data/cities/lyon/jk-beaute.yml b/data/cities/lyon/jk-beaute.yml
index 787631113..1ecafae74 100644
--- a/data/cities/lyon/jk-beaute.yml
+++ b/data/cities/lyon/jk-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.73291
 longitude: 4.87915
 postcode: "69008"
 city: Lyon
-street: "Rue Claude Violet"
-housenumber: 4
-phone: "+33 4 78 01 02 41"
-opening_hours: "Tu-Fr 09:30-19:15; Sa 09:00-13:45"
-website: ""
\ No newline at end of file
+street: Rue Claude Violet
+housenumber: "4"
+phone: +33 4 78 01 02 41
+opening_hours: Tu-Fr 09:30-19:15; Sa 09:00-13:45
+website: ""
diff --git a/data/cities/lyon/jocteur.yml b/data/cities/lyon/jocteur.yml
index 75f33f440..1982e05b8 100644
--- a/data/cities/lyon/jocteur.yml
+++ b/data/cities/lyon/jocteur.yml
@@ -4,8 +4,8 @@ latitude: 45.79828
 longitude: 4.83034
 postcode: "69009"
 city: Lyon
-street: "Place Henri Barbusse"
-housenumber: 5
+street: Place Henri Barbusse
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 07:00-20:00
+website: ""
diff --git a/data/cities/lyon/la-boutique-de-lentraide.yml b/data/cities/lyon/la-boutique-de-lentraide.yml
index c40ef16b9..70bcfeaeb 100644
--- a/data/cities/lyon/la-boutique-de-lentraide.yml
+++ b/data/cities/lyon/la-boutique-de-lentraide.yml
@@ -4,8 +4,8 @@ latitude: 45.75196
 longitude: 4.8521
 postcode: "69007"
 city: Lyon
-street: "Cours Gambetta"
-housenumber: 88
-phone: "+33 4 72 72 92 08"
-opening_hours: "Tu 13:00-17:45; We 13:00-18:15; Th 11:30-14:00; Fr 13:00-16:45"
-website: "https://www.entraideprotestantedelyon.fr/poles/la-boutique-de-lentraide/"
\ No newline at end of file
+street: Cours Gambetta
+housenumber: "88"
+phone: +33 4 72 72 92 08
+opening_hours: Tu 13:00-17:45; We 13:00-18:15; Th 11:30-14:00; Fr 13:00-16:45
+website: https://www.entraideprotestantedelyon.fr/poles/la-boutique-de-lentraide/
diff --git a/data/cities/lyon/la-garance-voyageuse.yml b/data/cities/lyon/la-garance-voyageuse.yml
index a2d670c32..16ac7d01c 100644
--- a/data/cities/lyon/la-garance-voyageuse.yml
+++ b/data/cities/lyon/la-garance-voyageuse.yml
@@ -1,11 +1,11 @@
 id: 62290924
-type: way
+type: node
 latitude: 45.76876
 longitude: 4.84225
 postcode: "69006"
 city: Lyon
-street: "Place Maréchal Lyautey"
-housenumber: 
-phone: "+33 4 37 42 56 64"
+street: Place Maréchal Lyautey
+housenumber: ""
+phone: +33 4 37 42 56 64
 opening_hours: ""
-website: "https://lagarancevoyageuse.fr/"
\ No newline at end of file
+website: https://lagarancevoyageuse.fr/
diff --git a/data/cities/lyon/la-mercerie-3.yml b/data/cities/lyon/la-mercerie-3.yml
index 29d82976c..dc7329b4f 100644
--- a/data/cities/lyon/la-mercerie-3.yml
+++ b/data/cities/lyon/la-mercerie-3.yml
@@ -4,8 +4,8 @@ latitude: 45.77639
 longitude: 4.8322
 postcode: "69004"
 city: Lyon
-street: "Grande Rue de la Croix-Rousse"
-housenumber: 3
+street: Grande Rue de la Croix-Rousse
+housenumber: "3"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/lyon/latelier-du-boucher.yml b/data/cities/lyon/latelier-du-boucher.yml
index d5aecfc8a..87a8a0c69 100644
--- a/data/cities/lyon/latelier-du-boucher.yml
+++ b/data/cities/lyon/latelier-du-boucher.yml
@@ -4,8 +4,8 @@ latitude: 45.77404
 longitude: 4.80821
 postcode: "69009"
 city: Lyon
-street: "Grande Rue de Vaise"
-housenumber: 37
+street: Grande Rue de Vaise
+housenumber: "37"
 phone: "+33781344805"
-opening_hours: "Tu-Sa 09:00-19:15, Su 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:15, Su 10:00-19:00
+website: ""
diff --git a/data/cities/lyon/laverie-automatique-speed-queen.yml b/data/cities/lyon/laverie-automatique-speed-queen.yml
index 1dd3e8f13..c6794620b 100644
--- a/data/cities/lyon/laverie-automatique-speed-queen.yml
+++ b/data/cities/lyon/laverie-automatique-speed-queen.yml
@@ -4,8 +4,8 @@ latitude: 45.73771
 longitude: 4.85252
 postcode: "69008"
 city: Lyon
-street: "Route de Vienne"
-housenumber: 104
-phone: "+33 7 55 51 69 19"
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+street: Route de Vienne
+housenumber: "104"
+phone: +33 7 55 51 69 19
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/lyon/le-chiquito-tabac-presse-loto.yml b/data/cities/lyon/le-chiquito-tabac-presse-loto.yml
index b66814cff..c2d1a0ba7 100644
--- a/data/cities/lyon/le-chiquito-tabac-presse-loto.yml
+++ b/data/cities/lyon/le-chiquito-tabac-presse-loto.yml
@@ -4,8 +4,8 @@ latitude: 45.75309
 longitude: 4.83031
 postcode: "69002"
 city: Lyon
-street: "Rue Auguste Comte"
-housenumber: 37
-phone: "+33 4 78 38 03 08"
-opening_hours: "Mo-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Auguste Comte
+housenumber: "37"
+phone: +33 4 78 38 03 08
+opening_hours: Mo-Sa 07:00-19:00
+website: ""
diff --git a/data/cities/lyon/le-petit-brivadois.yml b/data/cities/lyon/le-petit-brivadois.yml
index acb0c65b8..20f8d4cdd 100644
--- a/data/cities/lyon/le-petit-brivadois.yml
+++ b/data/cities/lyon/le-petit-brivadois.yml
@@ -4,8 +4,8 @@ latitude: 45.75974
 longitude: 4.87268
 postcode: "69003"
 city: Lyon
-street: "Rue François Gillet"
-housenumber: 4
+street: Rue François Gillet
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 06:30-19:00; Sa 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-19:00; Sa 07:00-12:30
+website: ""
diff --git a/data/cities/lyon/le-salon.yml b/data/cities/lyon/le-salon.yml
index b9892ea85..204650ed9 100644
--- a/data/cities/lyon/le-salon.yml
+++ b/data/cities/lyon/le-salon.yml
@@ -4,8 +4,8 @@ latitude: 45.72463
 longitude: 4.87463
 postcode: "69008"
 city: Lyon
-street: "Rue Jules Valensaut"
-housenumber: 37
-phone: "+33 9 73 23 02 87"
+street: Rue Jules Valensaut
+housenumber: "37"
+phone: +33 9 73 23 02 87
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/les-vins-de-vaise.yml b/data/cities/lyon/les-vins-de-vaise.yml
index 24ebd214b..1fc32d3a4 100644
--- a/data/cities/lyon/les-vins-de-vaise.yml
+++ b/data/cities/lyon/les-vins-de-vaise.yml
@@ -4,8 +4,8 @@ latitude: 45.77952
 longitude: 4.80492
 postcode: "69009"
 city: Lyon
-street: "Rue de la Claire"
-housenumber: 32
+street: Rue de la Claire
+housenumber: "32"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:30,15:00-19:30; Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30,15:00-19:30; Sa 09:30-19:30
+website: ""
diff --git a/data/cities/lyon/librairie-lastragale.yml b/data/cities/lyon/librairie-lastragale.yml
index 5dc0e97be..19be8c603 100644
--- a/data/cities/lyon/librairie-lastragale.yml
+++ b/data/cities/lyon/librairie-lastragale.yml
@@ -4,8 +4,8 @@ latitude: 45.76884
 longitude: 4.8547
 postcode: "69006"
 city: Lyon
-street: "Rue de Sèze"
-housenumber: 108
+street: Rue de Sèze
+housenumber: "108"
 phone: ""
-opening_hours: "Tu-Sa 10:00-19:30; Su 10:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:30; Su 10:00-13:00
+website: ""
diff --git a/data/cities/lyon/lidl.yml b/data/cities/lyon/lidl.yml
index 22e2ee1f8..1944eda47 100644
--- a/data/cities/lyon/lidl.yml
+++ b/data/cities/lyon/lidl.yml
@@ -4,8 +4,8 @@ latitude: 45.73979
 longitude: 4.86631
 postcode: "69008"
 city: Lyon
-street: "Rue Marius Berliet"
-housenumber: 115
+street: Rue Marius Berliet
+housenumber: "115"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:30"
-website: "https://www.lidl.fr/s/fr-FR/supermarch%C3%A9s/lyon/115-avenue-marius-berliet/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:30
+website: https://www.lidl.fr/s/fr-FR/supermarch%C3%A9s/lyon/115-avenue-marius-berliet/
diff --git a/data/cities/lyon/lion-a-bicyclette.yml b/data/cities/lyon/lion-a-bicyclette.yml
index c309aef10..11732824a 100644
--- a/data/cities/lyon/lion-a-bicyclette.yml
+++ b/data/cities/lyon/lion-a-bicyclette.yml
@@ -4,8 +4,8 @@ latitude: 45.75255
 longitude: 4.85335
 postcode: "69003"
 city: Lyon
-street: "Rue Garibaldi"
-housenumber: 284
+street: Rue Garibaldi
+housenumber: "284"
 phone: ""
-opening_hours: "Tue-Sa 10:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tue-Sa 10:00-18:00
+website: ""
diff --git a/data/cities/lyon/lolo-chatenay.yml b/data/cities/lyon/lolo-chatenay.yml
index e3faecf88..b48022314 100644
--- a/data/cities/lyon/lolo-chatenay.yml
+++ b/data/cities/lyon/lolo-chatenay.yml
@@ -4,8 +4,8 @@ latitude: 45.76016
 longitude: 4.83307
 postcode: "69002"
 city: Lyon
-street: "Place des Jacobins"
-housenumber: 8
-phone: "+33 4 78 42 90 82"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 11:00-13:00,14:00-19:00"
-website: "https://www.lolo-chatenay.com/"
\ No newline at end of file
+street: Place des Jacobins
+housenumber: "8"
+phone: +33 4 78 42 90 82
+opening_hours: Mo 14:00-19:00; Tu-Sa 11:00-13:00,14:00-19:00
+website: https://www.lolo-chatenay.com/
diff --git a/data/cities/lyon/louis-pion-lyon-confluence.yml b/data/cities/lyon/louis-pion-lyon-confluence.yml
index 63a140f09..cde961e91 100644
--- a/data/cities/lyon/louis-pion-lyon-confluence.yml
+++ b/data/cities/lyon/louis-pion-lyon-confluence.yml
@@ -4,8 +4,8 @@ latitude: 45.74069
 longitude: 4.8188
 postcode: "69002"
 city: Lyon
-street: "Cours Charlemagne"
-housenumber: 112
-phone: "+33 4 78 85 39 29"
+street: Cours Charlemagne
+housenumber: "112"
+phone: +33 4 78 85 39 29
 opening_hours: ""
-website: "https://boutiques.louispion.fr/fr/france-FR/217/louis-pion-lyon-confluence/details"
\ No newline at end of file
+website: https://boutiques.louispion.fr/fr/france-FR/217/louis-pion-lyon-confluence/details
diff --git a/data/cities/lyon/maison-bouaicha.yml b/data/cities/lyon/maison-bouaicha.yml
index ba76a1179..a2c79051d 100644
--- a/data/cities/lyon/maison-bouaicha.yml
+++ b/data/cities/lyon/maison-bouaicha.yml
@@ -4,8 +4,8 @@ latitude: 45.73289
 longitude: 4.86525
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 75
-phone: "+33 4 27 11 24 78"
-opening_hours: "Tu-Sa 08:30-13:00,15:00-19:30; Su 08:30-13:00"
-website: ""
\ No newline at end of file
+street: Boulevard des États-Unis
+housenumber: "75"
+phone: +33 4 27 11 24 78
+opening_hours: Tu-Sa 08:30-13:00,15:00-19:30; Su 08:30-13:00
+website: ""
diff --git a/data/cities/lyon/maison-bouchard.yml b/data/cities/lyon/maison-bouchard.yml
index cee8827e4..196da850f 100644
--- a/data/cities/lyon/maison-bouchard.yml
+++ b/data/cities/lyon/maison-bouchard.yml
@@ -4,8 +4,8 @@ latitude: 45.76518
 longitude: 4.79064
 postcode: "69009"
 city: Lyon
-street: "Rue Professeur Patel"
-housenumber: 15
-phone: "+33 4 78 15 93 64"
-opening_hours: "Mo-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Professeur Patel
+housenumber: "15"
+phone: +33 4 78 15 93 64
+opening_hours: Mo-Sa 07:00-19:00
+website: ""
diff --git a/data/cities/lyon/milpau.yml b/data/cities/lyon/milpau.yml
index b1b0de668..7ea4e2e75 100644
--- a/data/cities/lyon/milpau.yml
+++ b/data/cities/lyon/milpau.yml
@@ -5,7 +5,7 @@ longitude: 4.84102
 postcode: "69003"
 city: Lyon
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/montcycle.yml b/data/cities/lyon/montcycle.yml
index e9ad1e263..5aae05842 100644
--- a/data/cities/lyon/montcycle.yml
+++ b/data/cities/lyon/montcycle.yml
@@ -4,8 +4,8 @@ latitude: 45.7535
 longitude: 4.8921
 postcode: "69003"
 city: Lyon
-street: "Cours Richard Vitton"
-housenumber: 57
+street: Cours Richard Vitton
+housenumber: "57"
 phone: ""
-opening_hours: "Tu-Fr 09:00-13:00,14:30-18:30; Sa 10:00-17:00; Su off"
-website: "https://www.montcycle.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-13:00,14:30-18:30; Sa 10:00-17:00; Su off
+website: https://www.montcycle.fr/
diff --git a/data/cities/lyon/my-pressing-by-capnet.yml b/data/cities/lyon/my-pressing-by-capnet.yml
index 18fb31512..96eb0672f 100644
--- a/data/cities/lyon/my-pressing-by-capnet.yml
+++ b/data/cities/lyon/my-pressing-by-capnet.yml
@@ -4,8 +4,8 @@ latitude: 45.7478
 longitude: 4.8446
 postcode: ""
 city: Lyon
-street: "Rue Marc Bloch"
-housenumber: 7
-phone: "+33 9 74 56 96 64"
-opening_hours: "Mo-Fr 07:30-12:30,14:00-19:00; Sa 08:00-12:30"
-website: "https://www.capnet-pressing.com"
\ No newline at end of file
+street: Rue Marc Bloch
+housenumber: "7"
+phone: +33 9 74 56 96 64
+opening_hours: Mo-Fr 07:30-12:30,14:00-19:00; Sa 08:00-12:30
+website: https://www.capnet-pressing.com
diff --git a/data/cities/lyon/nosc-adventure-store.yml b/data/cities/lyon/nosc-adventure-store.yml
index 79948e293..6a4d312bd 100644
--- a/data/cities/lyon/nosc-adventure-store.yml
+++ b/data/cities/lyon/nosc-adventure-store.yml
@@ -4,8 +4,8 @@ latitude: 45.77019
 longitude: 4.83314
 postcode: "69001"
 city: Lyon
-street: "Passage Thiaffait"
-housenumber: 
+street: Passage Thiaffait
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 10:00-18:00; Sa 11:00-19:00"
-website: "https://www.nosc-sport.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-18:00; Sa 11:00-19:00
+website: https://www.nosc-sport.fr/
diff --git a/data/cities/lyon/nur.yml b/data/cities/lyon/nur.yml
index 741353cf2..898ac2167 100644
--- a/data/cities/lyon/nur.yml
+++ b/data/cities/lyon/nur.yml
@@ -4,8 +4,8 @@ latitude: 45.73284
 longitude: 4.86451
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 72
+street: Boulevard des États-Unis
+housenumber: "72"
 phone: ""
-opening_hours: "Mo-Su 05:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:00-20:00
+website: ""
diff --git a/data/cities/lyon/orient-69.yml b/data/cities/lyon/orient-69.yml
index 72b43cdf2..eb873ed42 100644
--- a/data/cities/lyon/orient-69.yml
+++ b/data/cities/lyon/orient-69.yml
@@ -4,8 +4,8 @@ latitude: 45.73475
 longitude: 4.85315
 postcode: "69008"
 city: Lyon
-street: "Route de Vienne"
-housenumber: 152
+street: Route de Vienne
+housenumber: "152"
 phone: ""
-opening_hours: "Mo-Su 08:30-20:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-20:30
+website: ""
diff --git a/data/cities/lyon/paneterra.yml b/data/cities/lyon/paneterra.yml
index 2d37f3832..e213d0bdd 100644
--- a/data/cities/lyon/paneterra.yml
+++ b/data/cities/lyon/paneterra.yml
@@ -4,8 +4,8 @@ latitude: 45.74618
 longitude: 4.82353
 postcode: "69002"
 city: Lyon
-street: "Cours Charlemagne"
-housenumber: 34
+street: Cours Charlemagne
+housenumber: "34"
 phone: "+33672915092"
-opening_hours: "Mo-Fr 07:30-19:00; Sa 08:00-19:00"
-website: "https://www.paneterra-69.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-19:00; Sa 08:00-19:00
+website: https://www.paneterra-69.fr/
diff --git a/data/cities/lyon/picard.yml b/data/cities/lyon/picard.yml
index 98276508f..f6c5ee5de 100644
--- a/data/cities/lyon/picard.yml
+++ b/data/cities/lyon/picard.yml
@@ -4,8 +4,8 @@ latitude: 45.77754
 longitude: 4.83309
 postcode: "69004"
 city: Lyon
-street: "Rue du Mail"
-housenumber: 17
-phone: "+33 4 78 29 31 84"
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: "https://magasins.picard.fr/270-picard-croix-rousse"
\ No newline at end of file
+street: Rue du Mail
+housenumber: "17"
+phone: +33 4 78 29 31 84
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: https://magasins.picard.fr/270-picard-croix-rousse
diff --git a/data/cities/lyon/pole-de-commerces-et-de-loisirs-confluence.yml b/data/cities/lyon/pole-de-commerces-et-de-loisirs-confluence.yml
index 69dbebf2f..fd51dbbb3 100644
--- a/data/cities/lyon/pole-de-commerces-et-de-loisirs-confluence.yml
+++ b/data/cities/lyon/pole-de-commerces-et-de-loisirs-confluence.yml
@@ -1,11 +1,11 @@
 id: 440270633
-type: way
+type: node
 latitude: 45.74095
 longitude: 4.81908
 postcode: "69002"
 city: Lyon
-street: "Rue Paul Montrochet"
-housenumber: 7
-phone: "+33 4 72 31 32 80"
-opening_hours: "Mo-Sa 10:00-20:00"
-website: "https://www.confluence.fr/"
\ No newline at end of file
+street: Rue Paul Montrochet
+housenumber: "7"
+phone: +33 4 72 31 32 80
+opening_hours: Mo-Sa 10:00-20:00
+website: https://www.confluence.fr/
diff --git a/data/cities/lyon/pralus-lyon-croix-rousse.yml b/data/cities/lyon/pralus-lyon-croix-rousse.yml
index 1f99dbbc3..1a0b793a3 100644
--- a/data/cities/lyon/pralus-lyon-croix-rousse.yml
+++ b/data/cities/lyon/pralus-lyon-croix-rousse.yml
@@ -4,8 +4,8 @@ latitude: 45.77643
 longitude: 4.8322
 postcode: "69004"
 city: Lyon
-street: "Grande Rue de la Croix-Rousse"
-housenumber: 3
-phone: "+33 4 72 07 76 07"
-opening_hours: "Mo-Sa 09:00-19:00; Su 09:00-13:00"
-website: "https://www.chocolats-pralus.com/fr/boutiques-pralus.html"
\ No newline at end of file
+street: Grande Rue de la Croix-Rousse
+housenumber: "3"
+phone: +33 4 72 07 76 07
+opening_hours: Mo-Sa 09:00-19:00; Su 09:00-13:00
+website: https://www.chocolats-pralus.com/fr/boutiques-pralus.html
diff --git a/data/cities/lyon/record.yml b/data/cities/lyon/record.yml
index e1bbc51b9..c699f6ed3 100644
--- a/data/cities/lyon/record.yml
+++ b/data/cities/lyon/record.yml
@@ -4,8 +4,8 @@ latitude: 45.75545
 longitude: 4.84371
 postcode: "69003"
 city: Lyon
-street: "Rue Paul Bert"
-housenumber: 
+street: Rue Paul Bert
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/resotainer-lyon-peh-self-stockage.yml b/data/cities/lyon/resotainer-lyon-peh-self-stockage.yml
index 3aa6dd771..757782d43 100644
--- a/data/cities/lyon/resotainer-lyon-peh-self-stockage.yml
+++ b/data/cities/lyon/resotainer-lyon-peh-self-stockage.yml
@@ -4,8 +4,8 @@ latitude: 45.72111
 longitude: 4.83308
 postcode: "69007"
 city: Lyon
-street: "Rue de Bâle"
-housenumber: 1
+street: Rue de Bâle
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/resotainer-lyon.yml b/data/cities/lyon/resotainer-lyon.yml
index 18933b382..939258081 100644
--- a/data/cities/lyon/resotainer-lyon.yml
+++ b/data/cities/lyon/resotainer-lyon.yml
@@ -4,8 +4,8 @@ latitude: 45.71735
 longitude: 4.82605
 postcode: "69007"
 city: Lyon
-street: "Rue Jean Bouin"
-housenumber: 11
+street: Rue Jean Bouin
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/rhone-medical.yml b/data/cities/lyon/rhone-medical.yml
index 32ef17933..05f77e704 100644
--- a/data/cities/lyon/rhone-medical.yml
+++ b/data/cities/lyon/rhone-medical.yml
@@ -4,8 +4,8 @@ latitude: 45.73397
 longitude: 4.85813
 postcode: "69008"
 city: Lyon
-street: "Rue Pierre Delore"
-housenumber: 45
-phone: "+33 4 78 58 34 15"
-opening_hours: "Mo-Fr 08:30-12:30,13:30-18:30; Sa 08:30-12:30"
-website: "https://rhone-medical.com/"
\ No newline at end of file
+street: Rue Pierre Delore
+housenumber: "45"
+phone: +33 4 78 58 34 15
+opening_hours: Mo-Fr 08:30-12:30,13:30-18:30; Sa 08:30-12:30
+website: https://rhone-medical.com/
diff --git a/data/cities/lyon/saveur-dailleurs-afrique-et-outre-mer.yml b/data/cities/lyon/saveur-dailleurs-afrique-et-outre-mer.yml
index 82448d3c6..e4d9c6ae9 100644
--- a/data/cities/lyon/saveur-dailleurs-afrique-et-outre-mer.yml
+++ b/data/cities/lyon/saveur-dailleurs-afrique-et-outre-mer.yml
@@ -4,8 +4,8 @@ latitude: 45.7795
 longitude: 4.80486
 postcode: "69009"
 city: Lyon
-street: "Rue de la Claire"
-housenumber: 32
+street: Rue de la Claire
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Su 10:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 10:30-19:00
+website: ""
diff --git a/data/cities/lyon/serenicar.yml b/data/cities/lyon/serenicar.yml
index 274af5687..7ef87922c 100644
--- a/data/cities/lyon/serenicar.yml
+++ b/data/cities/lyon/serenicar.yml
@@ -4,8 +4,8 @@ latitude: 45.77877
 longitude: 4.80098
 postcode: "69009"
 city: Lyon
-street: "Rue de la Gare"
-housenumber: 11
+street: Rue de la Gare
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/soleil-doctobre.yml b/data/cities/lyon/soleil-doctobre.yml
index 450fb8bd5..f0f6bcb3a 100644
--- a/data/cities/lyon/soleil-doctobre.yml
+++ b/data/cities/lyon/soleil-doctobre.yml
@@ -4,8 +4,8 @@ latitude: 45.77057
 longitude: 4.83164
 postcode: "69001"
 city: Lyon
-street: "Montée de la Grande Côte"
-housenumber: 67
-phone: "+33 4 26 00 93 40"
-opening_hours: "Tu-Sa 11:00-19:00"
-website: ""
\ No newline at end of file
+street: Montée de la Grande Côte
+housenumber: "67"
+phone: +33 4 26 00 93 40
+opening_hours: Tu-Sa 11:00-19:00
+website: ""
diff --git a/data/cities/lyon/speedway-lyon.yml b/data/cities/lyon/speedway-lyon.yml
index 5a0fabef5..207ea6e97 100644
--- a/data/cities/lyon/speedway-lyon.yml
+++ b/data/cities/lyon/speedway-lyon.yml
@@ -4,8 +4,8 @@ latitude: 45.75515
 longitude: 4.8465
 postcode: "69003"
 city: Lyon
-street: "Avenue Maréchal de Saxe"
-housenumber: 144
-phone: "+33 4 78 60 19 01"
-opening_hours: "Mo 10:00-19:00; Tu-Sa 09:30-19:00"
-website: "https://www.speedway.fr/pages/1-magasins/4-speedway-lyon.html"
\ No newline at end of file
+street: Avenue Maréchal de Saxe
+housenumber: "144"
+phone: +33 4 78 60 19 01
+opening_hours: Mo 10:00-19:00; Tu-Sa 09:30-19:00
+website: https://www.speedway.fr/pages/1-magasins/4-speedway-lyon.html
diff --git a/data/cities/lyon/stores-frezet.yml b/data/cities/lyon/stores-frezet.yml
index 9b4d63359..6b8d43519 100644
--- a/data/cities/lyon/stores-frezet.yml
+++ b/data/cities/lyon/stores-frezet.yml
@@ -4,8 +4,8 @@ latitude: 45.73587
 longitude: 4.88128
 postcode: "69008"
 city: Lyon
-street: "Rue Bataille"
-housenumber: 154
-phone: "+33 4 78 74 70 71"
+street: Rue Bataille
+housenumber: "154"
+phone: +33 4 78 74 70 71
 opening_hours: ""
-website: "https://www.fermetures-stores-frezet.fr/"
\ No newline at end of file
+website: https://www.fermetures-stores-frezet.fr/
diff --git a/data/cities/lyon/supermarche-asie.yml b/data/cities/lyon/supermarche-asie.yml
index 62c3141fc..94fe0d6cb 100644
--- a/data/cities/lyon/supermarche-asie.yml
+++ b/data/cities/lyon/supermarche-asie.yml
@@ -4,8 +4,8 @@ latitude: 45.75463
 longitude: 4.84157
 postcode: "69007"
 city: Lyon
-street: "Rue Passet"
-housenumber: 
+street: Rue Passet
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:30
+website: ""
diff --git a/data/cities/lyon/tabac-des-etats.yml b/data/cities/lyon/tabac-des-etats.yml
index d5176de6d..df2e4ab86 100644
--- a/data/cities/lyon/tabac-des-etats.yml
+++ b/data/cities/lyon/tabac-des-etats.yml
@@ -4,8 +4,8 @@ latitude: 45.7319
 longitude: 4.86602
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 83
+street: Boulevard des États-Unis
+housenumber: "83"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/tendance-coiffure.yml b/data/cities/lyon/tendance-coiffure.yml
index 0c7274fa0..c0ecbdceb 100644
--- a/data/cities/lyon/tendance-coiffure.yml
+++ b/data/cities/lyon/tendance-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.73172
 longitude: 4.86538
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 82
+street: Boulevard des États-Unis
+housenumber: "82"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/lyon/u-express.yml b/data/cities/lyon/u-express.yml
index 269525694..7e8a3000d 100644
--- a/data/cities/lyon/u-express.yml
+++ b/data/cities/lyon/u-express.yml
@@ -4,8 +4,8 @@ latitude: 45.74785
 longitude: 4.86498
 postcode: "69003"
 city: Lyon
-street: "Cours Albert Thomas"
-housenumber: 45
-phone: "+33 4 72 13 02 37"
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-13:00"
-website: "https://www.magasins-u.com/magasin/uexpress-lyonalbertthomas"
\ No newline at end of file
+street: Cours Albert Thomas
+housenumber: "45"
+phone: +33 4 72 13 02 37
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-13:00
+website: https://www.magasins-u.com/magasin/uexpress-lyonalbertthomas
diff --git a/data/cities/lyon/velogik-les-ateliers.yml b/data/cities/lyon/velogik-les-ateliers.yml
index 5cbef3f2e..51389649f 100644
--- a/data/cities/lyon/velogik-les-ateliers.yml
+++ b/data/cities/lyon/velogik-les-ateliers.yml
@@ -4,8 +4,8 @@ latitude: 45.74987
 longitude: 4.84596
 postcode: "69007"
 city: Lyon
-street: "Rue de la Thibaudière"
-housenumber: 32
+street: Rue de la Thibaudière
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: "https://velogik-ateliers.com/"
\ No newline at end of file
+website: https://velogik-ateliers.com/
diff --git a/data/cities/lyon/velograma.yml b/data/cities/lyon/velograma.yml
index 32f8017fb..7f1e211ad 100644
--- a/data/cities/lyon/velograma.yml
+++ b/data/cities/lyon/velograma.yml
@@ -4,8 +4,8 @@ latitude: 45.75664
 longitude: 4.86761
 postcode: "69003"
 city: Lyon
-street: "Rue Paul Bert"
-housenumber: 250
-phone: "06 10 20 87 44"
-opening_hours: "We-Sa 10:00-13:00,14:00-19:00"
-website: "https://sites.google.com/velograma.com/velograma-home/accueil"
\ No newline at end of file
+street: Rue Paul Bert
+housenumber: "250"
+phone: 06 10 20 87 44
+opening_hours: We-Sa 10:00-13:00,14:00-19:00
+website: https://sites.google.com/velograma.com/velograma-home/accueil
diff --git a/data/cities/lyon/vival.yml b/data/cities/lyon/vival.yml
index 6d8fe586a..03e22d1ab 100644
--- a/data/cities/lyon/vival.yml
+++ b/data/cities/lyon/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.73219
 longitude: 4.86501
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 78
-phone: "+33 4 82 33 24 27"
-opening_hours: "PH,Mo-Su 07:00-24:00"
-website: "https://magasins.vival.fr/fr/vival-lyon-etats-unis"
\ No newline at end of file
+street: Boulevard des États-Unis
+housenumber: "78"
+phone: +33 4 82 33 24 27
+opening_hours: PH,Mo-Su 07:00-24:00
+website: https://magasins.vival.fr/fr/vival-lyon-etats-unis
diff --git a/data/cities/lyon/yumna.yml b/data/cities/lyon/yumna.yml
index 6216c5697..6a7d4af8d 100644
--- a/data/cities/lyon/yumna.yml
+++ b/data/cities/lyon/yumna.yml
@@ -4,8 +4,8 @@ latitude: 45.75227
 longitude: 4.84516
 postcode: "69003"
 city: Lyon
-street: "Rue Chalopin"
-housenumber: 4
+street: Rue Chalopin
+housenumber: "4"
 phone: ""
-opening_hours: "Tu-Fr 11:00-19:00; Sa 11:00-20:00; Su 13:00-19:00"
-website: "https://www.yumna.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 11:00-19:00; Sa 11:00-20:00; Su 13:00-19:00
+website: https://www.yumna.fr/
diff --git a/data/cities/lyon/zen-mode.yml b/data/cities/lyon/zen-mode.yml
index fe5b011e0..edb111581 100644
--- a/data/cities/lyon/zen-mode.yml
+++ b/data/cities/lyon/zen-mode.yml
@@ -4,8 +4,8 @@ latitude: 45.73167
 longitude: 4.86542
 postcode: "69008"
 city: Lyon
-street: "Boulevard des États-Unis"
-housenumber: 82
+street: Boulevard des États-Unis
+housenumber: "82"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/mably/cote-fleurs-creation.yml b/data/cities/mably/cote-fleurs-creation.yml
index b8f38d204..fbe851a92 100644
--- a/data/cities/mably/cote-fleurs-creation.yml
+++ b/data/cities/mably/cote-fleurs-creation.yml
@@ -4,8 +4,8 @@ latitude: 46.05404
 longitude: 4.07355
 postcode: "42300"
 city: Mably
-street: "Route de BRIENNON"
-housenumber: 3
+street: Route de BRIENNON
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: "https://www.cotefleurscreation.fr/"
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: https://www.cotefleurscreation.fr/
diff --git a/data/cities/mably/decathlon-roanne-mably.yml b/data/cities/mably/decathlon-roanne-mably.yml
index 488994584..d44144fcd 100644
--- a/data/cities/mably/decathlon-roanne-mably.yml
+++ b/data/cities/mably/decathlon-roanne-mably.yml
@@ -1,11 +1,11 @@
 id: 95055929
-type: way
+type: node
 latitude: 46.06326
 longitude: 4.0588
 postcode: "42300"
 city: Mably
-street: "Rue des Buttes"
-housenumber: 
+street: Rue des Buttes
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: "https://www.decathlon.fr/fr/store?store_id=PS_151"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: https://www.decathlon.fr/fr/store?store_id=PS_151
diff --git a/data/cities/mably/intersport.yml b/data/cities/mably/intersport.yml
index de85619d8..8fe8e3f98 100644
--- a/data/cities/mably/intersport.yml
+++ b/data/cities/mably/intersport.yml
@@ -4,8 +4,8 @@ latitude: 46.06494
 longitude: 4.05942
 postcode: "42300"
 city: Mably
-street: "Rue Jean de la Fontaine"
-housenumber: 
+street: Rue Jean de la Fontaine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mably/jardinerie-loiseau.yml b/data/cities/mably/jardinerie-loiseau.yml
index 1db852eb8..fb86fe13d 100644
--- a/data/cities/mably/jardinerie-loiseau.yml
+++ b/data/cities/mably/jardinerie-loiseau.yml
@@ -4,8 +4,8 @@ latitude: 46.067
 longitude: 4.05446
 postcode: "42300"
 city: Mably
-street: "Route de Paris"
-housenumber: 18
+street: Route de Paris
+housenumber: "18"
 phone: "+33477683461"
-opening_hours: "Mo-Sa 09:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/mably/la-vie-claire.yml b/data/cities/mably/la-vie-claire.yml
index 5def2b59a..de54ee236 100644
--- a/data/cities/mably/la-vie-claire.yml
+++ b/data/cities/mably/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 46.06818
 longitude: 4.04942
 postcode: "42300"
 city: Mably
-street: "Rue de l'Artisanat"
-housenumber: 22
+street: Rue de l'Artisanat
+housenumber: "22"
 phone: "+33477723912"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.lavieclaire.com/magasin-bio/mably.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.lavieclaire.com/magasin-bio/mably.html
diff --git a/data/cities/machilly/boulangerie-patisserie-f-bourguignon.yml b/data/cities/machilly/boulangerie-patisserie-f-bourguignon.yml
index a24417396..221e24860 100644
--- a/data/cities/machilly/boulangerie-patisserie-f-bourguignon.yml
+++ b/data/cities/machilly/boulangerie-patisserie-f-bourguignon.yml
@@ -4,8 +4,8 @@ latitude: 46.25191
 longitude: 6.33173
 postcode: "74140"
 city: Machilly
-street: "Route des Voirons"
-housenumber: 320
+street: Route des Voirons
+housenumber: "320"
 phone: "+33450435170"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/atelier-floral-pollen.yml b/data/cities/maclas/atelier-floral-pollen.yml
index 5314a106c..afb4f6d3d 100644
--- a/data/cities/maclas/atelier-floral-pollen.yml
+++ b/data/cities/maclas/atelier-floral-pollen.yml
@@ -4,8 +4,8 @@ latitude: 45.36082
 longitude: 4.68338
 postcode: "42520"
 city: Maclas
-street: "Route de Saint-Appolinard"
-housenumber: 31
+street: Route de Saint-Appolinard
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/banette.yml b/data/cities/maclas/banette.yml
index 45ad66641..c17d1d101 100644
--- a/data/cities/maclas/banette.yml
+++ b/data/cities/maclas/banette.yml
@@ -4,8 +4,8 @@ latitude: 45.36245
 longitude: 4.68511
 postcode: "42520"
 city: Maclas
-street: "Place de l'Église"
-housenumber: 101
+street: Place de l'Église
+housenumber: "101"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/boucherie-fovet.yml b/data/cities/maclas/boucherie-fovet.yml
index 1a1719eb6..60379c9cc 100644
--- a/data/cities/maclas/boucherie-fovet.yml
+++ b/data/cities/maclas/boucherie-fovet.yml
@@ -4,8 +4,8 @@ latitude: 45.36292
 longitude: 4.68507
 postcode: "42520"
 city: Maclas
-street: "Place de l'Église"
-housenumber: 122
+street: Place de l'Église
+housenumber: "122"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/changer-dhair.yml b/data/cities/maclas/changer-dhair.yml
index c24908799..6dccef615 100644
--- a/data/cities/maclas/changer-dhair.yml
+++ b/data/cities/maclas/changer-dhair.yml
@@ -4,8 +4,8 @@ latitude: 45.36287
 longitude: 4.6862
 postcode: "42520"
 city: Maclas
-street: "Route de Lupé"
-housenumber: 12
+street: Route de Lupé
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/christophe-pinto.yml b/data/cities/maclas/christophe-pinto.yml
index 893511770..878b3f326 100644
--- a/data/cities/maclas/christophe-pinto.yml
+++ b/data/cities/maclas/christophe-pinto.yml
@@ -4,8 +4,8 @@ latitude: 45.36182
 longitude: 4.68456
 postcode: "42520"
 city: Maclas
-street: "Place Louis Gay"
-housenumber: 108
+street: Place Louis Gay
+housenumber: "108"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/esprit-chrisalide.yml b/data/cities/maclas/esprit-chrisalide.yml
index 82456a001..816d6e3b5 100644
--- a/data/cities/maclas/esprit-chrisalide.yml
+++ b/data/cities/maclas/esprit-chrisalide.yml
@@ -4,8 +4,8 @@ latitude: 45.36106
 longitude: 4.68306
 postcode: "42520"
 city: Maclas
-street: "Route de Saint-Appolinard"
-housenumber: 29
+street: Route de Saint-Appolinard
+housenumber: "29"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/france-materiaux-sauvignet-dumas.yml b/data/cities/maclas/france-materiaux-sauvignet-dumas.yml
index 395a745c0..7ec7b36ae 100644
--- a/data/cities/maclas/france-materiaux-sauvignet-dumas.yml
+++ b/data/cities/maclas/france-materiaux-sauvignet-dumas.yml
@@ -4,8 +4,8 @@ latitude: 45.36577
 longitude: 4.68317
 postcode: "42520"
 city: Maclas
-street: "Rue de l'Orme"
-housenumber: 46
+street: Rue de l'Orme
+housenumber: "46"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/monique-rondet.yml b/data/cities/maclas/monique-rondet.yml
index 13d044720..21e07fb0b 100644
--- a/data/cities/maclas/monique-rondet.yml
+++ b/data/cities/maclas/monique-rondet.yml
@@ -4,8 +4,8 @@ latitude: 45.36256
 longitude: 4.685
 postcode: "42520"
 city: Maclas
-street: "Place de l'Église"
-housenumber: 104
+street: Place de l'Église
+housenumber: "104"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/pascale-peyramaure.yml b/data/cities/maclas/pascale-peyramaure.yml
index e181d74b0..6dab1bbf9 100644
--- a/data/cities/maclas/pascale-peyramaure.yml
+++ b/data/cities/maclas/pascale-peyramaure.yml
@@ -4,8 +4,8 @@ latitude: 45.36301
 longitude: 4.68421
 postcode: "42520"
 city: Maclas
-street: "Route de Pélussin"
-housenumber: 3
+street: Route de Pélussin
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/prox-auto-euro-repar.yml b/data/cities/maclas/prox-auto-euro-repar.yml
index e0acc4614..321020744 100644
--- a/data/cities/maclas/prox-auto-euro-repar.yml
+++ b/data/cities/maclas/prox-auto-euro-repar.yml
@@ -4,8 +4,8 @@ latitude: 45.36608
 longitude: 4.69105
 postcode: "42520"
 city: Maclas
-street: "Route de Lupé"
+street: Route de Lupé
 housenumber: 45B
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/quincaillerie-marion.yml b/data/cities/maclas/quincaillerie-marion.yml
index ea8eaa58b..0757c3bdc 100644
--- a/data/cities/maclas/quincaillerie-marion.yml
+++ b/data/cities/maclas/quincaillerie-marion.yml
@@ -4,8 +4,8 @@ latitude: 45.36206
 longitude: 4.68511
 postcode: "42520"
 city: Maclas
-street: "Place Louis Gay"
-housenumber: 102
+street: Place Louis Gay
+housenumber: "102"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/savonnerie-du-pilat.yml b/data/cities/maclas/savonnerie-du-pilat.yml
index 5df2a05ec..acbdd41b7 100644
--- a/data/cities/maclas/savonnerie-du-pilat.yml
+++ b/data/cities/maclas/savonnerie-du-pilat.yml
@@ -4,8 +4,8 @@ latitude: 45.36279
 longitude: 4.6846
 postcode: "42520"
 city: Maclas
-street: "Place de l'Église"
-housenumber: 111
+street: Place de l'Église
+housenumber: "111"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maclas/vival.yml b/data/cities/maclas/vival.yml
index 82841c5b9..278b560c3 100644
--- a/data/cities/maclas/vival.yml
+++ b/data/cities/maclas/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.36277
 longitude: 4.68541
 postcode: "42520"
 city: Maclas
-street: "Place de l'Église"
-housenumber: 126
-phone: "+33 4 37 04 97 74"
-opening_hours: "Mo-Sa 08:00-18:00"
-website: "https://magasins.vival.fr/fr/vival-maclas"
\ No newline at end of file
+street: Place de l'Église
+housenumber: "126"
+phone: +33 4 37 04 97 74
+opening_hours: Mo-Sa 08:00-18:00
+website: https://magasins.vival.fr/fr/vival-maclas
diff --git a/data/cities/macon/cuisine-artiplan.yml b/data/cities/macon/cuisine-artiplan.yml
index 5b4e9f9e4..99273a2a0 100644
--- a/data/cities/macon/cuisine-artiplan.yml
+++ b/data/cities/macon/cuisine-artiplan.yml
@@ -4,8 +4,8 @@ latitude: 46.30722
 longitude: 4.83665
 postcode: "71000"
 city: Mâcon
-street: "Quai Jean Jaurès"
-housenumber: 242
+street: Quai Jean Jaurès
+housenumber: "242"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:00"
-website: "https://www.cuisine-artiplan.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:00
+website: https://www.cuisine-artiplan.com/
diff --git a/data/cities/macon/midas.yml b/data/cities/macon/midas.yml
index 084480cd9..6f1695335 100644
--- a/data/cities/macon/midas.yml
+++ b/data/cities/macon/midas.yml
@@ -4,8 +4,8 @@ latitude: 46.30795
 longitude: 4.83683
 postcode: "71000"
 city: Mâcon
-street: "Quai Jean Jaurès"
-housenumber: 158
-phone: "+33 3 85 38 72 74"
+street: Quai Jean Jaurès
+housenumber: "158"
+phone: +33 3 85 38 72 74
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/macot-la-plagne/skiset-sports-i.yml b/data/cities/macot-la-plagne/skiset-sports-i.yml
index 10125c254..38cb0370f 100644
--- a/data/cities/macot-la-plagne/skiset-sports-i.yml
+++ b/data/cities/macot-la-plagne/skiset-sports-i.yml
@@ -4,8 +4,8 @@ latitude: 45.50754
 longitude: 6.70744
 postcode: "73210"
 city: macot la Plagne
-street: "Centre Commercial amont"
-housenumber: 
+street: Centre Commercial amont
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.skiset.com/station-ski/belle-plagne"
\ No newline at end of file
+website: https://www.skiset.com/station-ski/belle-plagne
diff --git a/data/cities/macot-la-plagne/sport-2000.yml b/data/cities/macot-la-plagne/sport-2000.yml
index 8ea14447b..bf5c31763 100644
--- a/data/cities/macot-la-plagne/sport-2000.yml
+++ b/data/cities/macot-la-plagne/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.50752
 longitude: 6.70784
 postcode: "73210"
 city: macot la Plagne
-street: "Centre Commercial amont"
-housenumber: 
-phone: "+33 4 79 09 07 79"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://armandberard.sport2000.fr"
\ No newline at end of file
+street: Centre Commercial amont
+housenumber: ""
+phone: +33 4 79 09 07 79
+opening_hours: Mo-Su 08:30-19:30
+website: https://armandberard.sport2000.fr
diff --git a/data/cities/magland/super-u.yml b/data/cities/magland/super-u.yml
index e0af90cb5..fb65f52af 100644
--- a/data/cities/magland/super-u.yml
+++ b/data/cities/magland/super-u.yml
@@ -1,11 +1,11 @@
 id: 510675354
-type: way
+type: node
 latitude: 46.03825
 longitude: 6.61148
 postcode: "74300"
 city: Magland
-street: "Allée des Noyères"
-housenumber: 180
+street: Allée des Noyères
+housenumber: "180"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/maillat/chistine-coiffure-mixte.yml b/data/cities/maillat/chistine-coiffure-mixte.yml
index 64d43ee47..8c048429d 100644
--- a/data/cities/maillat/chistine-coiffure-mixte.yml
+++ b/data/cities/maillat/chistine-coiffure-mixte.yml
@@ -4,8 +4,8 @@ latitude: 46.12872
 longitude: 5.5399
 postcode: "01430"
 city: Maillat
-street: "Rue du Clou"
-housenumber: 29
-phone: "+33 4 74 75 71 97"
+street: Rue du Clou
+housenumber: "29"
+phone: +33 4 74 75 71 97
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/maillat/guerry.yml b/data/cities/maillat/guerry.yml
index 444bc11db..09a9e1fff 100644
--- a/data/cities/maillat/guerry.yml
+++ b/data/cities/maillat/guerry.yml
@@ -4,8 +4,8 @@ latitude: 46.12878
 longitude: 5.5398
 postcode: "01430"
 city: Maillat
-street: "Rue du Clou"
-housenumber: 29
-phone: "+33 4 74 75 72 43"
+street: Rue du Clou
+housenumber: "29"
+phone: +33 4 74 75 72 43
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/malleval/terre-indienne.yml b/data/cities/malleval/terre-indienne.yml
index da1acee7c..76f0b5070 100644
--- a/data/cities/malleval/terre-indienne.yml
+++ b/data/cities/malleval/terre-indienne.yml
@@ -4,8 +4,8 @@ latitude: 45.38229
 longitude: 4.72808
 postcode: "42520"
 city: Malleval
-street: "Route du Bourg"
-housenumber: 174
+street: Route du Bourg
+housenumber: "174"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/marcy-letoile/boucherie-benoit.yml b/data/cities/marcy-letoile/boucherie-benoit.yml
index f39b32b40..cb23242d1 100644
--- a/data/cities/marcy-letoile/boucherie-benoit.yml
+++ b/data/cities/marcy-letoile/boucherie-benoit.yml
@@ -4,8 +4,8 @@ latitude: 45.78264
 longitude: 4.70754
 postcode: "69280"
 city: Marcy-l'Étoile
-street: "Avenue Jean Colomb"
-housenumber: 814
+street: Avenue Jean Colomb
+housenumber: "814"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/marcy-letoile/le-petit-casino.yml b/data/cities/marcy-letoile/le-petit-casino.yml
index f69938f0a..efb86ebda 100644
--- a/data/cities/marcy-letoile/le-petit-casino.yml
+++ b/data/cities/marcy-letoile/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.7823
 longitude: 4.70709
 postcode: "69280"
 city: Marcy-l'Étoile
-street: "Avenue Jean Colomb"
-housenumber: 880
-phone: "+33 4 78 44 28 20"
-opening_hours: "Mo-Sa 08:00-13:00,15:00-18:00; Sa 08:00-14:00; Su 08:30-12:30"
-website: "www.casino-proximite.fr"
\ No newline at end of file
+street: Avenue Jean Colomb
+housenumber: "880"
+phone: +33 4 78 44 28 20
+opening_hours: Mo-Sa 08:00-13:00,15:00-18:00; Sa 08:00-14:00; Su 08:30-12:30
+website: www.casino-proximite.fr
diff --git a/data/cities/margencel/alain-afflelou.yml b/data/cities/margencel/alain-afflelou.yml
index 43a0161c2..c67363d2f 100644
--- a/data/cities/margencel/alain-afflelou.yml
+++ b/data/cities/margencel/alain-afflelou.yml
@@ -5,7 +5,7 @@ longitude: 6.43425
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/margencel/aldi.yml b/data/cities/margencel/aldi.yml
index da2f6ca20..16eb0069e 100644
--- a/data/cities/margencel/aldi.yml
+++ b/data/cities/margencel/aldi.yml
@@ -1,11 +1,11 @@
 id: 1034493382
-type: way
+type: node
 latitude: 46.34569
 longitude: 6.42145
 postcode: "74200"
 city: Margencel
-street: "Route du Crêt Gojon"
-housenumber: 631
+street: Route du Crêt Gojon
+housenumber: "631"
 phone: ""
-opening_hours: "Mo-Fr 08:30-19:30; Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-19:30; Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/margencel/alpes-batteries.yml b/data/cities/margencel/alpes-batteries.yml
index eaa1fce54..266e81ef3 100644
--- a/data/cities/margencel/alpes-batteries.yml
+++ b/data/cities/margencel/alpes-batteries.yml
@@ -4,8 +4,8 @@ latitude: 46.34296
 longitude: 6.41565
 postcode: "74200"
 city: Margencel
-street: "Route du Crêt Gojon"
-housenumber: 73
+street: Route du Crêt Gojon
+housenumber: "73"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-12:00, 14:00-17:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-12:00, 14:00-17:30; Su off
+website: ""
diff --git a/data/cities/margencel/atelier-mobile-du-chablais.yml b/data/cities/margencel/atelier-mobile-du-chablais.yml
index 083d5f067..be3e55331 100644
--- a/data/cities/margencel/atelier-mobile-du-chablais.yml
+++ b/data/cities/margencel/atelier-mobile-du-chablais.yml
@@ -1,11 +1,11 @@
 id: 69054108
-type: way
+type: node
 latitude: 46.34165
 longitude: 6.42002
 postcode: "74200"
 city: Margencel
-street: "Route du Champ Courbe"
-housenumber: 31
+street: Route du Champ Courbe
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/margencel/bonobo.yml b/data/cities/margencel/bonobo.yml
index bde9a0957..2b0b43858 100644
--- a/data/cities/margencel/bonobo.yml
+++ b/data/cities/margencel/bonobo.yml
@@ -5,7 +5,7 @@ longitude: 6.43473
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/margencel/briant.yml b/data/cities/margencel/briant.yml
index d33fa3dff..e44babd22 100644
--- a/data/cities/margencel/briant.yml
+++ b/data/cities/margencel/briant.yml
@@ -5,7 +5,7 @@ longitude: 6.43443
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/margencel/carrefour.yml b/data/cities/margencel/carrefour.yml
index d02185c39..5455e4b77 100644
--- a/data/cities/margencel/carrefour.yml
+++ b/data/cities/margencel/carrefour.yml
@@ -5,7 +5,7 @@ longitude: 6.43488
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/margencel/centre-commercial-carrefour.yml b/data/cities/margencel/centre-commercial-carrefour.yml
index 337d3dd3b..fbb2d9291 100644
--- a/data/cities/margencel/centre-commercial-carrefour.yml
+++ b/data/cities/margencel/centre-commercial-carrefour.yml
@@ -1,11 +1,11 @@
 id: 69053228
-type: way
+type: node
 latitude: 46.3457
 longitude: 6.43551
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th,Sa 08:30-20:30, Fr 08:30-21:00, PH 08:30-20:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th,Sa 08:30-20:30, Fr 08:30-21:00, PH 08:30-20:30
+website: ""
diff --git a/data/cities/margencel/cocktel.yml b/data/cities/margencel/cocktel.yml
index 7ab1c2ea2..5155db6a6 100644
--- a/data/cities/margencel/cocktel.yml
+++ b/data/cities/margencel/cocktel.yml
@@ -5,7 +5,7 @@ longitude: 6.43412
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-14:00, 14:30-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-14:00, 14:30-18:30; Su off
+website: ""
diff --git a/data/cities/margencel/dejean.yml b/data/cities/margencel/dejean.yml
index 94a7bfeed..22b4bdeb7 100644
--- a/data/cities/margencel/dejean.yml
+++ b/data/cities/margencel/dejean.yml
@@ -5,7 +5,7 @@ longitude: 6.43448
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/margencel/express-services.yml b/data/cities/margencel/express-services.yml
index c29a84945..64549af4f 100644
--- a/data/cities/margencel/express-services.yml
+++ b/data/cities/margencel/express-services.yml
@@ -5,7 +5,7 @@ longitude: 6.43487
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/margencel/gedimat.yml b/data/cities/margencel/gedimat.yml
index 8a4f4f45d..daa7a8cca 100644
--- a/data/cities/margencel/gedimat.yml
+++ b/data/cities/margencel/gedimat.yml
@@ -1,11 +1,11 @@
 id: 1107835545
-type: way
+type: node
 latitude: 46.34409
 longitude: 6.41685
 postcode: "74200"
 city: Margencel
-street: "Route du Crêt Gojon"
-housenumber: 341
+street: Route du Crêt Gojon
+housenumber: "341"
 phone: ""
-opening_hours: "Mo-Fr 07:30-12:00, 13:30-18:00; Sa 07:30-12:30, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:00, 13:30-18:00; Sa 07:30-12:30, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/margencel/hairsuit.yml b/data/cities/margencel/hairsuit.yml
index 6afdde1d4..5826d8af6 100644
--- a/data/cities/margencel/hairsuit.yml
+++ b/data/cities/margencel/hairsuit.yml
@@ -5,7 +5,7 @@ longitude: 6.43457
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 09:00-19:00; Fr-Sa 08:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 09:00-19:00; Fr-Sa 08:30-19:00; Su off
+website: ""
diff --git a/data/cities/margencel/marionnaud.yml b/data/cities/margencel/marionnaud.yml
index c437bee61..5c51933a3 100644
--- a/data/cities/margencel/marionnaud.yml
+++ b/data/cities/margencel/marionnaud.yml
@@ -5,7 +5,7 @@ longitude: 6.43472
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/margencel/parapharmacie-carrefour.yml b/data/cities/margencel/parapharmacie-carrefour.yml
index 05e529944..ee9889310 100644
--- a/data/cities/margencel/parapharmacie-carrefour.yml
+++ b/data/cities/margencel/parapharmacie-carrefour.yml
@@ -5,7 +5,7 @@ longitude: 6.43408
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/margencel/pressing-tounet.yml b/data/cities/margencel/pressing-tounet.yml
index 0e6476b18..b71a8e9a7 100644
--- a/data/cities/margencel/pressing-tounet.yml
+++ b/data/cities/margencel/pressing-tounet.yml
@@ -5,7 +5,7 @@ longitude: 6.43418
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:15; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:15; Su off
+website: ""
diff --git a/data/cities/margencel/samse.yml b/data/cities/margencel/samse.yml
index 359eca4b5..48e7352c2 100644
--- a/data/cities/margencel/samse.yml
+++ b/data/cities/margencel/samse.yml
@@ -1,11 +1,11 @@
 id: 69051348
-type: way
+type: node
 latitude: 46.34649
 longitude: 6.42399
 postcode: "74200"
 city: Margencel
-street: "Route du Champ Courbe"
-housenumber: 117
+street: Route du Champ Courbe
+housenumber: "117"
 phone: ""
-opening_hours: "Mo-Th 07:30-11:45, 13:30-17:15; Fr-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:30-11:45, 13:30-17:15; Fr-Su off
+website: ""
diff --git a/data/cities/margencel/skoda.yml b/data/cities/margencel/skoda.yml
index 0fc920e32..624740864 100644
--- a/data/cities/margencel/skoda.yml
+++ b/data/cities/margencel/skoda.yml
@@ -4,8 +4,8 @@ latitude: 46.34451
 longitude: 6.41771
 postcode: "74200"
 city: Margencel
-street: "Zone D'activité Les 5 Chemins Margencel"
-housenumber: 
+street: Zone D'activité Les 5 Chemins Margencel
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: "https://mobilite.jeanlain.com/concessions/skoda-thonon/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: https://mobilite.jeanlain.com/concessions/skoda-thonon/
diff --git a/data/cities/margencel/sonepar.yml b/data/cities/margencel/sonepar.yml
index a18646f59..2df48f5ee 100644
--- a/data/cities/margencel/sonepar.yml
+++ b/data/cities/margencel/sonepar.yml
@@ -1,11 +1,12 @@
 id: 1232126967
-type: way
+type: node
 latitude: 46.34296
 longitude: 6.41545
 postcode: "74200"
 city: Margencel
-street: "Route du Crêt Gojon"
-housenumber: 73
+street: Route du Crêt Gojon
+housenumber: "73"
 phone: ""
-opening_hours: "Mo-Th 07:30-12:00, 13:30-16:30; Fr 07:30-12:00, 13:30-16:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:30-12:00, 13:30-16:30; Fr 07:30-12:00, 13:30-16:00; Sa-Su
+    off
+website: ""
diff --git a/data/cities/margencel/tabac-presse-beke.yml b/data/cities/margencel/tabac-presse-beke.yml
index 6993874e6..50e4cdced 100644
--- a/data/cities/margencel/tabac-presse-beke.yml
+++ b/data/cities/margencel/tabac-presse-beke.yml
@@ -5,7 +5,7 @@ longitude: 6.43502
 postcode: "74200"
 city: Margencel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:30-19:20; Sa 08:30-19:50; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-19:20; Sa 08:30-19:50; Su off
+website: ""
diff --git a/data/cities/marignier/boucherie-charcuterie-didier-bocquet.yml b/data/cities/marignier/boucherie-charcuterie-didier-bocquet.yml
index 9aa1c2287..fb13ce19e 100644
--- a/data/cities/marignier/boucherie-charcuterie-didier-bocquet.yml
+++ b/data/cities/marignier/boucherie-charcuterie-didier-bocquet.yml
@@ -4,8 +4,8 @@ latitude: 46.08964
 longitude: 6.50663
 postcode: "74970"
 city: Marignier
-street: "Avenue du Vieux Pont"
-housenumber: 26
-phone: "+33 4 50 34 62 29"
+street: Avenue du Vieux Pont
+housenumber: "26"
+phone: +33 4 50 34 62 29
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/marignier/boulangerie-delcourt.yml b/data/cities/marignier/boulangerie-delcourt.yml
index 61b6ea565..9c9b46d8e 100644
--- a/data/cities/marignier/boulangerie-delcourt.yml
+++ b/data/cities/marignier/boulangerie-delcourt.yml
@@ -4,8 +4,8 @@ latitude: 46.09162
 longitude: 6.50731
 postcode: "74970"
 city: Marignier
-street: "Avenue de Chatillon"
-housenumber: 15
-phone: "+33 4 50 90 73 27"
+street: Avenue de Chatillon
+housenumber: "15"
+phone: +33 4 50 90 73 27
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/marignier/spar.yml b/data/cities/marignier/spar.yml
index 806032a89..75678d95e 100644
--- a/data/cities/marignier/spar.yml
+++ b/data/cities/marignier/spar.yml
@@ -4,8 +4,8 @@ latitude: 46.09035
 longitude: 6.50103
 postcode: "74970"
 city: Marignier
-street: "Avenue de la Mairie"
-housenumber: 56
+street: Avenue de la Mairie
+housenumber: "56"
 phone: ""
-opening_hours: "Mo-Su 07:30-12:30, 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-12:30, 15:30-19:30
+website: ""
diff --git a/data/cities/mars/le-cracovie.yml b/data/cities/mars/le-cracovie.yml
index ee595dc57..c031fabed 100644
--- a/data/cities/mars/le-cracovie.yml
+++ b/data/cities/mars/le-cracovie.yml
@@ -1,11 +1,11 @@
 id: 433031629
-type: way
+type: node
 latitude: 46.14554
 longitude: 4.25589
 postcode: "42750"
 city: Mars
-street: "Chemin du Meplié"
-housenumber: 
-phone: "+33 4.77.60.51.32"
-opening_hours: "Mercredi au lundi 7:00-19:00"
-website: ""
\ No newline at end of file
+street: Chemin du Meplié
+housenumber: ""
+phone: +33 4.77.60.51.32
+opening_hours: Mercredi au lundi 7:00-19:00
+website: ""
diff --git a/data/cities/massieu/garage-gros-flandre.yml b/data/cities/massieu/garage-gros-flandre.yml
index a5dbc601f..32b748bfe 100644
--- a/data/cities/massieu/garage-gros-flandre.yml
+++ b/data/cities/massieu/garage-gros-flandre.yml
@@ -4,8 +4,8 @@ latitude: 45.43607
 longitude: 5.58029
 postcode: "38620"
 city: Massieu
-street: "Route de Chirens"
-housenumber: 1215
+street: Route de Chirens
+housenumber: "1215"
 phone: "+33476075283"
-opening_hours: "Mo 08:00-12:00,14:00-18:30; Tu-Fr 08:00-12:00,14:00-18:30"
-website: "https://concessions.peugeot.fr/massieu/"
\ No newline at end of file
+opening_hours: Mo 08:00-12:00,14:00-18:30; Tu-Fr 08:00-12:00,14:00-18:30
+website: https://concessions.peugeot.fr/massieu/
diff --git a/data/cities/massieux/acm-cuisines.yml b/data/cities/massieux/acm-cuisines.yml
index 923efd769..31b4882da 100644
--- a/data/cities/massieux/acm-cuisines.yml
+++ b/data/cities/massieux/acm-cuisines.yml
@@ -4,8 +4,8 @@ latitude: 45.90326
 longitude: 4.81738
 postcode: "01600"
 city: Massieux
-street: "Avenue Lavoisier"
-housenumber: 102
+street: Avenue Lavoisier
+housenumber: "102"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/massieux/aldi.yml b/data/cities/massieux/aldi.yml
index dc24de123..83fe7d519 100644
--- a/data/cities/massieux/aldi.yml
+++ b/data/cities/massieux/aldi.yml
@@ -1,11 +1,11 @@
 id: 394991391
-type: way
+type: node
 latitude: 45.90444
 longitude: 4.81817
 postcode: "01600"
 city: Massieux
-street: "Avenue Lavoisier"
-housenumber: 177
+street: Avenue Lavoisier
+housenumber: "177"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/massieux/boulangerie-patisserie.yml b/data/cities/massieux/boulangerie-patisserie.yml
index 2e3567a81..aee1e35af 100644
--- a/data/cities/massieux/boulangerie-patisserie.yml
+++ b/data/cities/massieux/boulangerie-patisserie.yml
@@ -4,8 +4,8 @@ latitude: 45.90889
 longitude: 4.8163
 postcode: "01600"
 city: Massieux
-street: "Chemin du Pré Blanc"
-housenumber: 55
+street: Chemin du Pré Blanc
+housenumber: "55"
 phone: ""
-opening_hours: "Mo-Fr 06:00-19:00; Sa 06:30-13:00; Su,PH 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-19:00; Sa 06:30-13:00; Su,PH 07:00-12:30
+website: ""
diff --git a/data/cities/massieux/bricoman.yml b/data/cities/massieux/bricoman.yml
index 17d6da009..cf27614d7 100644
--- a/data/cities/massieux/bricoman.yml
+++ b/data/cities/massieux/bricoman.yml
@@ -1,11 +1,11 @@
 id: 394993982
-type: way
+type: node
 latitude: 45.90508
 longitude: 4.81724
 postcode: "01600"
 city: Massieux
-street: "Avenue Lavoisier"
-housenumber: 101
+street: Avenue Lavoisier
+housenumber: "101"
 phone: "+33478983540"
-opening_hours: "Mo-Sa 07:00-19:00"
-website: "https://www.bricoman.fr/nos-magasins/magasin-massieux.html"
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:00
+website: https://www.bricoman.fr/nos-magasins/magasin-massieux.html
diff --git a/data/cities/massieux/garage-agl.yml b/data/cities/massieux/garage-agl.yml
index 446cf4ad2..e6fe8de24 100644
--- a/data/cities/massieux/garage-agl.yml
+++ b/data/cities/massieux/garage-agl.yml
@@ -1,11 +1,11 @@
 id: 395064750
-type: way
+type: node
 latitude: 45.90567
 longitude: 4.81654
 postcode: "01600"
 city: Massieux
-street: "Rue de la Gare"
-housenumber: 49
+street: Rue de la Gare
+housenumber: "49"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/massieux/tabac-presse.yml b/data/cities/massieux/tabac-presse.yml
index 07a5d4848..974013eb4 100644
--- a/data/cities/massieux/tabac-presse.yml
+++ b/data/cities/massieux/tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.90899
 longitude: 4.81631
 postcode: "01600"
 city: Massieux
-street: "Chemin du Pré Blanc"
-housenumber: 55
+street: Chemin du Pré Blanc
+housenumber: "55"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/massongy/ciel-bleu.yml b/data/cities/massongy/ciel-bleu.yml
index a1185ee36..f3a6c87b6 100644
--- a/data/cities/massongy/ciel-bleu.yml
+++ b/data/cities/massongy/ciel-bleu.yml
@@ -4,8 +4,8 @@ latitude: 46.31784
 longitude: 6.33061
 postcode: "74140"
 city: Massongy
-street: "Route de l'Église"
-housenumber: 4
-phone: "+33 9 87 74 61 11"
-opening_hours: "Mo-Fr 09:00-12:30,14:00-19:00; Sa 09:00-12:30,13:30-17:00"
-website: "https://cielbleu-pressing.fr"
\ No newline at end of file
+street: Route de l'Église
+housenumber: "4"
+phone: +33 9 87 74 61 11
+opening_hours: Mo-Fr 09:00-12:30,14:00-19:00; Sa 09:00-12:30,13:30-17:00
+website: https://cielbleu-pressing.fr
diff --git a/data/cities/matafelon-granges/fromagerie-de-courtouphle.yml b/data/cities/matafelon-granges/fromagerie-de-courtouphle.yml
index 878a0ab78..76f8c9c27 100644
--- a/data/cities/matafelon-granges/fromagerie-de-courtouphle.yml
+++ b/data/cities/matafelon-granges/fromagerie-de-courtouphle.yml
@@ -1,11 +1,11 @@
 id: 236499103
-type: way
+type: node
 latitude: 46.26765
 longitude: 5.53682
 postcode: "01580"
 city: Matafelon-Granges
-street: "Rue des Bateliers"
-housenumber: 
+street: Rue des Bateliers
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/aux-delices-de-megeve.yml b/data/cities/megeve/aux-delices-de-megeve.yml
index 5c7df2023..3046cbe3e 100644
--- a/data/cities/megeve/aux-delices-de-megeve.yml
+++ b/data/cities/megeve/aux-delices-de-megeve.yml
@@ -4,8 +4,8 @@ latitude: 45.86196
 longitude: 6.61857
 postcode: "74120"
 city: Megève
-street: "Route du Palais des Sports"
-housenumber: 290
+street: Route du Palais des Sports
+housenumber: "290"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/boucherie-de-megeve.yml b/data/cities/megeve/boucherie-de-megeve.yml
index e3def7cd8..916c730c2 100644
--- a/data/cities/megeve/boucherie-de-megeve.yml
+++ b/data/cities/megeve/boucherie-de-megeve.yml
@@ -4,8 +4,8 @@ latitude: 45.86186
 longitude: 6.61866
 postcode: "74120"
 city: Megève
-street: "Route du Palais des Sports"
-housenumber: 282
-phone: "+334 50 93 21 34"
+street: Route du Palais des Sports
+housenumber: "282"
+phone: +334 50 93 21 34
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/carrefour-contact.yml b/data/cities/megeve/carrefour-contact.yml
index 748cbcafa..f92c04808 100644
--- a/data/cities/megeve/carrefour-contact.yml
+++ b/data/cities/megeve/carrefour-contact.yml
@@ -1,11 +1,11 @@
 id: 68158460
-type: way
+type: node
 latitude: 45.86351
 longitude: 6.62529
 postcode: "74120"
 city: Megève
-street: "Route Nationale"
-housenumber: 681
+street: Route Nationale
+housenumber: "681"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00, Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00, Su 09:00-13:00
+website: ""
diff --git a/data/cities/megeve/carrefour-montagne.yml b/data/cities/megeve/carrefour-montagne.yml
index b165aeff5..76d26a343 100644
--- a/data/cities/megeve/carrefour-montagne.yml
+++ b/data/cities/megeve/carrefour-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.85695
 longitude: 6.61582
 postcode: "74120"
 city: Megève
-street: "Rue Ambroise Martin"
-housenumber: 156
+street: Rue Ambroise Martin
+housenumber: "156"
 phone: ""
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/megeve/casino-supermarche.yml b/data/cities/megeve/casino-supermarche.yml
index e5224c5ac..6dfbd6c34 100644
--- a/data/cities/megeve/casino-supermarche.yml
+++ b/data/cities/megeve/casino-supermarche.yml
@@ -1,11 +1,11 @@
 id: 157666398
-type: way
+type: node
 latitude: 45.87095
 longitude: 6.63052
 postcode: "74120"
 city: Megève
-street: "Route de Sallanches"
-housenumber: 283
+street: Route de Sallanches
+housenumber: "283"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30; PH closed"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30; PH closed
+website: ""
diff --git a/data/cities/megeve/henry-sports.yml b/data/cities/megeve/henry-sports.yml
index 42c185510..fa9215f0d 100644
--- a/data/cities/megeve/henry-sports.yml
+++ b/data/cities/megeve/henry-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.84989
 longitude: 6.61469
 postcode: "74120"
 city: Megève
-street: "Route du Téléphérique"
-housenumber: 202
+street: Route du Téléphérique
+housenumber: "202"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/intersport-route-du-palais-des-sports.yml b/data/cities/megeve/intersport-route-du-palais-des-sports.yml
index c262aa62b..022d30698 100644
--- a/data/cities/megeve/intersport-route-du-palais-des-sports.yml
+++ b/data/cities/megeve/intersport-route-du-palais-des-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.86233
 longitude: 6.61838
 postcode: "74120"
 city: Megève
-street: "Route du Palais des Sports"
-housenumber: 332
+street: Route du Palais des Sports
+housenumber: "332"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/intersport.yml b/data/cities/megeve/intersport.yml
index 3823f78ac..0337076e2 100644
--- a/data/cities/megeve/intersport.yml
+++ b/data/cities/megeve/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.85121
 longitude: 6.6152
 postcode: "74120"
 city: Megève
-street: "Route de Rochebrune"
-housenumber: 527
+street: Route de Rochebrune
+housenumber: "527"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/le-petit-casino.yml b/data/cities/megeve/le-petit-casino.yml
index 14aee1186..b72d4cc95 100644
--- a/data/cities/megeve/le-petit-casino.yml
+++ b/data/cities/megeve/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.85572
 longitude: 6.616
 postcode: "74120"
 city: Megève
-street: "Rue de la Poste"
-housenumber: 47
+street: Rue de la Poste
+housenumber: "47"
 phone: ""
-opening_hours: "Mo-Tu,Th-Sa 08:00-12:15, 16:00-19:00; We,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Sa 08:00-12:15, 16:00-19:00; We,Su off
+website: ""
diff --git a/data/cities/megeve/pelloux-sports.yml b/data/cities/megeve/pelloux-sports.yml
index 183b12128..5826bde93 100644
--- a/data/cities/megeve/pelloux-sports.yml
+++ b/data/cities/megeve/pelloux-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.85632
 longitude: 6.61731
 postcode: "74120"
 city: Megève
-street: "Arcades du Mont Blanc"
-housenumber: 4
+street: Arcades du Mont Blanc
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: "https://www.skimium.fr/magasin-location-ski/megeve/pelloux-sports"
\ No newline at end of file
+website: https://www.skimium.fr/magasin-location-ski/megeve/pelloux-sports
diff --git a/data/cities/megeve/sherpa.yml b/data/cities/megeve/sherpa.yml
index 6c946addc..e855b3a4d 100644
--- a/data/cities/megeve/sherpa.yml
+++ b/data/cities/megeve/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 45.85726
 longitude: 6.61172
 postcode: "74120"
 city: Megève
-street: "Route du Chinaillon"
-housenumber: 1935
+street: Route du Chinaillon
+housenumber: "1935"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/ski-shop-duvillard-sports-megeve-mont-arbois.yml b/data/cities/megeve/ski-shop-duvillard-sports-megeve-mont-arbois.yml
index b1d951b3c..245fcbb0b 100644
--- a/data/cities/megeve/ski-shop-duvillard-sports-megeve-mont-arbois.yml
+++ b/data/cities/megeve/ski-shop-duvillard-sports-megeve-mont-arbois.yml
@@ -4,8 +4,8 @@ latitude: 45.8529
 longitude: 6.63205
 postcode: "74120"
 city: Megève
-street: "Route Edmond de Rothschild"
-housenumber: 3063
+street: Route Edmond de Rothschild
+housenumber: "3063"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/megeve/sport-2000-anouk-socquet-sports.yml b/data/cities/megeve/sport-2000-anouk-socquet-sports.yml
index 0eb77b20c..d79ac251a 100644
--- a/data/cities/megeve/sport-2000-anouk-socquet-sports.yml
+++ b/data/cities/megeve/sport-2000-anouk-socquet-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.85462
 longitude: 6.61603
 postcode: "74120"
 city: Megève
-street: "Route de Rochebrune"
-housenumber: 
+street: Route de Rochebrune
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://socquetsports.sport2000.fr/"
\ No newline at end of file
+website: https://socquetsports.sport2000.fr/
diff --git a/data/cities/meibel-les-allues/ski-set.yml b/data/cities/meibel-les-allues/ski-set.yml
index cff16519a..c0cbae683 100644
--- a/data/cities/meibel-les-allues/ski-set.yml
+++ b/data/cities/meibel-les-allues/ski-set.yml
@@ -4,8 +4,8 @@ latitude: 45.3938
 longitude: 6.56712
 postcode: "73550"
 city: meibel Les Allues
-street: "LE trempllin"
-housenumber: 
+street: LE trempllin
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meillonnas/vival.yml b/data/cities/meillonnas/vival.yml
index 2f5526bb0..2eff67388 100644
--- a/data/cities/meillonnas/vival.yml
+++ b/data/cities/meillonnas/vival.yml
@@ -4,8 +4,9 @@ latitude: 46.24408
 longitude: 5.34972
 postcode: "01370"
 city: Meillonnas
-street: "Rue du Mollard"
-housenumber: 
-phone: "+33 4 74 42 58 99"
-opening_hours: "Mo-Tu 06:30-12:30,15:00-19:00; Th-Fr 06:30-12:30,15:00-19:00; Sa 07:00-12:30,15:00-19:00; Su 07:00-12:00"
-website: "https://magasins.vival.fr/fr/s/vival-meillonnas"
\ No newline at end of file
+street: Rue du Mollard
+housenumber: ""
+phone: +33 4 74 42 58 99
+opening_hours: Mo-Tu 06:30-12:30,15:00-19:00; Th-Fr 06:30-12:30,15:00-19:00; Sa 07:00-12:30,15:00-19:00;
+    Su 07:00-12:00
+website: https://magasins.vival.fr/fr/s/vival-meillonnas
diff --git a/data/cities/mens/au-petit-marche.yml b/data/cities/mens/au-petit-marche.yml
index 2d46cf935..ff5476bc3 100644
--- a/data/cities/mens/au-petit-marche.yml
+++ b/data/cities/mens/au-petit-marche.yml
@@ -4,8 +4,8 @@ latitude: 44.81772
 longitude: 5.75219
 postcode: "38710"
 city: Mens
-street: "Boulevard E. Arnaud"
-housenumber: 
-phone: "+33 4 76 34 67 61"
-opening_hours: "Tu-Sa 07:30-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+street: Boulevard E. Arnaud
+housenumber: ""
+phone: +33 4 76 34 67 61
+opening_hours: Tu-Sa 07:30-12:30, 15:00-19:00
+website: ""
diff --git a/data/cities/mens/friperie-solidaire.yml b/data/cities/mens/friperie-solidaire.yml
index ad70869c6..0769c604b 100644
--- a/data/cities/mens/friperie-solidaire.yml
+++ b/data/cities/mens/friperie-solidaire.yml
@@ -4,8 +4,8 @@ latitude: 44.81775
 longitude: 5.75011
 postcode: "38710"
 city: Mens
-street: "Place Paul Brachet"
-housenumber: 
+street: Place Paul Brachet
+housenumber: ""
 phone: ""
-opening_hours: "We 09:00-17:00; Fr 14:00-17:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: We 09:00-17:00; Fr 14:00-17:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/mens/la-palpitante.yml b/data/cities/mens/la-palpitante.yml
index d54162a98..ab71ccf1d 100644
--- a/data/cities/mens/la-palpitante.yml
+++ b/data/cities/mens/la-palpitante.yml
@@ -4,8 +4,8 @@ latitude: 44.8182
 longitude: 5.75151
 postcode: "38710"
 city: Mens
-street: "Place de la Halle"
-housenumber: 1
-phone: "+33 4 56 55 23 08"
-opening_hours: "Tu-Sa 10:00-13:00,14:30-18:30"
-website: "http://lapalpitante.fr"
\ No newline at end of file
+street: Place de la Halle
+housenumber: "1"
+phone: +33 4 56 55 23 08
+opening_hours: Tu-Sa 10:00-13:00,14:30-18:30
+website: http://lapalpitante.fr
diff --git a/data/cities/mens/recycleart.yml b/data/cities/mens/recycleart.yml
index dcf48da61..d91ed6d0e 100644
--- a/data/cities/mens/recycleart.yml
+++ b/data/cities/mens/recycleart.yml
@@ -4,8 +4,8 @@ latitude: 44.82025
 longitude: 5.74839
 postcode: "38710"
 city: Mens
-street: "Avenue Roger Brachet"
-housenumber: 
+street: Avenue Roger Brachet
+housenumber: ""
 phone: ""
-opening_hours: "Mo 15:30-17:00, 09:00-18:00; We 10:00-12:00; Sa 14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 15:30-17:00, 09:00-18:00; We 10:00-12:00; Sa 14:00-17:00
+website: ""
diff --git a/data/cities/mens/renault-garage-picca.yml b/data/cities/mens/renault-garage-picca.yml
index caa51752f..03a26bd3c 100644
--- a/data/cities/mens/renault-garage-picca.yml
+++ b/data/cities/mens/renault-garage-picca.yml
@@ -4,8 +4,8 @@ latitude: 44.81698
 longitude: 5.74825
 postcode: "38710"
 city: Mens
-street: "Place du Vercors"
-housenumber: 
+street: Place du Vercors
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 08:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/mens/roues-libres.yml b/data/cities/mens/roues-libres.yml
index 5dfda6428..d5767f3c1 100644
--- a/data/cities/mens/roues-libres.yml
+++ b/data/cities/mens/roues-libres.yml
@@ -4,8 +4,8 @@ latitude: 44.82134
 longitude: 5.75245
 postcode: "38710"
 city: Mens
-street: "Boulevard Édouard Arnaud"
-housenumber: 416
+street: Boulevard Édouard Arnaud
+housenumber: "416"
 phone: ""
-opening_hours: "We-Fr 09:30-12:00, 14:30-18:30; Sa 10:00-13:30"
-website: ""
\ No newline at end of file
+opening_hours: We-Fr 09:30-12:00, 14:30-18:30; Sa 10:00-13:30
+website: ""
diff --git a/data/cities/menthon-saint-bernard/8-a-huit.yml b/data/cities/menthon-saint-bernard/8-a-huit.yml
index e50ec3033..b043ce83f 100644
--- a/data/cities/menthon-saint-bernard/8-a-huit.yml
+++ b/data/cities/menthon-saint-bernard/8-a-huit.yml
@@ -4,8 +4,8 @@ latitude: 45.85937
 longitude: 6.1964
 postcode: "74290"
 city: Menthon-Saint-Bernard
-street: "Rue de Saint-Bernard"
-housenumber: 453
+street: Rue de Saint-Bernard
+housenumber: "453"
 phone: ""
-opening_hours: "Mo-Sa 08:15-13:00,15:00-19:45; Su 08:15-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:15-13:00,15:00-19:45; Su 08:15-12:45
+website: ""
diff --git a/data/cities/menthonnex-en-bornes/gaec-la-ferme-de-bornette.yml b/data/cities/menthonnex-en-bornes/gaec-la-ferme-de-bornette.yml
index d3c8d0a1d..769e7e584 100644
--- a/data/cities/menthonnex-en-bornes/gaec-la-ferme-de-bornette.yml
+++ b/data/cities/menthonnex-en-bornes/gaec-la-ferme-de-bornette.yml
@@ -4,8 +4,8 @@ latitude: 46.05816
 longitude: 6.17322
 postcode: "74350"
 city: Menthonnex-en-Bornes
-street: "Route de la Côte"
-housenumber: 156
+street: Route de la Côte
+housenumber: "156"
 phone: ""
 opening_hours: ""
-website: "https://www.lafermedebornette.fr/"
\ No newline at end of file
+website: https://www.lafermedebornette.fr/
diff --git a/data/cities/menthonnex-en-bornes/le-fournil-de-menthonay.yml b/data/cities/menthonnex-en-bornes/le-fournil-de-menthonay.yml
index 365a00b8d..bcd5859cd 100644
--- a/data/cities/menthonnex-en-bornes/le-fournil-de-menthonay.yml
+++ b/data/cities/menthonnex-en-bornes/le-fournil-de-menthonay.yml
@@ -4,8 +4,8 @@ latitude: 46.05309
 longitude: 6.172
 postcode: "74350"
 city: Menthonnex-en-Bornes
-street: "Place de la Mairie"
-housenumber: 48
+street: Place de la Mairie
+housenumber: "48"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meribel/chaudanne-sport.yml b/data/cities/meribel/chaudanne-sport.yml
index 043b778c6..2dcbf730e 100644
--- a/data/cities/meribel/chaudanne-sport.yml
+++ b/data/cities/meribel/chaudanne-sport.yml
@@ -5,7 +5,7 @@ longitude: 6.56692
 postcode: "73550"
 city: Méribel
 street: ""
-housenumber: 127
-phone: "+33 4 79 08 89 12"
-opening_hours: "Mo-Su 08:30-19:30"
-website: "https://www.myski.shop/skishop-location-ski-meribel/chaudanne-sport#"
\ No newline at end of file
+housenumber: "127"
+phone: +33 4 79 08 89 12
+opening_hours: Mo-Su 08:30-19:30
+website: https://www.myski.shop/skishop-location-ski-meribel/chaudanne-sport#
diff --git a/data/cities/meribel/fusalp.yml b/data/cities/meribel/fusalp.yml
index 10f7f32a0..85a7edfb7 100644
--- a/data/cities/meribel/fusalp.yml
+++ b/data/cities/meribel/fusalp.yml
@@ -5,7 +5,7 @@ longitude: 6.56707
 postcode: "73550"
 city: Méribel
 street: ""
-housenumber: 127
-phone: "+33 4 79 41 69 50"
-opening_hours: "Mo-Su 09:00-19:30"
-website: "https://www.myski.shop/skishop-location-ski-meribel/apres-ski#"
\ No newline at end of file
+housenumber: "127"
+phone: +33 4 79 41 69 50
+opening_hours: Mo-Su 09:00-19:30
+website: https://www.myski.shop/skishop-location-ski-meribel/apres-ski#
diff --git a/data/cities/meribel/georges-mauduit-sports.yml b/data/cities/meribel/georges-mauduit-sports.yml
index 5528e6ccf..19565d077 100644
--- a/data/cities/meribel/georges-mauduit-sports.yml
+++ b/data/cities/meribel/georges-mauduit-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.39706
 longitude: 6.56652
 postcode: "73550"
 city: Méribel
-street: "Route du Centre"
-housenumber: 
-phone: "+33 4 79 08 63 08"
-opening_hours: "Mo-Su 09:00-19:30"
-website: "https://www.mauduitsports.com/"
\ No newline at end of file
+street: Route du Centre
+housenumber: ""
+phone: +33 4 79 08 63 08
+opening_hours: Mo-Su 09:00-19:30
+website: https://www.mauduitsports.com/
diff --git a/data/cities/meribel/intersport-2.yml b/data/cities/meribel/intersport-2.yml
index df868ba53..3e4a23e4f 100644
--- a/data/cities/meribel/intersport-2.yml
+++ b/data/cities/meribel/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.57415
 postcode: "73550"
 city: Méribel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meribel/intersport.yml b/data/cities/meribel/intersport.yml
index 8331a7770..3ee755087 100644
--- a/data/cities/meribel/intersport.yml
+++ b/data/cities/meribel/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.56605
 postcode: "73550"
 city: Méribel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meribel/leskale-ski-shop.yml b/data/cities/meribel/leskale-ski-shop.yml
index 9fdadd0da..7a1d936f2 100644
--- a/data/cities/meribel/leskale-ski-shop.yml
+++ b/data/cities/meribel/leskale-ski-shop.yml
@@ -5,7 +5,7 @@ longitude: 6.56714
 postcode: "73550"
 city: Méribel
 street: ""
-housenumber: 127
-phone: "+33 4 79 41 69 50"
-opening_hours: "Mo-Su 08:30-20:00"
-website: "https://www.myski.shop/skishop-location-ski-meribel/eskale"
\ No newline at end of file
+housenumber: "127"
+phone: +33 4 79 41 69 50
+opening_hours: Mo-Su 08:30-20:00
+website: https://www.myski.shop/skishop-location-ski-meribel/eskale
diff --git a/data/cities/meribel/skimium-2.yml b/data/cities/meribel/skimium-2.yml
index 317b0c3cb..2152ca9f9 100644
--- a/data/cities/meribel/skimium-2.yml
+++ b/data/cities/meribel/skimium-2.yml
@@ -5,7 +5,7 @@ longitude: 6.56626
 postcode: "73550"
 city: Méribel
 street: ""
-housenumber: 332
+housenumber: "332"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meribel/skimium.yml b/data/cities/meribel/skimium.yml
index 9d82d566e..a67fbf5f8 100644
--- a/data/cities/meribel/skimium.yml
+++ b/data/cities/meribel/skimium.yml
@@ -5,7 +5,7 @@ longitude: 6.5671
 postcode: "73550"
 city: Méribel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mery/garage-blanc-freres.yml b/data/cities/mery/garage-blanc-freres.yml
index 1c6e9b6a2..9befdade0 100644
--- a/data/cities/mery/garage-blanc-freres.yml
+++ b/data/cities/mery/garage-blanc-freres.yml
@@ -1,11 +1,11 @@
 id: 162984609
-type: way
+type: node
 latitude: 45.64318
 longitude: 5.91759
 postcode: "73420"
 city: Méry
-street: "Rue Charles Montreuil"
-housenumber: 9
+street: Rue Charles Montreuil
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/messery/le-petit-casino.yml b/data/cities/messery/le-petit-casino.yml
index 8c06fee6a..ef11ee93f 100644
--- a/data/cities/messery/le-petit-casino.yml
+++ b/data/cities/messery/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.35103
 longitude: 6.29416
 postcode: "74140"
 city: Messery
-street: "Rue du Veret"
-housenumber: 4
+street: Rue du Veret
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-13:00
+website: ""
diff --git a/data/cities/metz-tessy/sonance-audition.yml b/data/cities/metz-tessy/sonance-audition.yml
index 3fd77d638..16ed80e97 100644
--- a/data/cities/metz-tessy/sonance-audition.yml
+++ b/data/cities/metz-tessy/sonance-audition.yml
@@ -4,8 +4,8 @@ latitude: 45.93523
 longitude: 6.11688
 postcode: "74370"
 city: Metz-Tessy
-street: "Allée de la Mandallaz"
-housenumber: 
+street: Allée de la Mandallaz
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meximieux/bricomarche.yml b/data/cities/meximieux/bricomarche.yml
index 61dbe4825..e70a346cb 100644
--- a/data/cities/meximieux/bricomarche.yml
+++ b/data/cities/meximieux/bricomarche.yml
@@ -1,11 +1,11 @@
 id: 233140559
-type: way
+type: node
 latitude: 45.91342
 longitude: 5.19153
 postcode: "01800"
 city: Meximieux
-street: "Route de Chalamont"
-housenumber: 
+street: Route de Chalamont
+housenumber: ""
 phone: "+33474347266"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.brico-meximieux.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.brico-meximieux.com/
diff --git a/data/cities/meximieux/compttour-bike.yml b/data/cities/meximieux/compttour-bike.yml
index 5818824ad..e88f81243 100644
--- a/data/cities/meximieux/compttour-bike.yml
+++ b/data/cities/meximieux/compttour-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.90599
 longitude: 5.20434
 postcode: "01800"
 city: Meximieux
-street: "Route de Villieu"
-housenumber: 9014
+street: Route de Villieu
+housenumber: "9014"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meximieux/la-ferme-du-favier.yml b/data/cities/meximieux/la-ferme-du-favier.yml
index 304add511..a0777391a 100644
--- a/data/cities/meximieux/la-ferme-du-favier.yml
+++ b/data/cities/meximieux/la-ferme-du-favier.yml
@@ -4,8 +4,8 @@ latitude: 45.92206
 longitude: 5.18093
 postcode: "01800"
 city: Meximieux
-street: "Lieu-dit Le Favier"
-housenumber: 
+street: Lieu-dit Le Favier
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://amapdutoison.amap-aura.org/2018/12/26/producteur-de-miel-bio-de-pommes-bio-et-doeufs-bio/"
\ No newline at end of file
+website: https://amapdutoison.amap-aura.org/2018/12/26/producteur-de-miel-bio-de-pommes-bio-et-doeufs-bio/
diff --git a/data/cities/meximieux/lanimalerie-bricomarche.yml b/data/cities/meximieux/lanimalerie-bricomarche.yml
index dd6305570..49dd6927c 100644
--- a/data/cities/meximieux/lanimalerie-bricomarche.yml
+++ b/data/cities/meximieux/lanimalerie-bricomarche.yml
@@ -4,8 +4,8 @@ latitude: 45.91315
 longitude: 5.19233
 postcode: "01800"
 city: Meximieux
-street: "Route de Chalamont"
-housenumber: 
-phone: "+33 4 74 34 72 66"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.brico-meximieux.com"
\ No newline at end of file
+street: Route de Chalamont
+housenumber: ""
+phone: +33 4 74 34 72 66
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.brico-meximieux.com
diff --git a/data/cities/meximieux/midas.yml b/data/cities/meximieux/midas.yml
index d07fe3091..d5ffde08d 100644
--- a/data/cities/meximieux/midas.yml
+++ b/data/cities/meximieux/midas.yml
@@ -4,8 +4,8 @@ latitude: 45.90157
 longitude: 5.1993
 postcode: "01800"
 city: Meximieux
-street: "Rue de la Tréfilerie"
-housenumber: 
-phone: "+33 4 74 46 42 05"
+street: Rue de la Tréfilerie
+housenumber: ""
+phone: +33 4 74 46 42 05
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/meximieux/noz.yml b/data/cities/meximieux/noz.yml
index 926c292cf..e94b29466 100644
--- a/data/cities/meximieux/noz.yml
+++ b/data/cities/meximieux/noz.yml
@@ -1,11 +1,11 @@
 id: 233139793
-type: way
+type: node
 latitude: 45.9024
 longitude: 5.19378
 postcode: "01800"
 city: Meximieux
-street: "Rue de la Gare"
-housenumber: 25
+street: Rue de la Gare
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/meximieux/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/meximieux/
diff --git a/data/cities/meylan/as-sports.yml b/data/cities/meylan/as-sports.yml
index fe8a8064c..a603241fe 100644
--- a/data/cities/meylan/as-sports.yml
+++ b/data/cities/meylan/as-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.21211
 longitude: 5.77588
 postcode: "38240"
 city: Meylan
-street: "Chemin de Chaumetière"
-housenumber: 25
+street: Chemin de Chaumetière
+housenumber: "25"
 phone: ""
-opening_hours: "DEFINITIVEMENT FERME"
-website: ""
\ No newline at end of file
+opening_hours: DEFINITIVEMENT FERME
+website: ""
diff --git a/data/cities/meylan/au-potager.yml b/data/cities/meylan/au-potager.yml
index 02c95fbc2..587a4d57c 100644
--- a/data/cities/meylan/au-potager.yml
+++ b/data/cities/meylan/au-potager.yml
@@ -4,8 +4,8 @@ latitude: 45.21803
 longitude: 5.7803
 postcode: "38240"
 city: Meylan
-street: "Avenue de Chartreuse"
-housenumber: 44
+street: Avenue de Chartreuse
+housenumber: "44"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meylan/boulangerie-patisserie-maxence.yml b/data/cities/meylan/boulangerie-patisserie-maxence.yml
index 2fafdb3a6..ae51542f4 100644
--- a/data/cities/meylan/boulangerie-patisserie-maxence.yml
+++ b/data/cities/meylan/boulangerie-patisserie-maxence.yml
@@ -1,11 +1,11 @@
 id: 170516506
-type: way
+type: node
 latitude: 45.20642
 longitude: 5.76716
 postcode: "38240"
 city: Meylan
-street: "Avenue de Verdun"
-housenumber: 29
+street: Avenue de Verdun
+housenumber: "29"
 phone: ""
-opening_hours: "Mo-Fr 07:00-19:30; Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-19:30; Sa 07:00-19:00
+website: ""
diff --git a/data/cities/meylan/bureau-de-tabac-presse.yml b/data/cities/meylan/bureau-de-tabac-presse.yml
index 8745c2fcd..85f0ed080 100644
--- a/data/cities/meylan/bureau-de-tabac-presse.yml
+++ b/data/cities/meylan/bureau-de-tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.21187
 longitude: 5.78634
 postcode: "38240"
 city: Meylan
-street: "Place des Tuileaux"
-housenumber: 
+street: Place des Tuileaux
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 07:30-13:30,15:30-19:00; Sa 08:00-12:30; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-13:30,15:30-19:00; Sa 08:00-12:30; Su 08:00-12:00
+website: ""
diff --git a/data/cities/meylan/buro.yml b/data/cities/meylan/buro.yml
index 6b53921b7..c6bd2b59f 100644
--- a/data/cities/meylan/buro.yml
+++ b/data/cities/meylan/buro.yml
@@ -1,11 +1,11 @@
 id: 170514460
-type: way
+type: node
 latitude: 45.2033
 longitude: 5.76773
 postcode: "38240"
 city: Meylan
-street: "Boulevard des Alpes"
-housenumber: 7
+street: Boulevard des Alpes
+housenumber: "7"
 phone: "+33476541106"
-opening_hours: "Mo-Fr 09:00-12:15,13:45-19:00; Sa 09:00-12:00,14:00-18:30"
-website: "https://www.buroplus.com/buro-peri-ode-meylan_44_magasin.html"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:15,13:45-19:00; Sa 09:00-12:00,14:00-18:30
+website: https://www.buroplus.com/buro-peri-ode-meylan_44_magasin.html
diff --git a/data/cities/meylan/casino.yml b/data/cities/meylan/casino.yml
index 313dc5e08..daedb4e35 100644
--- a/data/cities/meylan/casino.yml
+++ b/data/cities/meylan/casino.yml
@@ -4,8 +4,9 @@ latitude: 45.21152
 longitude: 5.78626
 postcode: "38240"
 city: Meylan
-street: "Place des Tuileaux"
-housenumber: 2
-phone: "+33 4 76 90 10 86"
-opening_hours: "Mo-Fr 08:00-13:00,15:30-19:30; Sa 08:00-12:30; Jun 01 Mo-Fr 08:00-13:00,15:30-19:30; Jun 01 Sa 08:00-12:30; PH off"
-website: ""
\ No newline at end of file
+street: Place des Tuileaux
+housenumber: "2"
+phone: +33 4 76 90 10 86
+opening_hours: Mo-Fr 08:00-13:00,15:30-19:30; Sa 08:00-12:30; Jun 01 Mo-Fr 08:00-13:00,15:30-19:30;
+    Jun 01 Sa 08:00-12:30; PH off
+website: ""
diff --git a/data/cities/meylan/centre-commercial-carrefour-meylan.yml b/data/cities/meylan/centre-commercial-carrefour-meylan.yml
index a62ff90ad..b330456d8 100644
--- a/data/cities/meylan/centre-commercial-carrefour-meylan.yml
+++ b/data/cities/meylan/centre-commercial-carrefour-meylan.yml
@@ -1,11 +1,11 @@
 id: 31099979
-type: way
+type: node
 latitude: 45.20379
 longitude: 5.76336
 postcode: "38240"
 city: Meylan
-street: "Boulevard des Alpes"
-housenumber: 1
+street: Boulevard des Alpes
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 08:30-21:30; Sa 08:30-20:45; Su 08:30-12:30"
-website: "https://www.carrefour.fr/magasin/grenoble-meylan"
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-21:30; Sa 08:30-20:45; Su 08:30-12:30
+website: https://www.carrefour.fr/magasin/grenoble-meylan
diff --git a/data/cities/meylan/citroen.yml b/data/cities/meylan/citroen.yml
index caaf3e781..9b8adaead 100644
--- a/data/cities/meylan/citroen.yml
+++ b/data/cities/meylan/citroen.yml
@@ -1,11 +1,11 @@
 id: 102933028
-type: way
+type: node
 latitude: 45.20848
 longitude: 5.7915
 postcode: "38240"
 city: Meylan
-street: "Chemin du Vieux Chêne"
-housenumber: 25
+street: Chemin du Vieux Chêne
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meylan/cyclable-meylan.yml b/data/cities/meylan/cyclable-meylan.yml
index ce72c1bbe..3dde3817d 100644
--- a/data/cities/meylan/cyclable-meylan.yml
+++ b/data/cities/meylan/cyclable-meylan.yml
@@ -4,8 +4,8 @@ latitude: 45.20932
 longitude: 5.79129
 postcode: "38240"
 city: Meylan
-street: "Chemin du Vieux Chêne"
-housenumber: 22
+street: Chemin du Vieux Chêne
+housenumber: "22"
 phone: ""
-opening_hours: "Tu-Fr 10:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/meylan/franck-provost.yml b/data/cities/meylan/franck-provost.yml
index 452d778ca..190f02697 100644
--- a/data/cities/meylan/franck-provost.yml
+++ b/data/cities/meylan/franck-provost.yml
@@ -4,8 +4,8 @@ latitude: 45.2036
 longitude: 5.76358
 postcode: "38240"
 city: Meylan
-street: "Boulevard des Alpes"
-housenumber: 
+street: Boulevard des Alpes
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: "https://www.franckprovost.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: https://www.franckprovost.com/
diff --git a/data/cities/meylan/fromagerie-la-tentation.yml b/data/cities/meylan/fromagerie-la-tentation.yml
index 707b6c2d2..1bdd53ab9 100644
--- a/data/cities/meylan/fromagerie-la-tentation.yml
+++ b/data/cities/meylan/fromagerie-la-tentation.yml
@@ -4,8 +4,8 @@ latitude: 45.20356
 longitude: 5.76017
 postcode: "38240"
 city: Meylan
-street: "Avenue de la Plaine Fleurie"
-housenumber: 42
+street: Avenue de la Plaine Fleurie
+housenumber: "42"
 phone: ""
-opening_hours: "Tu-Su 09:00-12:30; Tu-Sa 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 09:00-12:30; Tu-Sa 15:30-19:30
+website: ""
diff --git a/data/cities/meylan/fromagerie-omeylan.yml b/data/cities/meylan/fromagerie-omeylan.yml
index dfc742489..ffca60784 100644
--- a/data/cities/meylan/fromagerie-omeylan.yml
+++ b/data/cities/meylan/fromagerie-omeylan.yml
@@ -4,8 +4,8 @@ latitude: 45.21785
 longitude: 5.78045
 postcode: "38240"
 city: Meylan
-street: "Avenue de Chartreuse"
-housenumber: 37
-phone: "+33 4 76 90 05 00"
+street: Avenue de Chartreuse
+housenumber: "37"
+phone: +33 4 76 90 05 00
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meylan/garage-pelletier.yml b/data/cities/meylan/garage-pelletier.yml
index f7cb396ce..8dcd88b1c 100644
--- a/data/cities/meylan/garage-pelletier.yml
+++ b/data/cities/meylan/garage-pelletier.yml
@@ -1,11 +1,11 @@
 id: 102937345
-type: way
+type: node
 latitude: 45.21463
 longitude: 5.77948
 postcode: "38240"
 city: Meylan
-street: "Chemin de l'Ancienne Mairie"
-housenumber: 14
-phone: "+33 4 76 90 26 49"
+street: Chemin de l'Ancienne Mairie
+housenumber: "14"
+phone: +33 4 76 90 26 49
 opening_hours: ""
-website: "https://concessions.peugeot.fr/meylan/"
\ No newline at end of file
+website: https://concessions.peugeot.fr/meylan/
diff --git a/data/cities/meylan/institut-valbeaute.yml b/data/cities/meylan/institut-valbeaute.yml
index 4282b7add..c1e1accaa 100644
--- a/data/cities/meylan/institut-valbeaute.yml
+++ b/data/cities/meylan/institut-valbeaute.yml
@@ -4,8 +4,8 @@ latitude: 45.20645
 longitude: 5.75731
 postcode: "38240"
 city: Meylan
-street: "Avenue de la Plaine Fleurie"
-housenumber: 19
+street: Avenue de la Plaine Fleurie
+housenumber: "19"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/meylan/king-jouet.yml b/data/cities/meylan/king-jouet.yml
index 7d3021472..e809a0993 100644
--- a/data/cities/meylan/king-jouet.yml
+++ b/data/cities/meylan/king-jouet.yml
@@ -1,11 +1,11 @@
 id: 170514459
-type: way
+type: node
 latitude: 45.20322
 longitude: 5.76669
 postcode: "38240"
 city: Meylan
-street: "Boulevard des Alpes"
-housenumber: 3
-phone: "+33 4 76 04 93 93"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.king-jouet.com/magasins/38-Isere/magasin-MEYLAN-0430.htm"
\ No newline at end of file
+street: Boulevard des Alpes
+housenumber: "3"
+phone: +33 4 76 04 93 93
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.king-jouet.com/magasins/38-Isere/magasin-MEYLAN-0430.htm
diff --git a/data/cities/meylan/la-bonne-pioche.yml b/data/cities/meylan/la-bonne-pioche.yml
index a880ed135..b67b9f5f7 100644
--- a/data/cities/meylan/la-bonne-pioche.yml
+++ b/data/cities/meylan/la-bonne-pioche.yml
@@ -4,8 +4,8 @@ latitude: 45.2063
 longitude: 5.77366
 postcode: "38240"
 city: Meylan
-street: "Avenue du Vercors"
-housenumber: 27
-phone: "+33 4 38 38 31 22"
-opening_hours: "Mo 15:45-19:00; Tu-Fr 9:00-13:45,15:45-19:00"
-website: "https://www.labonnepiochegrenoble.com"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "27"
+phone: +33 4 38 38 31 22
+opening_hours: Mo 15:45-19:00; Tu-Fr 9:00-13:45,15:45-19:00
+website: https://www.labonnepiochegrenoble.com
diff --git a/data/cities/meylan/la-noisette.yml b/data/cities/meylan/la-noisette.yml
index 2775ef24e..92f59ba43 100644
--- a/data/cities/meylan/la-noisette.yml
+++ b/data/cities/meylan/la-noisette.yml
@@ -4,8 +4,8 @@ latitude: 45.20315
 longitude: 5.76072
 postcode: "38240"
 city: Meylan
-street: "Avenue de la Plaine Fleurie"
-housenumber: 42
-phone: "+33 4 76 90 57 69"
-opening_hours: "Mo-Su 06:15-19:45"
-website: ""
\ No newline at end of file
+street: Avenue de la Plaine Fleurie
+housenumber: "42"
+phone: +33 4 76 90 57 69
+opening_hours: Mo-Su 06:15-19:45
+website: ""
diff --git a/data/cities/meylan/la-vie-claire.yml b/data/cities/meylan/la-vie-claire.yml
index 1cec6c71d..e6db219ab 100644
--- a/data/cities/meylan/la-vie-claire.yml
+++ b/data/cities/meylan/la-vie-claire.yml
@@ -1,11 +1,11 @@
 id: 313218551
-type: way
+type: node
 latitude: 45.21079
 longitude: 5.76351
 postcode: "38240"
 city: Meylan
-street: "Avenue du Grésivaudan"
-housenumber: 21
+street: Avenue du Grésivaudan
+housenumber: "21"
 phone: "+33476540908"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.lavieclaire.com/magasin-bio/meylan.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.lavieclaire.com/magasin-bio/meylan.html
diff --git a/data/cities/meylan/laboratoire-nutrixeal.yml b/data/cities/meylan/laboratoire-nutrixeal.yml
index 73b93edcc..d232d58fd 100644
--- a/data/cities/meylan/laboratoire-nutrixeal.yml
+++ b/data/cities/meylan/laboratoire-nutrixeal.yml
@@ -4,8 +4,8 @@ latitude: 45.20824
 longitude: 5.78198
 postcode: "38240"
 city: Meylan
-street: "Chemin du Pré Carré"
-housenumber: 10
-phone: "04 80 80 53 10"
-opening_hours: "Mo-Fr 09:00-12:30,14:00-17:30"
-website: "https://www.nutrixeal.fr"
\ No newline at end of file
+street: Chemin du Pré Carré
+housenumber: "10"
+phone: 04 80 80 53 10
+opening_hours: Mo-Fr 09:00-12:30,14:00-17:30
+website: https://www.nutrixeal.fr
diff --git a/data/cities/meylan/lamylois.yml b/data/cities/meylan/lamylois.yml
index 69aa42294..bd4ae9a53 100644
--- a/data/cities/meylan/lamylois.yml
+++ b/data/cities/meylan/lamylois.yml
@@ -4,8 +4,8 @@ latitude: 45.21161
 longitude: 5.78602
 postcode: "38240"
 city: Meylan
-street: "Place des Tuileaux"
-housenumber: 8
+street: Place des Tuileaux
+housenumber: "8"
 phone: "+33476639020"
-opening_hours: "Mo-Fr 06:30-19:00; Sa 07:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-19:00; Sa 07:30-19:00
+website: ""
diff --git a/data/cities/meylan/latelier.yml b/data/cities/meylan/latelier.yml
index 99aec6c1e..ee8e60903 100644
--- a/data/cities/meylan/latelier.yml
+++ b/data/cities/meylan/latelier.yml
@@ -4,8 +4,8 @@ latitude: 45.21809
 longitude: 5.7786
 postcode: "38240"
 city: Meylan
-street: "Avenue de Chartreuse"
-housenumber: 56
-phone: "+33 4 76 41 88 81"
-opening_hours: "Tu-Fr 09:00-18:00; Sa 09:00-17:00"
-website: "https://www.atelier-meylan.com/"
\ No newline at end of file
+street: Avenue de Chartreuse
+housenumber: "56"
+phone: +33 4 76 41 88 81
+opening_hours: Tu-Fr 09:00-18:00; Sa 09:00-17:00
+website: https://www.atelier-meylan.com/
diff --git a/data/cities/meylan/leau-vive.yml b/data/cities/meylan/leau-vive.yml
index 2112cc9e3..6895a4cf7 100644
--- a/data/cities/meylan/leau-vive.yml
+++ b/data/cities/meylan/leau-vive.yml
@@ -1,11 +1,11 @@
 id: 170514448
-type: way
+type: node
 latitude: 45.20308
 longitude: 5.76543
 postcode: "38240"
 city: Meylan
-street: "Allée des Centaurées"
-housenumber: 3
+street: Allée des Centaurées
+housenumber: "3"
 phone: "+33476511950"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.eau-vive.com/pa371/magasin?lieuID=1"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.eau-vive.com/pa371/magasin?lieuID=1
diff --git a/data/cities/meylan/lequilibriste.yml b/data/cities/meylan/lequilibriste.yml
index 8f156e95d..ad7f64b83 100644
--- a/data/cities/meylan/lequilibriste.yml
+++ b/data/cities/meylan/lequilibriste.yml
@@ -4,8 +4,8 @@ latitude: 45.20923
 longitude: 5.79113
 postcode: "38240"
 city: Meylan
-street: "Chemin du Vieux Chêne"
-housenumber: 22
-phone: "+33 4 76 54 64 95"
-opening_hours: "Mo-Fr 08:30-19:00"
-website: "https://www.lequilibristeboulangerie.fr/"
\ No newline at end of file
+street: Chemin du Vieux Chêne
+housenumber: "22"
+phone: +33 4 76 54 64 95
+opening_hours: Mo-Fr 08:30-19:00
+website: https://www.lequilibristeboulangerie.fr/
diff --git a/data/cities/meylan/monceau-fleurs-meylan.yml b/data/cities/meylan/monceau-fleurs-meylan.yml
index 45efa4317..da29e123b 100644
--- a/data/cities/meylan/monceau-fleurs-meylan.yml
+++ b/data/cities/meylan/monceau-fleurs-meylan.yml
@@ -4,8 +4,8 @@ latitude: 45.21096
 longitude: 5.78717
 postcode: "38240"
 city: Meylan
-street: "Chemin de Malacher"
-housenumber: 4
-phone: "+33 4 76 41 42 78"
+street: Chemin de Malacher
+housenumber: "4"
+phone: +33 4 76 41 42 78
 opening_hours: ""
-website: "https://www.monceauechirolles.com/"
\ No newline at end of file
+website: https://www.monceauechirolles.com/
diff --git a/data/cities/meylan/monique-et-jean-paul.yml b/data/cities/meylan/monique-et-jean-paul.yml
index b4aad6d42..116a13e0f 100644
--- a/data/cities/meylan/monique-et-jean-paul.yml
+++ b/data/cities/meylan/monique-et-jean-paul.yml
@@ -1,11 +1,11 @@
 id: 102936898
-type: way
+type: node
 latitude: 45.20808
 longitude: 5.80846
 postcode: "38240"
 city: Meylan
-street: "Chemin des Cantines"
-housenumber: 
-phone: "+33 4 76 41 00 92"
+street: Chemin des Cantines
+housenumber: ""
+phone: +33 4 76 41 00 92
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meylan/nalea-coiffure.yml b/data/cities/meylan/nalea-coiffure.yml
index fc8039bf7..9a73de69a 100644
--- a/data/cities/meylan/nalea-coiffure.yml
+++ b/data/cities/meylan/nalea-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.20909
 longitude: 5.7777
 postcode: "38240"
 city: Meylan
-street: "Avenue du Vercors"
-housenumber: 5
+street: Avenue du Vercors
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meylan/paquet-jardin.yml b/data/cities/meylan/paquet-jardin.yml
index b930f3b5b..f6aa6a9ac 100644
--- a/data/cities/meylan/paquet-jardin.yml
+++ b/data/cities/meylan/paquet-jardin.yml
@@ -1,11 +1,12 @@
 id: 91386614
-type: way
+type: node
 latitude: 45.20812
 longitude: 5.76747
 postcode: "38240"
 city: Meylan
-street: "Chemin de la Revirée"
-housenumber: 46
-phone: "+33 4 76 41 92 12"
-opening_hours: "Mo-Sa 09:30-12:30,14:00-19:00; Su 09:30-12:30,14:00-18:00; Jan Su off; Jul Su off; Aug Su off"
-website: "https://www.paquetjardin.com/"
\ No newline at end of file
+street: Chemin de la Revirée
+housenumber: "46"
+phone: +33 4 76 41 92 12
+opening_hours: Mo-Sa 09:30-12:30,14:00-19:00; Su 09:30-12:30,14:00-18:00; Jan Su off;
+    Jul Su off; Aug Su off
+website: https://www.paquetjardin.com/
diff --git a/data/cities/meylan/paul.yml b/data/cities/meylan/paul.yml
index 739a6bc10..8c6360fae 100644
--- a/data/cities/meylan/paul.yml
+++ b/data/cities/meylan/paul.yml
@@ -1,11 +1,11 @@
 id: 62092178
-type: way
+type: node
 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:00; Su 08:00-13:00"
-website: "https://paul.fr/stores/meylan"
\ No newline at end of file
+street: Avenue du Grésivaudan
+housenumber: "73"
+phone: +33 4 76 52 47 19
+opening_hours: Mo-Sa 07:00-19:00; Su 08:00-13:00
+website: https://paul.fr/stores/meylan
diff --git a/data/cities/meylan/picard.yml b/data/cities/meylan/picard.yml
index e9732577e..aef59f6b4 100644
--- a/data/cities/meylan/picard.yml
+++ b/data/cities/meylan/picard.yml
@@ -4,8 +4,8 @@ latitude: 45.207
 longitude: 5.75519
 postcode: "38240"
 city: Meylan
-street: "Avenue du Grésivaudan"
-housenumber: 77
-phone: "+33 4 76 41 26 63"
-opening_hours: "Mo-Sa 09:00-19:30, Su 09:00-12:45"
-website: "https://magasins.picard.fr/381-picard-grenoble-meylan"
\ No newline at end of file
+street: Avenue du Grésivaudan
+housenumber: "77"
+phone: +33 4 76 41 26 63
+opening_hours: Mo-Sa 09:00-19:30, Su 09:00-12:45
+website: https://magasins.picard.fr/381-picard-grenoble-meylan
diff --git a/data/cities/meylan/romain-rey.yml b/data/cities/meylan/romain-rey.yml
index 069c8420e..2ebb4dfbe 100644
--- a/data/cities/meylan/romain-rey.yml
+++ b/data/cities/meylan/romain-rey.yml
@@ -4,8 +4,8 @@ latitude: 45.21799
 longitude: 5.78011
 postcode: "38240"
 city: Meylan
-street: "Avenue de Chartreuse"
-housenumber: 46
+street: Avenue de Chartreuse
+housenumber: "46"
 phone: "+33476900982"
 opening_hours: ""
-website: "https://www.facebook.com/people/P%C3%A2tisserie-Chocolaterie-Rey/100063766321923/"
\ No newline at end of file
+website: https://www.facebook.com/people/P%C3%A2tisserie-Chocolaterie-Rey/100063766321923/
diff --git a/data/cities/meylan/royal-sa.yml b/data/cities/meylan/royal-sa.yml
index c882cd6ed..9fe78baed 100644
--- a/data/cities/meylan/royal-sa.yml
+++ b/data/cities/meylan/royal-sa.yml
@@ -4,8 +4,8 @@ latitude: 45.20264
 longitude: 5.76614
 postcode: "38240"
 city: Meylan
-street: "Boulevard des Alpes"
+street: Boulevard des Alpes
 housenumber: 1bis
-phone: "+33 4 76 41 90 10"
+phone: +33 4 76 41 90 10
 opening_hours: ""
-website: "https://bmw-royalsa.fr/"
\ No newline at end of file
+website: https://bmw-royalsa.fr/
diff --git a/data/cities/meylan/salon-marco.yml b/data/cities/meylan/salon-marco.yml
index 91478eb84..9a4f67458 100644
--- a/data/cities/meylan/salon-marco.yml
+++ b/data/cities/meylan/salon-marco.yml
@@ -4,8 +4,8 @@ latitude: 45.20638
 longitude: 5.75739
 postcode: "38240"
 city: Meylan
-street: "Avenue de la Plaine Fleurie"
-housenumber: 19
+street: Avenue de la Plaine Fleurie
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meylan/station-service-eni.yml b/data/cities/meylan/station-service-eni.yml
index ee3a64583..eaf5dfdbe 100644
--- a/data/cities/meylan/station-service-eni.yml
+++ b/data/cities/meylan/station-service-eni.yml
@@ -1,11 +1,11 @@
 id: 102933595
-type: way
+type: node
 latitude: 45.21518
 longitude: 5.78173
 postcode: "38240"
 city: Meylan
-street: "Avenue des 7 Laux"
-housenumber: 45
+street: Avenue des 7 Laux
+housenumber: "45"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/meylan/vinolea.yml b/data/cities/meylan/vinolea.yml
index 60a881ae0..de458d1ca 100644
--- a/data/cities/meylan/vinolea.yml
+++ b/data/cities/meylan/vinolea.yml
@@ -4,8 +4,8 @@ latitude: 45.20611
 longitude: 5.7733
 postcode: "38240"
 city: Meylan
-street: "Avenue du Vercors"
-housenumber: 27
-phone: "+334 76 51 62 08"
-opening_hours: "Tu-Th 09:30-12:30, 15:30-19:30; Fr-Sa 09:30-12:30, 14:30-19:30"
-website: "https://www.vinolea.com/vinolea-meylan/"
\ No newline at end of file
+street: Avenue du Vercors
+housenumber: "27"
+phone: +334 76 51 62 08
+opening_hours: Tu-Th 09:30-12:30, 15:30-19:30; Fr-Sa 09:30-12:30, 14:30-19:30
+website: https://www.vinolea.com/vinolea-meylan/
diff --git a/data/cities/meylan/yves-rocher.yml b/data/cities/meylan/yves-rocher.yml
index 932a42099..c3623e944 100644
--- a/data/cities/meylan/yves-rocher.yml
+++ b/data/cities/meylan/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.20348
 longitude: 5.76362
 postcode: "38240"
 city: Meylan
-street: "Boulevard des Alpes"
-housenumber: 1
+street: Boulevard des Alpes
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:15-20:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/meylan/meylan-c-cial/S-FRYROC794"
\ No newline at end of file
+opening_hours: Mo-Sa 09:15-20:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/meylan/meylan-c-cial/S-FRYROC794
diff --git a/data/cities/meyrie/essentiellement-votre.yml b/data/cities/meyrie/essentiellement-votre.yml
index 7e426e9a2..b4910f058 100644
--- a/data/cities/meyrie/essentiellement-votre.yml
+++ b/data/cities/meyrie/essentiellement-votre.yml
@@ -4,8 +4,8 @@ latitude: 45.5663
 longitude: 5.27954
 postcode: "38300"
 city: Meyrié
-street: "Route de Saint-Jean de Bournay"
-housenumber: 318
+street: Route de Saint-Jean de Bournay
+housenumber: "318"
 phone: ""
 opening_hours: ""
-website: "https://www.essentiellementvotre38.fr/"
\ No newline at end of file
+website: https://www.essentiellementvotre38.fr/
diff --git a/data/cities/meyrin/arcade-meyrinroule-association-geneve-roule.yml b/data/cities/meyrin/arcade-meyrinroule-association-geneve-roule.yml
index e4cadd20b..41cfc1985 100644
--- a/data/cities/meyrin/arcade-meyrinroule-association-geneve-roule.yml
+++ b/data/cities/meyrin/arcade-meyrinroule-association-geneve-roule.yml
@@ -4,8 +4,8 @@ latitude: 46.22923
 longitude: 6.07139
 postcode: "1217"
 city: Meyrin
-street: "Avenue de Vaudagne"
-housenumber: 1
-phone: "+41 22 740 10 70"
+street: Avenue de Vaudagne
+housenumber: "1"
+phone: +41 22 740 10 70
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyrin/coop.yml b/data/cities/meyrin/coop.yml
index 292fbd034..d22814d92 100644
--- a/data/cities/meyrin/coop.yml
+++ b/data/cities/meyrin/coop.yml
@@ -4,8 +4,8 @@ latitude: 46.22851
 longitude: 6.07257
 postcode: "1217"
 city: Meyrin
-street: "Route de Meyrin"
-housenumber: 
-phone: "+41 22 404 5040"
-opening_hours: "Mo-We 07:30-19:00; Th 07:30-20:00; Fr 07:30-19:30; Sa 07:30-18:00"
-website: ""
\ No newline at end of file
+street: Route de Meyrin
+housenumber: ""
+phone: +41 22 404 5040
+opening_hours: Mo-We 07:30-19:00; Th 07:30-20:00; Fr 07:30-19:30; Sa 07:30-18:00
+website: ""
diff --git a/data/cities/meyrin/electronic-systems-bretagne.yml b/data/cities/meyrin/electronic-systems-bretagne.yml
index e713a7c64..fa94e7e14 100644
--- a/data/cities/meyrin/electronic-systems-bretagne.yml
+++ b/data/cities/meyrin/electronic-systems-bretagne.yml
@@ -4,8 +4,8 @@ latitude: 46.23865
 longitude: 6.08055
 postcode: "1217"
 city: Meyrin
-street: "Rue des Lattes"
-housenumber: 25
+street: Rue des Lattes
+housenumber: "25"
 phone: ""
-opening_hours: "closed"
-website: ""
\ No newline at end of file
+opening_hours: closed
+website: ""
diff --git a/data/cities/meyrin/espace-coiffure.yml b/data/cities/meyrin/espace-coiffure.yml
index 53d15626c..6b8b977ae 100644
--- a/data/cities/meyrin/espace-coiffure.yml
+++ b/data/cities/meyrin/espace-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.23716
 longitude: 6.07767
 postcode: "1217"
 city: Meyrin
-street: "Promenade des Champs-Fréchets"
-housenumber: 22
+street: Promenade des Champs-Fréchets
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyrin/garage-champs-frechets.yml b/data/cities/meyrin/garage-champs-frechets.yml
index 4341bcb54..3df380d6d 100644
--- a/data/cities/meyrin/garage-champs-frechets.yml
+++ b/data/cities/meyrin/garage-champs-frechets.yml
@@ -4,8 +4,8 @@ latitude: 46.23709
 longitude: 6.07812
 postcode: "1217"
 city: Meyrin
-street: "Promenade des Champs-Fréchets"
-housenumber: 25
+street: Promenade des Champs-Fréchets
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyrin/gifi-route-de-meyrin.yml b/data/cities/meyrin/gifi-route-de-meyrin.yml
index e21975295..08f2dd9cd 100644
--- a/data/cities/meyrin/gifi-route-de-meyrin.yml
+++ b/data/cities/meyrin/gifi-route-de-meyrin.yml
@@ -1,11 +1,11 @@
 id: 79760027
-type: way
+type: node
 latitude: 46.22556
 longitude: 6.08586
 postcode: "1217"
 city: Meyrin
-street: "Route de Meyrin"
-housenumber: 210
+street: Route de Meyrin
+housenumber: "210"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyrin/gifi.yml b/data/cities/meyrin/gifi.yml
index b89625d72..c559cc438 100644
--- a/data/cities/meyrin/gifi.yml
+++ b/data/cities/meyrin/gifi.yml
@@ -4,8 +4,8 @@ latitude: 46.22546
 longitude: 6.08609
 postcode: "1217"
 city: Meyrin
-street: "Route de Meyrin"
-housenumber: 210
+street: Route de Meyrin
+housenumber: "210"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyrin/golfers-paradise.yml b/data/cities/meyrin/golfers-paradise.yml
index f9f48fdd1..b534f5c05 100644
--- a/data/cities/meyrin/golfers-paradise.yml
+++ b/data/cities/meyrin/golfers-paradise.yml
@@ -4,8 +4,8 @@ latitude: 46.22684
 longitude: 6.08455
 postcode: "1217"
 city: Meyrin
-street: "Chemin Riantbosson"
-housenumber: 11
+street: Chemin Riantbosson
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyrin/ing-dipl-fust.yml b/data/cities/meyrin/ing-dipl-fust.yml
index d1a4d8c5c..e4d6766c4 100644
--- a/data/cities/meyrin/ing-dipl-fust.yml
+++ b/data/cities/meyrin/ing-dipl-fust.yml
@@ -4,8 +4,8 @@ latitude: 46.22686
 longitude: 6.08453
 postcode: "1217"
 city: Meyrin
-street: "Chemin de Riantbosson"
-housenumber: 13
+street: Chemin de Riantbosson
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyrin/jumbo.yml b/data/cities/meyrin/jumbo.yml
index cd439db51..91efff828 100644
--- a/data/cities/meyrin/jumbo.yml
+++ b/data/cities/meyrin/jumbo.yml
@@ -4,8 +4,8 @@ latitude: 46.22707
 longitude: 6.07567
 postcode: "1217"
 city: Meyrin
-street: "Rue des Entreprises"
-housenumber: 12
+street: Rue des Entreprises
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-We 08:30-19:00; Th 08:30-20:30; Fr 08:30-19:30; Sa 08:00-18:00"
-website: "https://www.jumbo.ch/"
\ No newline at end of file
+opening_hours: Mo-We 08:30-19:00; Th 08:30-20:30; Fr 08:30-19:30; Sa 08:00-18:00
+website: https://www.jumbo.ch/
diff --git a/data/cities/meyrin/la-feve.yml b/data/cities/meyrin/la-feve.yml
index 192a2ac77..9ae72b4e0 100644
--- a/data/cities/meyrin/la-feve.yml
+++ b/data/cities/meyrin/la-feve.yml
@@ -4,8 +4,8 @@ latitude: 46.23175
 longitude: 6.07166
 postcode: "1217"
 city: Meyrin
-street: "Esplanade des Récréations"
-housenumber: 19
-phone: "+41 22 566 77 60"
-opening_hours: "Tu-Fr 09:30-19:00; Sa 10:00-17:00"
-website: "https://la-feve.ch/notre-magasin/"
\ No newline at end of file
+street: Esplanade des Récréations
+housenumber: "19"
+phone: +41 22 566 77 60
+opening_hours: Tu-Fr 09:30-19:00; Sa 10:00-17:00
+website: https://la-feve.ch/notre-magasin/
diff --git a/data/cities/meyrin/la-fraisiere.yml b/data/cities/meyrin/la-fraisiere.yml
index 94210dc8c..6c3d3c3ec 100644
--- a/data/cities/meyrin/la-fraisiere.yml
+++ b/data/cities/meyrin/la-fraisiere.yml
@@ -4,8 +4,8 @@ latitude: 46.22929
 longitude: 6.08777
 postcode: "1217"
 city: Meyrin
-street: "Chemin H-C Forestier"
-housenumber: 10
-phone: "+41 22 782 9058"
-opening_hours: "Mo, We, Sa 08:00-18:30"
-website: "https://www.lafraisiere.ch/"
\ No newline at end of file
+street: Chemin H-C Forestier
+housenumber: "10"
+phone: +41 22 782 9058
+opening_hours: Mo, We, Sa 08:00-18:30
+website: https://www.lafraisiere.ch/
diff --git a/data/cities/meyrin/migrolino.yml b/data/cities/meyrin/migrolino.yml
index de4d7b513..12ce22b8f 100644
--- a/data/cities/meyrin/migrolino.yml
+++ b/data/cities/meyrin/migrolino.yml
@@ -4,8 +4,8 @@ latitude: 46.22745
 longitude: 6.0784
 postcode: "1217"
 city: Meyrin
-street: "Route de Meyrin"
-housenumber: 248
-phone: "+41 22 782 09 36"
-opening_hours: "Mo-Su 06:00-22:00"
-website: ""
\ No newline at end of file
+street: Route de Meyrin
+housenumber: "248"
+phone: +41 22 782 09 36
+opening_hours: Mo-Su 06:00-22:00
+website: ""
diff --git a/data/cities/meyrin/oberson.yml b/data/cities/meyrin/oberson.yml
index f11a779ac..afa0cdc35 100644
--- a/data/cities/meyrin/oberson.yml
+++ b/data/cities/meyrin/oberson.yml
@@ -4,8 +4,8 @@ latitude: 46.22868
 longitude: 6.07179
 postcode: "1217"
 city: Meyrin
-street: "Route de Meyrin"
-housenumber: 299
-phone: "+41 22 782 10 45"
-opening_hours: "Mo-Fr 06:00-18:30; Sa-Su 06:00-13:30"
-website: "https://www.boulangerie-oberson.ch/"
\ No newline at end of file
+street: Route de Meyrin
+housenumber: "299"
+phone: +41 22 782 10 45
+opening_hours: Mo-Fr 06:00-18:30; Sa-Su 06:00-13:30
+website: https://www.boulangerie-oberson.ch/
diff --git a/data/cities/meyrin/pam-meryrin.yml b/data/cities/meyrin/pam-meryrin.yml
index 372a61a68..b89ad8346 100644
--- a/data/cities/meyrin/pam-meryrin.yml
+++ b/data/cities/meyrin/pam-meryrin.yml
@@ -4,8 +4,8 @@ latitude: 46.23734
 longitude: 6.07858
 postcode: "1217"
 city: Meyrin
-street: "Promenade des Champs-Fréchets"
-housenumber: 15
+street: Promenade des Champs-Fréchets
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Fr 08:00-19:00; Sa 08:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-19:00; Sa 08:00-18:00
+website: ""
diff --git a/data/cities/meyrin/pouly-boulangerie.yml b/data/cities/meyrin/pouly-boulangerie.yml
index 06999b631..00b46e261 100644
--- a/data/cities/meyrin/pouly-boulangerie.yml
+++ b/data/cities/meyrin/pouly-boulangerie.yml
@@ -4,8 +4,8 @@ latitude: 46.23743
 longitude: 6.07821
 postcode: "1217"
 city: Meyrin
-street: "Promenade des Champs-Fréchets"
-housenumber: 16
+street: Promenade des Champs-Fréchets
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Fr 06:00-16:45; Su 06:00-16:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-16:45; Su 06:00-16:45
+website: ""
diff --git a/data/cities/meyrin/velomania.yml b/data/cities/meyrin/velomania.yml
index fef55a5c4..7c633c9fc 100644
--- a/data/cities/meyrin/velomania.yml
+++ b/data/cities/meyrin/velomania.yml
@@ -4,8 +4,8 @@ latitude: 46.23094
 longitude: 6.06659
 postcode: "1217"
 city: Meyrin
-street: "Place de la diversité"
-housenumber: 7
-phone: "+41 22 719 87"
-opening_hours: "Tu-Fr 09:30-18:30; Sa 09:00-17:00"
-website: "https://www.velomania.ch/"
\ No newline at end of file
+street: Place de la diversité
+housenumber: "7"
+phone: +41 22 719 87
+opening_hours: Tu-Fr 09:30-18:30; Sa 09:00-17:00
+website: https://www.velomania.ch/
diff --git a/data/cities/meyrin/voi.yml b/data/cities/meyrin/voi.yml
index 772e44a6f..586e7e3b9 100644
--- a/data/cities/meyrin/voi.yml
+++ b/data/cities/meyrin/voi.yml
@@ -4,8 +4,8 @@ latitude: 46.23079
 longitude: 6.06746
 postcode: ""
 city: Meyrin
-street: "Place de la Diversité"
-housenumber: 3
+street: Place de la Diversité
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Fr 08:00-20:00; Sa 08:00-19:00; Su 09:00-17:00"
-website: "http://filialen.migros.ch/fr/voi-voi-meyrin-les-vergers"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-20:00; Sa 08:00-19:00; Su 09:00-17:00
+website: http://filialen.migros.ch/fr/voi-voi-meyrin-les-vergers
diff --git a/data/cities/meythet/comme-a-la-maison.yml b/data/cities/meythet/comme-a-la-maison.yml
index cca314da4..8cfab5303 100644
--- a/data/cities/meythet/comme-a-la-maison.yml
+++ b/data/cities/meythet/comme-a-la-maison.yml
@@ -4,8 +4,8 @@ latitude: 45.91946
 longitude: 6.08958
 postcode: "74960"
 city: Meythet
-street: "Route de Frangy"
-housenumber: 31
-phone: "+33 4 50 22 38 68"
-opening_hours: "Mo-Su 07:00-19:30"
-website: "https://bcalm.fr/"
\ No newline at end of file
+street: Route de Frangy
+housenumber: "31"
+phone: +33 4 50 22 38 68
+opening_hours: Mo-Su 07:00-19:30
+website: https://bcalm.fr/
diff --git a/data/cities/meythet/comptoir-auto-pieces.yml b/data/cities/meythet/comptoir-auto-pieces.yml
index 3a971105d..d6558b5a9 100644
--- a/data/cities/meythet/comptoir-auto-pieces.yml
+++ b/data/cities/meythet/comptoir-auto-pieces.yml
@@ -4,8 +4,8 @@ latitude: 45.91933
 longitude: 6.08963
 postcode: "74960"
 city: Meythet
-street: "Route de Frangy"
-housenumber: 31
-phone: "+33 4 50 22 22 23"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-12:00,14:00-18:00"
-website: "http://comptoirautopieces.fr/"
\ No newline at end of file
+street: Route de Frangy
+housenumber: "31"
+phone: +33 4 50 22 22 23
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-12:00,14:00-18:00
+website: http://comptoirautopieces.fr/
diff --git a/data/cities/meythet/plume-doie.yml b/data/cities/meythet/plume-doie.yml
index 4cf376e61..91b1b63d2 100644
--- a/data/cities/meythet/plume-doie.yml
+++ b/data/cities/meythet/plume-doie.yml
@@ -4,8 +4,8 @@ latitude: 45.9186
 longitude: 6.0951
 postcode: "74960"
 city: Meythet
-street: "Avenue du Stade"
-housenumber: 11
-phone: "+33 4 50 22 27 63"
-opening_hours: "lundi à vendredi    7h-12h30   14h-19h15"
-website: ""
\ No newline at end of file
+street: Avenue du Stade
+housenumber: "11"
+phone: +33 4 50 22 27 63
+opening_hours: lundi à vendredi    7h-12h30   14h-19h15
+website: ""
diff --git a/data/cities/meythet/seat.yml b/data/cities/meythet/seat.yml
index 2cbc1e4f8..cef8ea34e 100644
--- a/data/cities/meythet/seat.yml
+++ b/data/cities/meythet/seat.yml
@@ -1,11 +1,11 @@
 id: 62527328
-type: way
+type: node
 latitude: 45.91886
 longitude: 6.09079
 postcode: "74960"
 city: Meythet
-street: "Route de Frangy"
-housenumber: 58
-phone: "+33 4 50 22 03 22"
+street: Route de Frangy
+housenumber: "58"
+phone: +33 4 50 22 03 22
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meythet/skoda.yml b/data/cities/meythet/skoda.yml
index 3a3bf3b81..41aa45b77 100644
--- a/data/cities/meythet/skoda.yml
+++ b/data/cities/meythet/skoda.yml
@@ -4,8 +4,8 @@ latitude: 45.91827
 longitude: 6.09034
 postcode: "74960"
 city: Meythet
-street: "Route de Frangy"
-housenumber: 
+street: Route de Frangy
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: "https://mobilite.jeanlain.com/concessions/skoda-meythet/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: https://mobilite.jeanlain.com/concessions/skoda-meythet/
diff --git a/data/cities/meyzieu/alain-verne.yml b/data/cities/meyzieu/alain-verne.yml
index 0703af23f..73f6afb8d 100644
--- a/data/cities/meyzieu/alain-verne.yml
+++ b/data/cities/meyzieu/alain-verne.yml
@@ -1,11 +1,11 @@
 id: 1065706097
-type: way
+type: node
 latitude: 45.77016
 longitude: 4.98815
 postcode: "69330"
 city: Meyzieu
-street: "Boulevard Ambroise Paré"
-housenumber: 20
+street: Boulevard Ambroise Paré
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: "https://www.garage-alain-verne.fr/"
\ No newline at end of file
+website: https://www.garage-alain-verne.fr/
diff --git a/data/cities/meyzieu/boucherie-vignot.yml b/data/cities/meyzieu/boucherie-vignot.yml
index a4be2ba32..ecccc6cf7 100644
--- a/data/cities/meyzieu/boucherie-vignot.yml
+++ b/data/cities/meyzieu/boucherie-vignot.yml
@@ -4,8 +4,8 @@ latitude: 45.76534
 longitude: 5.00326
 postcode: "69330"
 city: Meyzieu
-street: "Rue Louis Saulnier"
-housenumber: 25
+street: Rue Louis Saulnier
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/meyzieu/resotainer-lyon-est-meyzieu.yml b/data/cities/meyzieu/resotainer-lyon-est-meyzieu.yml
index 5f100502c..ffb4a6f00 100644
--- a/data/cities/meyzieu/resotainer-lyon-est-meyzieu.yml
+++ b/data/cities/meyzieu/resotainer-lyon-est-meyzieu.yml
@@ -4,8 +4,8 @@ latitude: 45.77157
 longitude: 5.01724
 postcode: "69330"
 city: Meyzieu
-street: "Avenue Lionel Terray"
-housenumber: 2
+street: Avenue Lionel Terray
+housenumber: "2"
 phone: "+33469982317"
-opening_hours: "Mo-Fr 09:00-12:15,13:00-17:30; Sa 09:00-17:00"
-website: "https://www.resotainer.fr/agence-meyzieu"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:15,13:00-17:30; Sa 09:00-17:00
+website: https://www.resotainer.fr/agence-meyzieu
diff --git a/data/cities/meyzieu/speed-queen-meyzieu.yml b/data/cities/meyzieu/speed-queen-meyzieu.yml
index f2caae07d..3036f00c0 100644
--- a/data/cities/meyzieu/speed-queen-meyzieu.yml
+++ b/data/cities/meyzieu/speed-queen-meyzieu.yml
@@ -4,8 +4,8 @@ latitude: 45.77122
 longitude: 4.99893
 postcode: "69330"
 city: Meyzieu
-street: "Rue de la Gare"
-housenumber: 17
+street: Rue de la Gare
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Su 07:30-20:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-20:30
+website: ""
diff --git a/data/cities/mieussy/forfaits.yml b/data/cities/mieussy/forfaits.yml
index 29c538654..258929ed4 100644
--- a/data/cities/mieussy/forfaits.yml
+++ b/data/cities/mieussy/forfaits.yml
@@ -1,11 +1,11 @@
 id: 225166645
-type: way
+type: node
 latitude: 46.1616
 longitude: 6.5539
 postcode: ""
 city: Mieussy
-street: "Chemin de Farquet"
+street: Chemin de Farquet
 housenumber: 145,147
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mieussy/mieuski.yml b/data/cities/mieussy/mieuski.yml
index ac4c86ab3..160fcd7ff 100644
--- a/data/cities/mieussy/mieuski.yml
+++ b/data/cities/mieussy/mieuski.yml
@@ -1,11 +1,11 @@
 id: 225166518
-type: way
+type: node
 latitude: 46.134
 longitude: 6.52183
 postcode: "74440"
 city: Mieussy
-street: "Route de la Montagne"
-housenumber: 394
+street: Route de la Montagne
+housenumber: "394"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mionnay/iloe-beaute.yml b/data/cities/mionnay/iloe-beaute.yml
index 16530e479..17f25ff06 100644
--- a/data/cities/mionnay/iloe-beaute.yml
+++ b/data/cities/mionnay/iloe-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.89577
 longitude: 4.92981
 postcode: "01390"
 city: Mionnay
-street: "Rue Principale"
-housenumber: 104
+street: Rue Principale
+housenumber: "104"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mions/besson-chaussures.yml b/data/cities/mions/besson-chaussures.yml
index e06533e23..3a94b0559 100644
--- a/data/cities/mions/besson-chaussures.yml
+++ b/data/cities/mions/besson-chaussures.yml
@@ -1,11 +1,11 @@
 id: 79135301
-type: way
+type: node
 latitude: 45.67707
 longitude: 4.96834
 postcode: "69780"
 city: Mions
-street: "Route d'Heyrieux"
-housenumber: 31
-phone: "+33 8 25351134"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-19:00"
-website: "https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-lyon-mions_mions_69780/189.html"
\ No newline at end of file
+street: Route d'Heyrieux
+housenumber: "31"
+phone: +33 8 25351134
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-19:00
+website: https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-lyon-mions_mions_69780/189.html
diff --git a/data/cities/mions/bigmat.yml b/data/cities/mions/bigmat.yml
index f94ccaa7a..3cc57c762 100644
--- a/data/cities/mions/bigmat.yml
+++ b/data/cities/mions/bigmat.yml
@@ -4,8 +4,8 @@ latitude: 45.67738
 longitude: 4.95948
 postcode: "69780"
 city: Mions
-street: "Rue Joseph Marie Jacquard"
-housenumber: 20
+street: Rue Joseph Marie Jacquard
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: "http://www.girardon-mions.com/contact"
\ No newline at end of file
+website: http://www.girardon-mions.com/contact
diff --git a/data/cities/mions/boulangerie-patisserie-millet.yml b/data/cities/mions/boulangerie-patisserie-millet.yml
index b763b384e..04b267e09 100644
--- a/data/cities/mions/boulangerie-patisserie-millet.yml
+++ b/data/cities/mions/boulangerie-patisserie-millet.yml
@@ -4,8 +4,8 @@ latitude: 45.66377
 longitude: 4.9566
 postcode: "69780"
 city: Mions
-street: "Place de la République"
-housenumber: 11
-phone: "+33 4 72 18 19 55"
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+street: Place de la République
+housenumber: "11"
+phone: +33 4 72 18 19 55
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/mions/carole-coiffure.yml b/data/cities/mions/carole-coiffure.yml
index 3e981d697..48163b5da 100644
--- a/data/cities/mions/carole-coiffure.yml
+++ b/data/cities/mions/carole-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.66337
 longitude: 4.95636
 postcode: "69780"
 city: Mions
-street: "Rue du 11 Novembre 1918"
-housenumber: 
-phone: "+33 4 78 40 16 78"
+street: Rue du 11 Novembre 1918
+housenumber: ""
+phone: +33 4 78 40 16 78
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mions/setj-coiffure.yml b/data/cities/mions/setj-coiffure.yml
index b419236aa..bbe7c36a4 100644
--- a/data/cities/mions/setj-coiffure.yml
+++ b/data/cities/mions/setj-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.66341
 longitude: 4.9564
 postcode: "69780"
 city: Mions
-street: "Rue du 11 Novembre 1918"
-housenumber: 
+street: Rue du 11 Novembre 1918
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mions/solusons.yml b/data/cities/mions/solusons.yml
index 23736f04e..2d35be13b 100644
--- a/data/cities/mions/solusons.yml
+++ b/data/cities/mions/solusons.yml
@@ -4,8 +4,8 @@ latitude: 45.6624
 longitude: 4.95616
 postcode: "69780"
 city: Mions
-street: "Rue du 11 Novembre 1918"
-housenumber: 10
-phone: "+33 4 81 49 61 50"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue du 11 Novembre 1918
+housenumber: "10"
+phone: +33 4 81 49 61 50
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/miribel/mado-coiffure.yml b/data/cities/miribel/mado-coiffure.yml
index e2cbf3ca8..79ffd9345 100644
--- a/data/cities/miribel/mado-coiffure.yml
+++ b/data/cities/miribel/mado-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.82999
 longitude: 4.94676
 postcode: "01700"
 city: Miribel
-street: "Place de la Pompe"
-housenumber: 
-phone: "+33 4 78 55 39 51"
+street: Place de la Pompe
+housenumber: ""
+phone: +33 4 78 55 39 51
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/action-sports.yml b/data/cities/modane/action-sports.yml
index e4e13e554..14db2bc62 100644
--- a/data/cities/modane/action-sports.yml
+++ b/data/cities/modane/action-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.1925
 longitude: 6.65531
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 7
-phone: "+33 4 79 05 35 29"
+street: Rue de la République
+housenumber: "7"
+phone: +33 4 79 05 35 29
 opening_hours: ""
-website: "https://www.action-sports.fr/"
\ No newline at end of file
+website: https://www.action-sports.fr/
diff --git a/data/cities/modane/beaute-passion.yml b/data/cities/modane/beaute-passion.yml
index 51b77084f..feff0f55f 100644
--- a/data/cities/modane/beaute-passion.yml
+++ b/data/cities/modane/beaute-passion.yml
@@ -4,8 +4,8 @@ latitude: 45.19257
 longitude: 6.65565
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 11
+street: Rue de la République
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/biocoop.yml b/data/cities/modane/biocoop.yml
index a0972782f..9447822a9 100644
--- a/data/cities/modane/biocoop.yml
+++ b/data/cities/modane/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 45.1952
 longitude: 6.661
 postcode: "73500"
 city: Modane
-street: "Avenue Jean Jaurès"
-housenumber: 22
-phone: "+33 4 79 05 42 78"
+street: Avenue Jean Jaurès
+housenumber: "22"
+phone: +33 4 79 05 42 78
 opening_hours: ""
-website: "https://www.biocoop.fr/magasins-bio/Trouver-mon-magasin-Biocoop/Auvergne-Rhone-Alpes/Savoie/L-ESPRIT-VERT"
\ No newline at end of file
+website: https://www.biocoop.fr/magasins-bio/Trouver-mon-magasin-Biocoop/Auvergne-Rhone-Alpes/Savoie/L-ESPRIT-VERT
diff --git a/data/cities/modane/cbm-concept.yml b/data/cities/modane/cbm-concept.yml
index a5344f0b3..c71b66b88 100644
--- a/data/cities/modane/cbm-concept.yml
+++ b/data/cities/modane/cbm-concept.yml
@@ -4,8 +4,8 @@ latitude: 45.19627
 longitude: 6.66236
 postcode: "73500"
 city: Modane
-street: "Avenue Jean Jaurès"
-housenumber: 36
+street: Avenue Jean Jaurès
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: "https://cbm-concept.fr/"
\ No newline at end of file
+website: https://cbm-concept.fr/
diff --git a/data/cities/modane/cooperative-laitiere-de-haute-maurienne-vanoise-modane.yml b/data/cities/modane/cooperative-laitiere-de-haute-maurienne-vanoise-modane.yml
index 27ed29064..0b26b5cc4 100644
--- a/data/cities/modane/cooperative-laitiere-de-haute-maurienne-vanoise-modane.yml
+++ b/data/cities/modane/cooperative-laitiere-de-haute-maurienne-vanoise-modane.yml
@@ -4,8 +4,8 @@ latitude: 45.19394
 longitude: 6.65891
 postcode: "73500"
 city: Modane
-street: "Place Sommeiller"
-housenumber: 18
-phone: "+33 4 79 64 00 24"
+street: Place Sommeiller
+housenumber: "18"
+phone: +33 4 79 64 00 24
 opening_hours: ""
-website: "https://www.producteurs-savoie-mont-blanc.com/cooperative-laitiere-de-haute-maurienne-vanoise-modane-fromages-produits-laitiers-magasin-de-cooperative.html"
\ No newline at end of file
+website: https://www.producteurs-savoie-mont-blanc.com/cooperative-laitiere-de-haute-maurienne-vanoise-modane-fromages-produits-laitiers-magasin-de-cooperative.html
diff --git a/data/cities/modane/descourt-et-cabaud.yml b/data/cities/modane/descourt-et-cabaud.yml
index 26332ceb3..cae3b2051 100644
--- a/data/cities/modane/descourt-et-cabaud.yml
+++ b/data/cities/modane/descourt-et-cabaud.yml
@@ -1,11 +1,11 @@
 id: 100867814
-type: way
+type: node
 latitude: 45.20585
 longitude: 6.67957
 postcode: "73500"
 city: Modane
-street: "Rue de la Boucle"
-housenumber: 130
+street: Rue de la Boucle
+housenumber: "130"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/etre-et-avoir.yml b/data/cities/modane/etre-et-avoir.yml
index cf5433500..f672550b3 100644
--- a/data/cities/modane/etre-et-avoir.yml
+++ b/data/cities/modane/etre-et-avoir.yml
@@ -4,8 +4,8 @@ latitude: 45.19287
 longitude: 6.65594
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 22
+street: Rue de la République
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: "https://fr-fr.facebook.com/ETRE-ET-AVOIR-315185091918720/"
\ No newline at end of file
+website: https://fr-fr.facebook.com/ETRE-ET-AVOIR-315185091918720/
diff --git a/data/cities/modane/eurorepar-car-service-garage-international.yml b/data/cities/modane/eurorepar-car-service-garage-international.yml
index e65281e96..5124ef770 100644
--- a/data/cities/modane/eurorepar-car-service-garage-international.yml
+++ b/data/cities/modane/eurorepar-car-service-garage-international.yml
@@ -4,8 +4,8 @@ latitude: 45.19269
 longitude: 6.65514
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 10
-phone: "+33 4 79 05 07 68"
+street: Rue de la République
+housenumber: "10"
+phone: +33 4 79 05 07 68
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/extra-ets-caffoz.yml b/data/cities/modane/extra-ets-caffoz.yml
index 0380456b8..c3dce96d4 100644
--- a/data/cities/modane/extra-ets-caffoz.yml
+++ b/data/cities/modane/extra-ets-caffoz.yml
@@ -4,8 +4,8 @@ latitude: 45.19612
 longitude: 6.66223
 postcode: "73500"
 city: Modane
-street: "Avenue Jean Jaurès"
-housenumber: 34
-phone: "+33 4 79 05 08 63"
+street: Avenue Jean Jaurès
+housenumber: "34"
+phone: +33 4 79 05 08 63
 opening_hours: ""
-website: "https://modane.extra.fr/"
\ No newline at end of file
+website: https://modane.extra.fr/
diff --git a/data/cities/modane/favre-antiquites-brocante.yml b/data/cities/modane/favre-antiquites-brocante.yml
index cc650eaa7..01ee4b934 100644
--- a/data/cities/modane/favre-antiquites-brocante.yml
+++ b/data/cities/modane/favre-antiquites-brocante.yml
@@ -4,8 +4,8 @@ latitude: 45.19294
 longitude: 6.65619
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 26
-phone: "+33 6 08 86 81 51"
+street: Rue de la République
+housenumber: "26"
+phone: +33 6 08 86 81 51
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/frequence-0-16.yml b/data/cities/modane/frequence-0-16.yml
index 4403988a3..a3e66f424 100644
--- a/data/cities/modane/frequence-0-16.yml
+++ b/data/cities/modane/frequence-0-16.yml
@@ -4,8 +4,8 @@ latitude: 45.19246
 longitude: 6.65509
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 5
+street: Rue de la République
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/garage-ragona-palmano-sarl-citroen.yml b/data/cities/modane/garage-ragona-palmano-sarl-citroen.yml
index 9099346cd..1316529f3 100644
--- a/data/cities/modane/garage-ragona-palmano-sarl-citroen.yml
+++ b/data/cities/modane/garage-ragona-palmano-sarl-citroen.yml
@@ -4,8 +4,8 @@ latitude: 45.19597
 longitude: 6.66203
 postcode: "73500"
 city: Modane
-street: "Avenue Jean Jaurès"
-housenumber: 32
+street: Avenue Jean Jaurès
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/histoire-de-lire.yml b/data/cities/modane/histoire-de-lire.yml
index f8874bdd7..1b485b1ec 100644
--- a/data/cities/modane/histoire-de-lire.yml
+++ b/data/cities/modane/histoire-de-lire.yml
@@ -4,8 +4,8 @@ latitude: 45.19268
 longitude: 6.65616
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 15
-phone: "+33 4 79 05 87 74"
+street: Rue de la République
+housenumber: "15"
+phone: +33 4 79 05 87 74
 opening_hours: ""
-website: "https://histoiredeliremodane.com/"
\ No newline at end of file
+website: https://histoiredeliremodane.com/
diff --git a/data/cities/modane/la-mascarade.yml b/data/cities/modane/la-mascarade.yml
index 5653dbda0..bb66f60c9 100644
--- a/data/cities/modane/la-mascarade.yml
+++ b/data/cities/modane/la-mascarade.yml
@@ -4,8 +4,8 @@ latitude: 45.19254
 longitude: 6.65552
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 9
+street: Rue de la République
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: "https://www.facebook.com/la.mascarade.modane"
\ No newline at end of file
+website: https://www.facebook.com/la.mascarade.modane
diff --git a/data/cities/modane/la-montagne-chocolatee.yml b/data/cities/modane/la-montagne-chocolatee.yml
index fd316879b..d99acafa1 100644
--- a/data/cities/modane/la-montagne-chocolatee.yml
+++ b/data/cities/modane/la-montagne-chocolatee.yml
@@ -4,8 +4,8 @@ latitude: 45.19478
 longitude: 6.66038
 postcode: "73500"
 city: Modane
-street: "Avenue Jean Jaurès"
-housenumber: 12
-phone: "+33 6 64 24 69 58"
+street: Avenue Jean Jaurès
+housenumber: "12"
+phone: +33 6 64 24 69 58
 opening_hours: ""
-website: "https://fr-fr.facebook.com/lamontagnechocolatee/"
\ No newline at end of file
+website: https://fr-fr.facebook.com/lamontagnechocolatee/
diff --git a/data/cities/modane/les-mondes-de-alf.yml b/data/cities/modane/les-mondes-de-alf.yml
index ed5e37235..52f258e23 100644
--- a/data/cities/modane/les-mondes-de-alf.yml
+++ b/data/cities/modane/les-mondes-de-alf.yml
@@ -4,8 +4,8 @@ latitude: 45.19345
 longitude: 6.65713
 postcode: "73500"
 city: Modane
-street: "Place du Replaton"
-housenumber: 2
-phone: "+33 4 79 05 90 26"
+street: Place du Replaton
+housenumber: "2"
+phone: +33 4 79 05 90 26
 opening_hours: ""
-website: "https://www.facebook.com/LesMondesDeAlf/"
\ No newline at end of file
+website: https://www.facebook.com/LesMondesDeAlf/
diff --git a/data/cities/modane/mod-bijoux.yml b/data/cities/modane/mod-bijoux.yml
index 0780ac5bc..56ed27557 100644
--- a/data/cities/modane/mod-bijoux.yml
+++ b/data/cities/modane/mod-bijoux.yml
@@ -4,8 +4,8 @@ latitude: 45.19353
 longitude: 6.65794
 postcode: "73500"
 city: Modane
-street: "Place Sommeiller"
-housenumber: 4
+street: Place Sommeiller
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/modane-reparation-telephone-portable.yml b/data/cities/modane/modane-reparation-telephone-portable.yml
index e62274668..a79545c7b 100644
--- a/data/cities/modane/modane-reparation-telephone-portable.yml
+++ b/data/cities/modane/modane-reparation-telephone-portable.yml
@@ -4,8 +4,8 @@ latitude: 45.19277
 longitude: 6.65559
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 18
+street: Rue de la République
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/monica-fruits-et-legumes.yml b/data/cities/modane/monica-fruits-et-legumes.yml
index 93e50c969..f9233c5e1 100644
--- a/data/cities/modane/monica-fruits-et-legumes.yml
+++ b/data/cities/modane/monica-fruits-et-legumes.yml
@@ -4,8 +4,8 @@ latitude: 45.1935
 longitude: 6.65785
 postcode: "73500"
 city: Modane
-street: "Place Sommeiller"
-housenumber: 3
-phone: "+33 4 79 05 24 28"
+street: Place Sommeiller
+housenumber: "3"
+phone: +33 4 79 05 24 28
 opening_hours: ""
-website: "https://fr-fr.facebook.com/pages/category/Specialty-Grocery-Store/Monica-Fruits-et-Legumes-1687698064780571/"
\ No newline at end of file
+website: https://fr-fr.facebook.com/pages/category/Specialty-Grocery-Store/Monica-Fruits-et-Legumes-1687698064780571/
diff --git a/data/cities/modane/neovie.yml b/data/cities/modane/neovie.yml
index 5daaa7188..929a09b63 100644
--- a/data/cities/modane/neovie.yml
+++ b/data/cities/modane/neovie.yml
@@ -4,8 +4,8 @@ latitude: 45.19298
 longitude: 6.6563
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 28
+street: Rue de la République
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: "https://neovie-store.fr/"
\ No newline at end of file
+website: https://neovie-store.fr/
diff --git a/data/cities/modane/noguera.yml b/data/cities/modane/noguera.yml
index 41df0e6d7..2e27c2f84 100644
--- a/data/cities/modane/noguera.yml
+++ b/data/cities/modane/noguera.yml
@@ -4,8 +4,8 @@ latitude: 45.19255
 longitude: 6.65441
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 6
+street: Rue de la République
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/pagnott.yml b/data/cities/modane/pagnott.yml
index dc98af41f..35d47c06e 100644
--- a/data/cities/modane/pagnott.yml
+++ b/data/cities/modane/pagnott.yml
@@ -4,8 +4,8 @@ latitude: 45.19372
 longitude: 6.65841
 postcode: "73500"
 city: Modane
-street: "Place Sommeiller"
-housenumber: 10
+street: Place Sommeiller
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/pompes-funebres-marbrerie-de-la-vanoise.yml b/data/cities/modane/pompes-funebres-marbrerie-de-la-vanoise.yml
index 7bd9fabfc..4901875aa 100644
--- a/data/cities/modane/pompes-funebres-marbrerie-de-la-vanoise.yml
+++ b/data/cities/modane/pompes-funebres-marbrerie-de-la-vanoise.yml
@@ -4,8 +4,8 @@ latitude: 45.19891
 longitude: 6.66785
 postcode: "73500"
 city: Modane
-street: "Route de Bardone"
-housenumber: 120
+street: Route de Bardone
+housenumber: "120"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/salon-creatif.yml b/data/cities/modane/salon-creatif.yml
index 165e7a071..90cb06d9d 100644
--- a/data/cities/modane/salon-creatif.yml
+++ b/data/cities/modane/salon-creatif.yml
@@ -4,8 +4,8 @@ latitude: 45.19283
 longitude: 6.65581
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 20
-phone: "+33 4 79 05 21 86"
+street: Rue de la République
+housenumber: "20"
+phone: +33 4 79 05 21 86
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/style.yml b/data/cities/modane/style.yml
index 2e2362a8f..00549610f 100644
--- a/data/cities/modane/style.yml
+++ b/data/cities/modane/style.yml
@@ -4,8 +4,8 @@ latitude: 45.19349
 longitude: 6.65726
 postcode: "73500"
 city: Modane
-street: "Place du Replaton"
-housenumber: 2
+street: Place du Replaton
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/tabac-presse-de-la-gare.yml b/data/cities/modane/tabac-presse-de-la-gare.yml
index 9f67aca22..2f106e83c 100644
--- a/data/cities/modane/tabac-presse-de-la-gare.yml
+++ b/data/cities/modane/tabac-presse-de-la-gare.yml
@@ -4,8 +4,8 @@ latitude: 45.19411
 longitude: 6.65932
 postcode: "73500"
 city: Modane
-street: "Place Sommeiller"
-housenumber: 24
+street: Place Sommeiller
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/tete-a-tete.yml b/data/cities/modane/tete-a-tete.yml
index f0cf118de..ac0362972 100644
--- a/data/cities/modane/tete-a-tete.yml
+++ b/data/cities/modane/tete-a-tete.yml
@@ -4,8 +4,8 @@ latitude: 45.19264
 longitude: 6.65602
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 15
+street: Rue de la République
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/voyages-et-montagne.yml b/data/cities/modane/voyages-et-montagne.yml
index 485321e1f..015d02707 100644
--- a/data/cities/modane/voyages-et-montagne.yml
+++ b/data/cities/modane/voyages-et-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.19409
 longitude: 6.65926
 postcode: "73500"
 city: Modane
-street: "Place Sommeiller"
-housenumber: 22
+street: Place Sommeiller
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/modane/wills-beer-et-wine.yml b/data/cities/modane/wills-beer-et-wine.yml
index d08887d02..7e02587f8 100644
--- a/data/cities/modane/wills-beer-et-wine.yml
+++ b/data/cities/modane/wills-beer-et-wine.yml
@@ -4,8 +4,8 @@ latitude: 45.19274
 longitude: 6.65533
 postcode: "73500"
 city: Modane
-street: "Rue de la République"
-housenumber: 14
+street: Rue de la République
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: "https://www.facebook.com/Le-Chti-Savoyard-73-346563735739393/"
\ No newline at end of file
+website: https://www.facebook.com/Le-Chti-Savoyard-73-346563735739393/
diff --git a/data/cities/moirans/art-coiffure.yml b/data/cities/moirans/art-coiffure.yml
index 6f92fd97a..f69938a9b 100644
--- a/data/cities/moirans/art-coiffure.yml
+++ b/data/cities/moirans/art-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.32699
 longitude: 5.56594
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 33
+street: Rue de la République
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/au-bonheur-des-chiens.yml b/data/cities/moirans/au-bonheur-des-chiens.yml
index 159a769be..83a59ccb4 100644
--- a/data/cities/moirans/au-bonheur-des-chiens.yml
+++ b/data/cities/moirans/au-bonheur-des-chiens.yml
@@ -4,8 +4,8 @@ latitude: 45.32643
 longitude: 5.56328
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 97
+street: Rue de la République
+housenumber: "97"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/caparol-center.yml b/data/cities/moirans/caparol-center.yml
index de0723274..0fc852a50 100644
--- a/data/cities/moirans/caparol-center.yml
+++ b/data/cities/moirans/caparol-center.yml
@@ -4,8 +4,8 @@ latitude: 45.31983
 longitude: 5.59552
 postcode: "38430"
 city: Moirans
-street: "Rue de Corporat"
-housenumber: 
-phone: "+33 4 76 37 54 57"
+street: Rue de Corporat
+housenumber: ""
+phone: +33 4 76 37 54 57
 opening_hours: ""
-website: "http://caparolcenter-moirans.fr/"
\ No newline at end of file
+website: http://caparolcenter-moirans.fr/
diff --git a/data/cities/moirans/centralp-auto.yml b/data/cities/moirans/centralp-auto.yml
index 5c7402050..e45a6ea94 100644
--- a/data/cities/moirans/centralp-auto.yml
+++ b/data/cities/moirans/centralp-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.31712
 longitude: 5.60076
 postcode: "38430"
 city: Moirans
-street: "Rue de l'Eygala"
-housenumber: 94
-phone: "+33 669595643"
-opening_hours: "Mo-Fr 09:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue de l'Eygala
+housenumber: "94"
+phone: +33 669595643
+opening_hours: Mo-Fr 09:00-18:00
+website: ""
diff --git a/data/cities/moirans/ceralp-piscines-carre-bleu.yml b/data/cities/moirans/ceralp-piscines-carre-bleu.yml
index 2c27c1542..80e64c0cb 100644
--- a/data/cities/moirans/ceralp-piscines-carre-bleu.yml
+++ b/data/cities/moirans/ceralp-piscines-carre-bleu.yml
@@ -4,8 +4,8 @@ latitude: 45.31569
 longitude: 5.60336
 postcode: "38430"
 city: Moirans
-street: "Rue Aristide Bergès"
-housenumber: 1246
+street: Rue Aristide Bergès
+housenumber: "1246"
 phone: ""
 opening_hours: ""
-website: "https://www.piscines-carrebleu.fr/"
\ No newline at end of file
+website: https://www.piscines-carrebleu.fr/
diff --git a/data/cities/moirans/dolce-italia.yml b/data/cities/moirans/dolce-italia.yml
index 2bbbaf478..10657078f 100644
--- a/data/cities/moirans/dolce-italia.yml
+++ b/data/cities/moirans/dolce-italia.yml
@@ -4,8 +4,8 @@ latitude: 45.3269
 longitude: 5.56565
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 54
+street: Rue de la République
+housenumber: "54"
 phone: ""
-opening_hours: "Tu,Th,Fr 09:00-19:00; We 15:00-19:00; Sa 09:00-12:30,16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Th,Fr 09:00-19:00; We 15:00-19:00; Sa 09:00-12:30,16:00-19:00
+website: ""
diff --git a/data/cities/moirans/evanescence.yml b/data/cities/moirans/evanescence.yml
index dc24e8a5b..208a9cfdd 100644
--- a/data/cities/moirans/evanescence.yml
+++ b/data/cities/moirans/evanescence.yml
@@ -4,8 +4,8 @@ latitude: 45.32724
 longitude: 5.56609
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 42
+street: Rue de la République
+housenumber: "42"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/expo-clavel.yml b/data/cities/moirans/expo-clavel.yml
index ba7e62f40..7e8ab0386 100644
--- a/data/cities/moirans/expo-clavel.yml
+++ b/data/cities/moirans/expo-clavel.yml
@@ -4,8 +4,8 @@ latitude: 45.32367
 longitude: 5.59049
 postcode: "38430"
 city: Moirans
-street: "Route de Grenoble"
-housenumber: 48
+street: Route de Grenoble
+housenumber: "48"
 phone: ""
-opening_hours: "mo-sa 9:00-12:00, 14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: mo-sa 9:00-12:00, 14:00-18:30
+website: ""
diff --git a/data/cities/moirans/foussier.yml b/data/cities/moirans/foussier.yml
index a4f11f0e6..2ea5e35c4 100644
--- a/data/cities/moirans/foussier.yml
+++ b/data/cities/moirans/foussier.yml
@@ -4,8 +4,8 @@ latitude: 45.31992
 longitude: 5.59536
 postcode: "38430"
 city: Moirans
-street: "Rue de Corporat"
-housenumber: 
-phone: "+33 4 78 49 49 49"
-opening_hours: "Mo-Fr 07:30-12:00,13:30-17:30"
-website: "https://www.foussier.fr/"
\ No newline at end of file
+street: Rue de Corporat
+housenumber: ""
+phone: +33 4 78 49 49 49
+opening_hours: Mo-Fr 07:30-12:00,13:30-17:30
+website: https://www.foussier.fr/
diff --git a/data/cities/moirans/gaec-la-amapola.yml b/data/cities/moirans/gaec-la-amapola.yml
index 5bb8ae21d..291b3b7c1 100644
--- a/data/cities/moirans/gaec-la-amapola.yml
+++ b/data/cities/moirans/gaec-la-amapola.yml
@@ -1,11 +1,11 @@
 id: 444514195
-type: way
+type: node
 latitude: 45.30986
 longitude: 5.55315
 postcode: "38430"
 city: Moirans
-street: "Route des Maraîchers"
-housenumber: 
+street: Route des Maraîchers
+housenumber: ""
 phone: ""
-opening_hours: "We 16:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: We 16:30-19:00
+website: ""
diff --git a/data/cities/moirans/imprimerie-ruzzin.yml b/data/cities/moirans/imprimerie-ruzzin.yml
index e9dcb5237..2a2dac403 100644
--- a/data/cities/moirans/imprimerie-ruzzin.yml
+++ b/data/cities/moirans/imprimerie-ruzzin.yml
@@ -4,8 +4,8 @@ latitude: 45.32681
 longitude: 5.56296
 postcode: "38430"
 city: Moirans
-street: "Rue du 8 Mai 1945"
-housenumber: 2
+street: Rue du 8 Mai 1945
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/interflora.yml b/data/cities/moirans/interflora.yml
index fad59f456..051689bfa 100644
--- a/data/cities/moirans/interflora.yml
+++ b/data/cities/moirans/interflora.yml
@@ -4,8 +4,8 @@ latitude: 45.3268
 longitude: 5.56391
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
+street: Rue de la République
 housenumber: 86 bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/jennif-hair.yml b/data/cities/moirans/jennif-hair.yml
index fb6e40708..76e91acc0 100644
--- a/data/cities/moirans/jennif-hair.yml
+++ b/data/cities/moirans/jennif-hair.yml
@@ -4,8 +4,8 @@ latitude: 45.32538
 longitude: 5.56459
 postcode: "38430"
 city: Moirans
-street: "Place Général de Gaulle"
-housenumber: 14
+street: Place Général de Gaulle
+housenumber: "14"
 phone: ""
-opening_hours: "Tu,Th 09:00-18:30; We 09:00-12:00,14:00-18:30; Fr 09:00-18:00; Sa 08:30-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Th 09:00-18:30; We 09:00-12:00,14:00-18:30; Fr 09:00-18:00; Sa 08:30-17:00
+website: ""
diff --git a/data/cities/moirans/laiterie-gilbert.yml b/data/cities/moirans/laiterie-gilbert.yml
index f334bee87..489e63552 100644
--- a/data/cities/moirans/laiterie-gilbert.yml
+++ b/data/cities/moirans/laiterie-gilbert.yml
@@ -4,8 +4,8 @@ latitude: 45.32662
 longitude: 5.56493
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 67
+street: Rue de la République
+housenumber: "67"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:30, 15:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:30, 15:30-19:00
+website: ""
diff --git a/data/cities/moirans/le-semeur.yml b/data/cities/moirans/le-semeur.yml
index 93af2689a..91f0fabc5 100644
--- a/data/cities/moirans/le-semeur.yml
+++ b/data/cities/moirans/le-semeur.yml
@@ -4,8 +4,8 @@ latitude: 45.3265
 longitude: 5.56332
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 95
+street: Rue de la République
+housenumber: "95"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/le-stromboli.yml b/data/cities/moirans/le-stromboli.yml
index ef8a03cac..4c8e33ea8 100644
--- a/data/cities/moirans/le-stromboli.yml
+++ b/data/cities/moirans/le-stromboli.yml
@@ -4,8 +4,8 @@ latitude: 45.32687
 longitude: 5.5643
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 82
+street: Rue de la République
+housenumber: "82"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/miriad-informatique.yml b/data/cities/moirans/miriad-informatique.yml
index bf70e00c1..79f99c8b8 100644
--- a/data/cities/moirans/miriad-informatique.yml
+++ b/data/cities/moirans/miriad-informatique.yml
@@ -4,8 +4,8 @@ latitude: 45.32639
 longitude: 5.56324
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 99
+street: Rue de la République
+housenumber: "99"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/optique-facon-de-voir.yml b/data/cities/moirans/optique-facon-de-voir.yml
index 99698ab0a..a3e5514a4 100644
--- a/data/cities/moirans/optique-facon-de-voir.yml
+++ b/data/cities/moirans/optique-facon-de-voir.yml
@@ -4,8 +4,8 @@ latitude: 45.32656
 longitude: 5.56295
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 102
+street: Rue de la République
+housenumber: "102"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/moirans/optique-vision-plus.yml b/data/cities/moirans/optique-vision-plus.yml
index a901de008..95d5b98f0 100644
--- a/data/cities/moirans/optique-vision-plus.yml
+++ b/data/cities/moirans/optique-vision-plus.yml
@@ -4,8 +4,8 @@ latitude: 45.32683
 longitude: 5.56466
 postcode: "38430"
 city: Moirans
-street: "Rue de la République"
-housenumber: 76
+street: Rue de la République
+housenumber: "76"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moirans/samse.yml b/data/cities/moirans/samse.yml
index c9954c693..00c8877eb 100644
--- a/data/cities/moirans/samse.yml
+++ b/data/cities/moirans/samse.yml
@@ -4,8 +4,8 @@ latitude: 45.3198
 longitude: 5.59723
 postcode: "38430"
 city: Moirans
-street: "Rue de l'Eygala"
-housenumber: 
-phone: "+33 4 76508600"
-opening_hours: "Mo-Fr 07:30-12:00,13:30-17:30; Sa 08:00-12:00"
-website: "https://www.samse.fr/agence/samse/moirans/35"
\ No newline at end of file
+street: Rue de l'Eygala
+housenumber: ""
+phone: +33 4 76508600
+opening_hours: Mo-Fr 07:30-12:00,13:30-17:30; Sa 08:00-12:00
+website: https://www.samse.fr/agence/samse/moirans/35
diff --git a/data/cities/moirans/sestriere.yml b/data/cities/moirans/sestriere.yml
index c74eb173b..058c2ef79 100644
--- a/data/cities/moirans/sestriere.yml
+++ b/data/cities/moirans/sestriere.yml
@@ -4,8 +4,8 @@ latitude: 45.3177
 longitude: 5.59993
 postcode: "38430"
 city: Moirans
-street: "Rue de l'Eygala"
-housenumber: 198
-phone: "+33 476502724"
+street: Rue de l'Eygala
+housenumber: "198"
+phone: +33 476502724
 opening_hours: ""
-website: "http://www.sestrierevernici.com/"
\ No newline at end of file
+website: http://www.sestrierevernici.com/
diff --git a/data/cities/monbonnot-saint-martin/epicuria.yml b/data/cities/monbonnot-saint-martin/epicuria.yml
index d354aedaa..6e5ecd891 100644
--- a/data/cities/monbonnot-saint-martin/epicuria.yml
+++ b/data/cities/monbonnot-saint-martin/epicuria.yml
@@ -4,8 +4,8 @@ latitude: 45.22788
 longitude: 5.80404
 postcode: "38330"
 city: Monbonnot-Saint-Martin
-street: "Rue du Général de Gaulle"
-housenumber: 810
+street: Rue du Général de Gaulle
+housenumber: "810"
 phone: "+33972521313"
-opening_hours: "Mo-Su 06:45–19:30"
-website: "http://www.epicuriasucresale.com/"
\ No newline at end of file
+opening_hours: Mo-Su 06:45–19:30
+website: http://www.epicuriasucresale.com/
diff --git a/data/cities/monestier-de-clermont/proxi.yml b/data/cities/monestier-de-clermont/proxi.yml
index 52373ea66..af0c1df95 100644
--- a/data/cities/monestier-de-clermont/proxi.yml
+++ b/data/cities/monestier-de-clermont/proxi.yml
@@ -5,7 +5,7 @@ longitude: 5.63448
 postcode: "38650"
 city: Monestier-de-Clermont
 street: ""
-housenumber: 136
+housenumber: "136"
 phone: ""
-opening_hours: "Mo-Fr 07:00-13:00,15:00-19:00; Sa 07:30-12:30,15:00-19:00; Su 07:30-12:30,15:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-13:00,15:00-19:00; Sa 07:30-12:30,15:00-19:00; Su 07:30-12:30,15:30-18:00
+website: ""
diff --git a/data/cities/monestier-de-clermont/two-wheels.yml b/data/cities/monestier-de-clermont/two-wheels.yml
index 71e978de4..b2f6aa3b1 100644
--- a/data/cities/monestier-de-clermont/two-wheels.yml
+++ b/data/cities/monestier-de-clermont/two-wheels.yml
@@ -4,8 +4,8 @@ latitude: 44.91128
 longitude: 5.63134
 postcode: "38650"
 city: Monestier-de-Clermont
-street: "Grand Rue"
-housenumber: 
+street: Grand Rue
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 15:00-18:00, Sa 09:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 15:00-18:00, Sa 09:30-12:00
+website: ""
diff --git a/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml b/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml
index 747887e53..2499ee260 100644
--- a/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml
+++ b/data/cities/monnetier-mornex/bar-tabac-presse-du-soleil-levant.yml
@@ -4,8 +4,8 @@ latitude: 46.16144
 longitude: 6.22944
 postcode: "74560"
 city: Monnetier-Mornex
-street: "Route du Salève"
-housenumber: 1482
+street: Route du Salève
+housenumber: "1482"
 phone: ""
-opening_hours: "Mo-Fr 06:30-20:00; Sa 08:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-20:00; Sa 08:00-20:00; Su off
+website: ""
diff --git a/data/cities/monnetier-mornex/boutique-bouddhist-gifts.yml b/data/cities/monnetier-mornex/boutique-bouddhist-gifts.yml
index d101fdf56..347c1869c 100644
--- a/data/cities/monnetier-mornex/boutique-bouddhist-gifts.yml
+++ b/data/cities/monnetier-mornex/boutique-bouddhist-gifts.yml
@@ -1,11 +1,11 @@
 id: 1082336499
-type: way
+type: node
 latitude: 46.14766
 longitude: 6.188
 postcode: "74560"
 city: MONNETIER MORNEX
-street: "7660 ROUTE DES 3 LACS"
-housenumber: 7660
+street: 7660 ROUTE DES 3 LACS
+housenumber: "7660"
 phone: "+33450962852"
-opening_hours: "Tu-Su 10:00-12:00 14:00-17:00"
-website: "https://sanghasaleve.wixsite.com/shedrubchoekhorling/boutique"
\ No newline at end of file
+opening_hours: Tu-Su 10:00-12:00 14:00-17:00
+website: https://sanghasaleve.wixsite.com/shedrubchoekhorling/boutique
diff --git a/data/cities/monnetier-mornex/labo-creation-florales.yml b/data/cities/monnetier-mornex/labo-creation-florales.yml
index fa406f6c4..d69f9b34a 100644
--- a/data/cities/monnetier-mornex/labo-creation-florales.yml
+++ b/data/cities/monnetier-mornex/labo-creation-florales.yml
@@ -4,8 +4,8 @@ latitude: 46.1633
 longitude: 6.23223
 postcode: "74560"
 city: Monnetier-Mornex
-street: "Impasse de la Croix Blanche"
-housenumber: 74
-phone: "+33 6 63 43 20 63"
+street: Impasse de la Croix Blanche
+housenumber: "74"
+phone: +33 6 63 43 20 63
 opening_hours: ""
-website: "https://www.labo-m-creationsflorales.com/"
\ No newline at end of file
+website: https://www.labo-m-creationsflorales.com/
diff --git a/data/cities/monnetier-mornex/le-boudoir-de-mandarine.yml b/data/cities/monnetier-mornex/le-boudoir-de-mandarine.yml
index d1b2f7990..71a4d3ed7 100644
--- a/data/cities/monnetier-mornex/le-boudoir-de-mandarine.yml
+++ b/data/cities/monnetier-mornex/le-boudoir-de-mandarine.yml
@@ -4,8 +4,8 @@ latitude: 46.13462
 longitude: 6.21433
 postcode: "74560"
 city: Monnetier-Mornex
-street: "Chemin du Moulin de Naz"
-housenumber: 176
-phone: "+33 6 82 87 49 54"
+street: Chemin du Moulin de Naz
+housenumber: "176"
+phone: +33 6 82 87 49 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/monnetier-mornex/le-petit-casino.yml b/data/cities/monnetier-mornex/le-petit-casino.yml
index 8108df024..adcd70617 100644
--- a/data/cities/monnetier-mornex/le-petit-casino.yml
+++ b/data/cities/monnetier-mornex/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.16422
 longitude: 6.23662
 postcode: "74560"
 city: Monnetier-Mornex
-street: "Route du Salève"
-housenumber: 806
+street: Route du Salève
+housenumber: "806"
 phone: ""
-opening_hours: "Mo-Sa 07:30-13:00, 15:00-20:00; Su 08:00-13:00, 16:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-13:00, 15:00-20:00; Su 08:00-13:00, 16:00-20:00
+website: ""
diff --git a/data/cities/montagnieu/domaine-peillot.yml b/data/cities/montagnieu/domaine-peillot.yml
index 9220f5289..857b7a4ea 100644
--- a/data/cities/montagnieu/domaine-peillot.yml
+++ b/data/cities/montagnieu/domaine-peillot.yml
@@ -4,8 +4,8 @@ latitude: 45.79316
 longitude: 5.46899
 postcode: "01470"
 city: Montagnieu
-street: "Route de Seillonaz"
-housenumber: 
+street: Route de Seillonaz
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montagny/boulangerie-patisserie-patet.yml b/data/cities/montagny/boulangerie-patisserie-patet.yml
index 34ff478c4..4e4a44832 100644
--- a/data/cities/montagny/boulangerie-patisserie-patet.yml
+++ b/data/cities/montagny/boulangerie-patisserie-patet.yml
@@ -4,8 +4,8 @@ latitude: 46.0327
 longitude: 4.23591
 postcode: "42840"
 city: Montagny
-street: "Rue de la République"
-housenumber: 
-phone: "+33 4 77 66 12 24"
-opening_hours: "Tu-Su 05:30-19:00"
-website: ""
\ No newline at end of file
+street: Rue de la République
+housenumber: ""
+phone: +33 4 77 66 12 24
+opening_hours: Tu-Su 05:30-19:00
+website: ""
diff --git a/data/cities/montagny/les-comptoirs-de-la-bio.yml b/data/cities/montagny/les-comptoirs-de-la-bio.yml
index 6d421d7b4..ee735b2a4 100644
--- a/data/cities/montagny/les-comptoirs-de-la-bio.yml
+++ b/data/cities/montagny/les-comptoirs-de-la-bio.yml
@@ -1,11 +1,11 @@
 id: 132885744
-type: way
+type: node
 latitude: 45.61573
 longitude: 4.76933
 postcode: "69700"
 city: Montagny
-street: "Route de Lyon"
-housenumber: 42
+street: Route de Lyon
+housenumber: "42"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://magasins.lescomptoirsdelabio.fr/fr/les-comptoirs-de-la-bio-montagny-105471"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: https://magasins.lescomptoirsdelabio.fr/fr/les-comptoirs-de-la-bio-montagny-105471
diff --git a/data/cities/montalieu-vercieu/bar-a-fleurs.yml b/data/cities/montalieu-vercieu/bar-a-fleurs.yml
index 391fab2b5..44e8c90d8 100644
--- a/data/cities/montalieu-vercieu/bar-a-fleurs.yml
+++ b/data/cities/montalieu-vercieu/bar-a-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.81453
 longitude: 5.40407
 postcode: "38390"
 city: Montalieu-Vercieu
-street: "Grande Rue"
-housenumber: 107
-phone: "+33 4 74 88 61 62"
-opening_hours: "Tu-Sa 08:30-12:30,14:00-19:15; Su,PH 08:30-12:30"
-website: "https://www.bar-a-fleurs-montalieu.fr/"
\ No newline at end of file
+street: Grande Rue
+housenumber: "107"
+phone: +33 4 74 88 61 62
+opening_hours: Tu-Sa 08:30-12:30,14:00-19:15; Su,PH 08:30-12:30
+website: https://www.bar-a-fleurs-montalieu.fr/
diff --git a/data/cities/montalieu-vercieu/decoland.yml b/data/cities/montalieu-vercieu/decoland.yml
index 7baf32b1d..b026c7e3f 100644
--- a/data/cities/montalieu-vercieu/decoland.yml
+++ b/data/cities/montalieu-vercieu/decoland.yml
@@ -4,8 +4,8 @@ latitude: 45.81542
 longitude: 5.40336
 postcode: "38390"
 city: Montalieu-Vercieu
-street: "Route de Lyon"
-housenumber: 11
+street: Route de Lyon
+housenumber: "11"
 phone: "+33474885290"
-opening_hours: "Tu-Fr 08:45-12:00,14:30-19:00; Sa 09:00-12:15,14:30-18:00; "
-website: ""
\ No newline at end of file
+opening_hours: 'Tu-Fr 08:45-12:00,14:30-19:00; Sa 09:00-12:15,14:30-18:00; '
+website: ""
diff --git a/data/cities/montalieu-vercieu/espace-bike.yml b/data/cities/montalieu-vercieu/espace-bike.yml
index 1dc25b28d..5dd3a87dc 100644
--- a/data/cities/montalieu-vercieu/espace-bike.yml
+++ b/data/cities/montalieu-vercieu/espace-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.82443
 longitude: 5.42033
 postcode: "38390"
 city: Montalieu-Vercieu
-street: "La Vallée Bleue"
-housenumber: 
+street: La Vallée Bleue
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbonnot-saint-martin/botanic.yml b/data/cities/montbonnot-saint-martin/botanic.yml
index cf270cafc..627eb6746 100644
--- a/data/cities/montbonnot-saint-martin/botanic.yml
+++ b/data/cities/montbonnot-saint-martin/botanic.yml
@@ -4,8 +4,8 @@ latitude: 45.22333
 longitude: 5.81899
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Route de la Doux"
-housenumber: 1063
-phone: "+33 9 70 83 74 74"
-opening_hours: "Mo-Sa 09:30-19:00; Su 09:30-12:30,14:00-18:00"
-website: "https://www.botanic.com/jardinerie/botanic-montbonnot-38330-mob.html"
\ No newline at end of file
+street: Route de la Doux
+housenumber: "1063"
+phone: +33 9 70 83 74 74
+opening_hours: Mo-Sa 09:30-19:00; Su 09:30-12:30,14:00-18:00
+website: https://www.botanic.com/jardinerie/botanic-montbonnot-38330-mob.html
diff --git a/data/cities/montbonnot-saint-martin/boulangerie-marie-blachere.yml b/data/cities/montbonnot-saint-martin/boulangerie-marie-blachere.yml
index a49d457e5..2f037e91c 100644
--- a/data/cities/montbonnot-saint-martin/boulangerie-marie-blachere.yml
+++ b/data/cities/montbonnot-saint-martin/boulangerie-marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 45.22345
 longitude: 5.82015
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Route de la Doux"
-housenumber: 1063
+street: Route de la Doux
+housenumber: "1063"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30; Su 08:00-13:00"
-website: "https://boulangeries.marieblachere.com/Montbonnot"
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30; Su 08:00-13:00
+website: https://boulangeries.marieblachere.com/Montbonnot
diff --git a/data/cities/montbonnot-saint-martin/carrefour-express.yml b/data/cities/montbonnot-saint-martin/carrefour-express.yml
index 39e52fd29..e50523432 100644
--- a/data/cities/montbonnot-saint-martin/carrefour-express.yml
+++ b/data/cities/montbonnot-saint-martin/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.22271
 longitude: 5.81327
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Avenue de l'Europe"
-housenumber: 1435
-phone: "+33 6 40 23 81 19"
-opening_hours: "Mo-Sa 07:00-20:00, Su 08:30-13:00, 15:00-20:00"
-website: "https://www.carrefour.fr/magasin/express-montbonnot-st-martin"
\ No newline at end of file
+street: Avenue de l'Europe
+housenumber: "1435"
+phone: +33 6 40 23 81 19
+opening_hours: Mo-Sa 07:00-20:00, Su 08:30-13:00, 15:00-20:00
+website: https://www.carrefour.fr/magasin/express-montbonnot-st-martin
diff --git a/data/cities/montbonnot-saint-martin/edelweiss-pressing.yml b/data/cities/montbonnot-saint-martin/edelweiss-pressing.yml
index 6f50ab2d2..2f33f461a 100644
--- a/data/cities/montbonnot-saint-martin/edelweiss-pressing.yml
+++ b/data/cities/montbonnot-saint-martin/edelweiss-pressing.yml
@@ -4,8 +4,8 @@ latitude: 45.22251
 longitude: 5.81256
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Avenue de l'Europe"
-housenumber: 1365
+street: Avenue de l'Europe
+housenumber: "1365"
 phone: "+33438388651"
-opening_hours: "Mo-Fr 08:00-19:00; Sa 09:00-13:00, 14:00-18:00"
-website: "http://www.edelweiss-pressing.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-19:00; Sa 09:00-13:00, 14:00-18:00
+website: http://www.edelweiss-pressing.fr/
diff --git a/data/cities/montbonnot-saint-martin/epicuria.yml b/data/cities/montbonnot-saint-martin/epicuria.yml
index bd875bbe0..16690742e 100644
--- a/data/cities/montbonnot-saint-martin/epicuria.yml
+++ b/data/cities/montbonnot-saint-martin/epicuria.yml
@@ -4,8 +4,8 @@ latitude: 45.22217
 longitude: 5.81214
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Avenue de l'Europe"
-housenumber: 1323
+street: Avenue de l'Europe
+housenumber: "1323"
 phone: ""
-opening_hours: "Mo-Su 06:30-19:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:30-19:45
+website: ""
diff --git a/data/cities/montbonnot-saint-martin/la-brulerie-des-alpes.yml b/data/cities/montbonnot-saint-martin/la-brulerie-des-alpes.yml
index 203f2f368..c7a1d33f3 100644
--- a/data/cities/montbonnot-saint-martin/la-brulerie-des-alpes.yml
+++ b/data/cities/montbonnot-saint-martin/la-brulerie-des-alpes.yml
@@ -4,8 +4,8 @@ latitude: 45.22273
 longitude: 5.81292
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Avenue de l'Europe"
-housenumber: 1435
+street: Avenue de l'Europe
+housenumber: "1435"
 phone: ""
-opening_hours: "Tu-Sa 09:30-18:30"
-website: "https://labruleriedesalpes.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-18:30
+website: https://labruleriedesalpes.fr/
diff --git a/data/cities/montbonnot-saint-martin/laiterie-gilbert.yml b/data/cities/montbonnot-saint-martin/laiterie-gilbert.yml
index a11110132..e2855ff81 100644
--- a/data/cities/montbonnot-saint-martin/laiterie-gilbert.yml
+++ b/data/cities/montbonnot-saint-martin/laiterie-gilbert.yml
@@ -4,8 +4,8 @@ latitude: 45.22512
 longitude: 5.79872
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Rue du Général de Gaulle"
-housenumber: 279
-phone: "+33 4 76 57 01 42"
-opening_hours: "Tu-Sa 08:30-12:30,15:30-19:30"
-website: "https://www.laiterie-gilbert.fr/"
\ No newline at end of file
+street: Rue du Général de Gaulle
+housenumber: "279"
+phone: +33 4 76 57 01 42
+opening_hours: Tu-Sa 08:30-12:30,15:30-19:30
+website: https://www.laiterie-gilbert.fr/
diff --git a/data/cities/montbonnot-saint-martin/union-primeurs.yml b/data/cities/montbonnot-saint-martin/union-primeurs.yml
index eb1b476ac..efba0ff0a 100644
--- a/data/cities/montbonnot-saint-martin/union-primeurs.yml
+++ b/data/cities/montbonnot-saint-martin/union-primeurs.yml
@@ -4,8 +4,8 @@ latitude: 45.21932
 longitude: 5.81517
 postcode: "38330"
 city: Montbonnot-Saint-Martin
-street: "Rue Vaucanson"
-housenumber: 30
-phone: "+33 4 76 41 13 25"
+street: Rue Vaucanson
+housenumber: "30"
+phone: +33 4 76 41 13 25
 opening_hours: ""
-website: "http://www.union-primeurs.com/"
\ No newline at end of file
+website: http://www.union-primeurs.com/
diff --git a/data/cities/montbrison/a-laffut-de-la-nature.yml b/data/cities/montbrison/a-laffut-de-la-nature.yml
index 205666240..ed0f41605 100644
--- a/data/cities/montbrison/a-laffut-de-la-nature.yml
+++ b/data/cities/montbrison/a-laffut-de-la-nature.yml
@@ -4,8 +4,8 @@ latitude: 45.59717
 longitude: 4.08273
 postcode: "42600"
 city: Montbrison
-street: "Rue des Dombes"
-housenumber: 8
-phone: "+33 4 77 96 40 34"
+street: Rue des Dombes
+housenumber: "8"
+phone: +33 4 77 96 40 34
 opening_hours: ""
-website: "https://a-laffut-de-la-nature.business.site/"
\ No newline at end of file
+website: https://a-laffut-de-la-nature.business.site/
diff --git a/data/cities/montbrison/afej-forez.yml b/data/cities/montbrison/afej-forez.yml
index f86d955a5..531496d1d 100644
--- a/data/cities/montbrison/afej-forez.yml
+++ b/data/cities/montbrison/afej-forez.yml
@@ -4,8 +4,8 @@ latitude: 45.605
 longitude: 4.0734
 postcode: "42600"
 city: Montbrison
-street: "Avenue Émile Reymond"
-housenumber: 10
+street: Avenue Émile Reymond
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/artisans-du-monde.yml b/data/cities/montbrison/artisans-du-monde.yml
index 5b68df5bd..22e5bc6bc 100644
--- a/data/cities/montbrison/artisans-du-monde.yml
+++ b/data/cities/montbrison/artisans-du-monde.yml
@@ -4,8 +4,8 @@ latitude: 45.60833
 longitude: 4.06386
 postcode: "42600"
 city: Montbrison
-street: "Rue de la Préfecture"
-housenumber: 1
-phone: "+33 6 51 44 75 14"
+street: Rue de la Préfecture
+housenumber: "1"
+phone: +33 6 51 44 75 14
 opening_hours: ""
-website: "https://artisansdumonde.org/les-associations-locales/artisans-du-monde-montbrison"
\ No newline at end of file
+website: https://artisansdumonde.org/les-associations-locales/artisans-du-monde-montbrison
diff --git a/data/cities/montbrison/blackstore.yml b/data/cities/montbrison/blackstore.yml
index cf69a47b0..359cd51f6 100644
--- a/data/cities/montbrison/blackstore.yml
+++ b/data/cities/montbrison/blackstore.yml
@@ -4,8 +4,8 @@ latitude: 45.59546
 longitude: 4.08475
 postcode: "42600"
 city: Montbrison
-street: "Allée Auguste Bernard"
-housenumber: 1
+street: Allée Auguste Bernard
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00
+website: ""
diff --git a/data/cities/montbrison/boucherie-maisonny.yml b/data/cities/montbrison/boucherie-maisonny.yml
index 4fb6fa3ca..d9f30aaf6 100644
--- a/data/cities/montbrison/boucherie-maisonny.yml
+++ b/data/cities/montbrison/boucherie-maisonny.yml
@@ -4,8 +4,8 @@ latitude: 45.60697
 longitude: 4.06344
 postcode: "42600"
 city: Montbrison
-street: "Place Grenette"
-housenumber: 12
-phone: "+33 4 77 58 04 20"
+street: Place Grenette
+housenumber: "12"
+phone: +33 4 77 58 04 20
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/bruno-guerpillon.yml b/data/cities/montbrison/bruno-guerpillon.yml
index 7f297adfc..7ed374e63 100644
--- a/data/cities/montbrison/bruno-guerpillon.yml
+++ b/data/cities/montbrison/bruno-guerpillon.yml
@@ -4,8 +4,8 @@ latitude: 45.60696
 longitude: 4.06336
 postcode: "42600"
 city: Montbrison
-street: "Place Grenette"
-housenumber: 10
-phone: "+33 4 77 58 18 19"
+street: Place Grenette
+housenumber: "10"
+phone: +33 4 77 58 18 19
 opening_hours: ""
-website: "https://brunoguerpillon.fr/"
\ No newline at end of file
+website: https://brunoguerpillon.fr/
diff --git a/data/cities/montbrison/cycles-sprint.yml b/data/cities/montbrison/cycles-sprint.yml
index 699268d5b..6a9f4cfef 100644
--- a/data/cities/montbrison/cycles-sprint.yml
+++ b/data/cities/montbrison/cycles-sprint.yml
@@ -4,8 +4,8 @@ latitude: 45.60608
 longitude: 4.06895
 postcode: "42600"
 city: Montbrison
-street: "Boulevard Gambetta"
-housenumber: 1
-phone: "+33-477583504"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00"
-website: "https://sprint-montbrison.fr/"
\ No newline at end of file
+street: Boulevard Gambetta
+housenumber: "1"
+phone: +33-477583504
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00
+website: https://sprint-montbrison.fr/
diff --git a/data/cities/montbrison/disqe-etcetera.yml b/data/cities/montbrison/disqe-etcetera.yml
index 48a902831..8af432f35 100644
--- a/data/cities/montbrison/disqe-etcetera.yml
+++ b/data/cities/montbrison/disqe-etcetera.yml
@@ -4,8 +4,8 @@ latitude: 45.60843
 longitude: 4.06494
 postcode: "42600"
 city: Montbrison
-street: "Rue Pasteur"
-housenumber: 1
-phone: "+33 6 75 20 29 09"
+street: Rue Pasteur
+housenumber: "1"
+phone: +33 6 75 20 29 09
 opening_hours: ""
-website: "https://www.disqu-etctera.fr/"
\ No newline at end of file
+website: https://www.disqu-etctera.fr/
diff --git a/data/cities/montbrison/duboeuf.yml b/data/cities/montbrison/duboeuf.yml
index 8689dab9e..08369f16b 100644
--- a/data/cities/montbrison/duboeuf.yml
+++ b/data/cities/montbrison/duboeuf.yml
@@ -4,8 +4,8 @@ latitude: 45.60533
 longitude: 4.06767
 postcode: "42600"
 city: Montbrison
-street: "Rue Marguerite Fournier"
-housenumber: 26
-phone: "+33 4 77 58 35 54"
+street: Rue Marguerite Fournier
+housenumber: "26"
+phone: +33 4 77 58 35 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/emmaus.yml b/data/cities/montbrison/emmaus.yml
index 361b3a4f6..890a2416f 100644
--- a/data/cities/montbrison/emmaus.yml
+++ b/data/cities/montbrison/emmaus.yml
@@ -4,8 +4,8 @@ latitude: 45.59982
 longitude: 4.06915
 postcode: "42600"
 city: Montbrison
-street: "Rue de Rigaud"
-housenumber: 22
-phone: "+33 4 77 58 63 31"
+street: Rue de Rigaud
+housenumber: "22"
+phone: +33 4 77 58 63 31
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/ex-petra-ad-lapidem.yml b/data/cities/montbrison/ex-petra-ad-lapidem.yml
index 5c7b10d9e..fa0753fc7 100644
--- a/data/cities/montbrison/ex-petra-ad-lapidem.yml
+++ b/data/cities/montbrison/ex-petra-ad-lapidem.yml
@@ -5,7 +5,7 @@ longitude: 4.06379
 postcode: "42600"
 city: Montbrison
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/fromagerie-mons.yml b/data/cities/montbrison/fromagerie-mons.yml
index bcf92fcbe..3c0a9940f 100644
--- a/data/cities/montbrison/fromagerie-mons.yml
+++ b/data/cities/montbrison/fromagerie-mons.yml
@@ -4,8 +4,8 @@ latitude: 45.60669
 longitude: 4.06367
 postcode: "42600"
 city: Montbrison
-street: "Rue Tupinerie"
-housenumber: 11
-phone: "+33 4 77 96 16 74"
+street: Rue Tupinerie
+housenumber: "11"
+phone: +33 4 77 96 16 74
 opening_hours: ""
-website: "https://mons-fromages.com/fr/stores/boutique-montbrison"
\ No newline at end of file
+website: https://mons-fromages.com/fr/stores/boutique-montbrison
diff --git a/data/cities/montbrison/gerard-vernet-horticulture.yml b/data/cities/montbrison/gerard-vernet-horticulture.yml
index 5343f55e8..750794f62 100644
--- a/data/cities/montbrison/gerard-vernet-horticulture.yml
+++ b/data/cities/montbrison/gerard-vernet-horticulture.yml
@@ -4,8 +4,8 @@ latitude: 45.62283
 longitude: 4.06236
 postcode: "42600"
 city: Montbrison
-street: "Chemin des Vignes"
-housenumber: 29
-phone: "04 77 58 24 76"
+street: Chemin des Vignes
+housenumber: "29"
+phone: 04 77 58 24 76
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/la-grange-des-paysans.yml b/data/cities/montbrison/la-grange-des-paysans.yml
index a1272b4d3..8ca15ad30 100644
--- a/data/cities/montbrison/la-grange-des-paysans.yml
+++ b/data/cities/montbrison/la-grange-des-paysans.yml
@@ -4,8 +4,8 @@ latitude: 45.59792
 longitude: 4.07541
 postcode: "42600"
 city: Montbrison
-street: "Avenue de Saint-Étienne"
-housenumber: 16
-phone: "+33 4 77 76 31 36"
+street: Avenue de Saint-Étienne
+housenumber: "16"
+phone: +33 4 77 76 31 36
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/le-spatioport.yml b/data/cities/montbrison/le-spatioport.yml
index 8c44271c1..92a999987 100644
--- a/data/cities/montbrison/le-spatioport.yml
+++ b/data/cities/montbrison/le-spatioport.yml
@@ -4,8 +4,8 @@ latitude: 45.60684
 longitude: 4.06361
 postcode: "42600"
 city: Montbrison
-street: "Rue Grenette"
-housenumber: 5
-phone: "+33 4 77 96 95 05"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-19:00"
-website: "https://www.lespatioport.com/"
\ No newline at end of file
+street: Rue Grenette
+housenumber: "5"
+phone: +33 4 77 96 95 05
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-19:00
+website: https://www.lespatioport.com/
diff --git a/data/cities/montbrison/locamat-42.yml b/data/cities/montbrison/locamat-42.yml
index c3ae7ff3b..e89f1b807 100644
--- a/data/cities/montbrison/locamat-42.yml
+++ b/data/cities/montbrison/locamat-42.yml
@@ -4,8 +4,8 @@ latitude: 45.59786
 longitude: 4.07772
 postcode: "42600"
 city: Montbrison
-street: "Avenue de Saint-Étienne"
-housenumber: 37
-phone: "+33 4 77 96 09 02"
+street: Avenue de Saint-Étienne
+housenumber: "37"
+phone: +33 4 77 96 09 02
 opening_hours: ""
-website: "https://www.locamat42.fr/"
\ No newline at end of file
+website: https://www.locamat42.fr/
diff --git a/data/cities/montbrison/maison-pouilly.yml b/data/cities/montbrison/maison-pouilly.yml
index ed2b3df42..29959cf19 100644
--- a/data/cities/montbrison/maison-pouilly.yml
+++ b/data/cities/montbrison/maison-pouilly.yml
@@ -4,8 +4,8 @@ latitude: 45.59803
 longitude: 4.07564
 postcode: "42600"
 city: Montbrison
-street: "Avenue de Saint-Étienne"
-housenumber: 16
+street: Avenue de Saint-Étienne
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/mondovelo.yml b/data/cities/montbrison/mondovelo.yml
index 29e08067b..2cb3ac0db 100644
--- a/data/cities/montbrison/mondovelo.yml
+++ b/data/cities/montbrison/mondovelo.yml
@@ -4,8 +4,8 @@ latitude: 45.597
 longitude: 4.0831
 postcode: "42600"
 city: Montbrison
-street: "Rue des Dombes"
-housenumber: 6
-phone: "+33 4 77 96 36 65"
+street: Rue des Dombes
+housenumber: "6"
+phone: +33 4 77 96 36 65
 opening_hours: ""
-website: "https://montbrison.mondovelo.fr/"
\ No newline at end of file
+website: https://montbrison.mondovelo.fr/
diff --git a/data/cities/montbrison/mr-bricolage.yml b/data/cities/montbrison/mr-bricolage.yml
index be56b4e7f..05afa2480 100644
--- a/data/cities/montbrison/mr-bricolage.yml
+++ b/data/cities/montbrison/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 164008847
-type: way
+type: node
 latitude: 45.61925
 longitude: 4.06626
 postcode: "42600"
 city: Montbrison
-street: "Avenue Charles de Gaulle"
-housenumber: 24
+street: Avenue Charles de Gaulle
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/neel-chocolatier.yml b/data/cities/montbrison/neel-chocolatier.yml
index 8c1e44c78..42e73efcb 100644
--- a/data/cities/montbrison/neel-chocolatier.yml
+++ b/data/cities/montbrison/neel-chocolatier.yml
@@ -4,8 +4,8 @@ latitude: 45.60646
 longitude: 4.06523
 postcode: "42600"
 city: Montbrison
-street: "Rue Tupinerie"
-housenumber: 44
-phone: "04 77 58 51 39"
+street: Rue Tupinerie
+housenumber: "44"
+phone: 04 77 58 51 39
 opening_hours: ""
-website: "https://www.neel-chocolatier.com/"
\ No newline at end of file
+website: https://www.neel-chocolatier.com/
diff --git a/data/cities/montbrison/opalys.yml b/data/cities/montbrison/opalys.yml
index 5646d788e..e56f764a2 100644
--- a/data/cities/montbrison/opalys.yml
+++ b/data/cities/montbrison/opalys.yml
@@ -4,8 +4,8 @@ latitude: 45.6062
 longitude: 4.06288
 postcode: "42600"
 city: Montbrison
-street: "Boulevard Chavassieu"
-housenumber: 20
-phone: "04 77 58 17 01"
+street: Boulevard Chavassieu
+housenumber: "20"
+phone: 04 77 58 17 01
 opening_hours: ""
-website: "http://www.opalys-fleurs.fr/"
\ No newline at end of file
+website: http://www.opalys-fleurs.fr/
diff --git a/data/cities/montbrison/optical-center.yml b/data/cities/montbrison/optical-center.yml
index 2c535051c..549d13f5c 100644
--- a/data/cities/montbrison/optical-center.yml
+++ b/data/cities/montbrison/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.5973
 longitude: 4.0855
 postcode: "42600"
 city: Montbrison
-street: "Rue de la Maisonnette"
-housenumber: 
+street: Rue de la Maisonnette
+housenumber: ""
 phone: "+33477241139"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/187-opticien-montbrison-optical-center"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/187-opticien-montbrison-optical-center
diff --git a/data/cities/montbrison/saveur-natur.yml b/data/cities/montbrison/saveur-natur.yml
index 08a61624f..627c79ea3 100644
--- a/data/cities/montbrison/saveur-natur.yml
+++ b/data/cities/montbrison/saveur-natur.yml
@@ -4,8 +4,8 @@ latitude: 45.60613
 longitude: 4.06425
 postcode: "42600"
 city: Montbrison
-street: "Quai de l'Astrée"
-housenumber: 6
-phone: "+33 4 77 97 81 88"
+street: Quai de l'Astrée
+housenumber: "6"
+phone: +33 4 77 97 81 88
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/tabac-presse-le-saint-andre.yml b/data/cities/montbrison/tabac-presse-le-saint-andre.yml
index 99fa8e23b..37eaaf94a 100644
--- a/data/cities/montbrison/tabac-presse-le-saint-andre.yml
+++ b/data/cities/montbrison/tabac-presse-le-saint-andre.yml
@@ -4,8 +4,8 @@ latitude: 45.60716
 longitude: 4.0657
 postcode: "42600"
 city: Montbrison
-street: "Place Saint-André"
-housenumber: 1
+street: Place Saint-André
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/utile.yml b/data/cities/montbrison/utile.yml
index cf97bca00..c55e530c8 100644
--- a/data/cities/montbrison/utile.yml
+++ b/data/cities/montbrison/utile.yml
@@ -4,8 +4,8 @@ latitude: 45.60689
 longitude: 4.0658
 postcode: "42600"
 city: Montbrison
-street: "Rue du Marché"
-housenumber: 7
-phone: "+33 4 77 58 83 48"
+street: Rue du Marché
+housenumber: "7"
+phone: +33 4 77 58 83 48
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montbrison/yves-rocher.yml b/data/cities/montbrison/yves-rocher.yml
index 7c4cd2e07..0dd82658f 100644
--- a/data/cities/montbrison/yves-rocher.yml
+++ b/data/cities/montbrison/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.60645
 longitude: 4.0651
 postcode: "42600"
 city: Montbrison
-street: "Rue Tupinerie"
-housenumber: 42
+street: Rue Tupinerie
+housenumber: "42"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-13:00, 14:00-19:00"
-website: "https://www.yves-rocher.fr/magasins-instituts-de-beaute/montbrison/S-FRYROC265"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-13:00, 14:00-19:00
+website: https://www.yves-rocher.fr/magasins-instituts-de-beaute/montbrison/S-FRYROC265
diff --git a/data/cities/montceaux/auchan.yml b/data/cities/montceaux/auchan.yml
index 71176662c..142e90e4c 100644
--- a/data/cities/montceaux/auchan.yml
+++ b/data/cities/montceaux/auchan.yml
@@ -1,11 +1,11 @@
 id: 248395627
-type: way
+type: node
 latitude: 46.09676
 longitude: 4.77442
 postcode: "01090"
 city: Montceaux
-street: "Route de Francheleins"
-housenumber: 1
+street: Route de Francheleins
+housenumber: "1"
 phone: "+33474067528"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/montceaux/les-equipiers.yml b/data/cities/montceaux/les-equipiers.yml
index f2b49a85b..16e3766e6 100644
--- a/data/cities/montceaux/les-equipiers.yml
+++ b/data/cities/montceaux/les-equipiers.yml
@@ -1,11 +1,11 @@
 id: 626347925
-type: way
+type: node
 latitude: 46.0982
 longitude: 4.77522
 postcode: "01090"
 city: Montceaux
-street: "ZA Du Grand Rivolet"
-housenumber: 
-phone: "+33 4 28 44 10 08"
-opening_hours: "Tu-Fr 09:00-19:00 Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+street: ZA Du Grand Rivolet
+housenumber: ""
+phone: +33 4 28 44 10 08
+opening_hours: Tu-Fr 09:00-19:00 Sa 09:00-18:00
+website: ""
diff --git a/data/cities/montchavin-la-plagne-bellentre/sherpa.yml b/data/cities/montchavin-la-plagne-bellentre/sherpa.yml
index 27d66ff3a..e3d498f8d 100644
--- a/data/cities/montchavin-la-plagne-bellentre/sherpa.yml
+++ b/data/cities/montchavin-la-plagne-bellentre/sherpa.yml
@@ -1,11 +1,11 @@
 id: 44660568
-type: way
+type: node
 latitude: 45.56026
 longitude: 6.73502
 postcode: "73210"
 city: Montchavin la Plagne, Bellentre
 street: ""
-housenumber: 24
-phone: "+33 4 79 07 89 11"
+housenumber: "24"
+phone: +33 4 79 07 89 11
 opening_hours: ""
-website: "https://www.sherpa.net/trouver-un-magasin/votre-magasin-sherpa/?id_store=36"
\ No newline at end of file
+website: https://www.sherpa.net/trouver-un-magasin/votre-magasin-sherpa/?id_store=36
diff --git a/data/cities/montchavin-la-plagne-bellentre/tabac-presse-souvenirs.yml b/data/cities/montchavin-la-plagne-bellentre/tabac-presse-souvenirs.yml
index ecc5c3a30..89d9d7c94 100644
--- a/data/cities/montchavin-la-plagne-bellentre/tabac-presse-souvenirs.yml
+++ b/data/cities/montchavin-la-plagne-bellentre/tabac-presse-souvenirs.yml
@@ -1,11 +1,11 @@
 id: 44660528
-type: way
+type: node
 latitude: 45.56013
 longitude: 6.73488
 postcode: "73210"
 city: Montchavin la Plagne, Bellentre
-street: "Rue Principale"
-housenumber: 
+street: Rue Principale
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montchavin/ski-republic.yml b/data/cities/montchavin/ski-republic.yml
index c811fb975..d10dc6197 100644
--- a/data/cities/montchavin/ski-republic.yml
+++ b/data/cities/montchavin/ski-republic.yml
@@ -5,7 +5,7 @@ longitude: 6.73954
 postcode: "73210"
 city: Montchavin
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montelimar/blue-vintage.yml b/data/cities/montelimar/blue-vintage.yml
index cfee684c6..7c311d8e5 100644
--- a/data/cities/montelimar/blue-vintage.yml
+++ b/data/cities/montelimar/blue-vintage.yml
@@ -4,8 +4,8 @@ latitude: 44.55882
 longitude: 4.75029
 postcode: "26200"
 city: Montélimar
-street: "Rue Sainte-Croix"
-housenumber: 19
+street: Rue Sainte-Croix
+housenumber: "19"
 phone: "+33978801819"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montelimar/bodyhouse.yml b/data/cities/montelimar/bodyhouse.yml
index 3a655ebaa..0be9d3c95 100644
--- a/data/cities/montelimar/bodyhouse.yml
+++ b/data/cities/montelimar/bodyhouse.yml
@@ -4,8 +4,8 @@ latitude: 44.53857
 longitude: 4.73398
 postcode: "26200"
 city: Montélimar
-street: "Chemin de Fortuneau"
-housenumber: 6
+street: Chemin de Fortuneau
+housenumber: "6"
 phone: "0475983210"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://bh-boutiques.fr/montelimar/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://bh-boutiques.fr/montelimar/
diff --git a/data/cities/montelimar/boulangerie-sophie-lebreuilly.yml b/data/cities/montelimar/boulangerie-sophie-lebreuilly.yml
index 9b0e22d43..d378aec93 100644
--- a/data/cities/montelimar/boulangerie-sophie-lebreuilly.yml
+++ b/data/cities/montelimar/boulangerie-sophie-lebreuilly.yml
@@ -4,8 +4,8 @@ latitude: 44.53346
 longitude: 4.73367
 postcode: "26200"
 city: Montélimar
-street: "Avenue de Gournier"
-housenumber: 
+street: Avenue de Gournier
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 06:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:30-20:00
+website: ""
diff --git a/data/cities/montelimar/chant-libre.yml b/data/cities/montelimar/chant-libre.yml
index 2bdd489c1..c27fdb712 100644
--- a/data/cities/montelimar/chant-libre.yml
+++ b/data/cities/montelimar/chant-libre.yml
@@ -1,11 +1,11 @@
 id: 74564745
-type: way
+type: node
 latitude: 44.55906
 longitude: 4.75214
 postcode: "26200"
 city: Montélimar
-street: "Place des Clercs"
-housenumber: 22
-phone: "+33 4 75 01 92 22"
-opening_hours: "Mo,Su off; Tu-Sa 09:00-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+street: Place des Clercs
+housenumber: "22"
+phone: +33 4 75 01 92 22
+opening_hours: Mo,Su off; Tu-Sa 09:00-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/montelimar/lapeyre.yml b/data/cities/montelimar/lapeyre.yml
index af15a674e..87f1d9e37 100644
--- a/data/cities/montelimar/lapeyre.yml
+++ b/data/cities/montelimar/lapeyre.yml
@@ -4,8 +4,8 @@ latitude: 44.53842
 longitude: 4.74579
 postcode: "26200"
 city: Montélimar
-street: "Route de Marseille"
-housenumber: 168
+street: Route de Marseille
+housenumber: "168"
 phone: "0475923390"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montelimar/maefaf.yml b/data/cities/montelimar/maefaf.yml
index 574912c08..88fbb6077 100644
--- a/data/cities/montelimar/maefaf.yml
+++ b/data/cities/montelimar/maefaf.yml
@@ -4,8 +4,8 @@ latitude: 44.55405
 longitude: 4.74896
 postcode: "26200"
 city: Montélimar
-street: "Avenue d'Aygu"
-housenumber: 7
+street: Avenue d'Aygu
+housenumber: "7"
 phone: "0475988791"
-opening_hours: "Tu-Sa 09:30-18:45"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-18:45
+website: ""
diff --git a/data/cities/montelimar/midas.yml b/data/cities/montelimar/midas.yml
index 9053f10a2..3580f78a3 100644
--- a/data/cities/montelimar/midas.yml
+++ b/data/cities/montelimar/midas.yml
@@ -4,8 +4,8 @@ latitude: 44.5434
 longitude: 4.74689
 postcode: "26200"
 city: MONTELIMAR
-street: "Avenue Jean Jaurès"
-housenumber: 115
-phone: "+33 4 75 01 47 60"
+street: Avenue Jean Jaurès
+housenumber: "115"
+phone: +33 4 75 01 47 60
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/montelimar/noz.yml b/data/cities/montelimar/noz.yml
index b8be6fa51..d5f7891d6 100644
--- a/data/cities/montelimar/noz.yml
+++ b/data/cities/montelimar/noz.yml
@@ -4,8 +4,8 @@ latitude: 44.53109
 longitude: 4.73613
 postcode: "26200"
 city: Montélimar
-street: "Route de Châteauneuf"
-housenumber: 132
+street: Route de Châteauneuf
+housenumber: "132"
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/montelimar/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/montelimar/
diff --git a/data/cities/montelimar/utile.yml b/data/cities/montelimar/utile.yml
index 70e2dc547..3d824cfb5 100644
--- a/data/cities/montelimar/utile.yml
+++ b/data/cities/montelimar/utile.yml
@@ -4,8 +4,8 @@ latitude: 44.55551
 longitude: 4.74909
 postcode: "26200"
 city: Montélimar
-street: "Boulevard du Général de Gaulle"
-housenumber: 7
+street: Boulevard du Général de Gaulle
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montluel/atelier-vert.yml b/data/cities/montluel/atelier-vert.yml
index 931fb681c..6f013143f 100644
--- a/data/cities/montluel/atelier-vert.yml
+++ b/data/cities/montluel/atelier-vert.yml
@@ -4,8 +4,8 @@ latitude: 45.85185
 longitude: 5.05825
 postcode: "01120"
 city: Montluel
-street: "Grande Rue"
-housenumber: 65
-phone: "+33 4 72 25 74 51"
+street: Grande Rue
+housenumber: "65"
+phone: +33 4 72 25 74 51
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montluel/boucherie-butcher.yml b/data/cities/montluel/boucherie-butcher.yml
index f167d1cc6..f0a44d607 100644
--- a/data/cities/montluel/boucherie-butcher.yml
+++ b/data/cities/montluel/boucherie-butcher.yml
@@ -4,8 +4,8 @@ latitude: 45.85162
 longitude: 5.05705
 postcode: "01120"
 city: Montluel
-street: "Avenue de la Gare"
-housenumber: 29
-phone: "+33 4 78 06 10 27"
+street: Avenue de la Gare
+housenumber: "29"
+phone: +33 4 78 06 10 27
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montluel/emma-d.yml b/data/cities/montluel/emma-d.yml
index 34050e8ab..2f6dfc825 100644
--- a/data/cities/montluel/emma-d.yml
+++ b/data/cities/montluel/emma-d.yml
@@ -4,8 +4,8 @@ latitude: 45.85186
 longitude: 5.05787
 postcode: "01120"
 city: Montluel
-street: "Grande Rue"
-housenumber: 91
+street: Grande Rue
+housenumber: "91"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montluel/garage-des-tilleuls.yml b/data/cities/montluel/garage-des-tilleuls.yml
index fb7d0af7d..82efc18dd 100644
--- a/data/cities/montluel/garage-des-tilleuls.yml
+++ b/data/cities/montluel/garage-des-tilleuls.yml
@@ -4,8 +4,8 @@ latitude: 45.84997
 longitude: 5.05461
 postcode: "01120"
 city: Montluel
-street: "Rue Neuve"
-housenumber: 402
-phone: "+33 4 78 06 38 68"
+street: Rue Neuve
+housenumber: "402"
+phone: +33 4 78 06 38 68
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montluel/k-par-k-coiffure.yml b/data/cities/montluel/k-par-k-coiffure.yml
index 2cf7080cf..1c52b0b77 100644
--- a/data/cities/montluel/k-par-k-coiffure.yml
+++ b/data/cities/montluel/k-par-k-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.85196
 longitude: 5.0578
 postcode: "01120"
 city: Montluel
-street: "Grande Rue"
-housenumber: 100
-phone: "+33 4 78 06 06 16"
+street: Grande Rue
+housenumber: "100"
+phone: +33 4 78 06 06 16
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montluel/lepicerie-du-village.yml b/data/cities/montluel/lepicerie-du-village.yml
index 9dbdb8d38..05bd1e3a1 100644
--- a/data/cities/montluel/lepicerie-du-village.yml
+++ b/data/cities/montluel/lepicerie-du-village.yml
@@ -4,8 +4,8 @@ latitude: 45.85185
 longitude: 5.05835
 postcode: "01120"
 city: Montluel
-street: "Grande Rue"
-housenumber: 55
-phone: "+33 4 72 88 35 89"
+street: Grande Rue
+housenumber: "55"
+phone: +33 4 72 88 35 89
 opening_hours: ""
-website: "http://epicerie-du-village.com/"
\ No newline at end of file
+website: http://epicerie-du-village.com/
diff --git a/data/cities/montluel/salon-sylvie.yml b/data/cities/montluel/salon-sylvie.yml
index d505e35ce..89b0241f8 100644
--- a/data/cities/montluel/salon-sylvie.yml
+++ b/data/cities/montluel/salon-sylvie.yml
@@ -4,8 +4,8 @@ latitude: 45.85185
 longitude: 5.05849
 postcode: "01120"
 city: Montluel
-street: "Grande Rue"
-housenumber: 43
-phone: "+33 4 78 06 15 59"
+street: Grande Rue
+housenumber: "43"
+phone: +33 4 78 06 15 59
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montreal-la-cluse/agri-sud-est.yml b/data/cities/montreal-la-cluse/agri-sud-est.yml
index b75cbd7c4..789855467 100644
--- a/data/cities/montreal-la-cluse/agri-sud-est.yml
+++ b/data/cities/montreal-la-cluse/agri-sud-est.yml
@@ -1,11 +1,11 @@
 id: 169046088
-type: way
+type: node
 latitude: 46.17234
 longitude: 5.57596
 postcode: "01460"
 city: Montréal-la-Cluse
-street: "Rue du Jura"
-housenumber: 70
-phone: "+33 4 74 76 03 44"
+street: Rue du Jura
+housenumber: "70"
+phone: +33 4 74 76 03 44
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montreal-la-cluse/boucherie-maduli.yml b/data/cities/montreal-la-cluse/boucherie-maduli.yml
index 3c3688cce..55037ae78 100644
--- a/data/cities/montreal-la-cluse/boucherie-maduli.yml
+++ b/data/cities/montreal-la-cluse/boucherie-maduli.yml
@@ -4,8 +4,8 @@ latitude: 46.17054
 longitude: 5.57675
 postcode: "01460"
 city: Montréal-la-Cluse
-street: "Rue des Savoies"
-housenumber: 3
+street: Rue des Savoies
+housenumber: "3"
 phone: "+33474760363"
-opening_hours: "Tu,Th,Fr 08:00-12:30,15:30-19:00; We 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Th,Fr 08:00-12:30,15:30-19:00; We 08:00-12:30
+website: ""
diff --git a/data/cities/montreal-la-cluse/carrefour-market.yml b/data/cities/montreal-la-cluse/carrefour-market.yml
index 02370bf22..76f86d131 100644
--- a/data/cities/montreal-la-cluse/carrefour-market.yml
+++ b/data/cities/montreal-la-cluse/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 46.17269
 longitude: 5.57639
 postcode: "01460"
 city: Montréal-la-Cluse
-street: "Rue du Jura"
-housenumber: 68
-phone: "+33 4 74 76 26 43"
-opening_hours: "Mo-Sa 08:00-19:30; Su 09:00-12:30"
-website: "https://www.carrefour.fr/magasin/market-montreal-la-cluse"
\ No newline at end of file
+street: Rue du Jura
+housenumber: "68"
+phone: +33 4 74 76 26 43
+opening_hours: Mo-Sa 08:00-19:30; Su 09:00-12:30
+website: https://www.carrefour.fr/magasin/market-montreal-la-cluse
diff --git a/data/cities/montreal-la-cluse/lhair-du-lac.yml b/data/cities/montreal-la-cluse/lhair-du-lac.yml
index d29898f91..f20d56cbb 100644
--- a/data/cities/montreal-la-cluse/lhair-du-lac.yml
+++ b/data/cities/montreal-la-cluse/lhair-du-lac.yml
@@ -4,8 +4,9 @@ latitude: 46.17023
 longitude: 5.5768
 postcode: "01460"
 city: Montréal-la-Cluse
-street: "Rue des Savoies"
-housenumber: 12
+street: Rue des Savoies
+housenumber: "12"
 phone: "+33474497120"
-opening_hours: "Mo 09:00-12:00,14:00-18:30; Tu 09:00-12:00,13:30-18:30; We off; Th,Fr 09:00-18:30; Sa 08:30-14:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 09:00-12:00,14:00-18:30; Tu 09:00-12:00,13:30-18:30; We off; Th,Fr
+    09:00-18:30; Sa 08:30-14:00; Su off
+website: ""
diff --git a/data/cities/montriond/carrosserie-des-plagnettes.yml b/data/cities/montriond/carrosserie-des-plagnettes.yml
new file mode 100644
index 000000000..1c8a65d61
--- /dev/null
+++ b/data/cities/montriond/carrosserie-des-plagnettes.yml
@@ -0,0 +1,11 @@
+id: 316598117
+type: node
+latitude: 46.20007
+longitude: 6.68212
+postcode: ""
+city: Montriond
+street: Route du Pont de Fer
+housenumber: "71"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/montriond/les-sculpteurs-du-lac.yml b/data/cities/montriond/les-sculpteurs-du-lac.yml
index c66a510ca..1b84ce558 100644
--- a/data/cities/montriond/les-sculpteurs-du-lac.yml
+++ b/data/cities/montriond/les-sculpteurs-du-lac.yml
@@ -1,11 +1,11 @@
 id: 316598032
-type: way
+type: node
 latitude: 46.20552
 longitude: 6.7085
 postcode: "74110"
 city: Montriond
-street: "Route de Dravachet"
-housenumber: 1050
+street: Route de Dravachet
+housenumber: "1050"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00"
-website: "https://www.sculpteursdulac-shop.com"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:00
+website: https://www.sculpteursdulac-shop.com
diff --git a/data/cities/montriond/sport-2000-2.yml b/data/cities/montriond/sport-2000-2.yml
index 735fbd3b9..77b992b3f 100644
--- a/data/cities/montriond/sport-2000-2.yml
+++ b/data/cities/montriond/sport-2000-2.yml
@@ -5,7 +5,7 @@ longitude: 6.76029
 postcode: "74110"
 city: Montriond
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montriond/sport-2000.yml b/data/cities/montriond/sport-2000.yml
index e6c3b32b4..fca588b4c 100644
--- a/data/cities/montriond/sport-2000.yml
+++ b/data/cities/montriond/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.19653
 longitude: 6.69445
 postcode: "74110"
 city: Montriond
-street: "Route de Morzine"
-housenumber: 44
-phone: "+33 4 50 75 79 38"
+street: Route de Morzine
+housenumber: "44"
+phone: +33 4 50 75 79 38
 opening_hours: ""
-website: "https://www.ardentsports.sport2000.fr/"
\ No newline at end of file
+website: https://www.ardentsports.sport2000.fr/
diff --git a/data/cities/montriond/vival.yml b/data/cities/montriond/vival.yml
index 52f5ca86c..5867f8a30 100644
--- a/data/cities/montriond/vival.yml
+++ b/data/cities/montriond/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.19628
 longitude: 6.6947
 postcode: "74110"
 city: Montriond
-street: "Route de Morzine"
-housenumber: 90
+street: Route de Morzine
+housenumber: "90"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:00, 15:00-19:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:00, 15:00-19:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/montrond-les-bains/patisserie-bruno-guerpillon.yml b/data/cities/montrond-les-bains/patisserie-bruno-guerpillon.yml
index 827367f74..6b674ea58 100644
--- a/data/cities/montrond-les-bains/patisserie-bruno-guerpillon.yml
+++ b/data/cities/montrond-les-bains/patisserie-bruno-guerpillon.yml
@@ -1,11 +1,11 @@
 id: 129385128
-type: way
+type: node
 latitude: 45.64835
 longitude: 4.23119
 postcode: "42210"
 city: Montrond-les-Bains
-street: "Avenue de la Route Bleue"
-housenumber: 464
+street: Avenue de la Route Bleue
+housenumber: "464"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montseveroux/ferme-du-contrevent.yml b/data/cities/montseveroux/ferme-du-contrevent.yml
index a9dfba866..9fc884591 100644
--- a/data/cities/montseveroux/ferme-du-contrevent.yml
+++ b/data/cities/montseveroux/ferme-du-contrevent.yml
@@ -4,8 +4,8 @@ latitude: 45.42037
 longitude: 4.97447
 postcode: "38122"
 city: Montseveroux
-street: "Route des Quatre Vents"
-housenumber: 277
+street: Route des Quatre Vents
+housenumber: "277"
 phone: "+33474585434"
-opening_hours: "Fr 16:00-19:00"
-website: "https://www.lafermeducontrevent.fr/"
\ No newline at end of file
+opening_hours: Fr 16:00-19:00
+website: https://www.lafermeducontrevent.fr/
diff --git a/data/cities/montvalezan/go-sport-montagne-rolling-snow.yml b/data/cities/montvalezan/go-sport-montagne-rolling-snow.yml
index ca66cab77..35fae524c 100644
--- a/data/cities/montvalezan/go-sport-montagne-rolling-snow.yml
+++ b/data/cities/montvalezan/go-sport-montagne-rolling-snow.yml
@@ -5,7 +5,7 @@ longitude: 6.85105
 postcode: "73700"
 city: Montvalezan
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/montvalezan/intersport-2.yml b/data/cities/montvalezan/intersport-2.yml
index 562e32daf..60b2f3bfb 100644
--- a/data/cities/montvalezan/intersport-2.yml
+++ b/data/cities/montvalezan/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.84948
 postcode: "73700"
 city: Montvalezan
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montvalezan/intersport.yml b/data/cities/montvalezan/intersport.yml
index 5818cae86..41067e998 100644
--- a/data/cities/montvalezan/intersport.yml
+++ b/data/cities/montvalezan/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.84995
 postcode: "73700"
 city: Montvalezan
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montvalezan/precision-ski.yml b/data/cities/montvalezan/precision-ski.yml
index 280c91b0c..9684c38d3 100644
--- a/data/cities/montvalezan/precision-ski.yml
+++ b/data/cities/montvalezan/precision-ski.yml
@@ -5,7 +5,8 @@ longitude: 6.86239
 postcode: "73700"
 city: Montvalezan
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 08:30-12:30, 16:30-19:00; Fr 08:30-12:30, 15:00-19:00; Sa-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:30, 16:30-19:00; Fr 08:30-12:30, 15:00-19:00; Sa-Su
+    08:30-19:00
+website: ""
diff --git a/data/cities/montvalezan/ski-set-olympic-sports.yml b/data/cities/montvalezan/ski-set-olympic-sports.yml
index 8ae54934c..6c0240d7f 100644
--- a/data/cities/montvalezan/ski-set-olympic-sports.yml
+++ b/data/cities/montvalezan/ski-set-olympic-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.6258
 longitude: 6.86336
 postcode: "73700"
 city: montvalezan
-street: "les eucherts-la roserie"
-housenumber: 
+street: les eucherts-la roserie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montvalezan/skimium-le-roc-noir.yml b/data/cities/montvalezan/skimium-le-roc-noir.yml
index b0b2f79b1..106195cd3 100644
--- a/data/cities/montvalezan/skimium-le-roc-noir.yml
+++ b/data/cities/montvalezan/skimium-le-roc-noir.yml
@@ -4,8 +4,8 @@ latitude: 45.62824
 longitude: 6.84855
 postcode: "73700"
 city: Montvalezan
-street: "centre station"
-housenumber: 
+street: centre station
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montvalezan/sport-2000.yml b/data/cities/montvalezan/sport-2000.yml
index 0212e9117..b2938809f 100644
--- a/data/cities/montvalezan/sport-2000.yml
+++ b/data/cities/montvalezan/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.62727
 longitude: 6.84978
 postcode: "73700"
 city: Montvalezan
-street: "Centre Commercial"
-housenumber: 
+street: Centre Commercial
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/montvendre/rcycle.yml b/data/cities/montvendre/rcycle.yml
index 310626bb8..7e5a13f93 100644
--- a/data/cities/montvendre/rcycle.yml
+++ b/data/cities/montvendre/rcycle.yml
@@ -1,11 +1,11 @@
 id: 325904229
-type: way
+type: node
 latitude: 44.87094
 longitude: 5.02135
 postcode: "26120"
 city: Montvendre
-street: "Passage du Charon"
-housenumber: 10
+street: Passage du Charon
+housenumber: "10"
 phone: "0628459162"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/montverdun/boulangerie-valette-michel.yml b/data/cities/montverdun/boulangerie-valette-michel.yml
index 0acb55aaf..a5d2a2f4e 100644
--- a/data/cities/montverdun/boulangerie-valette-michel.yml
+++ b/data/cities/montverdun/boulangerie-valette-michel.yml
@@ -4,8 +4,8 @@ latitude: 45.71496
 longitude: 4.06719
 postcode: "42130"
 city: Montverdun
-street: "Route de Saint-Étienne-le-Molard"
-housenumber: 49
-phone: "04 77 97 46 57"
+street: Route de Saint-Étienne-le-Molard
+housenumber: "49"
+phone: 04 77 97 46 57
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moras-en-valloire/charlene-madinier-coiffure.yml b/data/cities/moras-en-valloire/charlene-madinier-coiffure.yml
index 70d04414e..02f3dce23 100644
--- a/data/cities/moras-en-valloire/charlene-madinier-coiffure.yml
+++ b/data/cities/moras-en-valloire/charlene-madinier-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.29044
 longitude: 4.99036
 postcode: "26210"
 city: Moras-en-Valloire
-street: "Pl. du 19 Mars 1962"
-housenumber: 
+street: Pl. du 19 Mars 1962
+housenumber: ""
 phone: "0412054818"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morestel/boulangerie-marie-blachere.yml b/data/cities/morestel/boulangerie-marie-blachere.yml
index 709eafd4f..e62596002 100644
--- a/data/cities/morestel/boulangerie-marie-blachere.yml
+++ b/data/cities/morestel/boulangerie-marie-blachere.yml
@@ -1,11 +1,11 @@
 id: 335790262
-type: way
+type: node
 latitude: 45.68015
 longitude: 5.46104
 postcode: "38510"
 city: Morestel
-street: "Route de Lyon"
-housenumber: 91
+street: Route de Lyon
+housenumber: "91"
 phone: ""
-opening_hours: "Mo-Su 06:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:30-19:30
+website: ""
diff --git a/data/cities/morestel/gifi.yml b/data/cities/morestel/gifi.yml
index 0aa229cb1..2b02af603 100644
--- a/data/cities/morestel/gifi.yml
+++ b/data/cities/morestel/gifi.yml
@@ -4,8 +4,8 @@ latitude: 45.67209
 longitude: 5.48846
 postcode: "38510"
 city: Morestel
-street: "Route d'Argent"
-housenumber: 1369
+street: Route d'Argent
+housenumber: "1369"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morestel/klo.yml b/data/cities/morestel/klo.yml
index 2a3de80dd..ee35b7734 100644
--- a/data/cities/morestel/klo.yml
+++ b/data/cities/morestel/klo.yml
@@ -4,8 +4,8 @@ latitude: 45.67215
 longitude: 5.48801
 postcode: "38510"
 city: Morestel
-street: "Route d'Argent"
-housenumber: 1369
+street: Route d'Argent
+housenumber: "1369"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morestel/motos-vignat.yml b/data/cities/morestel/motos-vignat.yml
index a9b138095..172198957 100644
--- a/data/cities/morestel/motos-vignat.yml
+++ b/data/cities/morestel/motos-vignat.yml
@@ -1,11 +1,11 @@
 id: 143463640
-type: way
+type: node
 latitude: 45.68118
 longitude: 5.45868
 postcode: "38510"
 city: Morestel
-street: "Route de Lyon"
-housenumber: 325
+street: Route de Lyon
+housenumber: "325"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morestel/provenchalles.yml b/data/cities/morestel/provenchalles.yml
index 557d17bde..1504e4b00 100644
--- a/data/cities/morestel/provenchalles.yml
+++ b/data/cities/morestel/provenchalles.yml
@@ -1,11 +1,11 @@
 id: 335790261
-type: way
+type: node
 latitude: 45.68017
 longitude: 5.46096
 postcode: "38510"
 city: Morestel
-street: "Route de Lyon"
-housenumber: 91
+street: Route de Lyon
+housenumber: "91"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morestel/weldom.yml b/data/cities/morestel/weldom.yml
index 9ad8cb302..45c28ba86 100644
--- a/data/cities/morestel/weldom.yml
+++ b/data/cities/morestel/weldom.yml
@@ -4,8 +4,8 @@ latitude: 45.67339
 longitude: 5.48574
 postcode: "38510"
 city: Morestel
-street: "Route d'Argent"
-housenumber: 1121
+street: Route d'Argent
+housenumber: "1121"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-19:00"
-website: "https://www.weldom.fr/magasin/51"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:00-19:00
+website: https://www.weldom.fr/magasin/51
diff --git a/data/cities/morillon/intersport-montagne.yml b/data/cities/morillon/intersport-montagne.yml
index 5bd8ec097..0da4c2f9d 100644
--- a/data/cities/morillon/intersport-montagne.yml
+++ b/data/cities/morillon/intersport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 46.06617
 longitude: 6.67082
 postcode: "74440"
 city: Morillon
-street: "Route de Morillon"
-housenumber: 
+street: Route de Morillon
+housenumber: ""
 phone: ""
-opening_hours: "Nov-May Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Nov-May Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/morillon/precision-ski.yml b/data/cities/morillon/precision-ski.yml
index 774279966..c28f20956 100644
--- a/data/cities/morillon/precision-ski.yml
+++ b/data/cities/morillon/precision-ski.yml
@@ -4,8 +4,8 @@ latitude: 46.08542
 longitude: 6.67142
 postcode: "74440"
 city: Morillon
-street: "Route de Cluses"
-housenumber: 330
+street: Route de Cluses
+housenumber: "330"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morillon/rol-sports.yml b/data/cities/morillon/rol-sports.yml
index 50636b53b..96ba095f2 100644
--- a/data/cities/morillon/rol-sports.yml
+++ b/data/cities/morillon/rol-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.68151
 postcode: "74440"
 city: Morillon
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "http://www.location-ski-morillon.com/"
\ No newline at end of file
+website: http://www.location-ski-morillon.com/
diff --git a/data/cities/morillon/sherpa.yml b/data/cities/morillon/sherpa.yml
index 6e78aa038..3e1880068 100644
--- a/data/cities/morillon/sherpa.yml
+++ b/data/cities/morillon/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 46.06582
 longitude: 6.67021
 postcode: "74440"
 city: Morillon
-street: "Rue du Clocher"
-housenumber: 
+street: Rue du Clocher
+housenumber: ""
 phone: ""
-opening_hours: "Dec 19-Mar 20 Mo-Su 07:30-19:30; Jul 03-Aug 29 Mo-Su 08:00-12:30, 16:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Dec 19-Mar 20 Mo-Su 07:30-19:30; Jul 03-Aug 29 Mo-Su 08:00-12:30, 16:30-19:30
+website: ""
diff --git a/data/cities/morillon/twinner.yml b/data/cities/morillon/twinner.yml
index 97eb363f4..488268fb7 100644
--- a/data/cities/morillon/twinner.yml
+++ b/data/cities/morillon/twinner.yml
@@ -5,7 +5,7 @@ longitude: 6.67907
 postcode: "74440"
 city: Morillon
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "http://location-ski.twinner-sports.com/stations/morillon-village"
\ No newline at end of file
+website: http://location-ski.twinner-sports.com/stations/morillon-village
diff --git a/data/cities/mornant/automobiles-en-pays-mornantais.yml b/data/cities/mornant/automobiles-en-pays-mornantais.yml
index 3e414f784..3ffa34944 100644
--- a/data/cities/mornant/automobiles-en-pays-mornantais.yml
+++ b/data/cities/mornant/automobiles-en-pays-mornantais.yml
@@ -1,11 +1,11 @@
 id: 170272427
-type: way
+type: node
 latitude: 45.61543
 longitude: 4.70413
 postcode: "69440"
 city: Mornant
-street: "rue du Capitaine François Garbit"
-housenumber: 649
-phone: "+33 4 78 57 59 59"
-opening_hours: "Mo-Fr 07:30-12:00, 13:30-18:15"
-website: "https://www.renaultmornant.com/"
\ No newline at end of file
+street: rue du Capitaine François Garbit
+housenumber: "649"
+phone: +33 4 78 57 59 59
+opening_hours: Mo-Fr 07:30-12:00, 13:30-18:15
+website: https://www.renaultmornant.com/
diff --git a/data/cities/mornant/emmaus.yml b/data/cities/mornant/emmaus.yml
index 5f69f5f56..55dc16308 100644
--- a/data/cities/mornant/emmaus.yml
+++ b/data/cities/mornant/emmaus.yml
@@ -1,11 +1,11 @@
 id: 137358726
-type: way
+type: node
 latitude: 45.61711
 longitude: 4.67584
 postcode: "69440"
 city: Mornant
-street: "Boulevard du Pilat"
+street: Boulevard du Pilat
 housenumber: 1bis
-phone: "+33 4 78 56 43 40"
-opening_hours: "We 09:00-12:00; Sa 09:00-12:00"
-website: "https://www.ville-mornant.fr/Amis-d-Emma%C3%83%C2%BCs-de-la-Region-de-Mornant-mornant-art-192.html"
\ No newline at end of file
+phone: +33 4 78 56 43 40
+opening_hours: We 09:00-12:00; Sa 09:00-12:00
+website: https://www.ville-mornant.fr/Amis-d-Emma%C3%83%C2%BCs-de-la-Region-de-Mornant-mornant-art-192.html
diff --git a/data/cities/mornant/espace-funeraire.yml b/data/cities/mornant/espace-funeraire.yml
index dd2c7c66f..675690c10 100644
--- a/data/cities/mornant/espace-funeraire.yml
+++ b/data/cities/mornant/espace-funeraire.yml
@@ -1,11 +1,11 @@
 id: 609704100
-type: way
+type: node
 latitude: 45.62089
 longitude: 4.67576
 postcode: ""
 city: Mornant
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/mornant/intermarche-super.yml b/data/cities/mornant/intermarche-super.yml
index e7e278718..23adddca1 100644
--- a/data/cities/mornant/intermarche-super.yml
+++ b/data/cities/mornant/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 228676307
-type: way
+type: node
 latitude: 45.61856
 longitude: 4.67852
 postcode: ""
 city: Mornant
-street: "Rue Louis Guillaumond"
-housenumber: 
-phone: "+33 4 78 81 08 10"
-opening_hours: "Mo-Sa 08:00-20:00, Su 09:00-20:00"
-website: ""
\ No newline at end of file
+street: Rue Louis Guillaumond
+housenumber: ""
+phone: +33 4 78 81 08 10
+opening_hours: Mo-Sa 08:00-20:00, Su 09:00-20:00
+website: ""
diff --git a/data/cities/mornant/le-lotus-bio.yml b/data/cities/mornant/le-lotus-bio.yml
index afe3d192b..032aee6de 100644
--- a/data/cities/mornant/le-lotus-bio.yml
+++ b/data/cities/mornant/le-lotus-bio.yml
@@ -5,7 +5,7 @@ longitude: 4.67225
 postcode: ""
 city: Mornant
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo 15:00-19:00; Tu-Sa 09:00-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 15:00-19:00; Tu-Sa 09:00-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/mornant/lulu-librairie.yml b/data/cities/mornant/lulu-librairie.yml
index 17d464638..612afedef 100644
--- a/data/cities/mornant/lulu-librairie.yml
+++ b/data/cities/mornant/lulu-librairie.yml
@@ -4,8 +4,8 @@ latitude: 45.62035
 longitude: 4.67231
 postcode: "69440"
 city: Mornant
-street: "Avenue du Souvenir"
-housenumber: 7
+street: Avenue du Souvenir
+housenumber: "7"
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/morzine/all-mountain-rental.yml b/data/cities/morzine/all-mountain-rental.yml
index 1b4dfd5c7..093d4656f 100644
--- a/data/cities/morzine/all-mountain-rental.yml
+++ b/data/cities/morzine/all-mountain-rental.yml
@@ -4,8 +4,8 @@ latitude: 46.18847
 longitude: 6.70207
 postcode: "74110"
 city: Morzine
-street: "Route des Bois Venants"
-housenumber: 1098
+street: Route des Bois Venants
+housenumber: "1098"
 phone: ""
 opening_hours: ""
-website: "https://www.allmountainrental.com/"
\ No newline at end of file
+website: https://www.allmountainrental.com/
diff --git a/data/cities/morzine/berger-ski-service.yml b/data/cities/morzine/berger-ski-service.yml
index 60883f788..1d0595c31 100644
--- a/data/cities/morzine/berger-ski-service.yml
+++ b/data/cities/morzine/berger-ski-service.yml
@@ -4,8 +4,8 @@ latitude: 46.18015
 longitude: 6.70211
 postcode: "74110"
 city: Morzine
-street: "Taille de Mas du Pleney"
-housenumber: 179
+street: Taille de Mas du Pleney
+housenumber: "179"
 phone: ""
-opening_hours: "Dec 14-Apr 30 Mo-Su 08:30-19:00; May 1-Dec 15 off"
-website: ""
\ No newline at end of file
+opening_hours: Dec 14-Apr 30 Mo-Su 08:30-19:00; May 1-Dec 15 off
+website: ""
diff --git a/data/cities/morzine/carrefour-market.yml b/data/cities/morzine/carrefour-market.yml
index c7eed853e..443bb3f28 100644
--- a/data/cities/morzine/carrefour-market.yml
+++ b/data/cities/morzine/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 46.17987
 longitude: 6.70663
 postcode: "74110"
 city: Morzine
-street: "Route du Plan"
+street: Route du Plan
 housenumber: 141 bis
 phone: ""
-opening_hours: "Mo-Su 08:30-12:30, 15:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-12:30, 15:00-19:30; Su off
+website: ""
diff --git a/data/cities/morzine/carrefour-montagne.yml b/data/cities/morzine/carrefour-montagne.yml
index 23b660699..023e4b8ad 100644
--- a/data/cities/morzine/carrefour-montagne.yml
+++ b/data/cities/morzine/carrefour-montagne.yml
@@ -4,8 +4,8 @@ latitude: 46.19139
 longitude: 6.77605
 postcode: "74110"
 city: Morzine
-street: "Place Centrale"
-housenumber: 
+street: Place Centrale
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:00-20:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-20:30
+website: ""
diff --git a/data/cities/morzine/delbard.yml b/data/cities/morzine/delbard.yml
index aabf84a5f..bfc6f6436 100644
--- a/data/cities/morzine/delbard.yml
+++ b/data/cities/morzine/delbard.yml
@@ -1,11 +1,11 @@
 id: 1193113794
-type: way
+type: node
 latitude: 46.19555
 longitude: 6.68819
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 1992
+street: Route de la Plagne
+housenumber: "1992"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00,14:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-18:30; Su off
+website: ""
diff --git a/data/cities/morzine/francois-baud-freeride.yml b/data/cities/morzine/francois-baud-freeride.yml
index 30483c1ee..d3e0a8dee 100644
--- a/data/cities/morzine/francois-baud-freeride.yml
+++ b/data/cities/morzine/francois-baud-freeride.yml
@@ -4,8 +4,8 @@ latitude: 46.18033
 longitude: 6.7019
 postcode: "74110"
 city: Morzine
-street: "Taille de Mas du Pleney"
-housenumber: 146
+street: Taille de Mas du Pleney
+housenumber: "146"
 phone: ""
-opening_hours: "Mo-Su 08:15-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:15-19:00
+website: ""
diff --git a/data/cities/morzine/gitem.yml b/data/cities/morzine/gitem.yml
index 420a57681..cfdb4aee5 100644
--- a/data/cities/morzine/gitem.yml
+++ b/data/cities/morzine/gitem.yml
@@ -4,8 +4,8 @@ latitude: 46.19844
 longitude: 6.68229
 postcode: "74110"
 city: Morzine
-street: "Route des Grandes Alpes"
-housenumber: 89
-phone: "+33 4 50 75 76 26"
-opening_hours: "Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: "https://www.gitem.fr/nos-magasins.html/l/morzine/89-route-des-grandes-alpes/3927142"
\ No newline at end of file
+street: Route des Grandes Alpes
+housenumber: "89"
+phone: +33 4 50 75 76 26
+opening_hours: Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: https://www.gitem.fr/nos-magasins.html/l/morzine/89-route-des-grandes-alpes/3927142
diff --git a/data/cities/morzine/go-sport.yml b/data/cities/morzine/go-sport.yml
index 95e00e9b7..a89825d86 100644
--- a/data/cities/morzine/go-sport.yml
+++ b/data/cities/morzine/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.18092
 longitude: 6.70526
 postcode: "74110"
 city: Morzine
-street: "Rond Point de la Cruzaz"
-housenumber: 3
+street: Rond Point de la Cruzaz
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/morzine/hydro-mecalpes.yml b/data/cities/morzine/hydro-mecalpes.yml
index 4b9e680e1..85bd0ee39 100644
--- a/data/cities/morzine/hydro-mecalpes.yml
+++ b/data/cities/morzine/hydro-mecalpes.yml
@@ -1,11 +1,11 @@
 id: 225315331
-type: way
+type: node
 latitude: 46.19398
 longitude: 6.68137
 postcode: "74110"
 city: Morzine
-street: "Route d'Essert-Romand"
-housenumber: 364
+street: Route d'Essert-Romand
+housenumber: "364"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/imagine.yml b/data/cities/morzine/imagine.yml
index 59e66e2ac..d78c0be83 100644
--- a/data/cities/morzine/imagine.yml
+++ b/data/cities/morzine/imagine.yml
@@ -4,8 +4,8 @@ latitude: 46.18119
 longitude: 6.7047
 postcode: "74110"
 city: Morzine
-street: "Place de l'Office de Tourisme"
-housenumber: 7
+street: Place de l'Office de Tourisme
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/intersport-avenue-de-joux-plane.yml b/data/cities/morzine/intersport-avenue-de-joux-plane.yml
index 594b26f0c..89acd637c 100644
--- a/data/cities/morzine/intersport-avenue-de-joux-plane.yml
+++ b/data/cities/morzine/intersport-avenue-de-joux-plane.yml
@@ -4,8 +4,8 @@ latitude: 46.17945
 longitude: 6.70406
 postcode: "74110"
 city: Morzine
-street: "Avenue de Joux Plane"
-housenumber: 614
+street: Avenue de Joux Plane
+housenumber: "614"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/intersport-chemin-de-la-fruitiere.yml b/data/cities/morzine/intersport-chemin-de-la-fruitiere.yml
index 00170d3ad..7ea45ecfd 100644
--- a/data/cities/morzine/intersport-chemin-de-la-fruitiere.yml
+++ b/data/cities/morzine/intersport-chemin-de-la-fruitiere.yml
@@ -4,8 +4,8 @@ latitude: 46.17946
 longitude: 6.7063
 postcode: "74110"
 city: Morzine
-street: "Chemin de la Fruitière"
-housenumber: 184
+street: Chemin de la Fruitière
+housenumber: "184"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/intersport-place-des-ruches.yml b/data/cities/morzine/intersport-place-des-ruches.yml
index 07cf7eecf..845a407bd 100644
--- a/data/cities/morzine/intersport-place-des-ruches.yml
+++ b/data/cities/morzine/intersport-place-des-ruches.yml
@@ -4,8 +4,8 @@ latitude: 46.18972
 longitude: 6.77727
 postcode: "74110"
 city: Morzine
-street: "Place des Ruches"
-housenumber: 
+street: Place des Ruches
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/morzine/intersport-promenade-du-festival.yml b/data/cities/morzine/intersport-promenade-du-festival.yml
index 1b9659170..4fe298b9b 100644
--- a/data/cities/morzine/intersport-promenade-du-festival.yml
+++ b/data/cities/morzine/intersport-promenade-du-festival.yml
@@ -4,8 +4,8 @@ latitude: 46.1923
 longitude: 6.77554
 postcode: "74110"
 city: Morzine
-street: "Promenade du Festival"
-housenumber: 7
+street: Promenade du Festival
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/intersport-taille-de-mas-de-la-passerelle.yml b/data/cities/morzine/intersport-taille-de-mas-de-la-passerelle.yml
index 7162f45c6..e87fe0973 100644
--- a/data/cities/morzine/intersport-taille-de-mas-de-la-passerelle.yml
+++ b/data/cities/morzine/intersport-taille-de-mas-de-la-passerelle.yml
@@ -4,8 +4,8 @@ latitude: 46.18333
 longitude: 6.70329
 postcode: "74110"
 city: Morzine
-street: "Taille de Mas de la Passerelle"
-housenumber: 9
+street: Taille de Mas de la Passerelle
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/intersport.yml b/data/cities/morzine/intersport.yml
index bf616e476..37e60e61c 100644
--- a/data/cities/morzine/intersport.yml
+++ b/data/cities/morzine/intersport.yml
@@ -4,8 +4,8 @@ latitude: 46.19242
 longitude: 6.77485
 postcode: "74110"
 city: Morzine
-street: "Promenade du Festival"
-housenumber: 1
+street: Promenade du Festival
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/morzine/la-bomboniere.yml b/data/cities/morzine/la-bomboniere.yml
index 830a9d808..372c6de22 100644
--- a/data/cities/morzine/la-bomboniere.yml
+++ b/data/cities/morzine/la-bomboniere.yml
@@ -4,8 +4,8 @@ latitude: 46.18227
 longitude: 6.70285
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 129
+street: Route de la Plagne
+housenumber: "129"
 phone: ""
-opening_hours: "Mo-Tu,Th-Su 06:30-13:00, 15:30-19:00; We off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Su 06:30-13:00, 15:30-19:00; We off
+website: ""
diff --git a/data/cities/morzine/la-capitale.yml b/data/cities/morzine/la-capitale.yml
index fce7c0879..b3026903e 100644
--- a/data/cities/morzine/la-capitale.yml
+++ b/data/cities/morzine/la-capitale.yml
@@ -4,8 +4,8 @@ latitude: 46.18137
 longitude: 6.70466
 postcode: "74110"
 city: Morzine
-street: "Place de l'Office de Tourisme"
-housenumber: 18
+street: Place de l'Office de Tourisme
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/la-ferme-de-serraussaix.yml b/data/cities/morzine/la-ferme-de-serraussaix.yml
index e3db58f15..d5752630c 100644
--- a/data/cities/morzine/la-ferme-de-serraussaix.yml
+++ b/data/cities/morzine/la-ferme-de-serraussaix.yml
@@ -1,11 +1,11 @@
 id: 225316569
-type: way
+type: node
 latitude: 46.19785
 longitude: 6.74511
 postcode: "74110"
 city: Morzine
-street: "Route d'Avoriaz"
-housenumber: 9609
+street: Route d'Avoriaz
+housenumber: "9609"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/la-lunetterie.yml b/data/cities/morzine/la-lunetterie.yml
index 559da3129..2b9a2c90a 100644
--- a/data/cities/morzine/la-lunetterie.yml
+++ b/data/cities/morzine/la-lunetterie.yml
@@ -4,8 +4,8 @@ latitude: 46.18191
 longitude: 6.70333
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 73
+street: Route de la Plagne
+housenumber: "73"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/le-panier-montagnard.yml b/data/cities/morzine/le-panier-montagnard.yml
index 3fee322e3..a7834aa3d 100644
--- a/data/cities/morzine/le-panier-montagnard.yml
+++ b/data/cities/morzine/le-panier-montagnard.yml
@@ -4,8 +4,8 @@ latitude: 46.18204
 longitude: 6.70313
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 93
+street: Route de la Plagne
+housenumber: "93"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/les-planches.yml b/data/cities/morzine/les-planches.yml
index 015d25f49..edef10d35 100644
--- a/data/cities/morzine/les-planches.yml
+++ b/data/cities/morzine/les-planches.yml
@@ -4,8 +4,8 @@ latitude: 46.18178
 longitude: 6.70351
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 43
+street: Route de la Plagne
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/lolympique.yml b/data/cities/morzine/lolympique.yml
index 631cb3a7b..885c21630 100644
--- a/data/cities/morzine/lolympique.yml
+++ b/data/cities/morzine/lolympique.yml
@@ -4,8 +4,8 @@ latitude: 46.17957
 longitude: 6.70388
 postcode: "74110"
 city: Morzine
-street: "Avenue de Joux Plane"
-housenumber: 614
+street: Avenue de Joux Plane
+housenumber: "614"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/maison-tavernier.yml b/data/cities/morzine/maison-tavernier.yml
index 1d3db5c64..70d43a3d9 100644
--- a/data/cities/morzine/maison-tavernier.yml
+++ b/data/cities/morzine/maison-tavernier.yml
@@ -4,8 +4,8 @@ latitude: 46.19198
 longitude: 6.77121
 postcode: "74110"
 city: Morzine
-street: "Rue du Douchka"
-housenumber: 
-phone: "+33 4 50 79 04 62"
+street: Rue du Douchka
+housenumber: ""
+phone: +33 4 50 79 04 62
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/mechoud.yml b/data/cities/morzine/mechoud.yml
index 6c79c0845..a825ad64b 100644
--- a/data/cities/morzine/mechoud.yml
+++ b/data/cities/morzine/mechoud.yml
@@ -4,8 +4,8 @@ latitude: 46.18069
 longitude: 6.70548
 postcode: "74110"
 city: Morzine
-street: "Rue du Bourg"
-housenumber: 349
-phone: "+33 4 50 79 14 40"
-opening_hours: "Mo-Sa 08:30-12:00,14:30-19:00"
-website: "http://www.mechoud.fr/"
\ No newline at end of file
+street: Rue du Bourg
+housenumber: "349"
+phone: +33 4 50 79 14 40
+opening_hours: Mo-Sa 08:30-12:00,14:30-19:00
+website: http://www.mechoud.fr/
diff --git a/data/cities/morzine/mountain-company.yml b/data/cities/morzine/mountain-company.yml
index 3b3fd67b5..95ea18a15 100644
--- a/data/cities/morzine/mountain-company.yml
+++ b/data/cities/morzine/mountain-company.yml
@@ -4,8 +4,8 @@ latitude: 46.18121
 longitude: 6.7046
 postcode: "74110"
 city: Morzine
-street: "Place de l'Office de Tourisme"
-housenumber: 15
+street: Place de l'Office de Tourisme
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/nature-et-compagnie.yml b/data/cities/morzine/nature-et-compagnie.yml
index 792640dec..4936cbf9d 100644
--- a/data/cities/morzine/nature-et-compagnie.yml
+++ b/data/cities/morzine/nature-et-compagnie.yml
@@ -4,8 +4,8 @@ latitude: 46.18172
 longitude: 6.7036
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 43
+street: Route de la Plagne
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/nicolas-ski.yml b/data/cities/morzine/nicolas-ski.yml
index a91baefb0..c898ac1bd 100644
--- a/data/cities/morzine/nicolas-ski.yml
+++ b/data/cities/morzine/nicolas-ski.yml
@@ -1,11 +1,11 @@
 id: 225315524
-type: way
+type: node
 latitude: 46.17852
 longitude: 6.70555
 postcode: "74110"
 city: Morzine
-street: "Avenue de Joux Plane"
-housenumber: 452
+street: Avenue de Joux Plane
+housenumber: "452"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/pisciculture-des-meuniers.yml b/data/cities/morzine/pisciculture-des-meuniers.yml
index caeec9097..0b05ba991 100644
--- a/data/cities/morzine/pisciculture-des-meuniers.yml
+++ b/data/cities/morzine/pisciculture-des-meuniers.yml
@@ -1,11 +1,11 @@
 id: 1280567989
-type: way
+type: node
 latitude: 46.18275
 longitude: 6.72693
 postcode: "74110"
 city: Morzine
-street: "Route des Ardoisières"
+street: Route des Ardoisières
 housenumber: 567 B
 phone: ""
-opening_hours: "Mo-Sa 10:00-12:00, 16:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-12:00, 16:00-19:00; Su off
+website: ""
diff --git a/data/cities/morzine/pleney-sport.yml b/data/cities/morzine/pleney-sport.yml
index 9aa595e8d..f2dd4327c 100644
--- a/data/cities/morzine/pleney-sport.yml
+++ b/data/cities/morzine/pleney-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.18048
 longitude: 6.70239
 postcode: "74110"
 city: Morzine
-street: "Taille de Mas du Pleney"
-housenumber: 107
+street: Taille de Mas du Pleney
+housenumber: "107"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/sherpa-passage-malinka.yml b/data/cities/morzine/sherpa-passage-malinka.yml
index c975d941b..ca237c5fb 100644
--- a/data/cities/morzine/sherpa-passage-malinka.yml
+++ b/data/cities/morzine/sherpa-passage-malinka.yml
@@ -1,11 +1,12 @@
 id: 225313399
-type: way
+type: node
 latitude: 46.19249
 longitude: 6.77105
 postcode: "74110"
 city: Morzine
-street: "Passage Malinka"
-housenumber: 103
+street: Passage Malinka
+housenumber: "103"
 phone: ""
-opening_hours: "Dec 03-Mar 31 Mo-Su 08:00-20:30; Jul 03-Aug 26 Mo-Fr,Su 08:00-20:00, Sa 08:00-20:30"
-website: ""
\ No newline at end of file
+opening_hours: Dec 03-Mar 31 Mo-Su 08:00-20:30; Jul 03-Aug 26 Mo-Fr,Su 08:00-20:00,
+    Sa 08:00-20:30
+website: ""
diff --git a/data/cities/morzine/sherpa-route-de-la-plagne.yml b/data/cities/morzine/sherpa-route-de-la-plagne.yml
index 6967b52f4..93cd742ba 100644
--- a/data/cities/morzine/sherpa-route-de-la-plagne.yml
+++ b/data/cities/morzine/sherpa-route-de-la-plagne.yml
@@ -4,8 +4,8 @@ latitude: 46.18477
 longitude: 6.6986
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 535
+street: Route de la Plagne
+housenumber: "535"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:30, 15:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30, 15:00-19:00; Su off
+website: ""
diff --git a/data/cities/morzine/sherpa.yml b/data/cities/morzine/sherpa.yml
index b94b8888f..75609baf2 100644
--- a/data/cities/morzine/sherpa.yml
+++ b/data/cities/morzine/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 46.19065
 longitude: 6.7777
 postcode: "74110"
 city: Morzine
-street: "Place du Snow"
-housenumber: 61
+street: Place du Snow
+housenumber: "61"
 phone: ""
-opening_hours: "Dec 03-Apr 26 Mo-Su 08:00-20:30; Jun 19-Sep 01 Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Dec 03-Apr 26 Mo-Su 08:00-20:30; Jun 19-Sep 01 Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/morzine/skiset-caribou-sport.yml b/data/cities/morzine/skiset-caribou-sport.yml
index 5e2adf8ab..650033a8e 100644
--- a/data/cities/morzine/skiset-caribou-sport.yml
+++ b/data/cities/morzine/skiset-caribou-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.18121
 longitude: 6.70213
 postcode: "74110"
 city: Morzine
-street: "Route de la Combe à Zore"
-housenumber: 95
+street: Route de la Combe à Zore
+housenumber: "95"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/spar.yml b/data/cities/morzine/spar.yml
index ef4aff035..6d9147f3d 100644
--- a/data/cities/morzine/spar.yml
+++ b/data/cities/morzine/spar.yml
@@ -4,8 +4,8 @@ latitude: 46.18226
 longitude: 6.70316
 postcode: "74110"
 city: Morzine
-street: "Route de la Plagne"
-housenumber: 106
+street: Route de la Plagne
+housenumber: "106"
 phone: ""
-opening_hours: "07:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: 07:00-19:30
+website: ""
diff --git a/data/cities/morzine/sport-2000.yml b/data/cities/morzine/sport-2000.yml
index 547b5d64d..b68ac533f 100644
--- a/data/cities/morzine/sport-2000.yml
+++ b/data/cities/morzine/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.18089
 longitude: 6.70274
 postcode: "74110"
 city: Morzine
-street: "Taille de Mas du Pleney"
-housenumber: 
+street: Taille de Mas du Pleney
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/the-tasty-ski-company.yml b/data/cities/morzine/the-tasty-ski-company.yml
index 3419cb983..dace8f222 100644
--- a/data/cities/morzine/the-tasty-ski-company.yml
+++ b/data/cities/morzine/the-tasty-ski-company.yml
@@ -1,11 +1,11 @@
 id: 225312989
-type: way
+type: node
 latitude: 46.18029
 longitude: 6.70517
 postcode: "74110"
 city: Morzine
-street: "Chemin de la Coutettaz"
-housenumber: 84
+street: Chemin de la Coutettaz
+housenumber: "84"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/morzine/voiron-materiaux.yml b/data/cities/morzine/voiron-materiaux.yml
index aff025ded..b465948d6 100644
--- a/data/cities/morzine/voiron-materiaux.yml
+++ b/data/cities/morzine/voiron-materiaux.yml
@@ -4,8 +4,8 @@ latitude: 46.19739
 longitude: 6.68139
 postcode: "74110"
 city: Morzine
-street: "Route des Grandes Alpes"
-housenumber: 232
+street: Route des Grandes Alpes
+housenumber: "232"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moutiers/bijouterie-laurent.yml b/data/cities/moutiers/bijouterie-laurent.yml
index 7d981049d..50f384e67 100644
--- a/data/cities/moutiers/bijouterie-laurent.yml
+++ b/data/cities/moutiers/bijouterie-laurent.yml
@@ -4,8 +4,8 @@ latitude: 45.48479
 longitude: 6.53154
 postcode: "73600"
 city: Moûtiers
-street: "Square de la Liberté"
-housenumber: 58
+street: Square de la Liberté
+housenumber: "58"
 phone: ""
 opening_hours: ""
-website: "https://www.bijouterie-laurent.fr/"
\ No newline at end of file
+website: https://www.bijouterie-laurent.fr/
diff --git a/data/cities/moutiers/carrefour.yml b/data/cities/moutiers/carrefour.yml
index c5b1720de..4e18b15c6 100644
--- a/data/cities/moutiers/carrefour.yml
+++ b/data/cities/moutiers/carrefour.yml
@@ -4,8 +4,8 @@ latitude: 45.48584
 longitude: 6.52624
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Salines Royales"
-housenumber: 
+street: Avenue des Salines Royales
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moutiers/cooperative-laitiere-de-la-region-de-moutiers.yml b/data/cities/moutiers/cooperative-laitiere-de-la-region-de-moutiers.yml
index 7cfd9af79..b9bbb5dde 100644
--- a/data/cities/moutiers/cooperative-laitiere-de-la-region-de-moutiers.yml
+++ b/data/cities/moutiers/cooperative-laitiere-de-la-region-de-moutiers.yml
@@ -1,11 +1,11 @@
 id: 68633308
-type: way
+type: node
 latitude: 45.48632
 longitude: 6.53327
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Seizième Jeux Olympiques"
-housenumber: 20
-phone: "+33 4 79 24 03 65"
-opening_hours: "Mo-Sa 08:30-12:30,14:00-18:30"
-website: "https://www.beaufortdesmontagnes.com/"
\ No newline at end of file
+street: Avenue des Seizième Jeux Olympiques
+housenumber: "20"
+phone: +33 4 79 24 03 65
+opening_hours: Mo-Sa 08:30-12:30,14:00-18:30
+website: https://www.beaufortdesmontagnes.com/
diff --git a/data/cities/moutiers/cote-fleurs.yml b/data/cities/moutiers/cote-fleurs.yml
index fe1d480ba..8c98dd802 100644
--- a/data/cities/moutiers/cote-fleurs.yml
+++ b/data/cities/moutiers/cote-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.48583
 longitude: 6.52581
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Salines Royales"
-housenumber: 
+street: Avenue des Salines Royales
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moutiers/delapierre.yml b/data/cities/moutiers/delapierre.yml
index c84162893..7c93fa913 100644
--- a/data/cities/moutiers/delapierre.yml
+++ b/data/cities/moutiers/delapierre.yml
@@ -4,8 +4,8 @@ latitude: 45.48438
 longitude: 6.53208
 postcode: "73600"
 city: Moûtiers
-street: "Rue Cardinale"
-housenumber: 66
+street: Rue Cardinale
+housenumber: "66"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-17:00
+website: ""
diff --git a/data/cities/moutiers/dietetique-promovert-biomonde.yml b/data/cities/moutiers/dietetique-promovert-biomonde.yml
index 6734d0a76..ac54bdc45 100644
--- a/data/cities/moutiers/dietetique-promovert-biomonde.yml
+++ b/data/cities/moutiers/dietetique-promovert-biomonde.yml
@@ -4,8 +4,8 @@ latitude: 45.48388
 longitude: 6.53204
 postcode: "73600"
 city: Moûtiers
-street: "Grande Rue"
-housenumber: 132
+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
+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/
diff --git a/data/cities/moutiers/julien-dorcel.yml b/data/cities/moutiers/julien-dorcel.yml
index f4c1c201b..f58694df0 100644
--- a/data/cities/moutiers/julien-dorcel.yml
+++ b/data/cities/moutiers/julien-dorcel.yml
@@ -4,8 +4,8 @@ latitude: 45.48599
 longitude: 6.52589
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Salines Royales"
-housenumber: 
+street: Avenue des Salines Royales
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.juliendorcel.com/bijouterie/moutiers-1661M"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.juliendorcel.com/bijouterie/moutiers-1661M
diff --git a/data/cities/moutiers/le-chas-de-laiguille.yml b/data/cities/moutiers/le-chas-de-laiguille.yml
index 5dd53b5a2..3dad802d3 100644
--- a/data/cities/moutiers/le-chas-de-laiguille.yml
+++ b/data/cities/moutiers/le-chas-de-laiguille.yml
@@ -4,8 +4,8 @@ latitude: 45.48428
 longitude: 6.53132
 postcode: "73600"
 city: Moûtiers
-street: "Grande Rue"
-housenumber: 54
-phone: "+33 9 52 21 02 41"
-opening_hours: "Tu,Fr 09:00-12:30,13:30-18:30; We,Th 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "54"
+phone: +33 9 52 21 02 41
+opening_hours: Tu,Fr 09:00-12:30,13:30-18:30; We,Th 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/moutiers/lopticien-de-la-galerie.yml b/data/cities/moutiers/lopticien-de-la-galerie.yml
index b2d4a06ee..87f0a4a85 100644
--- a/data/cities/moutiers/lopticien-de-la-galerie.yml
+++ b/data/cities/moutiers/lopticien-de-la-galerie.yml
@@ -4,8 +4,8 @@ latitude: 45.48575
 longitude: 6.52577
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Salines Royales"
-housenumber: 
+street: Avenue des Salines Royales
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-13:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-13:00,14:00-19:00
+website: ""
diff --git a/data/cities/moutiers/magpresse.yml b/data/cities/moutiers/magpresse.yml
index 2d0efbeb0..fdfab9e6c 100644
--- a/data/cities/moutiers/magpresse.yml
+++ b/data/cities/moutiers/magpresse.yml
@@ -4,8 +4,8 @@ latitude: 45.48608
 longitude: 6.52594
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Salines Royales"
-housenumber: 
+street: Avenue des Salines Royales
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/moutiers/pat-a-tric.yml b/data/cities/moutiers/pat-a-tric.yml
index afb891492..06a9fab89 100644
--- a/data/cities/moutiers/pat-a-tric.yml
+++ b/data/cities/moutiers/pat-a-tric.yml
@@ -4,8 +4,8 @@ latitude: 45.48404
 longitude: 6.53177
 postcode: "73600"
 city: Moûtiers
-street: "Grande Rue"
-housenumber: 102
+street: Grande Rue
+housenumber: "102"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/moutiers/sergent.yml b/data/cities/moutiers/sergent.yml
index f9a380fd7..89e6ca7b4 100644
--- a/data/cities/moutiers/sergent.yml
+++ b/data/cities/moutiers/sergent.yml
@@ -4,8 +4,8 @@ latitude: 45.48455
 longitude: 6.53104
 postcode: "73600"
 city: Moûtiers
-street: "Grande Rue"
-housenumber: 17
+street: Grande Rue
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/moutiers/styleup.yml b/data/cities/moutiers/styleup.yml
index 493d9ecd6..60682d208 100644
--- a/data/cities/moutiers/styleup.yml
+++ b/data/cities/moutiers/styleup.yml
@@ -4,8 +4,8 @@ latitude: 45.48628
 longitude: 6.52604
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Salines Royales"
-housenumber: 
-phone: "+33 9 86 21 95 53"
-opening_hours: "Mo-Fr 09:00-18:30; Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+street: Avenue des Salines Royales
+housenumber: ""
+phone: +33 9 86 21 95 53
+opening_hours: Mo-Fr 09:00-18:30; Sa 09:00-19:30
+website: ""
diff --git a/data/cities/moutiers/top-pressing.yml b/data/cities/moutiers/top-pressing.yml
index 7ea1083ef..ba0175fc6 100644
--- a/data/cities/moutiers/top-pressing.yml
+++ b/data/cities/moutiers/top-pressing.yml
@@ -4,8 +4,8 @@ latitude: 45.48565
 longitude: 6.52571
 postcode: "73600"
 city: Moûtiers
-street: "Avenue des Salines Royales"
-housenumber: 
+street: Avenue des Salines Royales
+housenumber: ""
 phone: ""
-opening_hours: "Mo,We-Sa 09:00-13:00,13:30-19:00; Tu 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,We-Sa 09:00-13:00,13:30-19:00; Tu 09:00-19:00
+website: ""
diff --git a/data/cities/moutiers/weldom.yml b/data/cities/moutiers/weldom.yml
index a2a1194e4..61eb7325f 100644
--- a/data/cities/moutiers/weldom.yml
+++ b/data/cities/moutiers/weldom.yml
@@ -1,11 +1,11 @@
 id: 669758991
-type: way
+type: node
 latitude: 45.4862
 longitude: 6.52429
 postcode: "73600"
 city: Moûtiers
-street: "Rue des Érables"
-housenumber: 
-phone: "+33 4 79 24 44 89"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue des Érables
+housenumber: ""
+phone: +33 4 79 24 44 89
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/moye/garage-morel.yml b/data/cities/moye/garage-morel.yml
index 940a355f4..50a40a026 100644
--- a/data/cities/moye/garage-morel.yml
+++ b/data/cities/moye/garage-morel.yml
@@ -4,8 +4,8 @@ latitude: 45.88023
 longitude: 5.90795
 postcode: "74150"
 city: Moye
-street: "Route du Clergeon"
-housenumber: 2357
-phone: "+33 6 29 49 21 63"
+street: Route du Clergeon
+housenumber: "2357"
+phone: +33 6 29 49 21 63
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/musieges/cyclone.yml b/data/cities/musieges/cyclone.yml
index a1a9ab604..4b0a7a5dd 100644
--- a/data/cities/musieges/cyclone.yml
+++ b/data/cities/musieges/cyclone.yml
@@ -1,11 +1,11 @@
 id: 315542662
-type: way
+type: node
 latitude: 46.01259
 longitude: 5.94781
 postcode: "74270"
 city: Musièges
-street: "Allée de la Zone des Bonnets"
-housenumber: 538
-phone: "+33 4 50 32 27 15"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+street: Allée de la Zone des Bonnets
+housenumber: "538"
+phone: +33 4 50 32 27 15
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/nangy/autem.yml b/data/cities/nangy/autem.yml
index 7d24a6143..d39fc85f7 100644
--- a/data/cities/nangy/autem.yml
+++ b/data/cities/nangy/autem.yml
@@ -1,11 +1,11 @@
 id: 155220833
-type: way
+type: node
 latitude: 46.14481
 longitude: 6.31825
 postcode: ""
 city: Nangy
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/nangy/maison-janin.yml b/data/cities/nangy/maison-janin.yml
index aa465c37c..6f3c97e23 100644
--- a/data/cities/nangy/maison-janin.yml
+++ b/data/cities/nangy/maison-janin.yml
@@ -4,8 +4,8 @@ latitude: 46.15436
 longitude: 6.30377
 postcode: "74380"
 city: Nangy
-street: "Route d'Annemasse"
-housenumber: 151
+street: Route d'Annemasse
+housenumber: "151"
 phone: ""
-opening_hours: "Mo-Sa 05:30-19:00; Su 05:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 05:30-19:00; Su 05:30-13:00
+website: ""
diff --git a/data/cities/nantua/au-clos-fleuri.yml b/data/cities/nantua/au-clos-fleuri.yml
index 226790ffa..d4d583041 100644
--- a/data/cities/nantua/au-clos-fleuri.yml
+++ b/data/cities/nantua/au-clos-fleuri.yml
@@ -4,8 +4,8 @@ latitude: 46.15271
 longitude: 5.6075
 postcode: "01130"
 city: Nantua
-street: "Rue du Collège"
-housenumber: 49
+street: Rue du Collège
+housenumber: "49"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/nantua/audio.yml b/data/cities/nantua/audio.yml
index e80788230..e354b397d 100644
--- a/data/cities/nantua/audio.yml
+++ b/data/cities/nantua/audio.yml
@@ -4,8 +4,8 @@ latitude: 46.15431
 longitude: 5.60575
 postcode: "01130"
 city: Nantua
-street: "Rue de l'Hôtel de Ville"
-housenumber: 34
-phone: "+33 4 74 75 24 73"
-opening_hours: "Th 14:00-17:30"
-website: ""
\ No newline at end of file
+street: Rue de l'Hôtel de Ville
+housenumber: "34"
+phone: +33 4 74 75 24 73
+opening_hours: Th 14:00-17:30
+website: ""
diff --git a/data/cities/nantua/aux-couleurs-dharmonie.yml b/data/cities/nantua/aux-couleurs-dharmonie.yml
index 26a543e8c..c5019b1a4 100644
--- a/data/cities/nantua/aux-couleurs-dharmonie.yml
+++ b/data/cities/nantua/aux-couleurs-dharmonie.yml
@@ -4,8 +4,8 @@ latitude: 46.15437
 longitude: 5.60594
 postcode: "01130"
 city: Nantua
-street: "Rue de l'Hôtel de Ville"
-housenumber: 33
-phone: "+33 9 82 36 82 09"
-opening_hours: "Tu-Th 09:00-18:00; Fr 09:00-18:30; Sa 09:00-13:30"
-website: ""
\ No newline at end of file
+street: Rue de l'Hôtel de Ville
+housenumber: "33"
+phone: +33 9 82 36 82 09
+opening_hours: Tu-Th 09:00-18:00; Fr 09:00-18:30; Sa 09:00-13:30
+website: ""
diff --git a/data/cities/nantua/chez-charlotte.yml b/data/cities/nantua/chez-charlotte.yml
index bd65a9b35..2e8ba9258 100644
--- a/data/cities/nantua/chez-charlotte.yml
+++ b/data/cities/nantua/chez-charlotte.yml
@@ -4,8 +4,8 @@ latitude: 46.15413
 longitude: 5.60587
 postcode: "01130"
 city: Nantua
-street: "Rue de l'Hôtel de Ville"
-housenumber: 
+street: Rue de l'Hôtel de Ville
+housenumber: ""
 phone: ""
-opening_hours: "Tu-We, Fr-Sa 09:30-12:30, 15:00-18:30; Th 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-We, Fr-Sa 09:30-12:30, 15:00-18:30; Th 09:30-12:30
+website: ""
diff --git a/data/cities/nantua/eroglu-pneus.yml b/data/cities/nantua/eroglu-pneus.yml
index a1bc1922d..280d7396f 100644
--- a/data/cities/nantua/eroglu-pneus.yml
+++ b/data/cities/nantua/eroglu-pneus.yml
@@ -1,11 +1,11 @@
 id: 138473277
-type: way
+type: node
 latitude: 46.14089
 longitude: 5.62334
 postcode: "01130"
 city: Nantua
-street: "Rue des Battoirs"
-housenumber: 21
+street: Rue des Battoirs
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/nantua/latelier.yml b/data/cities/nantua/latelier.yml
index 0e77e40ee..fadb9b5a6 100644
--- a/data/cities/nantua/latelier.yml
+++ b/data/cities/nantua/latelier.yml
@@ -1,11 +1,11 @@
 id: 138475818
-type: way
+type: node
 latitude: 46.15333
 longitude: 5.60512
 postcode: "01130"
 city: Nantua
-street: "Rue Docteur Mercier"
-housenumber: 46
+street: Rue Docteur Mercier
+housenumber: "46"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/nantua/le-ptit-st-martin.yml b/data/cities/nantua/le-ptit-st-martin.yml
index ba02b9c92..2d0d025b9 100644
--- a/data/cities/nantua/le-ptit-st-martin.yml
+++ b/data/cities/nantua/le-ptit-st-martin.yml
@@ -4,8 +4,8 @@ latitude: 46.15437
 longitude: 5.60571
 postcode: "01130"
 city: Nantua
-street: "Rue de l'Hôtel de Ville"
-housenumber: 
+street: Rue de l'Hôtel de Ville
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-13:00
+website: ""
diff --git a/data/cities/nantua/letoile-primeur.yml b/data/cities/nantua/letoile-primeur.yml
index 7ab8b64cc..0da4e6da6 100644
--- a/data/cities/nantua/letoile-primeur.yml
+++ b/data/cities/nantua/letoile-primeur.yml
@@ -4,8 +4,8 @@ latitude: 46.15532
 longitude: 5.60543
 postcode: "01130"
 city: Nantua
-street: "Rue de l'Hôtel de Ville"
-housenumber: 4
+street: Rue de l'Hôtel de Ville
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/nantua/pfg.yml b/data/cities/nantua/pfg.yml
index e69464177..5422feb78 100644
--- a/data/cities/nantua/pfg.yml
+++ b/data/cities/nantua/pfg.yml
@@ -4,8 +4,8 @@ latitude: 46.15466
 longitude: 5.60579
 postcode: "01130"
 city: Nantua
-street: "Rue de l'Hôtel de Ville"
-housenumber: 21
+street: Rue de l'Hôtel de Ville
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/nantua/vival.yml b/data/cities/nantua/vival.yml
index b83cfbef9..b10accd48 100644
--- a/data/cities/nantua/vival.yml
+++ b/data/cities/nantua/vival.yml
@@ -1,11 +1,11 @@
 id: 138475917
-type: way
+type: node
 latitude: 46.15184
 longitude: 5.60691
 postcode: "01130"
 city: Nantua
-street: "Rue Paul Painlevé"
-housenumber: 4
-phone: "+33 4 74 75 56 21"
-opening_hours: "Mo-Sa 08:00-12:30, 14:30-19:30; Su 09:00-12:00"
-website: "https://magasins.vival.fr/fr/s/vival-nantua"
\ No newline at end of file
+street: Rue Paul Painlevé
+housenumber: "4"
+phone: +33 4 74 75 56 21
+opening_hours: Mo-Sa 08:00-12:30, 14:30-19:30; Su 09:00-12:00
+website: https://magasins.vival.fr/fr/s/vival-nantua
diff --git a/data/cities/neuvecelle/lorchidee.yml b/data/cities/neuvecelle/lorchidee.yml
index 0328c469f..54d0a9284 100644
--- a/data/cities/neuvecelle/lorchidee.yml
+++ b/data/cities/neuvecelle/lorchidee.yml
@@ -1,11 +1,11 @@
 id: 66969934
-type: way
+type: node
 latitude: 46.39897
 longitude: 6.60998
 postcode: "74500"
 city: Neuvecelle
-street: "Avenue d'Abondance"
-housenumber: 1259
+street: Avenue d'Abondance
+housenumber: "1259"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/neuville-sur-ain/intermarche-contact.yml b/data/cities/neuville-sur-ain/intermarche-contact.yml
index b0968dcc9..9fd5b8b94 100644
--- a/data/cities/neuville-sur-ain/intermarche-contact.yml
+++ b/data/cities/neuville-sur-ain/intermarche-contact.yml
@@ -1,11 +1,11 @@
 id: 661096824
-type: way
+type: node
 latitude: 46.07366
 longitude: 5.37674
 postcode: "01160"
 city: Neuville-sur-Ain
-street: "Rue du Docteur Hubert"
-housenumber: 547
+street: Rue du Docteur Hubert
+housenumber: "547"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:15; Su 09:00-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:15; Su 09:00-12:15
+website: ""
diff --git a/data/cities/neuville-sur-saone/cellier-neuvillois.yml b/data/cities/neuville-sur-saone/cellier-neuvillois.yml
index bc2f76c01..481d95d5a 100644
--- a/data/cities/neuville-sur-saone/cellier-neuvillois.yml
+++ b/data/cities/neuville-sur-saone/cellier-neuvillois.yml
@@ -4,8 +4,8 @@ latitude: 45.87662
 longitude: 4.84439
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Rue Pollet"
-housenumber: 3
+street: Rue Pollet
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: "https://cellierneuvillois.fr/"
\ No newline at end of file
+website: https://cellierneuvillois.fr/
diff --git a/data/cities/neuville-sur-saone/in-coiff.yml b/data/cities/neuville-sur-saone/in-coiff.yml
index 577ec5092..3b37d6f30 100644
--- a/data/cities/neuville-sur-saone/in-coiff.yml
+++ b/data/cities/neuville-sur-saone/in-coiff.yml
@@ -4,8 +4,8 @@ latitude: 45.87526
 longitude: 4.83903
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Rue Pierre Dugelay"
-housenumber: 1
+street: Rue Pierre Dugelay
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/neuville-sur-saone/la-maison-jaune.yml b/data/cities/neuville-sur-saone/la-maison-jaune.yml
index dcb1ab3f5..7c4a29ef3 100644
--- a/data/cities/neuville-sur-saone/la-maison-jaune.yml
+++ b/data/cities/neuville-sur-saone/la-maison-jaune.yml
@@ -4,8 +4,8 @@ latitude: 45.87532
 longitude: 4.84
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Rue de la République"
-housenumber: 36
+street: Rue de la République
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/neuville-sur-saone/le-fournil-neuvillois.yml b/data/cities/neuville-sur-saone/le-fournil-neuvillois.yml
index ce08b2061..93fae786d 100644
--- a/data/cities/neuville-sur-saone/le-fournil-neuvillois.yml
+++ b/data/cities/neuville-sur-saone/le-fournil-neuvillois.yml
@@ -4,8 +4,8 @@ latitude: 45.87633
 longitude: 4.83955
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Place Ampère"
-housenumber: 12
+street: Place Ampère
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:00
+website: ""
diff --git a/data/cities/neuville-sur-saone/le-salon-de-mickael.yml b/data/cities/neuville-sur-saone/le-salon-de-mickael.yml
index 5b3d1ece9..d151f164b 100644
--- a/data/cities/neuville-sur-saone/le-salon-de-mickael.yml
+++ b/data/cities/neuville-sur-saone/le-salon-de-mickael.yml
@@ -4,8 +4,8 @@ latitude: 45.87521
 longitude: 4.8402
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Rue de la République"
-housenumber: 51
+street: Rue de la République
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/neuville-sur-saone/lepi-fleurie.yml b/data/cities/neuville-sur-saone/lepi-fleurie.yml
index 9ab4036cb..db5a326ee 100644
--- a/data/cities/neuville-sur-saone/lepi-fleurie.yml
+++ b/data/cities/neuville-sur-saone/lepi-fleurie.yml
@@ -4,8 +4,8 @@ latitude: 45.8678
 longitude: 4.83984
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Route de Lyon"
-housenumber: 3
+street: Route de Lyon
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Fr 06:00-20:00; Sa 07:00-19:00"
-website: "https://www.bstradition.com/fleurieusursaone"
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-20:00; Sa 07:00-19:00
+website: https://www.bstradition.com/fleurieusursaone
diff --git a/data/cities/neuville-sur-saone/myo-cafe-couture.yml b/data/cities/neuville-sur-saone/myo-cafe-couture.yml
index 7036dd373..a81a16ca7 100644
--- a/data/cities/neuville-sur-saone/myo-cafe-couture.yml
+++ b/data/cities/neuville-sur-saone/myo-cafe-couture.yml
@@ -4,8 +4,8 @@ latitude: 45.87689
 longitude: 4.84109
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Rue Victor Hugo"
-housenumber: 29
-phone: "+33 9 50387210"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-17:00"
-website: "https://www.makeyourown.fr"
\ No newline at end of file
+street: Rue Victor Hugo
+housenumber: "29"
+phone: +33 9 50387210
+opening_hours: Tu-Fr 09:00-12:00,14:00-17:00
+website: https://www.makeyourown.fr
diff --git a/data/cities/neuville-sur-saone/o-lusitano.yml b/data/cities/neuville-sur-saone/o-lusitano.yml
index 16bc8b11d..f011447f5 100644
--- a/data/cities/neuville-sur-saone/o-lusitano.yml
+++ b/data/cities/neuville-sur-saone/o-lusitano.yml
@@ -4,8 +4,8 @@ latitude: 45.88045
 longitude: 4.83468
 postcode: "69250"
 city: Neuville-sur-Saône
-street: "Rue Barrée"
-housenumber: 1
+street: Rue Barrée
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "http://www.o-lusitano69.com/"
\ No newline at end of file
+website: http://www.o-lusitano69.com/
diff --git a/data/cities/neydens/carrosserie-vidal.yml b/data/cities/neydens/carrosserie-vidal.yml
index 0bbfc01ae..bcdfcaeab 100644
--- a/data/cities/neydens/carrosserie-vidal.yml
+++ b/data/cities/neydens/carrosserie-vidal.yml
@@ -4,8 +4,8 @@ latitude: 46.12025
 longitude: 6.09231
 postcode: "74160"
 city: Neydens
-street: "Route de Mouvis"
-housenumber: 204
-phone: "+33 04 50 49 08 47"
-opening_hours: "Mo-Fr 08:00-12:00;13:30-18:00"
-website: ""
\ No newline at end of file
+street: Route de Mouvis
+housenumber: "204"
+phone: +33 04 50 49 08 47
+opening_hours: Mo-Fr 08:00-12:00;13:30-18:00
+website: ""
diff --git a/data/cities/neydens/courir.yml b/data/cities/neydens/courir.yml
index b019cd1b1..50295d8e6 100644
--- a/data/cities/neydens/courir.yml
+++ b/data/cities/neydens/courir.yml
@@ -5,7 +5,7 @@ longitude: 6.09654
 postcode: ""
 city: Neydens
 street: ""
-housenumber: 
-phone: "04 50 49 76 05"
-opening_hours: "Mo-Su 09:30-20:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: 04 50 49 76 05
+opening_hours: Mo-Su 09:30-20:00
+website: ""
diff --git a/data/cities/neydens/cuisinella.yml b/data/cities/neydens/cuisinella.yml
index 0ce49e541..3cdc775e5 100644
--- a/data/cities/neydens/cuisinella.yml
+++ b/data/cities/neydens/cuisinella.yml
@@ -4,8 +4,8 @@ latitude: 46.12359
 longitude: 6.09169
 postcode: "74160"
 city: Neydens
-street: "Rue du Jura"
-housenumber: 
-phone: "+33 4 50 49 24 40"
+street: Rue du Jura
+housenumber: ""
+phone: +33 4 50 49 24 40
 opening_hours: ""
-website: "https://www.ma.cuisinella/fr-fr/magasins/haute-savoie/neydens"
\ No newline at end of file
+website: https://www.ma.cuisinella/fr-fr/magasins/haute-savoie/neydens
diff --git a/data/cities/neydens/darty.yml b/data/cities/neydens/darty.yml
index 7eb6190a5..5f81460fd 100644
--- a/data/cities/neydens/darty.yml
+++ b/data/cities/neydens/darty.yml
@@ -4,8 +4,8 @@ latitude: 46.1208
 longitude: 6.09418
 postcode: "74160"
 city: Neydens
-street: "Route d'Annecy"
-housenumber: 
-phone: "0 892 01 10 10"
+street: Route d'Annecy
+housenumber: ""
+phone: 0 892 01 10 10
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/neydens/equisphere.yml b/data/cities/neydens/equisphere.yml
index 2c589497d..bba4d881c 100644
--- a/data/cities/neydens/equisphere.yml
+++ b/data/cities/neydens/equisphere.yml
@@ -4,8 +4,8 @@ latitude: 46.12339
 longitude: 6.09285
 postcode: "74160"
 city: Neydens
-street: "Rue du Jura"
-housenumber: 226
+street: Rue du Jura
+housenumber: "226"
 phone: ""
-opening_hours: "Tu-Fr 11:00-19:00; Sa 10:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 11:00-19:00; Sa 10:00-18:00
+website: ""
diff --git a/data/cities/neydens/garage-saint-pierre-sarl-peugeot.yml b/data/cities/neydens/garage-saint-pierre-sarl-peugeot.yml
index 63b298ea1..09c989a16 100644
--- a/data/cities/neydens/garage-saint-pierre-sarl-peugeot.yml
+++ b/data/cities/neydens/garage-saint-pierre-sarl-peugeot.yml
@@ -1,11 +1,11 @@
 id: 78491199
-type: way
+type: node
 latitude: 46.12354
 longitude: 6.09249
 postcode: "74160"
 city: Neydens
-street: "Rue du Jura"
-housenumber: 97
-phone: "+33 4 50 35 19 30"
-opening_hours: "Mo-Fr 07:45-12:00,13:45-18:30"
-website: "https://agents.peugeot.fr/saint-julien-en-genevois"
\ No newline at end of file
+street: Rue du Jura
+housenumber: "97"
+phone: +33 4 50 35 19 30
+opening_hours: Mo-Fr 07:45-12:00,13:45-18:30
+website: https://agents.peugeot.fr/saint-julien-en-genevois
diff --git a/data/cities/neydens/go-sport.yml b/data/cities/neydens/go-sport.yml
index 24cf91516..5a2a3b9d0 100644
--- a/data/cities/neydens/go-sport.yml
+++ b/data/cities/neydens/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.12315
 longitude: 6.09733
 postcode: "74160"
 city: Neydens
-street: "Route des Envignes"
-housenumber: 500
+street: Route des Envignes
+housenumber: "500"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00"
-website: "https://www.go-sport.com/stores?lang=default#/stores/1184"
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00
+website: https://www.go-sport.com/stores?lang=default#/stores/1184
diff --git a/data/cities/neydens/mont-blanc-depannage-neydens.yml b/data/cities/neydens/mont-blanc-depannage-neydens.yml
index 9b5ebf6bf..5494c29c6 100644
--- a/data/cities/neydens/mont-blanc-depannage-neydens.yml
+++ b/data/cities/neydens/mont-blanc-depannage-neydens.yml
@@ -4,8 +4,8 @@ latitude: 46.12108
 longitude: 6.09334
 postcode: "74160"
 city: Neydens
-street: "Rue du Jura"
-housenumber: 73
-phone: "+33 04 50 43 20 20"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue du Jura
+housenumber: "73"
+phone: +33 04 50 43 20 20
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/neydens/rose-bonbon.yml b/data/cities/neydens/rose-bonbon.yml
index 81abdc1a2..17fd69f34 100644
--- a/data/cities/neydens/rose-bonbon.yml
+++ b/data/cities/neydens/rose-bonbon.yml
@@ -4,8 +4,8 @@ latitude: 46.12264
 longitude: 6.0963
 postcode: "74160"
 city: Neydens
-street: "Route des Envignes"
-housenumber: 500
-phone: "+33 4 50 49 76 54"
-opening_hours: "Mo-Su 09:00-20:00"
-website: ""
\ No newline at end of file
+street: Route des Envignes
+housenumber: "500"
+phone: +33 4 50 49 76 54
+opening_hours: Mo-Su 09:00-20:00
+website: ""
diff --git a/data/cities/neydens/vitam.yml b/data/cities/neydens/vitam.yml
index d22f9485d..4ce1f6ed4 100644
--- a/data/cities/neydens/vitam.yml
+++ b/data/cities/neydens/vitam.yml
@@ -1,11 +1,11 @@
 id: 79745939
-type: way
+type: node
 latitude: 46.12288
 longitude: 6.09647
 postcode: "74160"
 city: Neydens
-street: "Route des Envignes"
-housenumber: 500
+street: Route des Envignes
+housenumber: "500"
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00; Su 10:00-20:00
+website: ""
diff --git a/data/cities/noiretable/bricomarche.yml b/data/cities/noiretable/bricomarche.yml
index df9ba623a..a700d5cc8 100644
--- a/data/cities/noiretable/bricomarche.yml
+++ b/data/cities/noiretable/bricomarche.yml
@@ -1,11 +1,11 @@
 id: 319497894
-type: way
+type: node
 latitude: 45.82255
 longitude: 3.76551
 postcode: "42440"
 city: Noirétable
-street: "Rue de l'Aubépine"
-housenumber: 12
+street: Rue de l'Aubépine
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/noiretable/intermarche-super-rue-de-laubepine.yml b/data/cities/noiretable/intermarche-super-rue-de-laubepine.yml
index 3c16c461e..c7479c377 100644
--- a/data/cities/noiretable/intermarche-super-rue-de-laubepine.yml
+++ b/data/cities/noiretable/intermarche-super-rue-de-laubepine.yml
@@ -1,11 +1,11 @@
 id: 319497884
-type: way
+type: node
 latitude: 45.82205
 longitude: 3.76515
 postcode: "42440"
 city: Noirétable
-street: "Rue de l'Aubépine"
-housenumber: 12
+street: Rue de l'Aubépine
+housenumber: "12"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/noiretable/intermarche-super.yml b/data/cities/noiretable/intermarche-super.yml
index 110aaf3e5..dfd8562cd 100644
--- a/data/cities/noiretable/intermarche-super.yml
+++ b/data/cities/noiretable/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 319497879
-type: way
+type: node
 latitude: 45.82282
 longitude: 3.76495
 postcode: "42440"
 city: Noirétable
-street: "Rue de l'Aubépine"
-housenumber: 12
+street: Rue de l'Aubépine
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/notre-dame-de-bellecombe/go-sport-montagne-locskis.yml b/data/cities/notre-dame-de-bellecombe/go-sport-montagne-locskis.yml
index b450f2b1f..f15f0b41b 100644
--- a/data/cities/notre-dame-de-bellecombe/go-sport-montagne-locskis.yml
+++ b/data/cities/notre-dame-de-bellecombe/go-sport-montagne-locskis.yml
@@ -5,7 +5,7 @@ longitude: 6.51881
 postcode: "73590"
 city: Notre-Dame-de-Bellecombe
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 09:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-18:30
+website: ""
diff --git a/data/cities/notre-dame-de-bellecombe/intersport-james-sports.yml b/data/cities/notre-dame-de-bellecombe/intersport-james-sports.yml
index 1b321283b..9b9b378dd 100644
--- a/data/cities/notre-dame-de-bellecombe/intersport-james-sports.yml
+++ b/data/cities/notre-dame-de-bellecombe/intersport-james-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.54887
 postcode: "73590"
 city: Notre Dame de Bellecombe
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/notre-dame-de-bellecombe/intersport-village.yml b/data/cities/notre-dame-de-bellecombe/intersport-village.yml
index 394c77a96..0ad545969 100644
--- a/data/cities/notre-dame-de-bellecombe/intersport-village.yml
+++ b/data/cities/notre-dame-de-bellecombe/intersport-village.yml
@@ -4,8 +4,8 @@ latitude: 45.80768
 longitude: 6.51709
 postcode: "73590"
 city: Notre-Dame-de-Bellecombe
-street: "Rue de Savoie"
-housenumber: 56
-phone: "+33 47931 7095"
-opening_hours: "Mo-Fr 09:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue de Savoie
+housenumber: "56"
+phone: +33 47931 7095
+opening_hours: Mo-Fr 09:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/novalaise/larcade-fleurie.yml b/data/cities/novalaise/larcade-fleurie.yml
index 6b4f7d9a3..d420176a4 100644
--- a/data/cities/novalaise/larcade-fleurie.yml
+++ b/data/cities/novalaise/larcade-fleurie.yml
@@ -1,11 +1,11 @@
 id: 62721720
-type: way
+type: node
 latitude: 45.59395
 longitude: 5.77784
 postcode: "73470"
 city: Novalaise
-street: "Route du Lac"
-housenumber: 
-phone: "+33 4 79 28 72 42"
+street: Route du Lac
+housenumber: ""
+phone: +33 4 79 28 72 42
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/novalaise/lepicerie-du-coing.yml b/data/cities/novalaise/lepicerie-du-coing.yml
index abdb2a5d2..7164c55cd 100644
--- a/data/cities/novalaise/lepicerie-du-coing.yml
+++ b/data/cities/novalaise/lepicerie-du-coing.yml
@@ -4,8 +4,8 @@ latitude: 45.59511
 longitude: 5.77027
 postcode: "73470"
 city: Novalaise
-street: "Place du Bourniau"
-housenumber: 75
-phone: "+33 9 54 82 91 60"
-opening_hours: "Mo 08:00-12:30, Tu-Sa 08:00-12:30,15:30-19:30, Su 08:00-12:30"
-website: ""
\ No newline at end of file
+street: Place du Bourniau
+housenumber: "75"
+phone: +33 9 54 82 91 60
+opening_hours: Mo 08:00-12:30, Tu-Sa 08:00-12:30,15:30-19:30, Su 08:00-12:30
+website: ""
diff --git a/data/cities/novalaise/novalaise-optique.yml b/data/cities/novalaise/novalaise-optique.yml
index f92ee8373..fbb607732 100644
--- a/data/cities/novalaise/novalaise-optique.yml
+++ b/data/cities/novalaise/novalaise-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.59489
 longitude: 5.77092
 postcode: "73470"
 city: Novalaise
-street: "Route du Lac"
-housenumber: 18
-phone: "+33 9 84 55 04 41"
+street: Route du Lac
+housenumber: "18"
+phone: +33 9 84 55 04 41
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/novalaise/quincaillerie-dides.yml b/data/cities/novalaise/quincaillerie-dides.yml
index 63b564e2d..ed20065fa 100644
--- a/data/cities/novalaise/quincaillerie-dides.yml
+++ b/data/cities/novalaise/quincaillerie-dides.yml
@@ -1,11 +1,11 @@
 id: 62723272
-type: way
+type: node
 latitude: 45.59513
 longitude: 5.76989
 postcode: "73470"
 city: Novalaise
-street: "Route de Yenne"
-housenumber: 16
-phone: "+33 4 79 28 70 03"
+street: Route de Yenne
+housenumber: "16"
+phone: +33 4 79 28 70 03
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/novalaise/spar.yml b/data/cities/novalaise/spar.yml
index 44513973a..4ccd3707f 100644
--- a/data/cities/novalaise/spar.yml
+++ b/data/cities/novalaise/spar.yml
@@ -1,11 +1,11 @@
 id: 62722113
-type: way
+type: node
 latitude: 45.59425
 longitude: 5.77696
 postcode: "73470"
 city: Novalaise
-street: "Route du Lac"
-housenumber: 505
+street: Route du Lac
+housenumber: "505"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/noyarey/chausson-materiaux-rue-louise-drevet.yml b/data/cities/noyarey/chausson-materiaux-rue-louise-drevet.yml
index 141ddfceb..4d6de97fa 100644
--- a/data/cities/noyarey/chausson-materiaux-rue-louise-drevet.yml
+++ b/data/cities/noyarey/chausson-materiaux-rue-louise-drevet.yml
@@ -1,11 +1,11 @@
 id: 440765556
-type: way
+type: node
 latitude: 45.22997
 longitude: 5.64554
 postcode: "38360"
 city: Noyarey
-street: "Rue Louise Drevet"
-housenumber: 51
+street: Rue Louise Drevet
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/noyarey/chausson-materiaux.yml b/data/cities/noyarey/chausson-materiaux.yml
index f719b9b6b..8970840ed 100644
--- a/data/cities/noyarey/chausson-materiaux.yml
+++ b/data/cities/noyarey/chausson-materiaux.yml
@@ -1,11 +1,11 @@
 id: 83636258
-type: way
+type: node
 latitude: 45.23055
 longitude: 5.64711
 postcode: "38360"
 city: Noyarey
-street: "Rue Louise Drevet"
-housenumber: 51
+street: Rue Louise Drevet
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/noyarey/danielle-coiffure.yml b/data/cities/noyarey/danielle-coiffure.yml
index 80d332d76..70e60a3c0 100644
--- a/data/cities/noyarey/danielle-coiffure.yml
+++ b/data/cities/noyarey/danielle-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.23795
 longitude: 5.63546
 postcode: "38360"
 city: Noyarey
-street: "Avenue Saint-Jean"
-housenumber: 443
-phone: "+33 4 76 53 80 93"
+street: Avenue Saint-Jean
+housenumber: "443"
+phone: +33 4 76 53 80 93
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/noyarey/epicerie-chez-flo.yml b/data/cities/noyarey/epicerie-chez-flo.yml
index 1eb0661be..a0f9dd1d4 100644
--- a/data/cities/noyarey/epicerie-chez-flo.yml
+++ b/data/cities/noyarey/epicerie-chez-flo.yml
@@ -4,8 +4,8 @@ latitude: 45.24383
 longitude: 5.63188
 postcode: "38360"
 city: Noyarey
-street: "Avenue Saint-Jean"
-housenumber: 1229
+street: Avenue Saint-Jean
+housenumber: "1229"
 phone: "+649806615"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/noyarey/koralp.yml b/data/cities/noyarey/koralp.yml
index dc49d1e7b..0294db95a 100644
--- a/data/cities/noyarey/koralp.yml
+++ b/data/cities/noyarey/koralp.yml
@@ -4,8 +4,8 @@ latitude: 45.25357
 longitude: 5.62476
 postcode: "38360"
 city: Noyarey
-street: "Route du Ruisset"
-housenumber: 500
+street: Route du Ruisset
+housenumber: "500"
 phone: ""
 opening_hours: ""
-website: "https://www.koralp.com/"
\ No newline at end of file
+website: https://www.koralp.com/
diff --git a/data/cities/noyarey/salon-enchanthair.yml b/data/cities/noyarey/salon-enchanthair.yml
index 328460c2c..a7f56e5fc 100644
--- a/data/cities/noyarey/salon-enchanthair.yml
+++ b/data/cities/noyarey/salon-enchanthair.yml
@@ -4,8 +4,8 @@ latitude: 45.24401
 longitude: 5.6319
 postcode: "38360"
 city: Noyarey
-street: "Avenue Saint-Jean"
-housenumber: 1229
+street: Avenue Saint-Jean
+housenumber: "1229"
 phone: "+33616432353"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/onnion/chevrerie-de-la-trappaz.yml b/data/cities/onnion/chevrerie-de-la-trappaz.yml
index 61915fb20..e7978827e 100644
--- a/data/cities/onnion/chevrerie-de-la-trappaz.yml
+++ b/data/cities/onnion/chevrerie-de-la-trappaz.yml
@@ -4,8 +4,8 @@ latitude: 46.17876
 longitude: 6.49491
 postcode: "74490"
 city: Onnion
-street: "Route du Risse"
-housenumber: 1983
+street: Route du Risse
+housenumber: "1983"
 phone: ""
-opening_hours: "Mo, We-Sa 17:30-18:30; Tu,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo, We-Sa 17:30-18:30; Tu,Su off
+website: ""
diff --git a/data/cities/onnion/vival.yml b/data/cities/onnion/vival.yml
index 5be37a340..213de2054 100644
--- a/data/cities/onnion/vival.yml
+++ b/data/cities/onnion/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.17121
 longitude: 6.47952
 postcode: "74490"
 city: Onnion
-street: "Route du Risse"
-housenumber: 
+street: Route du Risse
+housenumber: ""
 phone: ""
-opening_hours: "Mo off; Tu-Sa 08:30-12:30,16:00-19:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 08:30-12:30,16:00-19:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/optevoz/boulangerie-millat.yml b/data/cities/optevoz/boulangerie-millat.yml
index c0020297d..eda2e521b 100644
--- a/data/cities/optevoz/boulangerie-millat.yml
+++ b/data/cities/optevoz/boulangerie-millat.yml
@@ -4,8 +4,8 @@ latitude: 45.7499
 longitude: 5.32892
 postcode: "38460"
 city: Optevoz
-street: "Place Charles Rouvière"
-housenumber: 78
-phone: "+33 4 74 83 82 67"
+street: Place Charles Rouvière
+housenumber: "78"
+phone: +33 4 74 83 82 67
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/orelle/poterie-bol-daltitude.yml b/data/cities/orelle/poterie-bol-daltitude.yml
index 88db0631d..78854a853 100644
--- a/data/cities/orelle/poterie-bol-daltitude.yml
+++ b/data/cities/orelle/poterie-bol-daltitude.yml
@@ -1,11 +1,11 @@
 id: 1017787615
-type: way
+type: node
 latitude: 45.21191
 longitude: 6.55759
 postcode: "73140"
 city: Orelle
-street: "Le Crêt du Vlé"
-housenumber: 
+street: Le Crêt du Vlé
+housenumber: ""
 phone: "+33671280195"
-opening_hours: "Mo-Tu 14:00-16h30; Th-Fr 09:00-12:00; "
-website: "https://boldaltitude.fr"
\ No newline at end of file
+opening_hours: 'Mo-Tu 14:00-16h30; Th-Fr 09:00-12:00; '
+website: https://boldaltitude.fr
diff --git a/data/cities/orelle/services-techniques-dorelle.yml b/data/cities/orelle/services-techniques-dorelle.yml
index 989ac2357..fb3e359a2 100644
--- a/data/cities/orelle/services-techniques-dorelle.yml
+++ b/data/cities/orelle/services-techniques-dorelle.yml
@@ -1,11 +1,11 @@
 id: 167599518
-type: way
+type: node
 latitude: 45.20781
 longitude: 6.54245
 postcode: "73140"
 city: Orelle
-street: "Route de Francoz (D215C)"
-housenumber: 409
+street: Route de Francoz (D215C)
+housenumber: "409"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/orlienas/le-verger-des-7-chemins.yml b/data/cities/orlienas/le-verger-des-7-chemins.yml
index 53cf2b946..ff76d6cfc 100644
--- a/data/cities/orlienas/le-verger-des-7-chemins.yml
+++ b/data/cities/orlienas/le-verger-des-7-chemins.yml
@@ -1,11 +1,11 @@
 id: 76652117
-type: way
+type: node
 latitude: 45.65234
 longitude: 4.74789
 postcode: ""
 city: Orliénas
 street: ""
-housenumber: 
-phone: "+33 4 72 31 11 83"
-opening_hours: "Mo-Sa 14:00-18:30; Th-Sa 09:00-12:15"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 72 31 11 83
+opening_hours: Mo-Sa 14:00-18:30; Th-Sa 09:00-12:15
+website: ""
diff --git a/data/cities/oullins/antenne-tele-services.yml b/data/cities/oullins/antenne-tele-services.yml
index faa572af9..7070e8890 100644
--- a/data/cities/oullins/antenne-tele-services.yml
+++ b/data/cities/oullins/antenne-tele-services.yml
@@ -4,8 +4,8 @@ latitude: 45.71519
 longitude: 4.80691
 postcode: "69600"
 city: Oullins
-street: "Rue de la République"
-housenumber: 81
-phone: "+33 4 78 51 03 34"
+street: Rue de la République
+housenumber: "81"
+phone: +33 4 78 51 03 34
 opening_hours: ""
-website: "https://www.antenne-tele-services.fr"
\ No newline at end of file
+website: https://www.antenne-tele-services.fr
diff --git a/data/cities/oullins/boutique-seconde-main.yml b/data/cities/oullins/boutique-seconde-main.yml
index e4c91e488..e4038a145 100644
--- a/data/cities/oullins/boutique-seconde-main.yml
+++ b/data/cities/oullins/boutique-seconde-main.yml
@@ -4,8 +4,8 @@ latitude: 45.71437
 longitude: 4.80571
 postcode: "69600"
 city: Oullins
-street: "Place Anatole France"
-housenumber: 5
+street: Place Anatole France
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oullins/oullins-collections.yml b/data/cities/oullins/oullins-collections.yml
index d967f54cd..fa3bcaabe 100644
--- a/data/cities/oullins/oullins-collections.yml
+++ b/data/cities/oullins/oullins-collections.yml
@@ -4,8 +4,8 @@ latitude: 45.71952
 longitude: 4.80323
 postcode: "69600"
 city: Oullins
-street: "Boulevard Émile Zola"
-housenumber: 
-phone: "+33 4 72 39 06 88"
+street: Boulevard Émile Zola
+housenumber: ""
+phone: +33 4 72 39 06 88
 opening_hours: ""
-website: "https://www.oullinscollection.fr/"
\ No newline at end of file
+website: https://www.oullinscollection.fr/
diff --git a/data/cities/oullins/peugeot-oullins-ms-automobiles.yml b/data/cities/oullins/peugeot-oullins-ms-automobiles.yml
index 560722cf6..4ba0a2bf3 100644
--- a/data/cities/oullins/peugeot-oullins-ms-automobiles.yml
+++ b/data/cities/oullins/peugeot-oullins-ms-automobiles.yml
@@ -4,8 +4,8 @@ latitude: 45.71496
 longitude: 4.81952
 postcode: "69600"
 city: Oullins
-street: "Avenue Jean Jaurès"
+street: Avenue Jean Jaurès
 housenumber: 45,57
 phone: ""
-opening_hours: "Mo-Fr 07:30-12:00,14:00-19:00; Sa 09:00-18:00"
-website: "https://peugeot-oullins.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:00,14:00-19:00; Sa 09:00-18:00
+website: https://peugeot-oullins.fr
diff --git a/data/cities/oullins/rize.yml b/data/cities/oullins/rize.yml
index b53e1e25a..c12f7bdb0 100644
--- a/data/cities/oullins/rize.yml
+++ b/data/cities/oullins/rize.yml
@@ -4,8 +4,8 @@ latitude: 45.71859
 longitude: 4.79139
 postcode: "69600"
 city: Oullins
-street: "Boulevard John-Fitzgerald Kennedy"
-housenumber: 
+street: Boulevard John-Fitzgerald Kennedy
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oyonnax/atelier-velo-collaboratif.yml b/data/cities/oyonnax/atelier-velo-collaboratif.yml
index 49ab5da5c..a6026d92e 100644
--- a/data/cities/oyonnax/atelier-velo-collaboratif.yml
+++ b/data/cities/oyonnax/atelier-velo-collaboratif.yml
@@ -4,8 +4,8 @@ latitude: 46.25619
 longitude: 5.65405
 postcode: "01100"
 city: Oyonnax
-street: "Rue Anatole France"
-housenumber: 152
-phone: "+33 6 51 26 10 42"
-opening_hours: "Sa-Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue Anatole France
+housenumber: "152"
+phone: +33 6 51 26 10 42
+opening_hours: Sa-Sa 09:00-12:00
+website: ""
diff --git a/data/cities/oyonnax/florescence.yml b/data/cities/oyonnax/florescence.yml
index 808eebbb6..2105e27ea 100644
--- a/data/cities/oyonnax/florescence.yml
+++ b/data/cities/oyonnax/florescence.yml
@@ -4,8 +4,8 @@ latitude: 46.26049
 longitude: 5.65852
 postcode: "01100"
 city: Oyonnax
-street: "Rue Anatole France"
-housenumber: 59
-phone: "+33 4 74 73 72 01"
+street: Rue Anatole France
+housenumber: "59"
+phone: +33 4 74 73 72 01
 opening_hours: ""
-website: "https://florescence-oyonnax.fr/"
\ No newline at end of file
+website: https://florescence-oyonnax.fr/
diff --git a/data/cities/oyonnax/ford-groupe-grenard.yml b/data/cities/oyonnax/ford-groupe-grenard.yml
index c3c599e84..4234a5c36 100644
--- a/data/cities/oyonnax/ford-groupe-grenard.yml
+++ b/data/cities/oyonnax/ford-groupe-grenard.yml
@@ -4,8 +4,8 @@ latitude: 46.26998
 longitude: 5.66043
 postcode: "01100"
 city: Oyonnax
-street: "Route de Dortan"
-housenumber: 46
-phone: "+33 4 74 73 84 33"
+street: Route de Dortan
+housenumber: "46"
+phone: +33 4 74 73 84 33
 opening_hours: ""
-website: "https://ford-besancon.amplitude-auto.com/"
\ No newline at end of file
+website: https://ford-besancon.amplitude-auto.com/
diff --git a/data/cities/oyonnax/geant-casino.yml b/data/cities/oyonnax/geant-casino.yml
index f15944532..6fdaeb406 100644
--- a/data/cities/oyonnax/geant-casino.yml
+++ b/data/cities/oyonnax/geant-casino.yml
@@ -1,11 +1,11 @@
 id: 507803997
-type: way
+type: node
 latitude: 46.2839
 longitude: 5.66275
 postcode: "01100"
 city: Oyonnax
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/oyonnax/intermarche-super.yml b/data/cities/oyonnax/intermarche-super.yml
index 5bc81d571..a5a48096d 100644
--- a/data/cities/oyonnax/intermarche-super.yml
+++ b/data/cities/oyonnax/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 224364463
-type: way
+type: node
 latitude: 46.2634
 longitude: 5.64711
 postcode: "01100"
 city: Oyonnax
-street: "Rue Jules Michelet"
-housenumber: 74
+street: Rue Jules Michelet
+housenumber: "74"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oyonnax/intermarche.yml b/data/cities/oyonnax/intermarche.yml
index c794f969b..62c4d1472 100644
--- a/data/cities/oyonnax/intermarche.yml
+++ b/data/cities/oyonnax/intermarche.yml
@@ -1,11 +1,11 @@
 id: 696109627
-type: way
+type: node
 latitude: 46.26216
 longitude: 5.64801
 postcode: "01100"
 city: Oyonnax
-street: "Rue Jules Michelet"
-housenumber: 74
+street: Rue Jules Michelet
+housenumber: "74"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/oyonnax/intersport.yml b/data/cities/oyonnax/intersport.yml
index ff4dfff03..394c4cf5d 100644
--- a/data/cities/oyonnax/intersport.yml
+++ b/data/cities/oyonnax/intersport.yml
@@ -5,7 +5,7 @@ longitude: 5.66366
 postcode: "01100"
 city: Oyonnax
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oyonnax/la-vie-claire.yml b/data/cities/oyonnax/la-vie-claire.yml
index 20d83280d..2377e5f46 100644
--- a/data/cities/oyonnax/la-vie-claire.yml
+++ b/data/cities/oyonnax/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 46.26814
 longitude: 5.65408
 postcode: "01100"
 city: Oyonnax
-street: "Rue Élie Deschamps"
-housenumber: 6
-phone: "+33 4 74 73 77 63"
-opening_hours: "Mo-Sa 08:30-19:00"
-website: "https://magasins.lavieclaire.com/lavieclaire/fr/boutique/france/auvergne-rhone-alpes/ain/oyonnax/oyonnax/132"
\ No newline at end of file
+street: Rue Élie Deschamps
+housenumber: "6"
+phone: +33 4 74 73 77 63
+opening_hours: Mo-Sa 08:30-19:00
+website: https://magasins.lavieclaire.com/lavieclaire/fr/boutique/france/auvergne-rhone-alpes/ain/oyonnax/oyonnax/132
diff --git a/data/cities/oyonnax/lapierriere-voyages.yml b/data/cities/oyonnax/lapierriere-voyages.yml
index 3483ff68b..8a19647b6 100644
--- a/data/cities/oyonnax/lapierriere-voyages.yml
+++ b/data/cities/oyonnax/lapierriere-voyages.yml
@@ -1,11 +1,11 @@
 id: 159158721
-type: way
+type: node
 latitude: 46.25844
 longitude: 5.65534
 postcode: "01100"
 city: Oyonnax
-street: "Rue Bichat"
-housenumber: 16
-phone: "+33 4 74 12 01 03"
+street: Rue Bichat
+housenumber: "16"
+phone: +33 4 74 12 01 03
 opening_hours: ""
-website: "https://www.pretapartir.fr/"
\ No newline at end of file
+website: https://www.pretapartir.fr/
diff --git a/data/cities/oyonnax/monfat.yml b/data/cities/oyonnax/monfat.yml
index a36170f1e..d16c0ccb8 100644
--- a/data/cities/oyonnax/monfat.yml
+++ b/data/cities/oyonnax/monfat.yml
@@ -1,11 +1,11 @@
 id: 159025533
-type: way
+type: node
 latitude: 46.23891
 longitude: 5.66871
 postcode: "01100"
 city: Oyonnax
-street: "Rue de Geilles"
-housenumber: 115
+street: Rue de Geilles
+housenumber: "115"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oyonnax/monoprix.yml b/data/cities/oyonnax/monoprix.yml
index d01a04667..3e5254fa9 100644
--- a/data/cities/oyonnax/monoprix.yml
+++ b/data/cities/oyonnax/monoprix.yml
@@ -1,11 +1,11 @@
 id: 159276194
-type: way
+type: node
 latitude: 46.25769
 longitude: 5.65667
 postcode: "01100"
 city: Oyonnax
-street: "Rue Francisco Ferrer"
-housenumber: 10
-phone: "+33 4 74 81 21 60"
-opening_hours: "Mo-Sa 8:30-20:00; Su 9:00-13:00"
-website: "https://www.monoprix.fr/822.html"
\ No newline at end of file
+street: Rue Francisco Ferrer
+housenumber: "10"
+phone: +33 4 74 81 21 60
+opening_hours: Mo-Sa 8:30-20:00; Su 9:00-13:00
+website: https://www.monoprix.fr/822.html
diff --git a/data/cities/oyonnax/noz.yml b/data/cities/oyonnax/noz.yml
index 3fa9ed386..bf2354404 100644
--- a/data/cities/oyonnax/noz.yml
+++ b/data/cities/oyonnax/noz.yml
@@ -4,8 +4,8 @@ latitude: 46.2488
 longitude: 5.6452
 postcode: "01100"
 city: Oyonnax
-street: "Rue Général Ferrié"
-housenumber: 3
+street: Rue Général Ferrié
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/oyonnax/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/oyonnax/
diff --git a/data/cities/oyonnax/pilippon.yml b/data/cities/oyonnax/pilippon.yml
index eab8179d9..b97469fdb 100644
--- a/data/cities/oyonnax/pilippon.yml
+++ b/data/cities/oyonnax/pilippon.yml
@@ -4,8 +4,8 @@ latitude: 46.25976
 longitude: 5.65462
 postcode: "01100"
 city: Oyonnax
-street: "Rue Jules Michelet"
-housenumber: 21
-phone: "+334 74 77 25 09"
+street: Rue Jules Michelet
+housenumber: "21"
+phone: +334 74 77 25 09
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oyonnax/pompes-funebres-et-marbrerie-comtet.yml b/data/cities/oyonnax/pompes-funebres-et-marbrerie-comtet.yml
index ccebef0c1..21e65f1ba 100644
--- a/data/cities/oyonnax/pompes-funebres-et-marbrerie-comtet.yml
+++ b/data/cities/oyonnax/pompes-funebres-et-marbrerie-comtet.yml
@@ -1,11 +1,11 @@
 id: 713890090
-type: way
+type: node
 latitude: 46.26403
 longitude: 5.6323
 postcode: "01100"
 city: Oyonnax
-street: "Rue des Cherolles"
-housenumber: 11
-phone: "+334 74 12 04 20"
+street: Rue des Cherolles
+housenumber: "11"
+phone: +334 74 12 04 20
 opening_hours: ""
-website: "http://www.pf-comtet.fr/"
\ No newline at end of file
+website: http://www.pf-comtet.fr/
diff --git a/data/cities/oyonnax/pop-musique.yml b/data/cities/oyonnax/pop-musique.yml
index bf447af0b..898d35c5d 100644
--- a/data/cities/oyonnax/pop-musique.yml
+++ b/data/cities/oyonnax/pop-musique.yml
@@ -1,11 +1,11 @@
 id: 159276344
-type: way
+type: node
 latitude: 46.25753
 longitude: 5.65724
 postcode: "01100"
 city: Oyonnax
-street: "Rue Francisco Ferrer"
-housenumber: 1
-phone: "+33 4 74 77 09 90"
+street: Rue Francisco Ferrer
+housenumber: "1"
+phone: +33 4 74 77 09 90
 opening_hours: ""
-website: "http://pop-musique-oyonnax.com"
\ No newline at end of file
+website: http://pop-musique-oyonnax.com
diff --git a/data/cities/oyonnax/tati.yml b/data/cities/oyonnax/tati.yml
index 58a4381d7..e3444c60b 100644
--- a/data/cities/oyonnax/tati.yml
+++ b/data/cities/oyonnax/tati.yml
@@ -1,11 +1,11 @@
 id: 246934640
-type: way
+type: node
 latitude: 46.28448
 longitude: 5.6605
 postcode: "01100"
 city: Oyonnax
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oyonnax/tisbarbier.yml b/data/cities/oyonnax/tisbarbier.yml
index 666a1bef2..28225004e 100644
--- a/data/cities/oyonnax/tisbarbier.yml
+++ b/data/cities/oyonnax/tisbarbier.yml
@@ -4,8 +4,8 @@ latitude: 46.26073
 longitude: 5.65884
 postcode: "01100"
 city: Oyonnax
-street: "Rue Anatole France"
-housenumber: 49
+street: Rue Anatole France
+housenumber: "49"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/oyonnax/zeeman.yml b/data/cities/oyonnax/zeeman.yml
index f135e6395..767a58aad 100644
--- a/data/cities/oyonnax/zeeman.yml
+++ b/data/cities/oyonnax/zeeman.yml
@@ -1,11 +1,11 @@
 id: 463271042
-type: way
+type: node
 latitude: 46.28446
 longitude: 5.66093
 postcode: "01100"
 city: Oyonnax
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pact/boucherie-amouroux.yml b/data/cities/pact/boucherie-amouroux.yml
index 5e2cf50c6..66f2b3577 100644
--- a/data/cities/pact/boucherie-amouroux.yml
+++ b/data/cities/pact/boucherie-amouroux.yml
@@ -5,7 +5,7 @@ longitude: 4.98877
 postcode: "38270"
 city: Pact
 street: ""
-housenumber: 173
+housenumber: "173"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pact/garage-da-silva.yml b/data/cities/pact/garage-da-silva.yml
index d4563db3c..ef3a5e754 100644
--- a/data/cities/pact/garage-da-silva.yml
+++ b/data/cities/pact/garage-da-silva.yml
@@ -5,7 +5,7 @@ longitude: 4.9893
 postcode: "38270"
 city: Pact
 street: ""
-housenumber: 221
-phone: "+33 4 74 84 87 19"
+housenumber: "221"
+phone: +33 4 74 84 87 19
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pact/le-bistrot.yml b/data/cities/pact/le-bistrot.yml
index 941e573ec..52c953b23 100644
--- a/data/cities/pact/le-bistrot.yml
+++ b/data/cities/pact/le-bistrot.yml
@@ -5,7 +5,7 @@ longitude: 4.98872
 postcode: ""
 city: Pact
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pailhares/au-gre-du-pain.yml b/data/cities/pailhares/au-gre-du-pain.yml
index 297a0cc7c..2039f42bd 100644
--- a/data/cities/pailhares/au-gre-du-pain.yml
+++ b/data/cities/pailhares/au-gre-du-pain.yml
@@ -5,7 +5,7 @@ longitude: 4.56646
 postcode: ""
 city: Pailharès
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 18:30-20:00; We off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 18:30-20:00; We off
+website: ""
diff --git a/data/cities/panissieres/chazalon.yml b/data/cities/panissieres/chazalon.yml
index a3a2cf2bd..e48f61f05 100644
--- a/data/cities/panissieres/chazalon.yml
+++ b/data/cities/panissieres/chazalon.yml
@@ -4,8 +4,8 @@ latitude: 45.78418
 longitude: 4.3523
 postcode: "42360"
 city: panissières
-street: "Chemin de chazalon"
-housenumber: 253
-phone: "+33 6 77 09 42 34"
-opening_hours: "Mo-Su 17:30-19:00"
-website: ""
\ No newline at end of file
+street: Chemin de chazalon
+housenumber: "253"
+phone: +33 6 77 09 42 34
+opening_hours: Mo-Su 17:30-19:00
+website: ""
diff --git a/data/cities/panissieres/fb-coiffure.yml b/data/cities/panissieres/fb-coiffure.yml
index 2431b9e9e..0c6f6cf71 100644
--- a/data/cities/panissieres/fb-coiffure.yml
+++ b/data/cities/panissieres/fb-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.79111
 longitude: 4.33885
 postcode: "42360"
 city: Panissieres
-street: "Rue Aristide Briand"
-housenumber: 2
-phone: "+33 4 77 28 70 03"
-opening_hours: "08:00-12:00,13:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue Aristide Briand
+housenumber: "2"
+phone: +33 4 77 28 70 03
+opening_hours: 08:00-12:00,13:00-18:00
+website: ""
diff --git a/data/cities/panissieres/spar.yml b/data/cities/panissieres/spar.yml
index 50ffea48e..94bcd765a 100644
--- a/data/cities/panissieres/spar.yml
+++ b/data/cities/panissieres/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.794
 longitude: 4.34089
 postcode: "42360"
 city: Panissières
-street: "Rue Jean Macé"
-housenumber: 25
+street: Rue Jean Macé
+housenumber: "25"
 phone: "+33477288228"
-opening_hours: "Mo-Sa 08:00-12:30,15:00-19:15; Su 08:30-12:30"
-website: "https://magasins.spar.fr/fr/s/spar-supermarche-panissieres"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30,15:00-19:15; Su 08:30-12:30
+website: https://magasins.spar.fr/fr/s/spar-supermarche-panissieres
diff --git a/data/cities/pas-de-lechelle/vival.yml b/data/cities/pas-de-lechelle/vival.yml
index d4eff976c..04c3f42b6 100644
--- a/data/cities/pas-de-lechelle/vival.yml
+++ b/data/cities/pas-de-lechelle/vival.yml
@@ -4,8 +4,8 @@ latitude: 46.16482
 longitude: 6.19059
 postcode: "74100"
 city: Pas de l'Echelle
-street: "Chemin de Veyrier"
-housenumber: 216
+street: Chemin de Veyrier
+housenumber: "216"
 phone: ""
-opening_hours: "Mo-Su 09:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-21:00
+website: ""
diff --git a/data/cities/passins-morestel/alpin-bike.yml b/data/cities/passins-morestel/alpin-bike.yml
index 9ba18f822..d3db35741 100644
--- a/data/cities/passins-morestel/alpin-bike.yml
+++ b/data/cities/passins-morestel/alpin-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.68379
 longitude: 5.45469
 postcode: "38510"
 city: Passins-Morestel
-street: "ZA du Lantay"
-housenumber: 
+street: ZA du Lantay
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/passy/bip-bip.yml b/data/cities/passy/bip-bip.yml
index 2a06a2146..ab491816a 100644
--- a/data/cities/passy/bip-bip.yml
+++ b/data/cities/passy/bip-bip.yml
@@ -4,8 +4,8 @@ latitude: 45.93879
 longitude: 6.70959
 postcode: "74190"
 city: Passy
-street: "Rue de l'Église"
-housenumber: 
+street: Rue de l'Église
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/passy/decathlon-mountain-store.yml b/data/cities/passy/decathlon-mountain-store.yml
index 738221e28..0007da774 100644
--- a/data/cities/passy/decathlon-mountain-store.yml
+++ b/data/cities/passy/decathlon-mountain-store.yml
@@ -1,11 +1,11 @@
 id: 231148124
-type: way
+type: node
 latitude: 45.91698
 longitude: 6.69048
 postcode: "74190"
 city: Passy
-street: "Avenue Léman Mont-Blanc"
-housenumber: 170
+street: Avenue Léman Mont-Blanc
+housenumber: "170"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/passy/du-pain-et-des-douceurs.yml b/data/cities/passy/du-pain-et-des-douceurs.yml
index e37100e45..f9b80aef1 100644
--- a/data/cities/passy/du-pain-et-des-douceurs.yml
+++ b/data/cities/passy/du-pain-et-des-douceurs.yml
@@ -1,11 +1,11 @@
 id: 78663478
-type: way
+type: node
 latitude: 45.92344
 longitude: 6.68646
 postcode: "74190"
 city: Passy
-street: "Place de la Mairie"
-housenumber: 82
+street: Place de la Mairie
+housenumber: "82"
 phone: "+33450891459"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/passy/le-panier-dassy.yml b/data/cities/passy/le-panier-dassy.yml
index e9ce0001d..9d39d3eee 100644
--- a/data/cities/passy/le-panier-dassy.yml
+++ b/data/cities/passy/le-panier-dassy.yml
@@ -4,8 +4,8 @@ latitude: 45.93883
 longitude: 6.71012
 postcode: "74190"
 city: Passy
-street: "Rue de l'Église"
-housenumber: 
+street: Rue de l'Église
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/passy/le-tourisme.yml b/data/cities/passy/le-tourisme.yml
index b107a8a81..0c4712c78 100644
--- a/data/cities/passy/le-tourisme.yml
+++ b/data/cities/passy/le-tourisme.yml
@@ -4,8 +4,8 @@ latitude: 45.93606
 longitude: 6.70943
 postcode: "74190"
 city: Passy
-street: "Rue d'Anterne"
-housenumber: 
+street: Rue d'Anterne
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/passy/les-confitures-de-la-creation-rue-des-cardinolins.yml b/data/cities/passy/les-confitures-de-la-creation-rue-des-cardinolins.yml
index 169ffb517..95de80eb9 100644
--- a/data/cities/passy/les-confitures-de-la-creation-rue-des-cardinolins.yml
+++ b/data/cities/passy/les-confitures-de-la-creation-rue-des-cardinolins.yml
@@ -4,8 +4,8 @@ latitude: 45.91751
 longitude: 6.71356
 postcode: "74190"
 city: Passy
-street: "Rue des Cardinolins"
-housenumber: 181
+street: Rue des Cardinolins
+housenumber: "181"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/passy/les-confitures-de-la-creation.yml b/data/cities/passy/les-confitures-de-la-creation.yml
index 6c7ac155e..0cdd46df4 100644
--- a/data/cities/passy/les-confitures-de-la-creation.yml
+++ b/data/cities/passy/les-confitures-de-la-creation.yml
@@ -4,8 +4,8 @@ latitude: 45.9174
 longitude: 6.71364
 postcode: "74190"
 city: Passy
-street: "Rue des Cardinolins"
-housenumber: 181
+street: Rue des Cardinolins
+housenumber: "181"
 phone: "+33450936839"
-opening_hours: "Mo-Fr 09:00-12:00; 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00; 14:00-18:00
+website: ""
diff --git a/data/cities/passy/relais-motards-74.yml b/data/cities/passy/relais-motards-74.yml
index 58c3cde09..73f54c2c2 100644
--- a/data/cities/passy/relais-motards-74.yml
+++ b/data/cities/passy/relais-motards-74.yml
@@ -1,11 +1,11 @@
 id: 78679374
-type: way
+type: node
 latitude: 45.90812
 longitude: 6.70636
 postcode: "74190"
 city: Passy
-street: "Avenue de Chamonix"
-housenumber: 438
-phone: "+33 6 28 49 59 87"
+street: Avenue de Chamonix
+housenumber: "438"
+phone: +33 6 28 49 59 87
 opening_hours: ""
-website: "http://relais-motards.net"
\ No newline at end of file
+website: http://relais-motards.net
diff --git a/data/cities/peillonnex/la-boulange-de-peillo.yml b/data/cities/peillonnex/la-boulange-de-peillo.yml
index 398035cdb..5c79b1152 100644
--- a/data/cities/peillonnex/la-boulange-de-peillo.yml
+++ b/data/cities/peillonnex/la-boulange-de-peillo.yml
@@ -1,11 +1,11 @@
 id: 148803826
-type: way
+type: node
 latitude: 46.13123
 longitude: 6.37576
 postcode: "74250"
 city: Peillonnex
-street: "Route de Bonneville"
-housenumber: 1058
+street: Route de Bonneville
+housenumber: "1058"
 phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+opening_hours: Sa-Su 07h30:12h30
+website: ""
diff --git a/data/cities/peisey-nancroix/esquilo.yml b/data/cities/peisey-nancroix/esquilo.yml
index 051f0432f..8a82e3632 100644
--- a/data/cities/peisey-nancroix/esquilo.yml
+++ b/data/cities/peisey-nancroix/esquilo.yml
@@ -4,8 +4,8 @@ latitude: 45.54651
 longitude: 6.7558
 postcode: "73210"
 city: Peisey-Nancroix
-street: "Rue des Monts d'Argent"
-housenumber: 
+street: Rue des Monts d'Argent
+housenumber: ""
 phone: "+33952137812"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/peisey-nancroix/gaec-alpin.yml b/data/cities/peisey-nancroix/gaec-alpin.yml
index 467f24cc1..dc1cc3363 100644
--- a/data/cities/peisey-nancroix/gaec-alpin.yml
+++ b/data/cities/peisey-nancroix/gaec-alpin.yml
@@ -4,8 +4,8 @@ latitude: 45.54683
 longitude: 6.75582
 postcode: "73210"
 city: Peisey-Nancroix
-street: "Rue des Monts d'Argent"
-housenumber: 
-phone: "+33 4 79 07 57 52"
+street: Rue des Monts d'Argent
+housenumber: ""
+phone: +33 4 79 07 57 52
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/peisey-nancroix/intersport.yml b/data/cities/peisey-nancroix/intersport.yml
index 151e8febd..94c7ed52f 100644
--- a/data/cities/peisey-nancroix/intersport.yml
+++ b/data/cities/peisey-nancroix/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.76334
 postcode: ""
 city: Peisey-Nancroix
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/peisey-nancroix/sport-2000.yml b/data/cities/peisey-nancroix/sport-2000.yml
index 44631e4ba..e6411186a 100644
--- a/data/cities/peisey-nancroix/sport-2000.yml
+++ b/data/cities/peisey-nancroix/sport-2000.yml
@@ -1,11 +1,11 @@
 id: 184940150
-type: way
+type: node
 latitude: 45.55223
 longitude: 6.76253
 postcode: "73210"
 city: Peisey-Nancroix
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:30-12:30, 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-12:30, 14:30-19:00
+website: ""
diff --git a/data/cities/peisey-vallandry/intersport.yml b/data/cities/peisey-vallandry/intersport.yml
index 8dc4a361b..680b834d4 100644
--- a/data/cities/peisey-vallandry/intersport.yml
+++ b/data/cities/peisey-vallandry/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.76192
 postcode: "73210"
 city: Peisey-Vallandry
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:30, 14:00-19:00; Sa-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:30, 14:00-19:00; Sa-Su 08:30-19:00
+website: ""
diff --git a/data/cities/pelussin/acoustica.yml b/data/cities/pelussin/acoustica.yml
index 7a02b36e0..54ddea88a 100644
--- a/data/cities/pelussin/acoustica.yml
+++ b/data/cities/pelussin/acoustica.yml
@@ -5,7 +5,7 @@ longitude: 4.68131
 postcode: "42410"
 city: Pélussin
 street: ""
-housenumber: 
-phone: "+33 4 74 53 03 68"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 03 68
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/pelussin/carrefour-contact.yml b/data/cities/pelussin/carrefour-contact.yml
index 2f827743e..19d3e9f63 100644
--- a/data/cities/pelussin/carrefour-contact.yml
+++ b/data/cities/pelussin/carrefour-contact.yml
@@ -1,11 +1,11 @@
 id: 156365481
-type: way
+type: node
 latitude: 45.41863
 longitude: 4.68477
 postcode: "42410"
 city: Pélussin
 street: ""
-housenumber: 
-phone: "+33 4 74 85 11 12"
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/contact-pelussin"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 11 12
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/contact-pelussin
diff --git a/data/cities/pelussin/delices-et-gourmandises.yml b/data/cities/pelussin/delices-et-gourmandises.yml
index 8411fa3c0..9a2a1ad33 100644
--- a/data/cities/pelussin/delices-et-gourmandises.yml
+++ b/data/cities/pelussin/delices-et-gourmandises.yml
@@ -1,11 +1,11 @@
 id: 312318792
-type: way
+type: node
 latitude: 45.41824
 longitude: 4.68258
 postcode: "42410"
 city: Pélussin
-street: "Place Notre-Dame"
-housenumber: 
+street: Place Notre-Dame
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pelussin/gaec-de-la-cabriole.yml b/data/cities/pelussin/gaec-de-la-cabriole.yml
index 172981b81..a4db41c52 100644
--- a/data/cities/pelussin/gaec-de-la-cabriole.yml
+++ b/data/cities/pelussin/gaec-de-la-cabriole.yml
@@ -5,7 +5,7 @@ longitude: 4.68444
 postcode: "42410"
 city: Pélussin
 street: ""
-housenumber: 62
-phone: "+33 4 74 87 63 30"
-opening_hours: "Mo-Sa 07:00-12:00, Mo-Fr 17:00-19:00, Sa 15:00-17:00, Su 07:00-10:00"
-website: "https://gaec-de-la-cabriole.jimdosite.com"
\ No newline at end of file
+housenumber: "62"
+phone: +33 4 74 87 63 30
+opening_hours: Mo-Sa 07:00-12:00, Mo-Fr 17:00-19:00, Sa 15:00-17:00, Su 07:00-10:00
+website: https://gaec-de-la-cabriole.jimdosite.com
diff --git a/data/cities/pelussin/gaec-des-hirondelles.yml b/data/cities/pelussin/gaec-des-hirondelles.yml
index 8be49168b..b977e9ddb 100644
--- a/data/cities/pelussin/gaec-des-hirondelles.yml
+++ b/data/cities/pelussin/gaec-des-hirondelles.yml
@@ -4,8 +4,8 @@ latitude: 45.40392
 longitude: 4.68204
 postcode: "42410"
 city: Pélussin
-street: "Montée de la valette"
-housenumber: 7
-phone: "+33 4 74 56 17 05"
-opening_hours: "Mo-Fr 08:30-12:00,14:30-18:00; Sa 8:00-12:00"
-website: "http://www.gaecdeshirondelles.fr"
\ No newline at end of file
+street: Montée de la valette
+housenumber: "7"
+phone: +33 4 74 56 17 05
+opening_hours: Mo-Fr 08:30-12:00,14:30-18:00; Sa 8:00-12:00
+website: http://www.gaecdeshirondelles.fr
diff --git a/data/cities/pelussin/les-fruits-du-mont-pilat.yml b/data/cities/pelussin/les-fruits-du-mont-pilat.yml
index 8c19d49da..ed9c63fe8 100644
--- a/data/cities/pelussin/les-fruits-du-mont-pilat.yml
+++ b/data/cities/pelussin/les-fruits-du-mont-pilat.yml
@@ -1,11 +1,11 @@
 id: 312666114
-type: way
+type: node
 latitude: 45.40248
 longitude: 4.68418
 postcode: "42410"
 city: Pélussin
-street: "RTE de Maclas - La Garde"
-housenumber: 58
+street: RTE de Maclas - La Garde
+housenumber: "58"
 phone: ""
-opening_hours: "Mo-Sa 9:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 9:00-18:30
+website: ""
diff --git a/data/cities/peron/intermarche-contact.yml b/data/cities/peron/intermarche-contact.yml
index a1feaf424..45d44a385 100644
--- a/data/cities/peron/intermarche-contact.yml
+++ b/data/cities/peron/intermarche-contact.yml
@@ -1,11 +1,11 @@
 id: 201833869
-type: way
+type: node
 latitude: 46.18309
 longitude: 5.92803
 postcode: "01630"
 city: Péron
-street: "ZA du Pré Munny"
-housenumber: 
+street: ZA du Pré Munny
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/peronnas/r-bike-01.yml b/data/cities/peronnas/r-bike-01.yml
index 59365f759..a5774d968 100644
--- a/data/cities/peronnas/r-bike-01.yml
+++ b/data/cities/peronnas/r-bike-01.yml
@@ -1,11 +1,11 @@
 id: 190060243
-type: way
+type: node
 latitude: 46.18672
 longitude: 5.20903
 postcode: "01960"
 city: Péronnas
-street: "Avenue de Lyon"
-housenumber: 651
+street: Avenue de Lyon
+housenumber: "651"
 phone: ""
 opening_hours: ""
-website: "http://www.kawasaki-rbike.com/"
\ No newline at end of file
+website: http://www.kawasaki-rbike.com/
diff --git a/data/cities/perouges/papiers-pasdeloup.yml b/data/cities/perouges/papiers-pasdeloup.yml
index 0d5275598..be30fd83e 100644
--- a/data/cities/perouges/papiers-pasdeloup.yml
+++ b/data/cities/perouges/papiers-pasdeloup.yml
@@ -4,8 +4,8 @@ latitude: 45.90353
 longitude: 5.18033
 postcode: "01800"
 city: Pérouges
-street: "Rue des Rondes"
-housenumber: 
+street: Rue des Rondes
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-12:30,14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-12:30,14:00-17:00
+website: ""
diff --git a/data/cities/perreux/noz.yml b/data/cities/perreux/noz.yml
index b7e562a03..f3190ffe0 100644
--- a/data/cities/perreux/noz.yml
+++ b/data/cities/perreux/noz.yml
@@ -1,11 +1,11 @@
 id: 186205835
-type: way
+type: node
 latitude: 46.0297
 longitude: 4.09742
 postcode: "42120"
 city: Perreux
-street: "Le Pont de Rhins Ouest"
-housenumber: 
+street: Le Pont de Rhins Ouest
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/perreux/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/perreux/
diff --git a/data/cities/perrignier/boucherie-bondaz.yml b/data/cities/perrignier/boucherie-bondaz.yml
index e48523706..1b7a0b491 100644
--- a/data/cities/perrignier/boucherie-bondaz.yml
+++ b/data/cities/perrignier/boucherie-bondaz.yml
@@ -1,11 +1,11 @@
 id: 224807058
-type: way
+type: node
 latitude: 46.30356
 longitude: 6.43689
 postcode: "74550"
 city: Perrignier
-street: "Route de Thonon"
-housenumber: 44
+street: Route de Thonon
+housenumber: "44"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/perrignier/boulangerie-favre.yml b/data/cities/perrignier/boulangerie-favre.yml
index 4d1942b54..4dbe72a4d 100644
--- a/data/cities/perrignier/boulangerie-favre.yml
+++ b/data/cities/perrignier/boulangerie-favre.yml
@@ -4,8 +4,8 @@ latitude: 46.30371
 longitude: 6.43717
 postcode: "74550"
 city: Perrignier
-street: "Route de Thonon"
-housenumber: 72
+street: Route de Thonon
+housenumber: "72"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30; Su 06:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30; Su 06:30-12:30
+website: ""
diff --git a/data/cities/perrignier/elan.yml b/data/cities/perrignier/elan.yml
index 9c4cfe23d..73803f000 100644
--- a/data/cities/perrignier/elan.yml
+++ b/data/cities/perrignier/elan.yml
@@ -4,8 +4,8 @@ latitude: 46.304
 longitude: 6.43691
 postcode: "74550"
 city: Perrignier
-street: "Route de Thonon"
-housenumber: 
+street: Route de Thonon
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/perrignier/garage-deremble.yml b/data/cities/perrignier/garage-deremble.yml
index 0de924218..6df3e6221 100644
--- a/data/cities/perrignier/garage-deremble.yml
+++ b/data/cities/perrignier/garage-deremble.yml
@@ -1,11 +1,11 @@
 id: 1145137990
-type: way
+type: node
 latitude: 46.30251
 longitude: 6.43555
 postcode: "74550"
 city: Perrignier
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/perrignier/ksd.yml b/data/cities/perrignier/ksd.yml
index 67fe1a2b7..e82ed6afc 100644
--- a/data/cities/perrignier/ksd.yml
+++ b/data/cities/perrignier/ksd.yml
@@ -1,11 +1,11 @@
 id: 657673201
-type: way
+type: node
 latitude: 46.30511
 longitude: 6.42148
 postcode: "74550"
 city: Perrignier
-street: "Route des Grandes Teppes"
-housenumber: 362
-phone: "+33 4 50 83 00 85"
+street: Route des Grandes Teppes
+housenumber: "362"
+phone: +33 4 50 83 00 85
 opening_hours: ""
-website: "https://www.ksd.fr"
\ No newline at end of file
+website: https://www.ksd.fr
diff --git a/data/cities/perrignier/location-vaisselle-du-chablais.yml b/data/cities/perrignier/location-vaisselle-du-chablais.yml
index 61483c735..ffc56fde4 100644
--- a/data/cities/perrignier/location-vaisselle-du-chablais.yml
+++ b/data/cities/perrignier/location-vaisselle-du-chablais.yml
@@ -1,11 +1,11 @@
 id: 860765126
-type: way
+type: node
 latitude: 46.30565
 longitude: 6.42216
 postcode: "74550"
 city: Perrignier
-street: "Rue du Brafyeu"
-housenumber: 
-phone: "+33 4 50 81 90 89"
+street: Rue du Brafyeu
+housenumber: ""
+phone: +33 4 50 81 90 89
 opening_hours: ""
-website: "http://lvchablais.fr"
\ No newline at end of file
+website: http://lvchablais.fr
diff --git a/data/cities/perrignier/metalp.yml b/data/cities/perrignier/metalp.yml
index f29dea9e1..442b032f0 100644
--- a/data/cities/perrignier/metalp.yml
+++ b/data/cities/perrignier/metalp.yml
@@ -4,8 +4,8 @@ latitude: 46.30545
 longitude: 6.42185
 postcode: "74550"
 city: Perrignier
-street: "Impasse du Pachoré"
-housenumber: 74
-phone: "+33 4 50 72 45 18"
+street: Impasse du Pachoré
+housenumber: "74"
+phone: +33 4 50 72 45 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/perrignier/my-cheminee-creation.yml b/data/cities/perrignier/my-cheminee-creation.yml
index 8d0a5efda..f0966fa81 100644
--- a/data/cities/perrignier/my-cheminee-creation.yml
+++ b/data/cities/perrignier/my-cheminee-creation.yml
@@ -4,8 +4,8 @@ latitude: 46.30556
 longitude: 6.42193
 postcode: "74550"
 city: Perrignier
-street: "Impasse du Pachoré"
-housenumber: 110
-phone: "+33 4 50 70 06 10"
+street: Impasse du Pachoré
+housenumber: "110"
+phone: +33 4 50 70 06 10
 opening_hours: ""
-website: "https://www.mycheminee.fr"
\ No newline at end of file
+website: https://www.mycheminee.fr
diff --git a/data/cities/perrignier/o-coeur-des-sens.yml b/data/cities/perrignier/o-coeur-des-sens.yml
index 15f518513..a6de403ec 100644
--- a/data/cities/perrignier/o-coeur-des-sens.yml
+++ b/data/cities/perrignier/o-coeur-des-sens.yml
@@ -4,8 +4,8 @@ latitude: 46.30079
 longitude: 6.41548
 postcode: "74550"
 city: Perrignier
-street: "Chemin des Mouilles"
-housenumber: 
-phone: "+33 4 50 73 66 25"
+street: Chemin des Mouilles
+housenumber: ""
+phone: +33 4 50 73 66 25
 opening_hours: ""
-website: "https://www.o-coeur-des-sens.com/"
\ No newline at end of file
+website: https://www.o-coeur-des-sens.com/
diff --git a/data/cities/perrignier/osmose-coiffure.yml b/data/cities/perrignier/osmose-coiffure.yml
index 362b9577e..23bea3e82 100644
--- a/data/cities/perrignier/osmose-coiffure.yml
+++ b/data/cities/perrignier/osmose-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.30075
 longitude: 6.41556
 postcode: "74550"
 city: Perrignier
-street: "Chemin des Mouilles"
-housenumber: 
-phone: "+33 4 50 81 74 15"
+street: Chemin des Mouilles
+housenumber: ""
+phone: +33 4 50 81 74 15
 opening_hours: ""
-website: "https://www.facebook.com/osmosecoiffureperrignier"
\ No newline at end of file
+website: https://www.facebook.com/osmosecoiffureperrignier
diff --git a/data/cities/perrignier/promedif.yml b/data/cities/perrignier/promedif.yml
index 826d98cca..aac071d52 100644
--- a/data/cities/perrignier/promedif.yml
+++ b/data/cities/perrignier/promedif.yml
@@ -1,11 +1,11 @@
 id: 224805987
-type: way
+type: node
 latitude: 46.30449
 longitude: 6.42225
 postcode: "74550"
 city: Perrignier
-street: "Route des Grandes Teppes"
-housenumber: 335
-phone: "+33 4 50 72 43 44"
+street: Route des Grandes Teppes
+housenumber: "335"
+phone: +33 4 50 72 43 44
 opening_hours: ""
-website: "http://www.promedif.eu"
\ No newline at end of file
+website: http://www.promedif.eu
diff --git a/data/cities/perrignier/union-nouvelle-leman.yml b/data/cities/perrignier/union-nouvelle-leman.yml
index 8ccea744c..353ec3289 100644
--- a/data/cities/perrignier/union-nouvelle-leman.yml
+++ b/data/cities/perrignier/union-nouvelle-leman.yml
@@ -1,11 +1,11 @@
 id: 860765127
-type: way
+type: node
 latitude: 46.30633
 longitude: 6.42298
 postcode: "74550"
 city: Perrignier
-street: "Rue du Brafyeu"
-housenumber: 206
-phone: "+33 4 50 71 23 32"
+street: Rue du Brafyeu
+housenumber: "206"
+phone: +33 4 50 71 23 32
 opening_hours: ""
-website: "https://www.un-leman.fr"
\ No newline at end of file
+website: https://www.un-leman.fr
diff --git a/data/cities/pers-jussy/casino-supermarche.yml b/data/cities/pers-jussy/casino-supermarche.yml
index 1d4e8787d..f09e7d295 100644
--- a/data/cities/pers-jussy/casino-supermarche.yml
+++ b/data/cities/pers-jussy/casino-supermarche.yml
@@ -1,11 +1,11 @@
 id: 807465717
-type: way
+type: node
 latitude: 46.12335
 longitude: 6.26763
 postcode: "74930"
 city: Pers-Jussy
-street: "Impasse des Contamines"
-housenumber: 240
+street: Impasse des Contamines
+housenumber: "240"
 phone: ""
-opening_hours: "Mo-Th 08:00-19:30; Fr-Sa 08:00-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:00-19:30; Fr-Sa 08:00-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/pers-jussy/le-petit-pers.yml b/data/cities/pers-jussy/le-petit-pers.yml
index bf3b91915..f48858c5b 100644
--- a/data/cities/pers-jussy/le-petit-pers.yml
+++ b/data/cities/pers-jussy/le-petit-pers.yml
@@ -4,8 +4,8 @@ latitude: 46.10893
 longitude: 6.26368
 postcode: "74930"
 city: Pers-Jussy
-street: "Chemin de Beule"
-housenumber: 74
-phone: "+33 4 50 95 70 79"
-opening_hours: "Mo-Su 06:30-12:30"
-website: ""
\ No newline at end of file
+street: Chemin de Beule
+housenumber: "74"
+phone: +33 4 50 95 70 79
+opening_hours: Mo-Su 06:30-12:30
+website: ""
diff --git a/data/cities/pers-jussy/nouvel-hair.yml b/data/cities/pers-jussy/nouvel-hair.yml
index b172f82a9..64d686e33 100644
--- a/data/cities/pers-jussy/nouvel-hair.yml
+++ b/data/cities/pers-jussy/nouvel-hair.yml
@@ -4,8 +4,8 @@ latitude: 46.10892
 longitude: 6.26359
 postcode: "74930"
 city: Pers-Jussy
-street: "Chemin de Beule"
-housenumber: 72
-phone: "+33 4 50 94 48 46"
+street: Chemin de Beule
+housenumber: "72"
+phone: +33 4 50 94 48 46
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pierre-benite/atelier-tricycle.yml b/data/cities/pierre-benite/atelier-tricycle.yml
index 56e275728..1d7b12374 100644
--- a/data/cities/pierre-benite/atelier-tricycle.yml
+++ b/data/cities/pierre-benite/atelier-tricycle.yml
@@ -4,8 +4,8 @@ latitude: 45.7041
 longitude: 4.82363
 postcode: "69310"
 city: Pierre-Bénite
-street: "Place Jean Jaurès"
-housenumber: 9
+street: Place Jean Jaurès
+housenumber: "9"
 phone: "+33753872549"
 opening_hours: ""
-website: "https://www.facebook.com/pg/Atelier-V%C3%A9lo-de-Pierre-B%C3%A9nite-274922476018176/"
\ No newline at end of file
+website: https://www.facebook.com/pg/Atelier-V%C3%A9lo-de-Pierre-B%C3%A9nite-274922476018176/
diff --git a/data/cities/pierre-benite/boucherie-des-combattants.yml b/data/cities/pierre-benite/boucherie-des-combattants.yml
index 3db049436..0ce4fba43 100644
--- a/data/cities/pierre-benite/boucherie-des-combattants.yml
+++ b/data/cities/pierre-benite/boucherie-des-combattants.yml
@@ -1,11 +1,11 @@
 id: 67483987
-type: way
+type: node
 latitude: 45.70618
 longitude: 4.8159
 postcode: "69310"
 city: Pierre-Bénite
-street: "Rue Paul Vaillant-Couturier"
-housenumber: 59
+street: Rue Paul Vaillant-Couturier
+housenumber: "59"
 phone: "+33478501325"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pierre-benite/grand-frais.yml b/data/cities/pierre-benite/grand-frais.yml
index 5f92ad264..08eea703b 100644
--- a/data/cities/pierre-benite/grand-frais.yml
+++ b/data/cities/pierre-benite/grand-frais.yml
@@ -4,8 +4,8 @@ latitude: 45.69455
 longitude: 4.82406
 postcode: "69310"
 city: Pierre-Bénite
-street: "Chemin des Mûriers"
-housenumber: 
-phone: "+33 4 78 50 78 35"
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: "https://www.grandfrais.com/magasins/pierre-benite"
\ No newline at end of file
+street: Chemin des Mûriers
+housenumber: ""
+phone: +33 4 78 50 78 35
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: https://www.grandfrais.com/magasins/pierre-benite
diff --git a/data/cities/pierre-benite/medor-et-compagnie.yml b/data/cities/pierre-benite/medor-et-compagnie.yml
index 0a3c4970d..ae99be689 100644
--- a/data/cities/pierre-benite/medor-et-compagnie.yml
+++ b/data/cities/pierre-benite/medor-et-compagnie.yml
@@ -4,8 +4,8 @@ latitude: 45.6944
 longitude: 4.82394
 postcode: "69310"
 city: Pierre-Bénite
-street: "Chemin des Mûriers"
-housenumber: 7
-phone: "+33 4 72 66 95 39"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.medoretcie.com/nos-magasins/medor-compagnie-pierre-benite/pbe.html"
\ No newline at end of file
+street: Chemin des Mûriers
+housenumber: "7"
+phone: +33 4 72 66 95 39
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.medoretcie.com/nos-magasins/medor-compagnie-pierre-benite/pbe.html
diff --git a/data/cities/pierre-benite/tabac-des-combattants.yml b/data/cities/pierre-benite/tabac-des-combattants.yml
index 389f0172b..0df483c8a 100644
--- a/data/cities/pierre-benite/tabac-des-combattants.yml
+++ b/data/cities/pierre-benite/tabac-des-combattants.yml
@@ -1,11 +1,11 @@
 id: 67484234
-type: way
+type: node
 latitude: 45.70602
 longitude: 4.81556
 postcode: "69310"
 city: Pierre-Bénite
-street: "Rue Paul Vaillant-Couturier"
-housenumber: 61
+street: Rue Paul Vaillant-Couturier
+housenumber: "61"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pierre-chatel/boulangerie-des-lacs.yml b/data/cities/pierre-chatel/boulangerie-des-lacs.yml
index c2a0e697d..9895bbaeb 100644
--- a/data/cities/pierre-chatel/boulangerie-des-lacs.yml
+++ b/data/cities/pierre-chatel/boulangerie-des-lacs.yml
@@ -5,7 +5,7 @@ longitude: 5.77824
 postcode: "38119"
 city: Pierre-Châtel
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 05:30-13:00,15:00-19:30; Su 05:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 05:30-13:00,15:00-19:30; Su 05:30-13:00
+website: ""
diff --git a/data/cities/pierreatte/cash-piscines.yml b/data/cities/pierreatte/cash-piscines.yml
index bc49d9511..1c5619f2b 100644
--- a/data/cities/pierreatte/cash-piscines.yml
+++ b/data/cities/pierreatte/cash-piscines.yml
@@ -4,8 +4,8 @@ latitude: 44.3623
 longitude: 4.69562
 postcode: "26700"
 city: Pierreatte
-street: "Rue Auguste Rodin"
-housenumber: 
+street: Rue Auguste Rodin
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pierreatte/centrakor.yml b/data/cities/pierreatte/centrakor.yml
index c84788999..b9b6a67ba 100644
--- a/data/cities/pierreatte/centrakor.yml
+++ b/data/cities/pierreatte/centrakor.yml
@@ -4,8 +4,8 @@ latitude: 44.36229
 longitude: 4.69651
 postcode: "26700"
 city: Pierreatte
-street: "Zone commerciale de la croix d'or"
-housenumber: 
+street: Zone commerciale de la croix d'or
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/pierreatte/marceletfils-bio.yml b/data/cities/pierreatte/marceletfils-bio.yml
index cca77af64..4b4773bf4 100644
--- a/data/cities/pierreatte/marceletfils-bio.yml
+++ b/data/cities/pierreatte/marceletfils-bio.yml
@@ -5,7 +5,7 @@ longitude: 4.69637
 postcode: "26700"
 city: Pierreatte
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pierreatte/maxi-zoo.yml b/data/cities/pierreatte/maxi-zoo.yml
index 212effbc1..382675f03 100644
--- a/data/cities/pierreatte/maxi-zoo.yml
+++ b/data/cities/pierreatte/maxi-zoo.yml
@@ -4,8 +4,8 @@ latitude: 44.36217
 longitude: 4.69558
 postcode: "26700"
 city: Pierreatte
-street: "Rue Auguste Rodin"
-housenumber: 
+street: Rue Auguste Rodin
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/plagne-1800/intersport.yml b/data/cities/plagne-1800/intersport.yml
index 683aa5863..01a969289 100644
--- a/data/cities/plagne-1800/intersport.yml
+++ b/data/cities/plagne-1800/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.67768
 postcode: "73210"
 city: Plagne 1800
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plagne-bellecote/ski-republic.yml b/data/cities/plagne-bellecote/ski-republic.yml
index 8bc6052be..61c604127 100644
--- a/data/cities/plagne-bellecote/ski-republic.yml
+++ b/data/cities/plagne-bellecote/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 45.51304
 longitude: 6.6972
 postcode: "73210"
 city: Plagne Bellecote
-street: "Centre Commercial Bellecote"
-housenumber: 
+street: Centre Commercial Bellecote
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plagne-bellecote/ski-team.yml b/data/cities/plagne-bellecote/ski-team.yml
index 98e9d3424..108fe9f54 100644
--- a/data/cities/plagne-bellecote/ski-team.yml
+++ b/data/cities/plagne-bellecote/ski-team.yml
@@ -5,7 +5,7 @@ longitude: 6.69761
 postcode: "73210"
 city: Plagne Bellecote
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plagne-bellecote/twinner.yml b/data/cities/plagne-bellecote/twinner.yml
index d16f2670b..d5e511e68 100644
--- a/data/cities/plagne-bellecote/twinner.yml
+++ b/data/cities/plagne-bellecote/twinner.yml
@@ -2,10 +2,10 @@ id: 3170288379
 type: node
 latitude: 45.51348
 longitude: 6.69747
-postcode: "73210;73120"
+postcode: 73210;73120
 city: Plagne Bellecote
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plagne-centre/intersport.yml b/data/cities/plagne-centre/intersport.yml
index eb2288d9b..a1f9a410a 100644
--- a/data/cities/plagne-centre/intersport.yml
+++ b/data/cities/plagne-centre/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.67627
 postcode: "73120"
 city: Plagne Centre
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plagne-centre/netski-allais-sport.yml b/data/cities/plagne-centre/netski-allais-sport.yml
index d3752f36b..875b8c571 100644
--- a/data/cities/plagne-centre/netski-allais-sport.yml
+++ b/data/cities/plagne-centre/netski-allais-sport.yml
@@ -5,7 +5,7 @@ longitude: 6.67852
 postcode: "73120"
 city: Plagne Centre
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plagne-centre/technique-extreme.yml b/data/cities/plagne-centre/technique-extreme.yml
index 16aeeb23f..13cdce059 100644
--- a/data/cities/plagne-centre/technique-extreme.yml
+++ b/data/cities/plagne-centre/technique-extreme.yml
@@ -5,7 +5,7 @@ longitude: 6.67532
 postcode: "73310"
 city: Plagne centre
 street: ""
-housenumber: 
-phone: "+33 479 09 12 13"
-opening_hours: "Dec-Apr: Mo-Su 09:00-12:00,15:00-19:30"
-website: "https://www.technique-extreme.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 479 09 12 13
+opening_hours: 'Dec-Apr: Mo-Su 09:00-12:00,15:00-19:30'
+website: https://www.technique-extreme.com/
diff --git a/data/cities/plagne-montalbert/intersport.yml b/data/cities/plagne-montalbert/intersport.yml
index 9e9db08e1..76b86c73c 100644
--- a/data/cities/plagne-montalbert/intersport.yml
+++ b/data/cities/plagne-montalbert/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.53495
 longitude: 6.6359
 postcode: "73120"
 city: Plagne Montalbert
-street: "plange Montalbert"
-housenumber: 
+street: plange Montalbert
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plagne-soleil/intersport.yml b/data/cities/plagne-soleil/intersport.yml
index b18d524ae..8d042d343 100644
--- a/data/cities/plagne-soleil/intersport.yml
+++ b/data/cities/plagne-soleil/intersport.yml
@@ -5,7 +5,8 @@ longitude: 6.68549
 postcode: "73120"
 city: Plagne Soleil
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 08:45-12:30,14:30-18:00; Fr 08:45-12:30,14:00-18:00; Sa 08:30-12:30,13:30-19:00; Su 08:30-12:30,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:45-12:30,14:30-18:00; Fr 08:45-12:30,14:00-18:00; Sa 08:30-12:30,13:30-19:00;
+    Su 08:30-12:30,14:00-18:00
+website: ""
diff --git a/data/cities/plateau-dassy/alpin-hair.yml b/data/cities/plateau-dassy/alpin-hair.yml
index 6cefca32d..024887b4c 100644
--- a/data/cities/plateau-dassy/alpin-hair.yml
+++ b/data/cities/plateau-dassy/alpin-hair.yml
@@ -4,8 +4,8 @@ latitude: 45.93701
 longitude: 6.70414
 postcode: "74190"
 city: Plateau d'Assy
-street: "Avenue du Docteur Jacques Arnaud"
-housenumber: 895
-phone: "+33 9 82 58 94 50"
-opening_hours: "Mo,Tu,Th 09:00-18:30; Fr 09:00-20:00; Sa 08:30-16:00"
-website: "https://www.planity.com/alpin-hair-74190-passy"
\ No newline at end of file
+street: Avenue du Docteur Jacques Arnaud
+housenumber: "895"
+phone: +33 9 82 58 94 50
+opening_hours: Mo,Tu,Th 09:00-18:30; Fr 09:00-20:00; Sa 08:30-16:00
+website: https://www.planity.com/alpin-hair-74190-passy
diff --git a/data/cities/plateau-des-petites-roches/atv-cycles-route-des-trois-villages.yml b/data/cities/plateau-des-petites-roches/atv-cycles-route-des-trois-villages.yml
index a9bffa5aa..9971983e8 100644
--- a/data/cities/plateau-des-petites-roches/atv-cycles-route-des-trois-villages.yml
+++ b/data/cities/plateau-des-petites-roches/atv-cycles-route-des-trois-villages.yml
@@ -4,8 +4,8 @@ latitude: 45.31222
 longitude: 5.88722
 postcode: "38660"
 city: Plateau des Petites Roches
-street: "Route des Trois Villages"
-housenumber: 5171
+street: Route des Trois Villages
+housenumber: "5171"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plateau-des-petites-roches/atv-cycles.yml b/data/cities/plateau-des-petites-roches/atv-cycles.yml
index c19b51111..0cd9df0f5 100644
--- a/data/cities/plateau-des-petites-roches/atv-cycles.yml
+++ b/data/cities/plateau-des-petites-roches/atv-cycles.yml
@@ -4,8 +4,8 @@ latitude: 45.31091
 longitude: 5.88726
 postcode: ""
 city: Plateau-des-Petites-Roches
-street: "route des Trois Villages"
-housenumber: 5171
+street: Route des Trois Villages
+housenumber: "5171"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/plateau-des-petites-roches/ferme-ouche.yml b/data/cities/plateau-des-petites-roches/ferme-ouche.yml
index 9eceb1b78..3a8cfd409 100644
--- a/data/cities/plateau-des-petites-roches/ferme-ouche.yml
+++ b/data/cities/plateau-des-petites-roches/ferme-ouche.yml
@@ -1,11 +1,11 @@
 id: 787169075
-type: way
+type: node
 latitude: 45.33161
 longitude: 5.9027
 postcode: ""
 city: Plateau-des-Petites-Roches
-street: "450, route du Col de Marcieu"
-housenumber: 
-phone: "+33 6 18 21 65 28"
+street: 450, route du Col de Marcieu
+housenumber: ""
+phone: +33 6 18 21 65 28
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plateau-des-petites-roches/le-magasin-general.yml b/data/cities/plateau-des-petites-roches/le-magasin-general.yml
index b6b3d0071..9eef2c945 100644
--- a/data/cities/plateau-des-petites-roches/le-magasin-general.yml
+++ b/data/cities/plateau-des-petites-roches/le-magasin-general.yml
@@ -4,8 +4,8 @@ latitude: 45.32863
 longitude: 5.90237
 postcode: "38660"
 city: Plateau-des-Petites-Roches
-street: "Rue des 22 Martyrs"
-housenumber: 108
-phone: "+33 6 41 43 10 14"
-opening_hours: "Mon 15:00-19:00; Tu-Sa 09:30-12:30, 15:00-19:00"
-website: "https://www.magasin-general.coop"
\ No newline at end of file
+street: Rue des 22 Martyrs
+housenumber: "108"
+phone: +33 6 41 43 10 14
+opening_hours: Mon 15:00-19:00; Tu-Sa 09:30-12:30, 15:00-19:00
+website: https://www.magasin-general.coop
diff --git a/data/cities/plateau-des-petites-roches/sas-ferme-ouche.yml b/data/cities/plateau-des-petites-roches/sas-ferme-ouche.yml
index 7a096d189..5c7b32c69 100644
--- a/data/cities/plateau-des-petites-roches/sas-ferme-ouche.yml
+++ b/data/cities/plateau-des-petites-roches/sas-ferme-ouche.yml
@@ -4,8 +4,8 @@ latitude: 45.32899
 longitude: 5.90257
 postcode: "38660"
 city: Plateau des petites roches
-street: "Chemin de Montbrun"
-housenumber: 32
+street: Chemin de Montbrun
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/plateau-dhauteville/la-main-dans-le-vrac.yml b/data/cities/plateau-dhauteville/la-main-dans-le-vrac.yml
index e32ffed61..b89c8298e 100644
--- a/data/cities/plateau-dhauteville/la-main-dans-le-vrac.yml
+++ b/data/cities/plateau-dhauteville/la-main-dans-le-vrac.yml
@@ -4,8 +4,8 @@ latitude: 45.97664
 longitude: 5.59962
 postcode: "01110"
 city: Plateau d'Hauteville
-street: "Avenue de Lyon"
-housenumber: 42
+street: Avenue de Lyon
+housenumber: "42"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/poisat/carrefour-market.yml b/data/cities/poisat/carrefour-market.yml
index 19c424a2c..02f1d2696 100644
--- a/data/cities/poisat/carrefour-market.yml
+++ b/data/cities/poisat/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 45.15919
 longitude: 5.76024
 postcode: "38320"
 city: Poisat
-street: "Place Georges Brassens"
-housenumber: 
-phone: "+33 4 76 00 00 82"
-opening_hours: "Mo-Sa 07:00-20:30, Su 08:00-12:30"
-website: "https://www.carrefour.fr/magasin/city-poisat"
\ No newline at end of file
+street: Place Georges Brassens
+housenumber: ""
+phone: +33 4 76 00 00 82
+opening_hours: Mo-Sa 07:00-20:30, Su 08:00-12:30
+website: https://www.carrefour.fr/magasin/city-poisat
diff --git a/data/cities/poisat/epicuria.yml b/data/cities/poisat/epicuria.yml
index 9d9e89efb..587844cd6 100644
--- a/data/cities/poisat/epicuria.yml
+++ b/data/cities/poisat/epicuria.yml
@@ -4,8 +4,8 @@ latitude: 45.15895
 longitude: 5.75976
 postcode: "38320"
 city: Poisat
-street: "Place Georges Brassens"
-housenumber: 27
-phone: "+33 9 72 52 13 13"
-opening_hours: "Mo-Su 06:30-20:00"
-website: "http://www.epicuriasucresale.com/"
\ No newline at end of file
+street: Place Georges Brassens
+housenumber: "27"
+phone: +33 9 72 52 13 13
+opening_hours: Mo-Su 06:30-20:00
+website: http://www.epicuriasucresale.com/
diff --git a/data/cities/poisy/casino-shop.yml b/data/cities/poisy/casino-shop.yml
index 2d47a618f..851c5ef1c 100644
--- a/data/cities/poisy/casino-shop.yml
+++ b/data/cities/poisy/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.92151
 longitude: 6.0618
 postcode: "74330"
 city: Poisy
-street: "Route de Lovagny"
-housenumber: 75
+street: Route de Lovagny
+housenumber: "75"
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30, 15:00-19:30; Su 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30, 15:00-19:30; Su 08:30-12:00
+website: ""
diff --git a/data/cities/poisy/les-pains-de-remi-poisy.yml b/data/cities/poisy/les-pains-de-remi-poisy.yml
index 78da4c404..f35d0da10 100644
--- a/data/cities/poisy/les-pains-de-remi-poisy.yml
+++ b/data/cities/poisy/les-pains-de-remi-poisy.yml
@@ -4,8 +4,8 @@ latitude: 45.92205
 longitude: 6.06307
 postcode: "74330"
 city: Poisy
-street: "Route d'Annecy"
-housenumber: 15
+street: Route d'Annecy
+housenumber: "15"
 phone: "0450882590"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/poisy/spar.yml b/data/cities/poisy/spar.yml
index 49835c9bb..d48aaf86f 100644
--- a/data/cities/poisy/spar.yml
+++ b/data/cities/poisy/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.91729
 longitude: 6.08339
 postcode: "74330"
 city: Poisy
-street: "Route des Creusettes"
-housenumber: 48
+street: Route des Creusettes
+housenumber: "48"
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00; Su 09:00-13:00, 16:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00; Su 09:00-13:00, 16:00-20:00
+website: ""
diff --git a/data/cities/polliat/intermarche.yml b/data/cities/polliat/intermarche.yml
index d2b69fad6..15ccc4f5f 100644
--- a/data/cities/polliat/intermarche.yml
+++ b/data/cities/polliat/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 46.2479
 longitude: 5.13225
 postcode: "01310"
 city: Polliat
-street: "Allée de l'Osier"
-housenumber: 21
+street: Allée de l'Osier
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pollionnay/marche-paysan.yml b/data/cities/pollionnay/marche-paysan.yml
index afd79b2c9..8bc9c9aac 100644
--- a/data/cities/pollionnay/marche-paysan.yml
+++ b/data/cities/pollionnay/marche-paysan.yml
@@ -1,11 +1,11 @@
 id: 132972793
-type: way
+type: node
 latitude: 45.76563
 longitude: 4.66153
 postcode: ""
 city: Pollionnay
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Fr 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Fr 16:00-19:00
+website: ""
diff --git a/data/cities/pomeys/cycle-activ-et-co.yml b/data/cities/pomeys/cycle-activ-et-co.yml
index 849891a19..b52263f0b 100644
--- a/data/cities/pomeys/cycle-activ-et-co.yml
+++ b/data/cities/pomeys/cycle-activ-et-co.yml
@@ -4,8 +4,8 @@ latitude: 45.63956
 longitude: 4.47746
 postcode: "69590"
 city: Pomeys
-street: "ZA Grange Figat RD 11"
-housenumber: 
+street: ZA Grange Figat RD 11
+housenumber: ""
 phone: "+33981375586"
-opening_hours: "Mo,Fr 14:30-19:30; Tu-Th 09:00-12:30,14:30-19:30; Sa 09:00-12:00,14:30-19:30"
-website: "https://www.cycle-activ-and-co.fr"
\ No newline at end of file
+opening_hours: Mo,Fr 14:30-19:30; Tu-Th 09:00-12:30,14:30-19:30; Sa 09:00-12:00,14:30-19:30
+website: https://www.cycle-activ-and-co.fr
diff --git a/data/cities/pomeys/garage-poyard-eurorepar.yml b/data/cities/pomeys/garage-poyard-eurorepar.yml
index 9e30671f0..555b740b1 100644
--- a/data/cities/pomeys/garage-poyard-eurorepar.yml
+++ b/data/cities/pomeys/garage-poyard-eurorepar.yml
@@ -4,8 +4,8 @@ latitude: 45.63931
 longitude: 4.47805
 postcode: "69590"
 city: Pomeys
-street: "ZA Grange Figeat"
-housenumber: 
+street: ZA Grange Figeat
+housenumber: ""
 phone: "+33478445395"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:30; Sa 08:00-12:00"
-website: "https://www.garage-poyard-pomeys.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:30; Sa 08:00-12:00
+website: https://www.garage-poyard-pomeys.fr/
diff --git a/data/cities/pomeys/latelier-daurelie.yml b/data/cities/pomeys/latelier-daurelie.yml
index 47e31dd07..969c570bf 100644
--- a/data/cities/pomeys/latelier-daurelie.yml
+++ b/data/cities/pomeys/latelier-daurelie.yml
@@ -4,8 +4,8 @@ latitude: 45.64985
 longitude: 4.44334
 postcode: "69590"
 city: Pomeys
-street: "Rue du Tilleul"
-housenumber: 425
+street: Rue du Tilleul
+housenumber: "425"
 phone: "+33478444984"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pomeys/proxi-monts-panier-local.yml b/data/cities/pomeys/proxi-monts-panier-local.yml
index 1f0f8dd2f..8e788f067 100644
--- a/data/cities/pomeys/proxi-monts-panier-local.yml
+++ b/data/cities/pomeys/proxi-monts-panier-local.yml
@@ -4,8 +4,8 @@ latitude: 45.6505
 longitude: 4.44269
 postcode: "69590"
 city: Pomeys
-street: "Rue du Tilleul"
-housenumber: 514
+street: Rue du Tilleul
+housenumber: "514"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-dain/pf-lamartine.yml b/data/cities/pont-dain/pf-lamartine.yml
index e792d8bca..e6562f4b8 100644
--- a/data/cities/pont-dain/pf-lamartine.yml
+++ b/data/cities/pont-dain/pf-lamartine.yml
@@ -1,11 +1,11 @@
 id: 154031729
-type: way
+type: node
 latitude: 46.0487
 longitude: 5.32669
 postcode: "01160"
 city: Pont-d'Ain
-street: "Rue de l'Ile de Varambon"
-housenumber: 117
+street: Rue de l'Ile de Varambon
+housenumber: "117"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-de-barret/la-marge.yml b/data/cities/pont-de-barret/la-marge.yml
index 77c572f3e..99b858be0 100644
--- a/data/cities/pont-de-barret/la-marge.yml
+++ b/data/cities/pont-de-barret/la-marge.yml
@@ -4,8 +4,8 @@ latitude: 44.60253
 longitude: 5.01175
 postcode: "16160"
 city: Pont-de-Barret
-street: "Rue du Commandant Chaix"
-housenumber: 60
-phone: "+336 89 62 84 13"
-opening_hours: "Thu 17:00-19:00; Sa-Su 10:00-12:00,15:00-18:00"
-website: "https://ketanet.fr/lamarge/"
\ No newline at end of file
+street: Rue du Commandant Chaix
+housenumber: "60"
+phone: +336 89 62 84 13
+opening_hours: Thu 17:00-19:00; Sa-Su 10:00-12:00,15:00-18:00
+website: https://ketanet.fr/lamarge/
diff --git a/data/cities/pont-de-beauvoisn/cash-express.yml b/data/cities/pont-de-beauvoisn/cash-express.yml
index 571ff8f7e..5c26dedab 100644
--- a/data/cities/pont-de-beauvoisn/cash-express.yml
+++ b/data/cities/pont-de-beauvoisn/cash-express.yml
@@ -4,8 +4,8 @@ latitude: 45.53156
 longitude: 5.68443
 postcode: "73330"
 city: Pont de Beauvoisn
-street: "Avenue Jean Jaurès"
-housenumber: 73
-phone: "+33 4 76069371"
-opening_hours: "10:00-12:30 14:30-18:45"
-website: "https://www.cashexpress.fr/magasin-pont-beauvoisin,418.html"
\ No newline at end of file
+street: Avenue Jean Jaurès
+housenumber: "73"
+phone: +33 4 76069371
+opening_hours: 10:00-12:30 14:30-18:45
+website: https://www.cashexpress.fr/magasin-pont-beauvoisin,418.html
diff --git a/data/cities/pont-de-beauvoisn/erofruits.yml b/data/cities/pont-de-beauvoisn/erofruits.yml
index 12157bb95..f7ab165cd 100644
--- a/data/cities/pont-de-beauvoisn/erofruits.yml
+++ b/data/cities/pont-de-beauvoisn/erofruits.yml
@@ -4,8 +4,8 @@ latitude: 45.53193
 longitude: 5.68286
 postcode: "73330"
 city: Pont de Beauvoisn
-street: "Zoning Industriel Baronnie"
-housenumber: 
+street: Zoning Industriel Baronnie
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-19:30
+website: ""
diff --git a/data/cities/pont-de-cheruy/adrenaline-studio.yml b/data/cities/pont-de-cheruy/adrenaline-studio.yml
index d63fa7f91..87a8ea26e 100644
--- a/data/cities/pont-de-cheruy/adrenaline-studio.yml
+++ b/data/cities/pont-de-cheruy/adrenaline-studio.yml
@@ -4,8 +4,8 @@ latitude: 45.75102
 longitude: 5.17569
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Rue Centrale"
-housenumber: 43
-phone: "+33 6 63 99 10 56"
-opening_hours: "Tu-Sa 13:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Centrale
+housenumber: "43"
+phone: +33 6 63 99 10 56
+opening_hours: Tu-Sa 13:00-19:00
+website: ""
diff --git a/data/cities/pont-de-cheruy/audition-sante.yml b/data/cities/pont-de-cheruy/audition-sante.yml
index 384e6708f..1415806b6 100644
--- a/data/cities/pont-de-cheruy/audition-sante.yml
+++ b/data/cities/pont-de-cheruy/audition-sante.yml
@@ -4,8 +4,8 @@ latitude: 45.75124
 longitude: 5.17611
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Rue des Aubépines"
-housenumber: 
-phone: "+33 4 78 80 67 23"
-opening_hours: "Tu-We 09:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue des Aubépines
+housenumber: ""
+phone: +33 4 78 80 67 23
+opening_hours: Tu-We 09:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/pont-de-cheruy/boulangerie-vial.yml b/data/cities/pont-de-cheruy/boulangerie-vial.yml
index 31678932e..03413d763 100644
--- a/data/cities/pont-de-cheruy/boulangerie-vial.yml
+++ b/data/cities/pont-de-cheruy/boulangerie-vial.yml
@@ -5,7 +5,7 @@ longitude: 5.17016
 postcode: "38230"
 city: Pont-de-Chéruy
 street: ""
-housenumber: 34
+housenumber: "34"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-de-cheruy/city-laverie.yml b/data/cities/pont-de-cheruy/city-laverie.yml
index 46960ce4b..1766f305c 100644
--- a/data/cities/pont-de-cheruy/city-laverie.yml
+++ b/data/cities/pont-de-cheruy/city-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.75127
 longitude: 5.17616
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Rue des Aubépines"
-housenumber: 
+street: Rue des Aubépines
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.city-laverie.com/laverie-pont-de-cheruy"
\ No newline at end of file
+website: https://www.city-laverie.com/laverie-pont-de-cheruy
diff --git a/data/cities/pont-de-cheruy/coeur-exotique.yml b/data/cities/pont-de-cheruy/coeur-exotique.yml
index 864511149..ce36739c8 100644
--- a/data/cities/pont-de-cheruy/coeur-exotique.yml
+++ b/data/cities/pont-de-cheruy/coeur-exotique.yml
@@ -4,8 +4,8 @@ latitude: 45.74995
 longitude: 5.17646
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Place René Duquaire"
-housenumber: 4
-phone: "+33 4 78 80 34 31"
+street: Place René Duquaire
+housenumber: "4"
+phone: +33 4 78 80 34 31
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-de-cheruy/ecig-eco.yml b/data/cities/pont-de-cheruy/ecig-eco.yml
index 655926cf6..8fc0481bb 100644
--- a/data/cities/pont-de-cheruy/ecig-eco.yml
+++ b/data/cities/pont-de-cheruy/ecig-eco.yml
@@ -4,8 +4,8 @@ latitude: 45.75016
 longitude: 5.16941
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Rue Neyret"
-housenumber: 
+street: Rue Neyret
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-de-cheruy/el-amir.yml b/data/cities/pont-de-cheruy/el-amir.yml
index c94f2fa91..1e735596f 100644
--- a/data/cities/pont-de-cheruy/el-amir.yml
+++ b/data/cities/pont-de-cheruy/el-amir.yml
@@ -4,8 +4,8 @@ latitude: 45.74998
 longitude: 5.17625
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Place René Duquaire"
-housenumber: 4
-phone: "+33 44 72 02 36 54"
+street: Place René Duquaire
+housenumber: "4"
+phone: +33 44 72 02 36 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-de-cheruy/le-tif.yml b/data/cities/pont-de-cheruy/le-tif.yml
index 87c808914..b2f935f01 100644
--- a/data/cities/pont-de-cheruy/le-tif.yml
+++ b/data/cities/pont-de-cheruy/le-tif.yml
@@ -4,8 +4,8 @@ latitude: 45.74994
 longitude: 5.17636
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Place René Duquaire"
-housenumber: 
-phone: "+33 4 78 32 12 44"
+street: Place René Duquaire
+housenumber: ""
+phone: +33 4 78 32 12 44
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-de-cheruy/saint-algue.yml b/data/cities/pont-de-cheruy/saint-algue.yml
index 3ce573044..bf0c119e3 100644
--- a/data/cities/pont-de-cheruy/saint-algue.yml
+++ b/data/cities/pont-de-cheruy/saint-algue.yml
@@ -4,8 +4,8 @@ latitude: 45.75119
 longitude: 5.17604
 postcode: "38230"
 city: Pont-de-Chéruy
-street: "Rue des Aubépines"
-housenumber: 
-phone: "+33 4 72 46 04 15"
+street: Rue des Aubépines
+housenumber: ""
+phone: +33 4 72 46 04 15
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-eveque/action.yml b/data/cities/pont-eveque/action.yml
index 06f5033e3..96ff62d15 100644
--- a/data/cities/pont-eveque/action.yml
+++ b/data/cities/pont-eveque/action.yml
@@ -1,11 +1,11 @@
 id: 1097901512
-type: way
+type: node
 latitude: 45.52592
 longitude: 4.91839
 postcode: "38780"
 city: Pont-Évêque
-street: "Allée de la Tour"
-housenumber: 1
+street: Allée de la Tour
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/pont-eveque/alpha-pneu.yml b/data/cities/pont-eveque/alpha-pneu.yml
index b0bece143..7d6ac348f 100644
--- a/data/cities/pont-eveque/alpha-pneu.yml
+++ b/data/cities/pont-eveque/alpha-pneu.yml
@@ -1,11 +1,11 @@
 id: 159292460
-type: way
+type: node
 latitude: 45.52381
 longitude: 4.91949
 postcode: "38780"
 city: Pont-Évêque
-street: "Avenue Georges et Louis Frêrejean"
-housenumber: 34
-phone: "+33 4 74 79 98 46"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Georges et Louis Frêrejean
+housenumber: "34"
+phone: +33 4 74 79 98 46
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/pont-eveque/brizglass.yml b/data/cities/pont-eveque/brizglass.yml
index f857f06e6..7db218592 100644
--- a/data/cities/pont-eveque/brizglass.yml
+++ b/data/cities/pont-eveque/brizglass.yml
@@ -1,11 +1,11 @@
 id: 159294100
-type: way
+type: node
 latitude: 45.52418
 longitude: 4.92006
 postcode: "38780"
 city: Pont-Évêque
-street: "Avenue Georges et Louis Frêrejean"
-housenumber: 34
-phone: "+33 4 30 22 03 29"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa Sur rendez-vous"
-website: "https://www.brizglass.com/"
\ No newline at end of file
+street: Avenue Georges et Louis Frêrejean
+housenumber: "34"
+phone: +33 4 30 22 03 29
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa "Sur rendez-vous"
+website: https://www.brizglass.com/
diff --git a/data/cities/pont-eveque/carrefour-market.yml b/data/cities/pont-eveque/carrefour-market.yml
index df8f44317..37bed468e 100644
--- a/data/cities/pont-eveque/carrefour-market.yml
+++ b/data/cities/pont-eveque/carrefour-market.yml
@@ -5,7 +5,7 @@ longitude: 4.91681
 postcode: ""
 city: Pont-Évêque
 street: ""
-housenumber: 
-phone: "+33 4 74 85 98 43"
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:30"
-website: "https://www.carrefour.fr/magasin/market-pont-eveque"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 98 43
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:30
+website: https://www.carrefour.fr/magasin/market-pont-eveque
diff --git a/data/cities/pont-eveque/distri-club-medical.yml b/data/cities/pont-eveque/distri-club-medical.yml
index 0c0e702ac..4dd5b3f39 100644
--- a/data/cities/pont-eveque/distri-club-medical.yml
+++ b/data/cities/pont-eveque/distri-club-medical.yml
@@ -4,8 +4,8 @@ latitude: 45.52933
 longitude: 4.91328
 postcode: "38780"
 city: Pont-Évêque
-street: "Rue Joseph Grenouillet"
-housenumber: 
+street: Rue Joseph Grenouillet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-eveque/face-b.yml b/data/cities/pont-eveque/face-b.yml
index 419e6bff8..b05f1082e 100644
--- a/data/cities/pont-eveque/face-b.yml
+++ b/data/cities/pont-eveque/face-b.yml
@@ -4,8 +4,8 @@ latitude: 45.53077
 longitude: 4.90556
 postcode: "38780"
 city: Pont-Évêque
-street: "Montée Lucien Magnat"
-housenumber: 71
+street: Montée Lucien Magnat
+housenumber: "71"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-eveque/maison-privas.yml b/data/cities/pont-eveque/maison-privas.yml
index b84fe9006..5f8387556 100644
--- a/data/cities/pont-eveque/maison-privas.yml
+++ b/data/cities/pont-eveque/maison-privas.yml
@@ -1,11 +1,11 @@
 id: 159293525
-type: way
+type: node
 latitude: 45.52947
 longitude: 4.90205
 postcode: "38780"
 city: Pont-Évêque
-street: "Montée Lucien Magnat"
-housenumber: 2
-phone: "+33 4 74 85 91 76"
-opening_hours: "Tu-Sa 07:00-12:30,15:00-19:00; Th 07:00-12:30"
-website: ""
\ No newline at end of file
+street: Montée Lucien Magnat
+housenumber: "2"
+phone: +33 4 74 85 91 76
+opening_hours: Tu-Sa 07:00-12:30,15:00-19:00; Th 07:00-12:30
+website: ""
diff --git a/data/cities/pont-eveque/salon-thomas.yml b/data/cities/pont-eveque/salon-thomas.yml
index 3f4cf0320..bb9447aa8 100644
--- a/data/cities/pont-eveque/salon-thomas.yml
+++ b/data/cities/pont-eveque/salon-thomas.yml
@@ -5,7 +5,7 @@ longitude: 4.91448
 postcode: "38780"
 city: Pont-Évêque
 street: ""
-housenumber: 46
-phone: "04 74 85 97 87"
+housenumber: "46"
+phone: 04 74 85 97 87
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pont-eveque/trira.yml b/data/cities/pont-eveque/trira.yml
index cfe6ccd80..9db2ac6db 100644
--- a/data/cities/pont-eveque/trira.yml
+++ b/data/cities/pont-eveque/trira.yml
@@ -5,7 +5,7 @@ longitude: 4.91443
 postcode: "38780"
 city: Pont-Évêque
 street: ""
-housenumber: 8
-phone: "+33 4 74 59 45 19"
-opening_hours: "Tu 14:00-18:00;We-Fr 10:00-12:00, 14:00-19:00, Sa 10:00-12:00, 14:00-18:00"
-website: "https://trira.com/"
\ No newline at end of file
+housenumber: "8"
+phone: +33 4 74 59 45 19
+opening_hours: Tu 14:00-18:00;We-Fr 10:00-12:00, 14:00-19:00, Sa 10:00-12:00, 14:00-18:00
+website: https://trira.com/
diff --git a/data/cities/pontaix/esprit-biscuit.yml b/data/cities/pontaix/esprit-biscuit.yml
index 9f97488ac..0afa38a76 100644
--- a/data/cities/pontaix/esprit-biscuit.yml
+++ b/data/cities/pontaix/esprit-biscuit.yml
@@ -4,8 +4,8 @@ latitude: 44.75697
 longitude: 5.26368
 postcode: "26150"
 city: Pontaix
-street: "Chemin des Sagnats"
-housenumber: 85
-phone: "+33 4 75 22 03 09"
+street: Chemin des Sagnats
+housenumber: "85"
+phone: +33 4 75 22 03 09
 opening_hours: ""
-website: "https://www.espritbiscuit.com/"
\ No newline at end of file
+website: https://www.espritbiscuit.com/
diff --git a/data/cities/pontcharra/action.yml b/data/cities/pontcharra/action.yml
index 956287574..61b56e009 100644
--- a/data/cities/pontcharra/action.yml
+++ b/data/cities/pontcharra/action.yml
@@ -1,11 +1,11 @@
 id: 1266513418
-type: way
+type: node
 latitude: 45.4378
 longitude: 6.00852
 postcode: "38530"
 city: Pontcharra
-street: "Rue du Port"
-housenumber: 
+street: Rue du Port
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pontcharra/bazarland.yml b/data/cities/pontcharra/bazarland.yml
index 99ba15bb8..aebce5797 100644
--- a/data/cities/pontcharra/bazarland.yml
+++ b/data/cities/pontcharra/bazarland.yml
@@ -4,8 +4,8 @@ latitude: 45.43678
 longitude: 6.00802
 postcode: "38530"
 city: Pontcharra
-street: "Rue du Port"
-housenumber: 
-phone: "+33 4 76 90 30 61"
-opening_hours: "Mo-Sa 09:30-12:30,13:30-17:30"
-website: "https://www.bazarland.fr/"
\ No newline at end of file
+street: Rue du Port
+housenumber: ""
+phone: +33 4 76 90 30 61
+opening_hours: Mo-Sa 09:30-12:30,13:30-17:30
+website: https://www.bazarland.fr/
diff --git a/data/cities/pontcharra/degriff-sport.yml b/data/cities/pontcharra/degriff-sport.yml
index 5adf93aea..f92c8a200 100644
--- a/data/cities/pontcharra/degriff-sport.yml
+++ b/data/cities/pontcharra/degriff-sport.yml
@@ -1,11 +1,11 @@
 id: 565474609
-type: way
+type: node
 latitude: 45.43575
 longitude: 6.00775
 postcode: ""
 city: Pontcharra
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pontcharra/la-halle.yml b/data/cities/pontcharra/la-halle.yml
index 5ade09945..7d4aa32e4 100644
--- a/data/cities/pontcharra/la-halle.yml
+++ b/data/cities/pontcharra/la-halle.yml
@@ -4,8 +4,8 @@ latitude: 45.43721
 longitude: 6.00837
 postcode: "38530"
 city: Pontcharra
-street: "Rue du Port"
-housenumber: 224
-phone: "+33 4 76 45 78 93"
-opening_hours: "Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+street: Rue du Port
+housenumber: "224"
+phone: +33 4 76 45 78 93
+opening_hours: Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/pontcharra/marie-blachere.yml b/data/cities/pontcharra/marie-blachere.yml
index 4d18bf0b2..8ce24830a 100644
--- a/data/cities/pontcharra/marie-blachere.yml
+++ b/data/cities/pontcharra/marie-blachere.yml
@@ -1,11 +1,11 @@
 id: 64761927
-type: way
+type: node
 latitude: 45.43425
 longitude: 6.01187
 postcode: "38530"
 city: Pontcharra
-street: "Avenue de la Gare"
-housenumber: 765
+street: Avenue de la Gare
+housenumber: "765"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30"
-website: "https://boulangeries.marieblachere.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30
+website: https://boulangeries.marieblachere.com/
diff --git a/data/cities/pontcharra/mr-bricolage.yml b/data/cities/pontcharra/mr-bricolage.yml
index 3641ac413..803bf3fb1 100644
--- a/data/cities/pontcharra/mr-bricolage.yml
+++ b/data/cities/pontcharra/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 64762462
-type: way
+type: node
 latitude: 45.43495
 longitude: 6.01049
 postcode: "38530"
 city: Pontcharra
-street: "Avenue de la Gare"
-housenumber: 905
+street: Avenue de la Gare
+housenumber: "905"
 phone: "+33476976056"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:30,14:00-19:00"
-website: "https://magasin.mr-bricolage.fr/185-mr-bricolage-pontcharra"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:30,14:00-19:00
+website: https://magasin.mr-bricolage.fr/185-mr-bricolage-pontcharra
diff --git a/data/cities/pontcharra/noz.yml b/data/cities/pontcharra/noz.yml
index d389bd96d..666a73c23 100644
--- a/data/cities/pontcharra/noz.yml
+++ b/data/cities/pontcharra/noz.yml
@@ -1,11 +1,11 @@
 id: 64763025
-type: way
+type: node
 latitude: 45.43337
 longitude: 6.01298
 postcode: "38530"
 city: Pontcharra
-street: "Avenue de la Gare"
-housenumber: 636
+street: Avenue de la Gare
+housenumber: "636"
 phone: ""
 opening_hours: ""
-website: "https://www.nozarrivages.com/magasin/pontcharra/"
\ No newline at end of file
+website: https://www.nozarrivages.com/magasin/pontcharra/
diff --git a/data/cities/pontcharra/r-de-rustin.yml b/data/cities/pontcharra/r-de-rustin.yml
index 567e378f6..c2b3aacd7 100644
--- a/data/cities/pontcharra/r-de-rustin.yml
+++ b/data/cities/pontcharra/r-de-rustin.yml
@@ -4,8 +4,8 @@ latitude: 45.43667
 longitude: 6.01041
 postcode: "38530"
 city: Pontcharra
-street: "Rue de la Ganterie"
-housenumber: 90
+street: Rue de la Ganterie
+housenumber: "90"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pontcharra/spa-institut-sophie-beaute.yml b/data/cities/pontcharra/spa-institut-sophie-beaute.yml
index 5ad5022cf..9ed65000e 100644
--- a/data/cities/pontcharra/spa-institut-sophie-beaute.yml
+++ b/data/cities/pontcharra/spa-institut-sophie-beaute.yml
@@ -1,11 +1,11 @@
 id: 64763684
-type: way
+type: node
 latitude: 45.43099
 longitude: 6.02085
 postcode: "38530"
 city: Pontcharra
-street: "Avenue du Dauphiné"
-housenumber: 111
+street: Avenue du Dauphiné
+housenumber: "111"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/port/ferme-des-lys.yml b/data/cities/port/ferme-des-lys.yml
index 848464f7a..001fe6186 100644
--- a/data/cities/port/ferme-des-lys.yml
+++ b/data/cities/port/ferme-des-lys.yml
@@ -4,8 +4,8 @@ latitude: 46.16381
 longitude: 5.57067
 postcode: "01460"
 city: Port
-street: "Route de Lyon"
-housenumber: 16
+street: Route de Lyon
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/port/mr-bricolage.yml b/data/cities/port/mr-bricolage.yml
index c70b4e710..22173b929 100644
--- a/data/cities/port/mr-bricolage.yml
+++ b/data/cities/port/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 144408470
-type: way
+type: node
 latitude: 46.16558
 longitude: 5.56974
 postcode: "01460"
 city: Port
-street: "Rue de l'Ancre"
-housenumber: 7
+street: Rue de l'Ancre
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/porte-des-pierres-dorees/tabac-presse-de-liergues.yml b/data/cities/porte-des-pierres-dorees/tabac-presse-de-liergues.yml
index afed51b7c..91b7bafac 100644
--- a/data/cities/porte-des-pierres-dorees/tabac-presse-de-liergues.yml
+++ b/data/cities/porte-des-pierres-dorees/tabac-presse-de-liergues.yml
@@ -4,8 +4,8 @@ latitude: 45.96849
 longitude: 4.6684
 postcode: "69400"
 city: Porte-des-Pierres-Dorées
-street: "Rue Marie Cartillier"
-housenumber: 8
+street: Rue Marie Cartillier
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pouilly-le-monial/couleur-du-temps.yml b/data/cities/pouilly-le-monial/couleur-du-temps.yml
index 7825421f5..0ff39c410 100644
--- a/data/cities/pouilly-le-monial/couleur-du-temps.yml
+++ b/data/cities/pouilly-le-monial/couleur-du-temps.yml
@@ -4,8 +4,8 @@ latitude: 45.9603
 longitude: 4.64783
 postcode: "69640"
 city: Pouilly le Monial
-street: "Route de Theizé"
-housenumber: 18
+street: Route de Theizé
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pouilly-le-monial/garage-degus.yml b/data/cities/pouilly-le-monial/garage-degus.yml
index 78feac166..663be5e15 100644
--- a/data/cities/pouilly-le-monial/garage-degus.yml
+++ b/data/cities/pouilly-le-monial/garage-degus.yml
@@ -4,8 +4,8 @@ latitude: 45.96111
 longitude: 4.6512
 postcode: "69400"
 city: Pouilly le Monial
-street: "Route de Liergues"
-housenumber: 
+street: Route de Liergues
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pouilly-le-monial/le-panier-des-doreens.yml b/data/cities/pouilly-le-monial/le-panier-des-doreens.yml
index 6143f61ec..7f3bf8aea 100644
--- a/data/cities/pouilly-le-monial/le-panier-des-doreens.yml
+++ b/data/cities/pouilly-le-monial/le-panier-des-doreens.yml
@@ -4,8 +4,8 @@ latitude: 45.96022
 longitude: 4.64779
 postcode: "69400"
 city: Pouilly le Monial
-street: "Route de Theizé"
-housenumber: 26
+street: Route de Theizé
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pouilly-le-monial/lorepi-ducreux.yml b/data/cities/pouilly-le-monial/lorepi-ducreux.yml
index 99fbc47a7..cb1892a37 100644
--- a/data/cities/pouilly-le-monial/lorepi-ducreux.yml
+++ b/data/cities/pouilly-le-monial/lorepi-ducreux.yml
@@ -4,8 +4,8 @@ latitude: 45.96011
 longitude: 4.64796
 postcode: "69400"
 city: Pouilly le Monial
-street: "Route de Theizé"
-housenumber: 30
+street: Route de Theizé
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pouilly-les-feurs/boulangerie-faverot.yml b/data/cities/pouilly-les-feurs/boulangerie-faverot.yml
index 013044a39..ece07f342 100644
--- a/data/cities/pouilly-les-feurs/boulangerie-faverot.yml
+++ b/data/cities/pouilly-les-feurs/boulangerie-faverot.yml
@@ -4,8 +4,9 @@ latitude: 45.79845
 longitude: 4.23147
 postcode: "42110"
 city: Pouilly-lès-Feurs
-street: "Rue du Pressoir"
-housenumber: 2
+street: Rue du Pressoir
+housenumber: "2"
 phone: ""
-opening_hours: "Tu,Th,Fr,Sa 06:30-13:30,16:00-19:00; We 06:30-13:00,16:00-19:00; Su,PH 06:30-12:30"
-website: "boulangerie-faverot.wixsite.com/civens"
\ No newline at end of file
+opening_hours: Tu,Th,Fr,Sa 06:30-13:30,16:00-19:00; We 06:30-13:00,16:00-19:00; Su,PH
+    06:30-12:30
+website: boulangerie-faverot.wixsite.com/civens
diff --git a/data/cities/pouilly-les-feurs/elocoiff.yml b/data/cities/pouilly-les-feurs/elocoiff.yml
index f9047a7b0..e249adbf4 100644
--- a/data/cities/pouilly-les-feurs/elocoiff.yml
+++ b/data/cities/pouilly-les-feurs/elocoiff.yml
@@ -4,8 +4,8 @@ latitude: 45.79804
 longitude: 4.23221
 postcode: "42110"
 city: Pouilly-lès-Feurs
-street: "Rue de la Libération"
-housenumber: 22
-phone: "+33 4 77 27 06 27"
-opening_hours: "Mo,Tu,We,Th,Fr 08:30-12:00,14:00-18:00; Sa 08:30-14:00"
-website: ""
\ No newline at end of file
+street: Rue de la Libération
+housenumber: "22"
+phone: +33 4 77 27 06 27
+opening_hours: Mo,Tu,We,Th,Fr 08:30-12:00,14:00-18:00; Sa 08:30-14:00
+website: ""
diff --git a/data/cities/pouilly-les-feurs/m-c-beaute.yml b/data/cities/pouilly-les-feurs/m-c-beaute.yml
index b8a7553e2..de2004989 100644
--- a/data/cities/pouilly-les-feurs/m-c-beaute.yml
+++ b/data/cities/pouilly-les-feurs/m-c-beaute.yml
@@ -1,11 +1,12 @@
 id: 365944130
-type: way
+type: node
 latitude: 45.79817
 longitude: 4.23224
 postcode: "42110"
 city: Pouilly-lès-Feurs
-street: "Rue de la Libération"
-housenumber: 16
-phone: "+33 4 77 26 24 74"
-opening_hours: "Mo 09:00-18:00 sur rendez-vous; Tu 09:00-18:00; Th,Fr 09:00-19:00; Sa 09:00-12:00"
-website: "https://mcbeaute.wixsite.com/mcbeaute"
\ No newline at end of file
+street: Rue de la Libération
+housenumber: "16"
+phone: +33 4 77 26 24 74
+opening_hours: Mo 09:00-18:00 "sur rendez-vous"; Tu 09:00-18:00; Th,Fr 09:00-19:00;
+    Sa 09:00-12:00
+website: https://mcbeaute.wixsite.com/mcbeaute
diff --git a/data/cities/pouilly-les-nonains/ferme-de-boisy.yml b/data/cities/pouilly-les-nonains/ferme-de-boisy.yml
index db5494e66..6b0ee1662 100644
--- a/data/cities/pouilly-les-nonains/ferme-de-boisy.yml
+++ b/data/cities/pouilly-les-nonains/ferme-de-boisy.yml
@@ -1,11 +1,11 @@
 id: 362418320
-type: way
+type: node
 latitude: 46.05527
 longitude: 3.97317
 postcode: "42155"
 city: Pouilly-Les-Nonains
-street: "Route Napoléon"
-housenumber: 654
-phone: "+33 4 77 66 85 31"
+street: Route Napoléon
+housenumber: "654"
+phone: +33 4 77 66 85 31
 opening_hours: ""
-website: "https://fermedeboisy.fr/"
\ No newline at end of file
+website: https://fermedeboisy.fr/
diff --git a/data/cities/prades/jardinerie-pontier-et-fils.yml b/data/cities/prades/jardinerie-pontier-et-fils.yml
index e1f80c066..307bb2a89 100644
--- a/data/cities/prades/jardinerie-pontier-et-fils.yml
+++ b/data/cities/prades/jardinerie-pontier-et-fils.yml
@@ -4,8 +4,8 @@ latitude: 44.64396
 longitude: 4.32665
 postcode: "07380"
 city: Prades
-street: "Route de Jaujac"
-housenumber: 245
-phone: "04 75 38 01 25"
-opening_hours: "Mo-Sa 08:00-12:00/14:00-19:00"
-website: ""
\ No newline at end of file
+street: Route de Jaujac
+housenumber: "245"
+phone: 04 75 38 01 25
+opening_hours: Mo-Sa 08:00-12:00/14:00-19:00
+website: ""
diff --git a/data/cities/prades/les-delices-du-terroir.yml b/data/cities/prades/les-delices-du-terroir.yml
index e74f700fb..2631f1826 100644
--- a/data/cities/prades/les-delices-du-terroir.yml
+++ b/data/cities/prades/les-delices-du-terroir.yml
@@ -4,8 +4,8 @@ latitude: 44.64404
 longitude: 4.32646
 postcode: "07380"
 city: Prades
-street: "Route de Jaujac"
-housenumber: 245
-phone: "04 75 38 01 25"
-opening_hours: "Mo-Sa 08:00-12:00/14:00-19:00"
-website: ""
\ No newline at end of file
+street: Route de Jaujac
+housenumber: "245"
+phone: 04 75 38 01 25
+opening_hours: Mo-Sa 08:00-12:00/14:00-19:00
+website: ""
diff --git a/data/cities/pralognan-la-vanoise/fromagerie-du-plan.yml b/data/cities/pralognan-la-vanoise/fromagerie-du-plan.yml
index a6f6a9e8a..5d8be12a5 100644
--- a/data/cities/pralognan-la-vanoise/fromagerie-du-plan.yml
+++ b/data/cities/pralognan-la-vanoise/fromagerie-du-plan.yml
@@ -5,7 +5,7 @@ longitude: 6.71764
 postcode: "73710"
 city: Pralognan-la-Vanoise
 street: ""
-housenumber: 125
+housenumber: "125"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pralognan-la-vanoise/go-sport-montagne.yml b/data/cities/pralognan-la-vanoise/go-sport-montagne.yml
index 7ca470508..a6b7fea88 100644
--- a/data/cities/pralognan-la-vanoise/go-sport-montagne.yml
+++ b/data/cities/pralognan-la-vanoise/go-sport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.38077
 longitude: 6.722
 postcode: "73710"
 city: Pralognan-la-Vanoise
-street: "Avenue de Chasseforet"
-housenumber: 160
+street: Avenue de Chasseforet
+housenumber: "160"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pralognan-la-vanoise/intersport.yml b/data/cities/pralognan-la-vanoise/intersport.yml
index 5bc06328a..87ebe9f0f 100644
--- a/data/cities/pralognan-la-vanoise/intersport.yml
+++ b/data/cities/pralognan-la-vanoise/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.38129
 longitude: 6.72161
 postcode: "73710"
 city: Pralognan-la-Vanoise
-street: "Avenue de Chasseforet"
-housenumber: 
+street: Avenue de Chasseforet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pralognan-la-vanoise/le-sherpa.yml b/data/cities/pralognan-la-vanoise/le-sherpa.yml
index 7c3db2fa3..35a193a69 100644
--- a/data/cities/pralognan-la-vanoise/le-sherpa.yml
+++ b/data/cities/pralognan-la-vanoise/le-sherpa.yml
@@ -5,7 +5,7 @@ longitude: 6.7199
 postcode: "73710"
 city: Pralognan-la-Vanoise
 street: ""
-housenumber: 400
+housenumber: "400"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pralognan-la-vanoise/sport-vanoise.yml b/data/cities/pralognan-la-vanoise/sport-vanoise.yml
index 89d5d4d1d..2e221b7d8 100644
--- a/data/cities/pralognan-la-vanoise/sport-vanoise.yml
+++ b/data/cities/pralognan-la-vanoise/sport-vanoise.yml
@@ -5,7 +5,7 @@ longitude: 6.72223
 postcode: "73710"
 city: Pralognan-la-Vanoise
 street: ""
-housenumber: 122
+housenumber: "122"
 phone: "+33479087465"
 opening_hours: ""
-website: "https://sportvanoise.fr/"
\ No newline at end of file
+website: https://sportvanoise.fr/
diff --git a/data/cities/prapoutel-les-7-laux/intersport-centre-daccueil.yml b/data/cities/prapoutel-les-7-laux/intersport-centre-daccueil.yml
index 24098c61f..60bfce6cb 100644
--- a/data/cities/prapoutel-les-7-laux/intersport-centre-daccueil.yml
+++ b/data/cities/prapoutel-les-7-laux/intersport-centre-daccueil.yml
@@ -4,8 +4,8 @@ latitude: 45.25632
 longitude: 5.99349
 postcode: "38190"
 city: Prapoutel Les 7 Laux
-street: "Centre d'accueil"
-housenumber: 
+street: Centre d'accueil
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/prapoutel-les-7-laux/intersport.yml b/data/cities/prapoutel-les-7-laux/intersport.yml
index 02d0eb1d0..f67743bf4 100644
--- a/data/cities/prapoutel-les-7-laux/intersport.yml
+++ b/data/cities/prapoutel-les-7-laux/intersport.yml
@@ -5,7 +5,7 @@ longitude: 5.99584
 postcode: "38190"
 city: Prapoutel Les 7 Laux
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/praz-sur-arly/sherpa.yml b/data/cities/praz-sur-arly/sherpa.yml
index 87cd1d850..a75f78d7e 100644
--- a/data/cities/praz-sur-arly/sherpa.yml
+++ b/data/cities/praz-sur-arly/sherpa.yml
@@ -4,8 +4,9 @@ latitude: 45.83838
 longitude: 6.57178
 postcode: "74120"
 city: Praz-sur-Arly
-street: "Route de Megève"
-housenumber: 33
+street: Route de Megève
+housenumber: "33"
 phone: ""
-opening_hours: "Dec 02-Apr 30 Mo-Su 07:30-12:30, 15:00-19:30; Jul 02-Sep 01 Mo-Su 07:00-12:30, 15:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Dec 02-Apr 30 Mo-Su 07:30-12:30, 15:00-19:30; Jul 02-Sep 01 Mo-Su 07:00-12:30,
+    15:00-19:30
+website: ""
diff --git a/data/cities/praz-sur-arly/skiset.yml b/data/cities/praz-sur-arly/skiset.yml
index 53f3e5906..8efc52263 100644
--- a/data/cities/praz-sur-arly/skiset.yml
+++ b/data/cities/praz-sur-arly/skiset.yml
@@ -4,8 +4,8 @@ latitude: 45.83852
 longitude: 6.57303
 postcode: "74120"
 city: Praz-sur-Arly
-street: "Route de Bellevarde"
-housenumber: 20
+street: Route de Bellevarde
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:30,14:00-17:45; Su 08:30-17:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:30,14:00-17:45; Su 08:30-17:45
+website: ""
diff --git a/data/cities/praz-sur-arly/sport-2000.yml b/data/cities/praz-sur-arly/sport-2000.yml
index dd6112a88..3f3485846 100644
--- a/data/cities/praz-sur-arly/sport-2000.yml
+++ b/data/cities/praz-sur-arly/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.83728
 longitude: 6.57025
 postcode: "74120"
 city: Praz-sur-Arly
-street: "Route du Val d'Arly"
-housenumber: 121
+street: Route du Val d'Arly
+housenumber: "121"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/precieux/la-ferme-epi-cest-tout.yml b/data/cities/precieux/la-ferme-epi-cest-tout.yml
index ae1126bc0..6c1bf23f0 100644
--- a/data/cities/precieux/la-ferme-epi-cest-tout.yml
+++ b/data/cities/precieux/la-ferme-epi-cest-tout.yml
@@ -4,8 +4,8 @@ latitude: 45.5832
 longitude: 4.16587
 postcode: "42600"
 city: Précieux
-street: "Route d'Azieux"
-housenumber: 1263
+street: Route d'Azieux
+housenumber: "1263"
 phone: ""
 opening_hours: ""
-website: "https://app.cagette.net/lafermeepicesttout"
\ No newline at end of file
+website: https://app.cagette.net/lafermeepicesttout
diff --git a/data/cities/presilly/carrosserie-des-grands-pres.yml b/data/cities/presilly/carrosserie-des-grands-pres.yml
index 1c770029a..0b655f3ba 100644
--- a/data/cities/presilly/carrosserie-des-grands-pres.yml
+++ b/data/cities/presilly/carrosserie-des-grands-pres.yml
@@ -4,8 +4,8 @@ latitude: 46.09244
 longitude: 6.09573
 postcode: "74160"
 city: Présilly
-street: "Allée des Grands Prés"
-housenumber: 60
+street: Allée des Grands Prés
+housenumber: "60"
 phone: "+33450044912"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa off; Su off; PH off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa off; Su off; PH off
+website: ""
diff --git a/data/cities/presilly/garage-michauto.yml b/data/cities/presilly/garage-michauto.yml
index 655640898..bec8e9d17 100644
--- a/data/cities/presilly/garage-michauto.yml
+++ b/data/cities/presilly/garage-michauto.yml
@@ -4,8 +4,8 @@ latitude: 46.09329
 longitude: 6.09494
 postcode: "74160"
 city: Présilly
-street: "Allée des Grands Prés"
-housenumber: 18
+street: Allée des Grands Prés
+housenumber: "18"
 phone: "+33458661333"
-opening_hours: "Mo-Fr 08:30-12:00,14:00-18:30; Sa off; Su off; PH off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00,14:00-18:30; Sa off; Su off; PH off
+website: ""
diff --git a/data/cities/pressins/alpes-bois-derives.yml b/data/cities/pressins/alpes-bois-derives.yml
index d0d9040ff..c75b3a95f 100644
--- a/data/cities/pressins/alpes-bois-derives.yml
+++ b/data/cities/pressins/alpes-bois-derives.yml
@@ -1,11 +1,11 @@
 id: 605037630
-type: way
+type: node
 latitude: 45.53248
 longitude: 5.63079
 postcode: "38480"
 city: Pressins
-street: "ZA Les Perrières"
-housenumber: 110
-phone: "+33 4 76 35 45 21"
+street: ZA Les Perrières
+housenumber: "110"
+phone: +33 4 76 35 45 21
 opening_hours: ""
-website: "https://www.alpesboisderives.fr"
\ No newline at end of file
+website: https://www.alpesboisderives.fr
diff --git a/data/cities/prevessin-moens/kahya-et-fils-primeurs.yml b/data/cities/prevessin-moens/kahya-et-fils-primeurs.yml
index fe2ebbf5a..8c841769c 100644
--- a/data/cities/prevessin-moens/kahya-et-fils-primeurs.yml
+++ b/data/cities/prevessin-moens/kahya-et-fils-primeurs.yml
@@ -1,11 +1,11 @@
 id: 68885828
-type: way
+type: node
 latitude: 46.25007
 longitude: 6.09004
 postcode: "01280"
 city: Prévessin-Moëns
-street: "Route du Nant"
-housenumber: 573
+street: Route du Nant
+housenumber: "573"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pringy/100-sport.yml b/data/cities/pringy/100-sport.yml
index 4d7cc1ca4..b7867b8ea 100644
--- a/data/cities/pringy/100-sport.yml
+++ b/data/cities/pringy/100-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.9442
 longitude: 6.12745
 postcode: "74370"
 city: Pringy
-street: "Route des Rutys"
-housenumber: 99
+street: Route des Rutys
+housenumber: "99"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pringy/argonay-piece-autos.yml b/data/cities/pringy/argonay-piece-autos.yml
index 0376ec38d..2541d3f31 100644
--- a/data/cities/pringy/argonay-piece-autos.yml
+++ b/data/cities/pringy/argonay-piece-autos.yml
@@ -1,11 +1,11 @@
 id: 62517280
-type: way
+type: node
 latitude: 45.94199
 longitude: 6.13369
 postcode: "74370"
 city: Pringy
-street: "Route de Pringy"
-housenumber: 235
+street: Route de Pringy
+housenumber: "235"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/pringy/biocoop-aquarius-pringy.yml b/data/cities/pringy/biocoop-aquarius-pringy.yml
index 4496d5fdb..1b365da54 100644
--- a/data/cities/pringy/biocoop-aquarius-pringy.yml
+++ b/data/cities/pringy/biocoop-aquarius-pringy.yml
@@ -4,8 +4,8 @@ latitude: 45.93908
 longitude: 6.12249
 postcode: "74370"
 city: Pringy
-street: "Route d'Annecy"
-housenumber: 95
-phone: "+33 4 50 27 22 84"
+street: Route d'Annecy
+housenumber: "95"
+phone: +33 4 50 27 22 84
 opening_hours: ""
-website: "https://www.aquarius-biocoop.org/"
\ No newline at end of file
+website: https://www.aquarius-biocoop.org/
diff --git a/data/cities/privas/bruno-durand-artisan-boulanger.yml b/data/cities/privas/bruno-durand-artisan-boulanger.yml
index ac6b4f992..3ae4f2dda 100644
--- a/data/cities/privas/bruno-durand-artisan-boulanger.yml
+++ b/data/cities/privas/bruno-durand-artisan-boulanger.yml
@@ -5,7 +5,7 @@ longitude: 4.59729
 postcode: ""
 city: Privas
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Fr 06:00-19:00; Sa 06:00-14:00,16:00-19:00; Su 06:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:00-19:00; Sa 06:00-14:00,16:00-19:00; Su 06:00-12:00
+website: ""
diff --git a/data/cities/publier/animalis.yml b/data/cities/publier/animalis.yml
index 80c14c122..e783825ea 100644
--- a/data/cities/publier/animalis.yml
+++ b/data/cities/publier/animalis.yml
@@ -1,11 +1,11 @@
 id: 1156910098
-type: way
+type: node
 latitude: 46.38828
 longitude: 6.52104
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 
+street: Rue des Vignes Rouges
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:00; Sa 10:00-19:30; Su off
+website: ""
diff --git a/data/cities/publier/biocoop-amphion-publier.yml b/data/cities/publier/biocoop-amphion-publier.yml
index 229794613..c2332dfce 100644
--- a/data/cities/publier/biocoop-amphion-publier.yml
+++ b/data/cities/publier/biocoop-amphion-publier.yml
@@ -1,11 +1,11 @@
 id: 1305914615
-type: way
+type: node
 latitude: 46.38817
 longitude: 6.52053
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 180
+street: Rue des Vignes Rouges
+housenumber: "180"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/publier/boucherie-sannicolo.yml b/data/cities/publier/boucherie-sannicolo.yml
index 5f883c39e..ff8c3fdfe 100644
--- a/data/cities/publier/boucherie-sannicolo.yml
+++ b/data/cities/publier/boucherie-sannicolo.yml
@@ -1,11 +1,11 @@
 id: 67010100
-type: way
+type: node
 latitude: 46.3874
 longitude: 6.54297
 postcode: "74500"
 city: Publier
-street: "Place du 8 Mai 1945"
-housenumber: 2
-phone: "+33 4 50 70 04 76"
-opening_hours: "Mo-Tu,Th-Sa 07:30-12:30,15:00-19:00; We 07:30-12:30; Su off"
-website: ""
\ No newline at end of file
+street: Place du 8 Mai 1945
+housenumber: "2"
+phone: +33 4 50 70 04 76
+opening_hours: Mo-Tu,Th-Sa 07:30-12:30,15:00-19:00; We 07:30-12:30; Su off
+website: ""
diff --git a/data/cities/publier/boulanger.yml b/data/cities/publier/boulanger.yml
index e1ab0be4a..d81c4b68b 100644
--- a/data/cities/publier/boulanger.yml
+++ b/data/cities/publier/boulanger.yml
@@ -1,11 +1,11 @@
 id: 1156910064
-type: way
+type: node
 latitude: 46.38891
 longitude: 6.52093
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 185
+street: Rue des Vignes Rouges
+housenumber: "185"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/publier/cash-piscines.yml b/data/cities/publier/cash-piscines.yml
index a33633bd3..9701ea3b8 100644
--- a/data/cities/publier/cash-piscines.yml
+++ b/data/cities/publier/cash-piscines.yml
@@ -1,11 +1,11 @@
 id: 1156910099
-type: way
+type: node
 latitude: 46.38808
 longitude: 6.52113
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 
+street: Rue des Vignes Rouges
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00; Su off
+website: ""
diff --git a/data/cities/publier/cooking-original.yml b/data/cities/publier/cooking-original.yml
index 25116b2f8..d484cd9be 100644
--- a/data/cities/publier/cooking-original.yml
+++ b/data/cities/publier/cooking-original.yml
@@ -1,11 +1,11 @@
 id: 1156910105
-type: way
+type: node
 latitude: 46.38813
 longitude: 6.5203
 postcode: "74500"
 city: Publier
-street: "Impasse des Vignes Rouges"
-housenumber: 
+street: Impasse des Vignes Rouges
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/publier/cora-drive-amphion.yml b/data/cities/publier/cora-drive-amphion.yml
index 6a38fea4f..542d9d727 100644
--- a/data/cities/publier/cora-drive-amphion.yml
+++ b/data/cities/publier/cora-drive-amphion.yml
@@ -1,11 +1,11 @@
 id: 1157609381
-type: way
+type: node
 latitude: 46.39123
 longitude: 6.52359
 postcode: "74500"
 city: Publier
-street: "Rue de Cartheray"
-housenumber: 1005
-phone: "+33 4 50 81 45 00"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.coradrive.fr/amphion"
\ No newline at end of file
+street: Rue de Cartheray
+housenumber: "1005"
+phone: +33 4 50 81 45 00
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.coradrive.fr/amphion
diff --git a/data/cities/publier/cora.yml b/data/cities/publier/cora.yml
index 9ed055bbe..377123027 100644
--- a/data/cities/publier/cora.yml
+++ b/data/cities/publier/cora.yml
@@ -4,8 +4,8 @@ latitude: 46.39157
 longitude: 6.52474
 postcode: "74500"
 city: Publier
-street: "Rue de la Botte"
-housenumber: 1005
-phone: "+33 4 50 81 45 00"
-opening_hours: "Mo-Sa 08:30-20:30; Su 09:00-12:30"
-website: "https://www.cora.fr/amphion/"
\ No newline at end of file
+street: Rue de la Botte
+housenumber: "1005"
+phone: +33 4 50 81 45 00
+opening_hours: Mo-Sa 08:30-20:30; Su 09:00-12:30
+website: https://www.cora.fr/amphion/
diff --git a/data/cities/publier/cuisinella.yml b/data/cities/publier/cuisinella.yml
index 88f9508de..259d47116 100644
--- a/data/cities/publier/cuisinella.yml
+++ b/data/cities/publier/cuisinella.yml
@@ -1,11 +1,12 @@
 id: 1156910107
-type: way
+type: node
 latitude: 46.388
 longitude: 6.52026
 postcode: "74500"
 city: Publier
-street: "Impasse des Vignes Rouges"
-housenumber: 185
+street: Impasse des Vignes Rouges
+housenumber: "185"
 phone: ""
-opening_hours: "Tu-Th 10:00-12:00,14:00-19:00; Fr 10:30-12:00,14:00-19:00; Sa 10:00-18:00; Su,Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 10:00-12:00,14:00-19:00; Fr 10:30-12:00,14:00-19:00; Sa 10:00-18:00;
+    Su,Mo off
+website: ""
diff --git a/data/cities/publier/cultura.yml b/data/cities/publier/cultura.yml
index 2e283b11f..c9339a178 100644
--- a/data/cities/publier/cultura.yml
+++ b/data/cities/publier/cultura.yml
@@ -1,11 +1,11 @@
 id: 851895921
-type: way
+type: node
 latitude: 46.38897
 longitude: 6.52177
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 
+street: Rue des Vignes Rouges
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: ""
diff --git a/data/cities/publier/decathlon.yml b/data/cities/publier/decathlon.yml
index 9e737dd9f..a52519bb1 100644
--- a/data/cities/publier/decathlon.yml
+++ b/data/cities/publier/decathlon.yml
@@ -1,11 +1,11 @@
 id: 1156910065
-type: way
+type: node
 latitude: 46.38922
 longitude: 6.52095
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 185
+street: Rue des Vignes Rouges
+housenumber: "185"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/publier/dolce-terra.yml b/data/cities/publier/dolce-terra.yml
index 45c7d836d..6aa602edf 100644
--- a/data/cities/publier/dolce-terra.yml
+++ b/data/cities/publier/dolce-terra.yml
@@ -4,8 +4,8 @@ latitude: 46.39107
 longitude: 6.52551
 postcode: "74500"
 city: Publier
-street: "Rue de Cartheray"
-housenumber: 
+street: Rue de Cartheray
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 09:00-19:30; Fr-Sa 09:00-20:00; Su 10:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 09:00-19:30; Fr-Sa 09:00-20:00; Su 10:00-12:30
+website: ""
diff --git a/data/cities/publier/feu-vert.yml b/data/cities/publier/feu-vert.yml
index 337b2f27b..71639445f 100644
--- a/data/cities/publier/feu-vert.yml
+++ b/data/cities/publier/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 989055446
-type: way
+type: node
 latitude: 46.38903
 longitude: 6.52476
 postcode: "74500"
 city: Publier
-street: "Rue des Fourches"
-housenumber: 284
+street: Rue des Fourches
+housenumber: "284"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:45; Sa 09:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:45; Sa 09:00-18:00; Su off
+website: ""
diff --git a/data/cities/publier/go-sport.yml b/data/cities/publier/go-sport.yml
index 781f151b8..9a63a885a 100644
--- a/data/cities/publier/go-sport.yml
+++ b/data/cities/publier/go-sport.yml
@@ -5,7 +5,7 @@ longitude: 6.52431
 postcode: "74500"
 city: Publier
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.go-sport.com/stores?lang=default#/stores/1812"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.go-sport.com/stores?lang=default#/stores/1812
diff --git a/data/cities/publier/le-fournil-de-publier.yml b/data/cities/publier/le-fournil-de-publier.yml
index ba73b293c..3d2beb18d 100644
--- a/data/cities/publier/le-fournil-de-publier.yml
+++ b/data/cities/publier/le-fournil-de-publier.yml
@@ -1,11 +1,11 @@
 id: 1229012853
-type: way
+type: node
 latitude: 46.38745
 longitude: 6.54298
 postcode: "74500"
 city: Publier
-street: "Place du 8 Mai 1945"
-housenumber: 3
+street: Place du 8 Mai 1945
+housenumber: "3"
 phone: ""
-opening_hours: "06:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: 06:30-19:30
+website: ""
diff --git a/data/cities/publier/lentrepot-du-bricolage.yml b/data/cities/publier/lentrepot-du-bricolage.yml
index e39611cf8..77a11fa35 100644
--- a/data/cities/publier/lentrepot-du-bricolage.yml
+++ b/data/cities/publier/lentrepot-du-bricolage.yml
@@ -1,11 +1,11 @@
 id: 67006976
-type: way
+type: node
 latitude: 46.38851
 longitude: 6.5217
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 
+street: Rue des Vignes Rouges
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-19:00; Su off
+website: ""
diff --git a/data/cities/publier/les-fournils-du-lac-amphion.yml b/data/cities/publier/les-fournils-du-lac-amphion.yml
index 0ab687b96..02f97fe11 100644
--- a/data/cities/publier/les-fournils-du-lac-amphion.yml
+++ b/data/cities/publier/les-fournils-du-lac-amphion.yml
@@ -1,11 +1,11 @@
 id: 851895920
-type: way
+type: node
 latitude: 46.3876
 longitude: 6.51995
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 420
+street: Rue des Vignes Rouges
+housenumber: "420"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/publier/lidl.yml b/data/cities/publier/lidl.yml
index e85c73673..5b8b7dc44 100644
--- a/data/cities/publier/lidl.yml
+++ b/data/cities/publier/lidl.yml
@@ -1,11 +1,11 @@
 id: 1156910063
-type: way
+type: node
 latitude: 46.38876
 longitude: 6.52025
 postcode: "74500"
 city: Publier
-street: "Rue des Vignes Rouges"
-housenumber: 185
+street: Rue des Vignes Rouges
+housenumber: "185"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/publier/marcel-et-fils.yml b/data/cities/publier/marcel-et-fils.yml
index 9095ade0f..38fd899a3 100644
--- a/data/cities/publier/marcel-et-fils.yml
+++ b/data/cities/publier/marcel-et-fils.yml
@@ -1,11 +1,11 @@
 id: 67005922
-type: way
+type: node
 latitude: 46.38924
 longitude: 6.52506
 postcode: "74500"
 city: Publier
-street: "Rue des Fourches"
-housenumber: 284
+street: Rue des Fourches
+housenumber: "284"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/publier/optical-center.yml b/data/cities/publier/optical-center.yml
index 65f54083d..a3a771b7b 100644
--- a/data/cities/publier/optical-center.yml
+++ b/data/cities/publier/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 46.39168
 longitude: 6.52614
 postcode: "74500"
 city: Publier
-street: "Route Départementale 1005"
-housenumber: 
+street: Route Départementale 1005
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/publier/picard.yml b/data/cities/publier/picard.yml
index 16b819604..72f1a4a27 100644
--- a/data/cities/publier/picard.yml
+++ b/data/cities/publier/picard.yml
@@ -4,8 +4,8 @@ latitude: 46.39104
 longitude: 6.5254
 postcode: "74500"
 city: Publier
-street: "Rue de Cartheray"
-housenumber: 
-phone: "+33 4 50 72 91 98"
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: ""
\ No newline at end of file
+street: Rue de Cartheray
+housenumber: ""
+phone: +33 4 50 72 91 98
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: ""
diff --git a/data/cities/publier/shopin-publier.yml b/data/cities/publier/shopin-publier.yml
index 32805fb47..cb8a0cb2a 100644
--- a/data/cities/publier/shopin-publier.yml
+++ b/data/cities/publier/shopin-publier.yml
@@ -1,11 +1,11 @@
 id: 556822483
-type: way
+type: node
 latitude: 46.39216
 longitude: 6.52488
 postcode: "74500"
 city: Publier
-street: "Rue de la Botte"
-housenumber: 1005
+street: Rue de la Botte
+housenumber: "1005"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/publier/super-u.yml b/data/cities/publier/super-u.yml
index d1bbae6bf..5d202af5a 100644
--- a/data/cities/publier/super-u.yml
+++ b/data/cities/publier/super-u.yml
@@ -1,11 +1,11 @@
 id: 1125514202
-type: way
+type: node
 latitude: 46.39422
 longitude: 6.53952
 postcode: "74500"
 city: Publier
-street: "Rue du Clos Fleuri"
-housenumber: 21
+street: Rue du Clos Fleuri
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:15
+website: ""
diff --git a/data/cities/publier/vetb.yml b/data/cities/publier/vetb.yml
index b1bc7da7c..e8ce7ac9b 100644
--- a/data/cities/publier/vetb.yml
+++ b/data/cities/publier/vetb.yml
@@ -1,11 +1,12 @@
 id: 674231445
-type: way
+type: node
 latitude: 46.38771
 longitude: 6.51998
 postcode: "74500"
 city: Publier
-street: "Impasse des Vignes Rouges"
-housenumber: 
+street: Impasse des Vignes Rouges
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-20:00; Tu-We 10:00-13:00,14:00-20:00; Th 10:00-13:00,14:00-20:30; Fr 10:00-20:30; Sa 10:00-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-20:00; Tu-We 10:00-13:00,14:00-20:00; Th 10:00-13:00,14:00-20:30;
+    Fr 10:00-20:30; Sa 10:00-20:00; Su off
+website: ""
diff --git a/data/cities/pusignan/caddy-malin.yml b/data/cities/pusignan/caddy-malin.yml
index 41f4199e6..d81a50e5e 100644
--- a/data/cities/pusignan/caddy-malin.yml
+++ b/data/cities/pusignan/caddy-malin.yml
@@ -4,8 +4,8 @@ latitude: 45.75951
 longitude: 5.06199
 postcode: "69330"
 city: Pusignan
-street: "Rue du Vallon"
-housenumber: 2
+street: Rue du Vallon
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 14:30-19:00; Tu-Fr 08:30-13:00,15:00-19:00; Sa 09:00-13:00,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:30-19:00; Tu-Fr 08:30-13:00,15:00-19:00; Sa 09:00-13:00,15:00-19:00
+website: ""
diff --git a/data/cities/pusignan/mannuel-correia.yml b/data/cities/pusignan/mannuel-correia.yml
index 1aff29c63..084f671f8 100644
--- a/data/cities/pusignan/mannuel-correia.yml
+++ b/data/cities/pusignan/mannuel-correia.yml
@@ -4,8 +4,9 @@ latitude: 45.75937
 longitude: 5.0619
 postcode: "69330"
 city: Pusignan
-street: "Rue du Vallon"
-housenumber: 2
-phone: "+33 4 78 31 32 21"
-opening_hours: "Tu 09:00-12:00,14:00-19:00; We 09:00-12:00; Th 09:00-20:00; Fr 09:00-19:00; Sa 09:00-16:00"
-website: "https://correiamanuelcoiffeurcreateur.site-solocal.com"
\ No newline at end of file
+street: Rue du Vallon
+housenumber: "2"
+phone: +33 4 78 31 32 21
+opening_hours: Tu 09:00-12:00,14:00-19:00; We 09:00-12:00; Th 09:00-20:00; Fr 09:00-19:00;
+    Sa 09:00-16:00
+website: https://correiamanuelcoiffeurcreateur.site-solocal.com
diff --git a/data/cities/pusignan/netto.yml b/data/cities/pusignan/netto.yml
index 2286f7775..b72c4fc7d 100644
--- a/data/cities/pusignan/netto.yml
+++ b/data/cities/pusignan/netto.yml
@@ -1,11 +1,11 @@
 id: 868801218
-type: way
+type: node
 latitude: 45.76583
 longitude: 5.07427
 postcode: "69330"
 city: Pusignan
-street: "Route de Jons"
-housenumber: 15
-phone: "+33 4 87 91 48 50"
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:30"
-website: "https://magasin.netto.fr/467-netto-pusignan"
\ No newline at end of file
+street: Route de Jons
+housenumber: "15"
+phone: +33 4 87 91 48 50
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:30
+website: https://magasin.netto.fr/467-netto-pusignan
diff --git a/data/cities/queige/epicerie-cafe-du-mirantin.yml b/data/cities/queige/epicerie-cafe-du-mirantin.yml
index 48a47a348..d22cf7c26 100644
--- a/data/cities/queige/epicerie-cafe-du-mirantin.yml
+++ b/data/cities/queige/epicerie-cafe-du-mirantin.yml
@@ -4,8 +4,8 @@ latitude: 45.71992
 longitude: 6.45944
 postcode: "73720"
 city: Queige
-street: "Place de la Mairie"
-housenumber: 
-phone: "+33 4 79 38 39 68"
-opening_hours: "Mo 7:00-13:00; Tu-Sa 7:00-13:30, 16:00-19:30; Su 7:00-13:00"
-website: "http://cafe-du-mirantin.com/"
\ No newline at end of file
+street: Place de la Mairie
+housenumber: ""
+phone: +33 4 79 38 39 68
+opening_hours: Mo 7:00-13:00; Tu-Sa 7:00-13:30, 16:00-19:30; Su 7:00-13:00
+website: http://cafe-du-mirantin.com/
diff --git a/data/cities/quincie-en-beaujolais/le-salon.yml b/data/cities/quincie-en-beaujolais/le-salon.yml
index 4bf13886a..7a4ca9e82 100644
--- a/data/cities/quincie-en-beaujolais/le-salon.yml
+++ b/data/cities/quincie-en-beaujolais/le-salon.yml
@@ -4,8 +4,9 @@ latitude: 46.11809
 longitude: 4.61528
 postcode: "69430"
 city: Quincié-en-Beaujolais
-street: "Rue du Bourg"
-housenumber: 220
+street: Rue du Bourg
+housenumber: "220"
 phone: "+33474043489"
-opening_hours: "Tu 09:00-17:00; We 08:00-12:00; Th 09:00-17:30; Fr 09:00-19:00; Sa 08:00-17:00"
-website: "http://lesalonbyn.fr"
\ No newline at end of file
+opening_hours: Tu 09:00-17:00; We 08:00-12:00; Th 09:00-17:30; Fr 09:00-19:00; Sa
+    08:00-17:00
+website: http://lesalonbyn.fr
diff --git a/data/cities/quincieux/le-courtil-de-quincieux.yml b/data/cities/quincieux/le-courtil-de-quincieux.yml
index 3ce3ffc2f..cbea325c9 100644
--- a/data/cities/quincieux/le-courtil-de-quincieux.yml
+++ b/data/cities/quincieux/le-courtil-de-quincieux.yml
@@ -4,8 +4,8 @@ latitude: 45.91012
 longitude: 4.79117
 postcode: ""
 city: Quincieux
-street: "Chemin de Jerusalem"
-housenumber: 26
+street: Chemin de Jerusalem
+housenumber: "26"
 phone: ""
-opening_hours: "Tu 16:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 16:30-19:00
+website: ""
diff --git a/data/cities/quincieux/le-verger-de-nadine.yml b/data/cities/quincieux/le-verger-de-nadine.yml
index 99a9bc0c8..41985dce1 100644
--- a/data/cities/quincieux/le-verger-de-nadine.yml
+++ b/data/cities/quincieux/le-verger-de-nadine.yml
@@ -4,8 +4,8 @@ latitude: 45.90925
 longitude: 4.75942
 postcode: "69650"
 city: Quincieux
-street: "Rue des Verchères"
-housenumber: 14
+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: "https://www.facebook.com/profile.php?id=100064335288878"
\ No newline at end of file
+opening_hours: Mo 15:00-19:00; Tu-Fr 09:30-12:30,15:00-19:00; Sa 09:00-13:00
+website: https://www.facebook.com/profile.php?id=100064335288878
diff --git a/data/cities/quintal/la-boulangerie.yml b/data/cities/quintal/la-boulangerie.yml
index 14c844351..0ca05c9d1 100644
--- a/data/cities/quintal/la-boulangerie.yml
+++ b/data/cities/quintal/la-boulangerie.yml
@@ -4,8 +4,8 @@ latitude: 45.84012
 longitude: 6.0841
 postcode: "74600"
 city: Quintal
-street: "Route de Viuz"
-housenumber: 17
+street: Route de Viuz
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/regnie-durette/boulangerie-patisserie-morin.yml b/data/cities/regnie-durette/boulangerie-patisserie-morin.yml
index 84eb29b32..21da0459b 100644
--- a/data/cities/regnie-durette/boulangerie-patisserie-morin.yml
+++ b/data/cities/regnie-durette/boulangerie-patisserie-morin.yml
@@ -4,8 +4,8 @@ latitude: 46.13905
 longitude: 4.64127
 postcode: "69430"
 city: Régnié-Durette
-street: "Chaussée d'Erpent"
-housenumber: 41
+street: Chaussée d'Erpent
+housenumber: "41"
 phone: "+33474043296"
-opening_hours: "Tu-Sa 06:30-12:30,15:00-19:30; Su 06:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:30-12:30,15:00-19:30; Su 06:30-12:30
+website: ""
diff --git a/data/cities/reignier-esery/au-petrin-des-saveurs.yml b/data/cities/reignier-esery/au-petrin-des-saveurs.yml
index 49b6a8ab6..d65b808d7 100644
--- a/data/cities/reignier-esery/au-petrin-des-saveurs.yml
+++ b/data/cities/reignier-esery/au-petrin-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 46.13604
 longitude: 6.26878
 postcode: "74930"
 city: Reignier-Esery
-street: "Grande Rue"
-housenumber: 334
+street: Grande Rue
+housenumber: "334"
 phone: ""
-opening_hours: "Mo-Sa 05:30-19:45; Su 05:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 05:30-19:45; Su 05:30-13:00
+website: ""
diff --git a/data/cities/reignier-esery/carrefour-market.yml b/data/cities/reignier-esery/carrefour-market.yml
index 0f010cdfa..d4f4574e4 100644
--- a/data/cities/reignier-esery/carrefour-market.yml
+++ b/data/cities/reignier-esery/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 814871093
-type: way
+type: node
 latitude: 46.13071
 longitude: 6.26881
 postcode: "74930"
 city: Reignier- Ésery
-street: "Rue de Bersat"
-housenumber: 210
+street: Rue de Bersat
+housenumber: "210"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/reignier-esery/la-ferme-des-4-saisons.yml b/data/cities/reignier-esery/la-ferme-des-4-saisons.yml
index 9e95dc534..dd87c00ff 100644
--- a/data/cities/reignier-esery/la-ferme-des-4-saisons.yml
+++ b/data/cities/reignier-esery/la-ferme-des-4-saisons.yml
@@ -1,11 +1,11 @@
 id: 80549515
-type: way
+type: node
 latitude: 46.15813
 longitude: 6.24251
 postcode: "74930"
 city: Reignier-Ésery
-street: "Route de Viaison"
-housenumber: 270
+street: Route de Viaison
+housenumber: "270"
 phone: ""
 opening_hours: ""
-website: "https://www.fermedes4saisons.com/"
\ No newline at end of file
+website: https://www.fermedes4saisons.com/
diff --git a/data/cities/reignier-esery/lart-du-pain.yml b/data/cities/reignier-esery/lart-du-pain.yml
index cd4da617d..d40c8b287 100644
--- a/data/cities/reignier-esery/lart-du-pain.yml
+++ b/data/cities/reignier-esery/lart-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 46.13768
 longitude: 6.27047
 postcode: "74930"
 city: Reignier-Esery
-street: "Grande Rue"
-housenumber: 109
-phone: "+33 4 50 95 74 00"
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "109"
+phone: +33 4 50 95 74 00
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/reignier-esery/pressing-de-lesplanade.yml b/data/cities/reignier-esery/pressing-de-lesplanade.yml
index 7ed0aeb66..9cc0af36f 100644
--- a/data/cities/reignier-esery/pressing-de-lesplanade.yml
+++ b/data/cities/reignier-esery/pressing-de-lesplanade.yml
@@ -4,8 +4,8 @@ latitude: 46.13616
 longitude: 6.26895
 postcode: "74930"
 city: Reignier-Ésery
-street: "Grande Rue"
-housenumber: 326
-phone: "+33 4 50 35 09 68"
+street: Grande Rue
+housenumber: "326"
+phone: +33 4 50 35 09 68
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/reignier/aux-saveurs-retrouvees.yml b/data/cities/reignier/aux-saveurs-retrouvees.yml
index 4a037664a..944c6f6ef 100644
--- a/data/cities/reignier/aux-saveurs-retrouvees.yml
+++ b/data/cities/reignier/aux-saveurs-retrouvees.yml
@@ -4,8 +4,8 @@ latitude: 46.13429
 longitude: 6.26822
 postcode: "74930"
 city: Reignier
-street: "Grande Rue"
-housenumber: 538
-phone: "+33 4 50 36 38 06"
+street: Grande Rue
+housenumber: "538"
+phone: +33 4 50 36 38 06
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/reignier/burnier-sa-s.yml b/data/cities/reignier/burnier-sa-s.yml
index 03483a4f7..d8e893e6e 100644
--- a/data/cities/reignier/burnier-sa-s.yml
+++ b/data/cities/reignier/burnier-sa-s.yml
@@ -4,8 +4,8 @@ latitude: 46.13496
 longitude: 6.26891
 postcode: "74930"
 city: Reignier
-street: "Grande Rue"
-housenumber: 445
-phone: "+33 4 50 43 40 31"
-opening_hours: "Mo-Sa 07:00-12:30,14:00-19:00; Th off; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "445"
+phone: +33 4 50 43 40 31
+opening_hours: Mo-Sa 07:00-12:30,14:00-19:00; Th off; Su 07:00-12:30
+website: ""
diff --git a/data/cities/reignier/epicerie-et-cie-reignier-esery.yml b/data/cities/reignier/epicerie-et-cie-reignier-esery.yml
index 8fcdc1420..04e0a3054 100644
--- a/data/cities/reignier/epicerie-et-cie-reignier-esery.yml
+++ b/data/cities/reignier/epicerie-et-cie-reignier-esery.yml
@@ -1,11 +1,11 @@
 id: 80547744
-type: way
+type: node
 latitude: 46.13413
 longitude: 6.2686
 postcode: "74930"
 city: Reignier
-street: "Grande Rue"
-housenumber: 549
-phone: "+33 450 82 70 36"
+street: Grande Rue
+housenumber: "549"
+phone: +33 450 82 70 36
 opening_hours: ""
-website: "https://epicerieetcie.com"
\ No newline at end of file
+website: https://epicerieetcie.com
diff --git a/data/cities/reignier/optique-reignier.yml b/data/cities/reignier/optique-reignier.yml
index a53e2802c..8e65cc0a9 100644
--- a/data/cities/reignier/optique-reignier.yml
+++ b/data/cities/reignier/optique-reignier.yml
@@ -4,8 +4,8 @@ latitude: 46.13701
 longitude: 6.26963
 postcode: "74930"
 city: Reignier
-street: "Grande Rue"
-housenumber: 208
-phone: "+33 4 50 43 40 90"
+street: Grande Rue
+housenumber: "208"
+phone: +33 4 50 43 40 90
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/renage/la-riviere-des-delices.yml b/data/cities/renage/la-riviere-des-delices.yml
index 0246a1261..00e8509a6 100644
--- a/data/cities/renage/la-riviere-des-delices.yml
+++ b/data/cities/renage/la-riviere-des-delices.yml
@@ -4,8 +4,8 @@ latitude: 45.33195
 longitude: 5.48572
 postcode: "38140"
 city: Renage
-street: "Rue de la République"
-housenumber: 1080
+street: Rue de la République
+housenumber: "1080"
 phone: "+33476910530"
-opening_hours: "Tu-Fr 06:00-13:00,15:00-19:00; Sa 07:00-13:00, 15:00-19:00; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:00-13:00,15:00-19:00; Sa 07:00-13:00, 15:00-19:00; Su 07:00-12:30
+website: ""
diff --git a/data/cities/renage/modcoiff.yml b/data/cities/renage/modcoiff.yml
index 9cf0aa784..6a0102eef 100644
--- a/data/cities/renage/modcoiff.yml
+++ b/data/cities/renage/modcoiff.yml
@@ -4,8 +4,8 @@ latitude: 45.33245
 longitude: 5.48518
 postcode: "38140"
 city: Renage
-street: "Rue de la République"
-housenumber: 1000
+street: Rue de la République
+housenumber: "1000"
 phone: "+33476910233"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/renage/netto.yml b/data/cities/renage/netto.yml
index e75e09b02..4800a0f9e 100644
--- a/data/cities/renage/netto.yml
+++ b/data/cities/renage/netto.yml
@@ -1,11 +1,11 @@
 id: 100776975
-type: way
+type: node
 latitude: 45.34233
 longitude: 5.49393
 postcode: "38140"
 city: Renage
-street: "Route de Rives"
-housenumber: 
-phone: "+33 4 76 91 22 00"
-opening_hours: "Mo-Th 08:30-12:30,14:00-19:15; Fr-Sa 08:30-19:15; Su 08:30-12:30"
-website: "https://magasin.netto.fr/423-netto-renage"
\ No newline at end of file
+street: Route de Rives
+housenumber: ""
+phone: +33 4 76 91 22 00
+opening_hours: Mo-Th 08:30-12:30,14:00-19:15; Fr-Sa 08:30-19:15; Su 08:30-12:30
+website: https://magasin.netto.fr/423-netto-renage
diff --git a/data/cities/renage/oz-boucherie.yml b/data/cities/renage/oz-boucherie.yml
index 35002f0f3..8f3468689 100644
--- a/data/cities/renage/oz-boucherie.yml
+++ b/data/cities/renage/oz-boucherie.yml
@@ -4,8 +4,8 @@ latitude: 45.33289
 longitude: 5.48444
 postcode: "38140"
 city: Renage
-street: "Boulevard Docteur Valois"
-housenumber: 15
+street: Boulevard Docteur Valois
+housenumber: "15"
 phone: "+33476063678"
-opening_hours: "Tu-Fr 08:00-12:00,15:00-19:00; Sa 08:00-12:30,15:00-19:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:00-12:00,15:00-19:00; Sa 08:00-12:30,15:00-19:00; Su 08:00-13:00
+website: ""
diff --git a/data/cities/renage/vival.yml b/data/cities/renage/vival.yml
index 1cecfe8dc..5eb4a5015 100644
--- a/data/cities/renage/vival.yml
+++ b/data/cities/renage/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.33168
 longitude: 5.48595
 postcode: "38140"
 city: Renage
-street: "Rue de la République"
-housenumber: 1100
+street: Rue de la République
+housenumber: "1100"
 phone: "+33636982494"
-opening_hours: "PH,Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: PH,Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/renaison/amplifon.yml b/data/cities/renaison/amplifon.yml
index b719d35d8..edc57d320 100644
--- a/data/cities/renaison/amplifon.yml
+++ b/data/cities/renaison/amplifon.yml
@@ -1,11 +1,11 @@
 id: 553305583
-type: way
+type: node
 latitude: 46.05173
 longitude: 3.93181
 postcode: "42370"
 city: Renaison
-street: "Rue du Collège"
-housenumber: 554
-phone: "+33 4 77 87 43 04"
-opening_hours: "Mo-Fr 09:00-18:30"
-website: "https://www.amplifon.com/web/fr/nous-trouver/-/store/amplifon-shop/563/amplifon+renaison/renaison/554+rue+du+college"
\ No newline at end of file
+street: Rue du Collège
+housenumber: "554"
+phone: +33 4 77 87 43 04
+opening_hours: Mo-Fr 09:00-18:30
+website: https://www.amplifon.com/web/fr/nous-trouver/-/store/amplifon-shop/563/amplifon+renaison/renaison/554+rue+du+college
diff --git a/data/cities/renaison/carrefour-market.yml b/data/cities/renaison/carrefour-market.yml
index 44a9229c6..b7bd4dfc1 100644
--- a/data/cities/renaison/carrefour-market.yml
+++ b/data/cities/renaison/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 193334304
-type: way
+type: node
 latitude: 46.05238
 longitude: 3.93152
 postcode: "42370"
 city: Renaison
-street: "Rue du Tacot"
-housenumber: 2
-phone: "+33 4 77 66 49 14"
-opening_hours: "Mo-Su 08:00-20:00"
-website: "https://www.carrefour.fr/magasin/market-renaison"
\ No newline at end of file
+street: Rue du Tacot
+housenumber: "2"
+phone: +33 4 77 66 49 14
+opening_hours: Mo-Su 08:00-20:00
+website: https://www.carrefour.fr/magasin/market-renaison
diff --git a/data/cities/renaison/deco-brico.yml b/data/cities/renaison/deco-brico.yml
index f1a863155..8d5e593db 100644
--- a/data/cities/renaison/deco-brico.yml
+++ b/data/cities/renaison/deco-brico.yml
@@ -4,8 +4,8 @@ latitude: 46.05139
 longitude: 3.93669
 postcode: "42370"
 city: Renaison
-street: "Chemin du Château"
-housenumber: 51
+street: Chemin du Château
+housenumber: "51"
 phone: ""
-opening_hours: "Mo-Fr 8:00-12:00,14:00-19:00; Sa 8:00-12:00,14:00-18:00"
-website: "https://www.bricopro.fr/carte-magasins/bricopro-renaison"
\ No newline at end of file
+opening_hours: Mo-Fr 8:00-12:00,14:00-19:00; Sa 8:00-12:00,14:00-18:00
+website: https://www.bricopro.fr/carte-magasins/bricopro-renaison
diff --git a/data/cities/renaison/jean-louis-david.yml b/data/cities/renaison/jean-louis-david.yml
index dc02a7df4..0df9069e8 100644
--- a/data/cities/renaison/jean-louis-david.yml
+++ b/data/cities/renaison/jean-louis-david.yml
@@ -1,11 +1,11 @@
 id: 553305582
-type: way
+type: node
 latitude: 46.05171
 longitude: 3.93173
 postcode: "42370"
 city: Renaison
-street: "Rue du Collège"
-housenumber: 554
-phone: "+33 4 27 62 01 94"
-opening_hours: "Tu-Fr 09:00-18:30"
-website: "https://www.jeanlouisdavid.com/salon-coiffure/coiffeur-renaison_s4705"
\ No newline at end of file
+street: Rue du Collège
+housenumber: "554"
+phone: +33 4 27 62 01 94
+opening_hours: Tu-Fr 09:00-18:30
+website: https://www.jeanlouisdavid.com/salon-coiffure/coiffeur-renaison_s4705
diff --git a/data/cities/renaison/maison-de-la-presse.yml b/data/cities/renaison/maison-de-la-presse.yml
index 2ac59a7dc..47dc0eb06 100644
--- a/data/cities/renaison/maison-de-la-presse.yml
+++ b/data/cities/renaison/maison-de-la-presse.yml
@@ -4,8 +4,8 @@ latitude: 46.05128
 longitude: 3.92486
 postcode: "42370"
 city: Renaison
-street: "Rue de Gruyères"
-housenumber: 69
-phone: "+33 4 77 64 44 09"
-opening_hours: "Mo 06:30-13:00; Tu-Sa 06:30-12:30,14:30-19:00; Su 07:00-12:30"
-website: "https://mdp-ballansat.com/"
\ No newline at end of file
+street: Rue de Gruyères
+housenumber: "69"
+phone: +33 4 77 64 44 09
+opening_hours: Mo 06:30-13:00; Tu-Sa 06:30-12:30,14:30-19:00; Su 07:00-12:30
+website: https://mdp-ballansat.com/
diff --git a/data/cities/reventin-vaugris/literie-mazaryk.yml b/data/cities/reventin-vaugris/literie-mazaryk.yml
index a8e505567..c346be8ed 100644
--- a/data/cities/reventin-vaugris/literie-mazaryk.yml
+++ b/data/cities/reventin-vaugris/literie-mazaryk.yml
@@ -5,7 +5,7 @@ longitude: 4.84742
 postcode: "38121"
 city: Reventin Vaugris
 street: ""
-housenumber: 
-phone: "+33 4 74 31 70 07"
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.mazaryk.fr/infos-et-contact/14/mazaryk/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 31 70 07
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: https://www.mazaryk.fr/infos-et-contact/14/mazaryk/
diff --git a/data/cities/rillieux-la-pape/ressourcerie-de-rillieux-la-pape.yml b/data/cities/rillieux-la-pape/ressourcerie-de-rillieux-la-pape.yml
index e64818aa3..18edc492d 100644
--- a/data/cities/rillieux-la-pape/ressourcerie-de-rillieux-la-pape.yml
+++ b/data/cities/rillieux-la-pape/ressourcerie-de-rillieux-la-pape.yml
@@ -4,8 +4,8 @@ latitude: 45.80456
 longitude: 4.88684
 postcode: "69140"
 city: Rillieux-la-Pape
-street: "Chemin des Îles"
-housenumber: 8
+street: Chemin des Îles
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: "https://recyclerierillieux.wordpress.com"
\ No newline at end of file
+website: https://recyclerierillieux.wordpress.com
diff --git a/data/cities/riorges/boulangerie-bonneton.yml b/data/cities/riorges/boulangerie-bonneton.yml
index a71a5c292..d6553954e 100644
--- a/data/cities/riorges/boulangerie-bonneton.yml
+++ b/data/cities/riorges/boulangerie-bonneton.yml
@@ -4,8 +4,8 @@ latitude: 46.03974
 longitude: 4.05138
 postcode: "42153"
 city: Riorges
-street: "Rue Maréchal Foch"
-housenumber: 53
+street: Rue Maréchal Foch
+housenumber: "53"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/riorges/boulangerie-de-marie-blachere.yml b/data/cities/riorges/boulangerie-de-marie-blachere.yml
index c61ae02a4..ee4abdf88 100644
--- a/data/cities/riorges/boulangerie-de-marie-blachere.yml
+++ b/data/cities/riorges/boulangerie-de-marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 46.04443
 longitude: 4.05213
 postcode: "42153"
 city: Riorges
-street: "Rue Joseph Gallieni"
-housenumber: 169
-phone: "+33 4 77 44 63 57"
+street: Rue Joseph Gallieni
+housenumber: "169"
+phone: +33 4 77 44 63 57
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/riorges/boulangerie-feuillette.yml b/data/cities/riorges/boulangerie-feuillette.yml
index 80bf13c0c..159af1d76 100644
--- a/data/cities/riorges/boulangerie-feuillette.yml
+++ b/data/cities/riorges/boulangerie-feuillette.yml
@@ -4,8 +4,8 @@ latitude: 46.05386
 longitude: 4.06381
 postcode: "42153"
 city: Riorges
-street: "Avenue Charles de Gaulle"
-housenumber: 381
-phone: "+33 4 12 05 19 55"
+street: Avenue Charles de Gaulle
+housenumber: "381"
+phone: +33 4 12 05 19 55
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/riorges/declic-pub.yml b/data/cities/riorges/declic-pub.yml
index 96e2b61b3..22804e365 100644
--- a/data/cities/riorges/declic-pub.yml
+++ b/data/cities/riorges/declic-pub.yml
@@ -4,8 +4,8 @@ latitude: 46.04356
 longitude: 4.05075
 postcode: "42153"
 city: Riorges
-street: "Allée du Lieutenant Vagneron"
-housenumber: 120
+street: Allée du Lieutenant Vagneron
+housenumber: "120"
 phone: ""
-opening_hours: "Mo-Th 08:00-12:00, 14:00-18:00; Fr 08:00-12:00, 13:30-16:00"
-website: "https://la-boutik.com"
\ No newline at end of file
+opening_hours: Mo-Th 08:00-12:00, 14:00-18:00; Fr 08:00-12:00, 13:30-16:00
+website: https://la-boutik.com
diff --git a/data/cities/riorges/epicerie-tout-dici.yml b/data/cities/riorges/epicerie-tout-dici.yml
index 47aa1551f..035458ab1 100644
--- a/data/cities/riorges/epicerie-tout-dici.yml
+++ b/data/cities/riorges/epicerie-tout-dici.yml
@@ -1,11 +1,11 @@
 id: 71641851
-type: way
+type: node
 latitude: 46.03784
 longitude: 4.03407
 postcode: "42153"
 city: Riorges
-street: "Rue de Saint-Alban"
-housenumber: 1463
-phone: "+33 6 14 61 92 23"
-opening_hours: "Tu,Fr 11:30-19:30; Sa 10:00-15:00"
-website: "https://www.toutdici.fr/"
\ No newline at end of file
+street: Rue de Saint-Alban
+housenumber: "1463"
+phone: +33 6 14 61 92 23
+opening_hours: Tu,Fr 11:30-19:30; Sa 10:00-15:00
+website: https://www.toutdici.fr/
diff --git a/data/cities/rive-de-gier/jullien-freres.yml b/data/cities/rive-de-gier/jullien-freres.yml
index 91a8d1d94..599ce1bce 100644
--- a/data/cities/rive-de-gier/jullien-freres.yml
+++ b/data/cities/rive-de-gier/jullien-freres.yml
@@ -1,11 +1,11 @@
 id: 144494463
-type: way
+type: node
 latitude: 45.53077
 longitude: 4.62115
 postcode: "42800"
 city: Rive-de-Gier
-street: "Avenue Maréchal Juin"
-housenumber: 
-phone: "+33 4 77 75 02 07"
+street: Avenue Maréchal Juin
+housenumber: ""
+phone: +33 4 77 75 02 07
 opening_hours: ""
-website: "http://www.jullien-freres-caves.fr/"
\ No newline at end of file
+website: http://www.jullien-freres-caves.fr/
diff --git a/data/cities/rive-de-gier/peugeot.yml b/data/cities/rive-de-gier/peugeot.yml
index 92db47ba1..2eca60f9f 100644
--- a/data/cities/rive-de-gier/peugeot.yml
+++ b/data/cities/rive-de-gier/peugeot.yml
@@ -4,8 +4,8 @@ latitude: 45.527
 longitude: 4.61154
 postcode: "42800"
 city: Rive de Gier
-street: "Rue Claude Drivon"
-housenumber: 
+street: Rue Claude Drivon
+housenumber: ""
 phone: "+33477750422"
 opening_hours: ""
-website: "https://concessions.peugeot.fr/rive-de-gier/"
\ No newline at end of file
+website: https://concessions.peugeot.fr/rive-de-gier/
diff --git a/data/cities/rive-de-gier/velo-etape.yml b/data/cities/rive-de-gier/velo-etape.yml
index cb9f33829..24400d529 100644
--- a/data/cities/rive-de-gier/velo-etape.yml
+++ b/data/cities/rive-de-gier/velo-etape.yml
@@ -4,8 +4,8 @@ latitude: 45.52237
 longitude: 4.59453
 postcode: "42800"
 city: Rive-de-Gier
-street: "Chemin du Sardon"
-housenumber: 
+street: Chemin du Sardon
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.velo-etape.fr/"
\ No newline at end of file
+website: https://www.velo-etape.fr/
diff --git a/data/cities/rives/auto-selection.yml b/data/cities/rives/auto-selection.yml
index 571645f81..84f0e52cd 100644
--- a/data/cities/rives/auto-selection.yml
+++ b/data/cities/rives/auto-selection.yml
@@ -1,11 +1,11 @@
 id: 232803109
-type: way
+type: node
 latitude: 45.35661
 longitude: 5.49247
 postcode: "38140"
 city: Rives
-street: "Rue du Vercors"
-housenumber: 184
-phone: "+33 4 76 66 18 86"
+street: Rue du Vercors
+housenumber: "184"
+phone: +33 4 76 66 18 86
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/rives/cycles-rossat.yml b/data/cities/rives/cycles-rossat.yml
index 95d873be9..5b0d6168f 100644
--- a/data/cities/rives/cycles-rossat.yml
+++ b/data/cities/rives/cycles-rossat.yml
@@ -4,8 +4,8 @@ latitude: 45.34875
 longitude: 5.49877
 postcode: "38140"
 city: Rives
-street: "Rue de la République"
-housenumber: 140
+street: Rue de la République
+housenumber: "140"
 phone: ""
-opening_hours: "Tu-Sa 08:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/rives/hobby-dou.yml b/data/cities/rives/hobby-dou.yml
index 309ad41f6..4b0960932 100644
--- a/data/cities/rives/hobby-dou.yml
+++ b/data/cities/rives/hobby-dou.yml
@@ -4,8 +4,8 @@ latitude: 45.34919
 longitude: 5.50354
 postcode: "38140"
 city: Rives
-street: "Rue de la République"
-housenumber: 56
+street: Rue de la République
+housenumber: "56"
 phone: "+33982627720"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/ambiance-et-styles.yml b/data/cities/roanne/ambiance-et-styles.yml
index ae48b8083..1af16e54f 100644
--- a/data/cities/roanne/ambiance-et-styles.yml
+++ b/data/cities/roanne/ambiance-et-styles.yml
@@ -4,8 +4,8 @@ latitude: 46.039
 longitude: 4.07153
 postcode: "42300"
 city: Roanne
-street: "Rue Charles de Gaulle"
-housenumber: 57
+street: Rue Charles de Gaulle
+housenumber: "57"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/boulangerie-grange.yml b/data/cities/roanne/boulangerie-grange.yml
index 258e28585..d5adbb399 100644
--- a/data/cities/roanne/boulangerie-grange.yml
+++ b/data/cities/roanne/boulangerie-grange.yml
@@ -4,8 +4,8 @@ latitude: 46.0398
 longitude: 4.07005
 postcode: "42300"
 city: Roanne
-street: "Rue des Aqueducs"
-housenumber: 7
+street: Rue des Aqueducs
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/bricorama-roanne.yml b/data/cities/roanne/bricorama-roanne.yml
index b93398676..e46d7d943 100644
--- a/data/cities/roanne/bricorama-roanne.yml
+++ b/data/cities/roanne/bricorama-roanne.yml
@@ -4,8 +4,8 @@ latitude: 46.03418
 longitude: 4.06418
 postcode: "42300"
 city: Roanne
-street: "Rue du Moulin Paillasson"
-housenumber: 
+street: Rue du Moulin Paillasson
+housenumber: ""
 phone: "+33477678573"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.bricorama.fr/magasins/bricorama-roanne.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: https://www.bricorama.fr/magasins/bricorama-roanne.html
diff --git a/data/cities/roanne/centre-commercial-saint-louis.yml b/data/cities/roanne/centre-commercial-saint-louis.yml
index e4178fa69..7dd3b069b 100644
--- a/data/cities/roanne/centre-commercial-saint-louis.yml
+++ b/data/cities/roanne/centre-commercial-saint-louis.yml
@@ -1,11 +1,11 @@
 id: 124621088
-type: way
+type: node
 latitude: 46.03402
 longitude: 4.06569
 postcode: "42300"
 city: Roanne
-street: "Rue Alexandre Raffin"
-housenumber: 
+street: Rue Alexandre Raffin
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/chez-cornaline.yml b/data/cities/roanne/chez-cornaline.yml
index 47f65b75a..612baf6c5 100644
--- a/data/cities/roanne/chez-cornaline.yml
+++ b/data/cities/roanne/chez-cornaline.yml
@@ -4,8 +4,8 @@ latitude: 46.03545
 longitude: 4.07368
 postcode: "42300"
 city: Roanne
-street: "Rue Maréchal Foch"
-housenumber: 11
-phone: "04 77 78 70 03"
+street: Rue Maréchal Foch
+housenumber: "11"
+phone: 04 77 78 70 03
 opening_hours: ""
-website: "https://www.chezcornaline.fr/"
\ No newline at end of file
+website: https://www.chezcornaline.fr/
diff --git a/data/cities/roanne/chopin-philippe.yml b/data/cities/roanne/chopin-philippe.yml
index 8e09e1a6d..e685e5cee 100644
--- a/data/cities/roanne/chopin-philippe.yml
+++ b/data/cities/roanne/chopin-philippe.yml
@@ -4,8 +4,8 @@ latitude: 46.03463
 longitude: 4.06919
 postcode: "42300"
 city: Roanne
-street: "Rue Beaulieu"
-housenumber: 6
+street: Rue Beaulieu
+housenumber: "6"
 phone: "+33477712696"
-opening_hours: "Mo-Fr 06:30-13:00,15:00-19:30; Sa 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-13:00,15:00-19:30; Sa 06:30-13:00
+website: ""
diff --git a/data/cities/roanne/coiffure-daniere.yml b/data/cities/roanne/coiffure-daniere.yml
index d14945ee4..cd69c537f 100644
--- a/data/cities/roanne/coiffure-daniere.yml
+++ b/data/cities/roanne/coiffure-daniere.yml
@@ -4,8 +4,8 @@ latitude: 46.0384
 longitude: 4.06437
 postcode: "42300"
 city: Roanne
-street: "Cours de la République"
-housenumber: 
+street: Cours de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/docks-du-blanc.yml b/data/cities/roanne/docks-du-blanc.yml
index a1908d742..0e244095c 100644
--- a/data/cities/roanne/docks-du-blanc.yml
+++ b/data/cities/roanne/docks-du-blanc.yml
@@ -4,8 +4,8 @@ latitude: 46.03725
 longitude: 4.06541
 postcode: "42300"
 city: Roanne
-street: "Rue Émile Noirot"
-housenumber: 36
+street: Rue Émile Noirot
+housenumber: "36"
 phone: "+33477781209"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/ecolo-cartouche.yml b/data/cities/roanne/ecolo-cartouche.yml
index 8fea2107e..57a306af0 100644
--- a/data/cities/roanne/ecolo-cartouche.yml
+++ b/data/cities/roanne/ecolo-cartouche.yml
@@ -4,8 +4,8 @@ latitude: 46.04453
 longitude: 4.07093
 postcode: "42300"
 city: Roanne
-street: "Avenue de Paris"
-housenumber: 59
-phone: "+33 4 77 78 13 52"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:30-12:00,13:30- 18:00"
-website: "https://www.ecolo-cartouche.fr"
\ No newline at end of file
+street: Avenue de Paris
+housenumber: "59"
+phone: +33 4 77 78 13 52
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:30-12:00,13:30- 18:00
+website: https://www.ecolo-cartouche.fr
diff --git a/data/cities/roanne/eri-informatique.yml b/data/cities/roanne/eri-informatique.yml
index 7ee0df3a8..3e0487f84 100644
--- a/data/cities/roanne/eri-informatique.yml
+++ b/data/cities/roanne/eri-informatique.yml
@@ -4,8 +4,8 @@ latitude: 46.03366
 longitude: 4.07726
 postcode: ""
 city: Roanne
-street: "Rue Jean Jaurès"
-housenumber: 4
+street: Rue Jean Jaurès
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/festival-des-pains.yml b/data/cities/roanne/festival-des-pains.yml
index 801d26564..ed2a7c9c4 100644
--- a/data/cities/roanne/festival-des-pains.yml
+++ b/data/cities/roanne/festival-des-pains.yml
@@ -4,8 +4,8 @@ latitude: 46.0389
 longitude: 4.05718
 postcode: "42300"
 city: Roanne
-street: "Rue Mulsant"
-housenumber: 98
-phone: "+33 4 77 71 36 15"
+street: Rue Mulsant
+housenumber: "98"
+phone: +33 4 77 71 36 15
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/garage-de-la-poste.yml b/data/cities/roanne/garage-de-la-poste.yml
index 10bd039ec..280bb7d20 100644
--- a/data/cities/roanne/garage-de-la-poste.yml
+++ b/data/cities/roanne/garage-de-la-poste.yml
@@ -4,8 +4,8 @@ latitude: 46.04406
 longitude: 4.08398
 postcode: "42311"
 city: Roanne
-street: "Boulevard Jean-Baptiste Clément"
-housenumber: 90
-phone: "+33 4 77 44 51 51"
-opening_hours: "Mo-Fr 08:30-19:00; Sa 09:00-18:30"
-website: "https://www.ford-garagegambetta.fr/"
\ No newline at end of file
+street: Boulevard Jean-Baptiste Clément
+housenumber: "90"
+phone: +33 4 77 44 51 51
+opening_hours: Mo-Fr 08:30-19:00; Sa 09:00-18:30
+website: https://www.ford-garagegambetta.fr/
diff --git a/data/cities/roanne/informaticum.yml b/data/cities/roanne/informaticum.yml
index 571375e48..176158910 100644
--- a/data/cities/roanne/informaticum.yml
+++ b/data/cities/roanne/informaticum.yml
@@ -4,8 +4,8 @@ latitude: 46.03809
 longitude: 4.05983
 postcode: "42300"
 city: Roanne
-street: "Rue Mulsant"
-housenumber: 25
+street: Rue Mulsant
+housenumber: "25"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/julien-dorcel.yml b/data/cities/roanne/julien-dorcel.yml
index 65cbe863b..0007446a6 100644
--- a/data/cities/roanne/julien-dorcel.yml
+++ b/data/cities/roanne/julien-dorcel.yml
@@ -4,8 +4,8 @@ latitude: 46.0661
 longitude: 4.05975
 postcode: "42300"
 city: Roanne
-street: "Centre Commercial Carrefour Mably"
-housenumber: 
+street: Centre Commercial Carrefour Mably
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.juliendorcel.com/bijouterie/roanne-1034M"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.juliendorcel.com/bijouterie/roanne-1034M
diff --git a/data/cities/roanne/monoprix.yml b/data/cities/roanne/monoprix.yml
index e0585915b..ca6858013 100644
--- a/data/cities/roanne/monoprix.yml
+++ b/data/cities/roanne/monoprix.yml
@@ -4,8 +4,8 @@ latitude: 46.0362
 longitude: 4.07056
 postcode: "42300"
 city: Roanne
-street: "Rue Charles de Gaulle"
-housenumber: 7
-phone: "+33 4 77 23 65 90"
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.monoprix.fr/223.html"
\ No newline at end of file
+street: Rue Charles de Gaulle
+housenumber: "7"
+phone: +33 4 77 23 65 90
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.monoprix.fr/223.html
diff --git a/data/cities/roanne/noz.yml b/data/cities/roanne/noz.yml
index 7d5ba6a17..2b58f8442 100644
--- a/data/cities/roanne/noz.yml
+++ b/data/cities/roanne/noz.yml
@@ -1,11 +1,11 @@
 id: 124646898
-type: way
+type: node
 latitude: 46.04522
 longitude: 4.06672
 postcode: "42300"
 city: Roanne
-street: "Rue François Poutignat"
-housenumber: 13
+street: Rue François Poutignat
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/roanne/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/roanne/
diff --git a/data/cities/roanne/optical-center.yml b/data/cities/roanne/optical-center.yml
index 998774bae..67e140950 100644
--- a/data/cities/roanne/optical-center.yml
+++ b/data/cities/roanne/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 46.03657
 longitude: 4.06805
 postcode: "42300"
 city: Roanne
-street: "Rue Alsace-Lorraine"
-housenumber: 32
-phone: "+33 4 77 71 09 43"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/3441-optical-center-roanne"
\ No newline at end of file
+street: Rue Alsace-Lorraine
+housenumber: "32"
+phone: +33 4 77 71 09 43
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/3441-optical-center-roanne
diff --git a/data/cities/roanne/pascal-coste.yml b/data/cities/roanne/pascal-coste.yml
index cddc7d386..403c007b4 100644
--- a/data/cities/roanne/pascal-coste.yml
+++ b/data/cities/roanne/pascal-coste.yml
@@ -4,8 +4,8 @@ latitude: 46.06659
 longitude: 4.05991
 postcode: "42300"
 city: Roanne
-street: "Rue Jean de la Fontaine"
-housenumber: 
+street: Rue Jean de la Fontaine
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-20:00"
-website: "https://www.pascalcoste.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-20:00
+website: https://www.pascalcoste.com/
diff --git a/data/cities/roanne/pralus.yml b/data/cities/roanne/pralus.yml
index c9fe0c093..5dccfdba5 100644
--- a/data/cities/roanne/pralus.yml
+++ b/data/cities/roanne/pralus.yml
@@ -4,8 +4,8 @@ latitude: 46.03639
 longitude: 4.07082
 postcode: "42300"
 city: Roanne
-street: "Rue Charles de Gaulle"
-housenumber: 8
+street: Rue Charles de Gaulle
+housenumber: "8"
 phone: "+33477712410"
-opening_hours: "Tu-Fr 08:30-12:15,14:00-19:00; Sa 08:15-12:30,14:00-19:15"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-12:15,14:00-19:00; Sa 08:15-12:30,14:00-19:15
+website: ""
diff --git a/data/cities/roanne/ressourcerie-acora.yml b/data/cities/roanne/ressourcerie-acora.yml
index 739ce0edd..80491181c 100644
--- a/data/cities/roanne/ressourcerie-acora.yml
+++ b/data/cities/roanne/ressourcerie-acora.yml
@@ -4,8 +4,8 @@ latitude: 46.03109
 longitude: 4.06215
 postcode: "42300"
 city: Roanne
-street: "36 Impasse Fontval"
-housenumber: 
+street: 36 Impasse Fontval
+housenumber: ""
 phone: ""
-opening_hours: "Mo 14:00-18:00; Tu-Fr 09:30-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:00; Tu-Fr 09:30-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/roanne/roanne-luminaire.yml b/data/cities/roanne/roanne-luminaire.yml
index 36ef7e6d7..7b480a88f 100644
--- a/data/cities/roanne/roanne-luminaire.yml
+++ b/data/cities/roanne/roanne-luminaire.yml
@@ -4,8 +4,8 @@ latitude: 46.0334
 longitude: 4.07727
 postcode: ""
 city: Roanne
-street: "Rue Jean Jaurès"
-housenumber: 1
+street: Rue Jean Jaurès
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/vision-plus.yml b/data/cities/roanne/vision-plus.yml
index 0afc4a2b0..c14afbb2f 100644
--- a/data/cities/roanne/vision-plus.yml
+++ b/data/cities/roanne/vision-plus.yml
@@ -4,8 +4,8 @@ latitude: 46.0665
 longitude: 4.05989
 postcode: "42300"
 city: Roanne
-street: "Rue Jean de la Fontaine"
-housenumber: 
+street: Rue Jean de la Fontaine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/roanne/yves-rocher.yml b/data/cities/roanne/yves-rocher.yml
index e96c87857..8426c2644 100644
--- a/data/cities/roanne/yves-rocher.yml
+++ b/data/cities/roanne/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 46.03698
 longitude: 4.07082
 postcode: "42300"
 city: Roanne
-street: "Rue Charles de Gaulle"
-housenumber: 21
+street: Rue Charles de Gaulle
+housenumber: "21"
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/roanne/roanne/S-FRYROC72"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/roanne/roanne/S-FRYROC72
diff --git a/data/cities/rochegude/au-phil-des-saveurs.yml b/data/cities/rochegude/au-phil-des-saveurs.yml
index 6f9bfe128..a205826b7 100644
--- a/data/cities/rochegude/au-phil-des-saveurs.yml
+++ b/data/cities/rochegude/au-phil-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 44.24847
 longitude: 4.83073
 postcode: "26790"
 city: Rochegude
-street: "Cours de l'Apparent"
-housenumber: 101
-phone: "09 67 37 58 57"
+street: Cours de l'Apparent
+housenumber: "101"
+phone: 09 67 37 58 57
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/rochetaillee-sur-saone/intermarche.yml b/data/cities/rochetaillee-sur-saone/intermarche.yml
index 160f4debd..a88e89f44 100644
--- a/data/cities/rochetaillee-sur-saone/intermarche.yml
+++ b/data/cities/rochetaillee-sur-saone/intermarche.yml
@@ -5,7 +5,7 @@ longitude: 4.83479
 postcode: ""
 city: Rochetaillée-sur-Saône
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/rochetaillee-sur-saone/maison-barberat.yml b/data/cities/rochetaillee-sur-saone/maison-barberat.yml
index 53166dc8d..28edbccd9 100644
--- a/data/cities/rochetaillee-sur-saone/maison-barberat.yml
+++ b/data/cities/rochetaillee-sur-saone/maison-barberat.yml
@@ -4,8 +4,8 @@ latitude: 45.83567
 longitude: 4.83828
 postcode: ""
 city: Rochetaillée-sur-Saône
-street: "Chemin de la Plage"
-housenumber: 705
-phone: "+33 4 72 17 00 20"
-opening_hours: "Mo-Fr 06:00-20:00; Sa 07:00-20:00; Su 07:00-14:00"
-website: "https://www.maisonbarberat.com/"
\ No newline at end of file
+street: Chemin de la Plage
+housenumber: "705"
+phone: +33 4 72 17 00 20
+opening_hours: Mo-Fr 06:00-20:00; Sa 07:00-20:00; Su 07:00-14:00
+website: https://www.maisonbarberat.com/
diff --git a/data/cities/rochetoirin/papeterie-morel.yml b/data/cities/rochetoirin/papeterie-morel.yml
index 02e78ee6a..a03075d0c 100644
--- a/data/cities/rochetoirin/papeterie-morel.yml
+++ b/data/cities/rochetoirin/papeterie-morel.yml
@@ -4,8 +4,8 @@ latitude: 45.56799
 longitude: 5.42027
 postcode: "38110"
 city: Rochetoirin
-street: "Route de Lyon"
-housenumber: 
+street: Route de Lyon
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/rontalon/vival-alanquepicerie.yml b/data/cities/rontalon/vival-alanquepicerie.yml
index 6f310c500..886bf5489 100644
--- a/data/cities/rontalon/vival-alanquepicerie.yml
+++ b/data/cities/rontalon/vival-alanquepicerie.yml
@@ -4,8 +4,8 @@ latitude: 45.66075
 longitude: 4.63269
 postcode: "69510"
 city: Rontalon
-street: "Place de l'Église"
-housenumber: 6
+street: Place de l'Église
+housenumber: "6"
 phone: "+33478489731"
-opening_hours: "Mo-Sa 07:30-12:30,16:00-19:00; We off; Su 07:30-12:30"
-website: "https://magasins.vival.fr/fr/vival-rontalon"
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-12:30,16:00-19:00; We off; Su 07:30-12:30
+website: https://magasins.vival.fr/fr/vival-rontalon
diff --git a/data/cities/roussas/domaine-de-grangeneuve.yml b/data/cities/roussas/domaine-de-grangeneuve.yml
index 0e3816af1..d8ec4a298 100644
--- a/data/cities/roussas/domaine-de-grangeneuve.yml
+++ b/data/cities/roussas/domaine-de-grangeneuve.yml
@@ -4,8 +4,8 @@ latitude: 44.43207
 longitude: 4.77502
 postcode: "26230"
 city: Roussas
-street: "Route des Esplanes"
-housenumber: 1200
+street: Route des Esplanes
+housenumber: "1200"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:30,14:30-19:00, Sa-Su 10:00-12:30,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:30,14:30-19:00, Sa-Su 10:00-12:30,14:30-19:00
+website: ""
diff --git a/data/cities/roussillon/boulangerie-panel-adeline.yml b/data/cities/roussillon/boulangerie-panel-adeline.yml
index 9b4007930..23b93f352 100644
--- a/data/cities/roussillon/boulangerie-panel-adeline.yml
+++ b/data/cities/roussillon/boulangerie-panel-adeline.yml
@@ -5,7 +5,7 @@ longitude: 4.81089
 postcode: "38150"
 city: Roussillon
 street: ""
-housenumber: 42
-phone: "+33 4 74 86 22 61"
-opening_hours: "Tu-Sa 06:30-12:30,15:00-19:00; Su 06:30-12:30"
-website: ""
\ No newline at end of file
+housenumber: "42"
+phone: +33 4 74 86 22 61
+opening_hours: Tu-Sa 06:30-12:30,15:00-19:00; Su 06:30-12:30
+website: ""
diff --git a/data/cities/roussillon/ford.yml b/data/cities/roussillon/ford.yml
index b1c9b1eb5..b544384c1 100644
--- a/data/cities/roussillon/ford.yml
+++ b/data/cities/roussillon/ford.yml
@@ -4,8 +4,8 @@ latitude: 45.39283
 longitude: 4.80612
 postcode: "38150"
 city: Roussillon
-street: "Route Nationale 7"
-housenumber: 
+street: Route Nationale 7
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00"
-website: "https://pros.lacentrale.fr/C025806/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00
+website: https://pros.lacentrale.fr/C025806/
diff --git a/data/cities/roussillon/yves-rocher.yml b/data/cities/roussillon/yves-rocher.yml
index f4b9b52ab..228ad3847 100644
--- a/data/cities/roussillon/yves-rocher.yml
+++ b/data/cities/roussillon/yves-rocher.yml
@@ -1,11 +1,11 @@
 id: 1043714534
-type: way
+type: node
 latitude: 45.34221
 longitude: 4.80622
 postcode: "38150"
 city: Roussillon
 street: ""
-housenumber: 
-phone: "+33 4 74 86 15 34"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/salaise-sur-sanne/salaise-sur-sanne/S-FRYROC409"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 86 15 34
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/salaise-sur-sanne/salaise-sur-sanne/S-FRYROC409
diff --git a/data/cities/rumilly/boulangerie-marie-blachere.yml b/data/cities/rumilly/boulangerie-marie-blachere.yml
index 9e34f2d3e..9bfbc2d50 100644
--- a/data/cities/rumilly/boulangerie-marie-blachere.yml
+++ b/data/cities/rumilly/boulangerie-marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 45.85708
 longitude: 5.95037
 postcode: "74150"
 city: Rumilly
-street: "Rue René Cassin"
-housenumber: 11
+street: Rue René Cassin
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/rumilly/feu-vert.yml b/data/cities/rumilly/feu-vert.yml
index 9588df5b7..674ae8284 100644
--- a/data/cities/rumilly/feu-vert.yml
+++ b/data/cities/rumilly/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 87063017
-type: way
+type: node
 latitude: 45.85159
 longitude: 5.95294
 postcode: "74150"
 city: Rumilly
-street: "Rue René Cassin"
-housenumber: 45
+street: Rue René Cassin
+housenumber: "45"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/rumilly/ikones.yml b/data/cities/rumilly/ikones.yml
index 0ba552f6b..915851835 100644
--- a/data/cities/rumilly/ikones.yml
+++ b/data/cities/rumilly/ikones.yml
@@ -4,8 +4,8 @@ latitude: 45.86675
 longitude: 5.94267
 postcode: "74150"
 city: Rumilly
-street: "Rue Centrale"
-housenumber: 4
-phone: "+33 4 50 68 41 76"
-opening_hours: "Tu-Sa 09:30-12:00,14:30-19:00"
-website: "https://www.facebook.com/ikonesboutique/"
\ No newline at end of file
+street: Rue Centrale
+housenumber: "4"
+phone: +33 4 50 68 41 76
+opening_hours: Tu-Sa 09:30-12:00,14:30-19:00
+website: https://www.facebook.com/ikonesboutique/
diff --git a/data/cities/rumilly/intertrade.yml b/data/cities/rumilly/intertrade.yml
index 5b7eb5029..d70d284ce 100644
--- a/data/cities/rumilly/intertrade.yml
+++ b/data/cities/rumilly/intertrade.yml
@@ -5,7 +5,7 @@ longitude: 5.95412
 postcode: "74150"
 city: Rumilly
 street: ""
-housenumber: 20
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:00"
-website: "www.intertrade-vsp.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:00
+website: www.intertrade-vsp.com/
diff --git a/data/cities/rumilly/le-petit-casino.yml b/data/cities/rumilly/le-petit-casino.yml
index 4cf2cadc1..40d743731 100644
--- a/data/cities/rumilly/le-petit-casino.yml
+++ b/data/cities/rumilly/le-petit-casino.yml
@@ -5,7 +5,7 @@ longitude: 5.94469
 postcode: "74150"
 city: Rumilly
 street: ""
-housenumber: 50
+housenumber: "50"
 phone: ""
-opening_hours: "Mo-Sa 07:30-12:30, 15:30-19:30; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-12:30, 15:30-19:30; Su 08:00-12:00
+website: ""
diff --git a/data/cities/rumilly/marche-filaterie-ganesh.yml b/data/cities/rumilly/marche-filaterie-ganesh.yml
index a48919b46..c2e238a02 100644
--- a/data/cities/rumilly/marche-filaterie-ganesh.yml
+++ b/data/cities/rumilly/marche-filaterie-ganesh.yml
@@ -5,7 +5,7 @@ longitude: 5.9437
 postcode: "74150"
 city: Rumilly
 street: ""
-housenumber: 5
+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"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-00:00; Tu-Fr 11:00-13:00,14:00-00:00; Sa-Su 09:30-00:00
+website: ""
diff --git a/data/cities/rumilly/supeco.yml b/data/cities/rumilly/supeco.yml
index 3a11f98ee..5eb4f7479 100644
--- a/data/cities/rumilly/supeco.yml
+++ b/data/cities/rumilly/supeco.yml
@@ -1,11 +1,11 @@
 id: 87066680
-type: way
+type: node
 latitude: 45.85854
 longitude: 5.94393
 postcode: "74150"
 city: Rumilly
 street: ""
-housenumber: 9
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/rumilly/thiriet.yml b/data/cities/rumilly/thiriet.yml
index ea001c9a4..d3443e3b6 100644
--- a/data/cities/rumilly/thiriet.yml
+++ b/data/cities/rumilly/thiriet.yml
@@ -4,8 +4,8 @@ latitude: 45.8574
 longitude: 5.9502
 postcode: "74150"
 city: Rumilly
-street: "Avenue René Cassin"
-housenumber: 11
+street: Avenue René Cassin
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su 09:30-12:30
+website: ""
diff --git a/data/cities/ruy-montceau/ferme-de-rosiere.yml b/data/cities/ruy-montceau/ferme-de-rosiere.yml
index b41700776..2273740ae 100644
--- a/data/cities/ruy-montceau/ferme-de-rosiere.yml
+++ b/data/cities/ruy-montceau/ferme-de-rosiere.yml
@@ -4,8 +4,8 @@ latitude: 45.59483
 longitude: 5.31217
 postcode: "38300"
 city: Ruy-Montceau
-street: "Chemin de Loudon"
-housenumber: 362
+street: Chemin de Loudon
+housenumber: "362"
 phone: "0953306828"
-opening_hours: "We 17:00-20:00"
-website: "https://fermederosiere.wordpress.com/"
\ No newline at end of file
+opening_hours: We 17:00-20:00
+website: https://fermederosiere.wordpress.com/
diff --git a/data/cities/sablons/denis-fraisse.yml b/data/cities/sablons/denis-fraisse.yml
index c442efcfd..69f1d7f44 100644
--- a/data/cities/sablons/denis-fraisse.yml
+++ b/data/cities/sablons/denis-fraisse.yml
@@ -4,8 +4,8 @@ latitude: 45.31945
 longitude: 4.7682
 postcode: "38550"
 city: Sablons
-street: "Route du Péage"
-housenumber: 2
+street: Route du Péage
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sablons/maison-jury.yml b/data/cities/sablons/maison-jury.yml
index 25f103359..4d34284b5 100644
--- a/data/cities/sablons/maison-jury.yml
+++ b/data/cities/sablons/maison-jury.yml
@@ -4,8 +4,8 @@ latitude: 45.31907
 longitude: 4.76907
 postcode: "38550"
 city: Sablons
-street: "Rue Gustave Toursier"
-housenumber: 3
-phone: "+33 4 74 84 32 25"
-opening_hours: "Tu-Sa 05:15-19:00; Su 07:00-12:45"
-website: ""
\ No newline at end of file
+street: Rue Gustave Toursier
+housenumber: "3"
+phone: +33 4 74 84 32 25
+opening_hours: Tu-Sa 05:15-19:00; Su 07:00-12:45
+website: ""
diff --git a/data/cities/sablons/tabac-presse-sablons.yml b/data/cities/sablons/tabac-presse-sablons.yml
index 0cc22015c..30db8eee7 100644
--- a/data/cities/sablons/tabac-presse-sablons.yml
+++ b/data/cities/sablons/tabac-presse-sablons.yml
@@ -4,8 +4,9 @@ latitude: 45.31886
 longitude: 4.76932
 postcode: "38550"
 city: Sablons
-street: "Rue Gustave Toursier"
-housenumber: 5
-phone: "+33 4 74 84 34 72"
-opening_hours: "Mo 06:30-12:30,15:00-19:00; Tu-Fr 06:00-12:30,14:30-19:30; Sa 07:00-12:30,14:30-19:30; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+street: Rue Gustave Toursier
+housenumber: "5"
+phone: +33 4 74 84 34 72
+opening_hours: Mo 06:30-12:30,15:00-19:00; Tu-Fr 06:00-12:30,14:30-19:30; Sa 07:00-12:30,14:30-19:30;
+    Su 07:00-12:30
+website: ""
diff --git a/data/cities/sain-bel/igtiff.yml b/data/cities/sain-bel/igtiff.yml
index 32a05e056..c7b48b6da 100644
--- a/data/cities/sain-bel/igtiff.yml
+++ b/data/cities/sain-bel/igtiff.yml
@@ -4,8 +4,8 @@ latitude: 45.81165
 longitude: 4.59972
 postcode: "69210"
 city: Sain-Bel
-street: "Quai de la Brévenne"
-housenumber: 26
+street: Quai de la Brévenne
+housenumber: "26"
 phone: "+33474012904"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sain-bel/maison-nicolas.yml b/data/cities/sain-bel/maison-nicolas.yml
index e769243e2..3096b0686 100644
--- a/data/cities/sain-bel/maison-nicolas.yml
+++ b/data/cities/sain-bel/maison-nicolas.yml
@@ -4,8 +4,8 @@ latitude: 45.8132
 longitude: 4.60172
 postcode: "69210"
 city: Sain-Bel
-street: "Quai de la Brévenne"
-housenumber: 36
+street: Quai de la Brévenne
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: "+33478433569"
\ No newline at end of file
+website: "+33478433569"
diff --git a/data/cities/sain-bel/maison-poulard.yml b/data/cities/sain-bel/maison-poulard.yml
index 5d13a1766..c80134f1e 100644
--- a/data/cities/sain-bel/maison-poulard.yml
+++ b/data/cities/sain-bel/maison-poulard.yml
@@ -4,8 +4,8 @@ latitude: 45.81081
 longitude: 4.59901
 postcode: "69210"
 city: Sain-Bel
-street: "Rue Joseph Volay"
-housenumber: 4
+street: Rue Joseph Volay
+housenumber: "4"
 phone: "+33970357243"
 opening_hours: ""
-website: "https://www.maison-poulard.fr"
\ No newline at end of file
+website: https://www.maison-poulard.fr
diff --git a/data/cities/sain-bel/maison-thollot.yml b/data/cities/sain-bel/maison-thollot.yml
index 5f88f6405..4077b5f34 100644
--- a/data/cities/sain-bel/maison-thollot.yml
+++ b/data/cities/sain-bel/maison-thollot.yml
@@ -4,8 +4,8 @@ latitude: 45.81103
 longitude: 4.5994
 postcode: "69210"
 city: Sain-Bel
-street: "Place du 8 Mai 1945"
-housenumber: 4
+street: Place du 8 Mai 1945
+housenumber: "4"
 phone: "+33474012627"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sain-bel/pressing-de-la-brevenne.yml b/data/cities/sain-bel/pressing-de-la-brevenne.yml
index 6730989d6..d604b089f 100644
--- a/data/cities/sain-bel/pressing-de-la-brevenne.yml
+++ b/data/cities/sain-bel/pressing-de-la-brevenne.yml
@@ -4,8 +4,8 @@ latitude: 45.81213
 longitude: 4.6002
 postcode: "69210"
 city: Sain-Bel
-street: "Quai de la Brévenne"
-housenumber: 30
+street: Quai de la Brévenne
+housenumber: "30"
 phone: "+33474725741"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sain-bel/sain-bel-optique.yml b/data/cities/sain-bel/sain-bel-optique.yml
index 14d92db0e..d90523a2c 100644
--- a/data/cities/sain-bel/sain-bel-optique.yml
+++ b/data/cities/sain-bel/sain-bel-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.81044
 longitude: 4.5986
 postcode: "69210"
 city: Sain-Bel
-street: "Rue Joseph Volay"
-housenumber: 17
+street: Rue Joseph Volay
+housenumber: "17"
 phone: "+33474012687"
-opening_hours: "Tu,Fr 09:00-12:00; We,Th 09:00-12:00,14:15-18:45; Sa 09:00-12:00,14:00-18:00"
-website: "https://sainbeloptique-sainbel.monopticien.com"
\ No newline at end of file
+opening_hours: Tu,Fr 09:00-12:00; We,Th 09:00-12:00,14:15-18:45; Sa 09:00-12:00,14:00-18:00
+website: https://sainbeloptique-sainbel.monopticien.com
diff --git a/data/cities/sain-bel/salon-monique.yml b/data/cities/sain-bel/salon-monique.yml
index 6bfb14748..725c6acd2 100644
--- a/data/cities/sain-bel/salon-monique.yml
+++ b/data/cities/sain-bel/salon-monique.yml
@@ -4,8 +4,8 @@ latitude: 45.81042
 longitude: 4.59854
 postcode: "69210"
 city: Sain-Bel
-street: "Rue Joseph Volay"
-housenumber: 19
+street: Rue Joseph Volay
+housenumber: "19"
 phone: "+33474012639"
-opening_hours: "Tu 09:00-12:00,14:00-18:30; We-Fr 08:30-12:00,14:00-18:30; Sa 08:00-14:00"
-website: "https://crouzet1elodie.wixsite.com/salonmonique"
\ No newline at end of file
+opening_hours: Tu 09:00-12:00,14:00-18:30; We-Fr 08:30-12:00,14:00-18:30; Sa 08:00-14:00
+website: https://crouzet1elodie.wixsite.com/salonmonique
diff --git a/data/cities/sain-bel/tabac-presse.yml b/data/cities/sain-bel/tabac-presse.yml
index 183207304..fcf59f2c9 100644
--- a/data/cities/sain-bel/tabac-presse.yml
+++ b/data/cities/sain-bel/tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.81113
 longitude: 4.59953
 postcode: "69210"
 city: Sain-Bel
-street: "Place du 8 Mai 1945"
-housenumber: 2
+street: Place du 8 Mai 1945
+housenumber: "2"
 phone: "+33474013342"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sain-bel/vival.yml b/data/cities/sain-bel/vival.yml
index b0466de76..db25534a8 100644
--- a/data/cities/sain-bel/vival.yml
+++ b/data/cities/sain-bel/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.81082
 longitude: 4.59935
 postcode: "69210"
 city: Sain-Bel
-street: "Place du 8 Mai 1945"
-housenumber: 7
+street: Place du 8 Mai 1945
+housenumber: "7"
 phone: "+33474012505"
-opening_hours: "Mo-Fr 08:00-12:30,15:00-19:00; Sa 08:00-13:00"
-website: "https://magasins.vival.fr/fr/s/vival-sain-bel"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:30,15:00-19:00; Sa 08:00-13:00
+website: https://magasins.vival.fr/fr/s/vival-sain-bel
diff --git a/data/cities/saint-agreve/au-petit-atelier.yml b/data/cities/saint-agreve/au-petit-atelier.yml
index 1e434c8dd..d2486ddb2 100644
--- a/data/cities/saint-agreve/au-petit-atelier.yml
+++ b/data/cities/saint-agreve/au-petit-atelier.yml
@@ -5,7 +5,7 @@ longitude: 4.39886
 postcode: ""
 city: Saint-Agrève
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo,Tu,Th-Su 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th-Su 06:30-13:00
+website: ""
diff --git a/data/cities/saint-agreve/isabelle-et-j-philippe.yml b/data/cities/saint-agreve/isabelle-et-j-philippe.yml
index c5c7988ab..84c8f1d8d 100644
--- a/data/cities/saint-agreve/isabelle-et-j-philippe.yml
+++ b/data/cities/saint-agreve/isabelle-et-j-philippe.yml
@@ -5,7 +5,7 @@ longitude: 4.39595
 postcode: ""
 city: Saint-Agrève
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-agreve/lart-des-choix.yml b/data/cities/saint-agreve/lart-des-choix.yml
index be9916404..eb2f5181b 100644
--- a/data/cities/saint-agreve/lart-des-choix.yml
+++ b/data/cities/saint-agreve/lart-des-choix.yml
@@ -5,7 +5,7 @@ longitude: 4.39876
 postcode: ""
 city: Saint-Agrève
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-alban-de-roche/noz.yml b/data/cities/saint-alban-de-roche/noz.yml
index 6a8aa6206..a8a5e044d 100644
--- a/data/cities/saint-alban-de-roche/noz.yml
+++ b/data/cities/saint-alban-de-roche/noz.yml
@@ -4,8 +4,8 @@ latitude: 45.59158
 longitude: 5.23823
 postcode: "38080"
 city: Saint-Alban-de-Roche
-street: "Route de Lyon"
+street: Route de Lyon
 housenumber: 3D
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/saint-alban-de-roche/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/saint-alban-de-roche/
diff --git a/data/cities/saint-alban-des-villards/garage-tardy-serge.yml b/data/cities/saint-alban-des-villards/garage-tardy-serge.yml
index e8ca13729..f2deb8430 100644
--- a/data/cities/saint-alban-des-villards/garage-tardy-serge.yml
+++ b/data/cities/saint-alban-des-villards/garage-tardy-serge.yml
@@ -1,11 +1,11 @@
 id: 1198586091
-type: way
+type: node
 latitude: 45.30287
 longitude: 6.24883
 postcode: "73130"
 city: Saint-Alban-des-Villards
 street: ""
-housenumber: 240
+housenumber: "240"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-alban-leysse/avia.yml b/data/cities/saint-alban-leysse/avia.yml
index 52647a353..f598728a8 100644
--- a/data/cities/saint-alban-leysse/avia.yml
+++ b/data/cities/saint-alban-leysse/avia.yml
@@ -4,8 +4,8 @@ latitude: 45.57381
 longitude: 5.95313
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Avenue de Chambéry"
-housenumber: 
+street: Avenue de Chambéry
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-alban-leysse/carrefour.yml b/data/cities/saint-alban-leysse/carrefour.yml
index 20088b16c..cc9584282 100644
--- a/data/cities/saint-alban-leysse/carrefour.yml
+++ b/data/cities/saint-alban-leysse/carrefour.yml
@@ -5,7 +5,7 @@ longitude: 5.9435
 postcode: "73000"
 city: Saint-Alban-Leysse
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-21:00
+website: ""
diff --git a/data/cities/saint-alban-leysse/decathlon-rue-du-marocaz.yml b/data/cities/saint-alban-leysse/decathlon-rue-du-marocaz.yml
index f2914d6f0..4ebe817a0 100644
--- a/data/cities/saint-alban-leysse/decathlon-rue-du-marocaz.yml
+++ b/data/cities/saint-alban-leysse/decathlon-rue-du-marocaz.yml
@@ -4,8 +4,8 @@ latitude: 45.57378
 longitude: 5.94929
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Rue du Marocaz"
-housenumber: 43
-phone: "+33 4 79 85 37 85"
-opening_hours: "Mo-Sa 09:30-19:30; Su, PH closed"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-saint-alban-leysse-0070007600076"
\ No newline at end of file
+street: Rue du Marocaz
+housenumber: "43"
+phone: +33 4 79 85 37 85
+opening_hours: Mo-Sa 09:30-19:30; Su, PH closed
+website: https://www.decathlon.fr/store-view/magasin-de-sports-saint-alban-leysse-0070007600076
diff --git a/data/cities/saint-alban-leysse/decathlon.yml b/data/cities/saint-alban-leysse/decathlon.yml
index c59d5d273..4b27dd63a 100644
--- a/data/cities/saint-alban-leysse/decathlon.yml
+++ b/data/cities/saint-alban-leysse/decathlon.yml
@@ -4,8 +4,8 @@ latitude: 45.57414
 longitude: 5.9491
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Rue du Marocaz"
-housenumber: 43
-phone: "+33 4 79 85 37 85"
-opening_hours: "Mo-Sa 09:30-19:30; Su, PH closed"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-saint-alban-leysse-0070007600076"
\ No newline at end of file
+street: Rue du Marocaz
+housenumber: "43"
+phone: +33 4 79 85 37 85
+opening_hours: Mo-Sa 09:30-19:30; Su, PH closed
+website: https://www.decathlon.fr/store-view/magasin-de-sports-saint-alban-leysse-0070007600076
diff --git a/data/cities/saint-alban-leysse/dvelos.yml b/data/cities/saint-alban-leysse/dvelos.yml
index 1a9c0f10b..33aa12834 100644
--- a/data/cities/saint-alban-leysse/dvelos.yml
+++ b/data/cities/saint-alban-leysse/dvelos.yml
@@ -4,8 +4,8 @@ latitude: 45.5725
 longitude: 5.95494
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Avenue de Chambéry"
-housenumber: 350
+street: Avenue de Chambéry
+housenumber: "350"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00; Su,PH off"
-website: "https://www.dvelos.com/magasin/6-chambery"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00; Su,PH off
+website: https://www.dvelos.com/magasin/6-chambery
diff --git a/data/cities/saint-alban-leysse/galion.yml b/data/cities/saint-alban-leysse/galion.yml
index 44f82bde7..f19b14265 100644
--- a/data/cities/saint-alban-leysse/galion.yml
+++ b/data/cities/saint-alban-leysse/galion.yml
@@ -1,11 +1,11 @@
 id: 112874156
-type: way
+type: node
 latitude: 45.57479
 longitude: 5.94743
 postcode: "73000"
 city: Saint-Alban-Leysse
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-alban-leysse/generale-doptique.yml b/data/cities/saint-alban-leysse/generale-doptique.yml
index c6823f3aa..3262ec0de 100644
--- a/data/cities/saint-alban-leysse/generale-doptique.yml
+++ b/data/cities/saint-alban-leysse/generale-doptique.yml
@@ -4,8 +4,8 @@ latitude: 45.57229
 longitude: 5.95023
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Rue de la Martiniere"
-housenumber: 
+street: Rue de la Martiniere
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-alban-leysse/giant.yml b/data/cities/saint-alban-leysse/giant.yml
index 2d096f3f1..e94c7fa79 100644
--- a/data/cities/saint-alban-leysse/giant.yml
+++ b/data/cities/saint-alban-leysse/giant.yml
@@ -4,8 +4,8 @@ latitude: 45.5723
 longitude: 5.95061
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Rue de la Martiniere"
-housenumber: 78
-phone: "+33 4 85 86 02 42"
-opening_hours: "Tu-Sa 09:30-12:30, 14:00-19:00; Su-Mo, PH closed"
-website: "https://www.giant-chambery.fr/fr"
\ No newline at end of file
+street: Rue de la Martiniere
+housenumber: "78"
+phone: +33 4 85 86 02 42
+opening_hours: Tu-Sa 09:30-12:30, 14:00-19:00; Su-Mo, PH closed
+website: https://www.giant-chambery.fr/fr
diff --git a/data/cities/saint-alban-leysse/king-jouet.yml b/data/cities/saint-alban-leysse/king-jouet.yml
index 488d23c90..467382bb1 100644
--- a/data/cities/saint-alban-leysse/king-jouet.yml
+++ b/data/cities/saint-alban-leysse/king-jouet.yml
@@ -4,8 +4,8 @@ latitude: 45.5728
 longitude: 5.95291
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Avenue de Chambéry"
-housenumber: 282
+street: Avenue de Chambéry
+housenumber: "282"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-alban-leysse/mg-motos.yml b/data/cities/saint-alban-leysse/mg-motos.yml
index bfcfa4d94..ecf660ab4 100644
--- a/data/cities/saint-alban-leysse/mg-motos.yml
+++ b/data/cities/saint-alban-leysse/mg-motos.yml
@@ -4,8 +4,8 @@ latitude: 45.57683
 longitude: 5.96386
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Route de la Féclaz"
-housenumber: 187
-phone: "+33 4 79 85 91 40"
-opening_hours: "Tu-Sa"
-website: ""
\ No newline at end of file
+street: Route de la Féclaz
+housenumber: "187"
+phone: +33 4 79 85 91 40
+opening_hours: Tu-Sa
+website: ""
diff --git a/data/cities/saint-alban-leysse/montania.yml b/data/cities/saint-alban-leysse/montania.yml
index 1fb45a318..ff752c911 100644
--- a/data/cities/saint-alban-leysse/montania.yml
+++ b/data/cities/saint-alban-leysse/montania.yml
@@ -4,8 +4,8 @@ latitude: 45.57268
 longitude: 5.95793
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Avenue de Chambéry"
-housenumber: 724
+street: Avenue de Chambéry
+housenumber: "724"
 phone: ""
-opening_hours: "Mo-Sa 10:00-12:30, 14:30-19:00"
-website: "https://www.montania-sport.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-12:30, 14:30-19:00
+website: https://www.montania-sport.com/
diff --git a/data/cities/saint-alban-leysse/picard.yml b/data/cities/saint-alban-leysse/picard.yml
index ce10cfdd4..90538d605 100644
--- a/data/cities/saint-alban-leysse/picard.yml
+++ b/data/cities/saint-alban-leysse/picard.yml
@@ -4,8 +4,8 @@ latitude: 45.57471
 longitude: 5.94971
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Rue du Marocaz"
-housenumber: 
-phone: "+33 4 79 85 35 05"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+street: Rue du Marocaz
+housenumber: ""
+phone: +33 4 79 85 35 05
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/saint-alban-leysse/renault.yml b/data/cities/saint-alban-leysse/renault.yml
index c8f29d49f..0f6bc2d28 100644
--- a/data/cities/saint-alban-leysse/renault.yml
+++ b/data/cities/saint-alban-leysse/renault.yml
@@ -4,8 +4,8 @@ latitude: 45.57215
 longitude: 5.95282
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Chemin des Glières"
-housenumber: 
+street: Chemin des Glières
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-alban-leysse/uniques.yml b/data/cities/saint-alban-leysse/uniques.yml
index ca330062c..de187aaf4 100644
--- a/data/cities/saint-alban-leysse/uniques.yml
+++ b/data/cities/saint-alban-leysse/uniques.yml
@@ -4,8 +4,8 @@ latitude: 45.57242
 longitude: 5.9584
 postcode: "73230"
 city: Saint-Alban-Leysse
-street: "Avenue de Chambéry"
-housenumber: 724
-phone: "+33 4 79 68 97 36"
+street: Avenue de Chambéry
+housenumber: "724"
+phone: +33 4 79 68 97 36
 opening_hours: ""
-website: "https://uniques.fr"
\ No newline at end of file
+website: https://uniques.fr
diff --git a/data/cities/saint-andre-de-boege/gaec-le-plane.yml b/data/cities/saint-andre-de-boege/gaec-le-plane.yml
index 13e132554..0bdbb7c7b 100644
--- a/data/cities/saint-andre-de-boege/gaec-le-plane.yml
+++ b/data/cities/saint-andre-de-boege/gaec-le-plane.yml
@@ -1,11 +1,11 @@
 id: 595140442
-type: way
+type: node
 latitude: 46.19355
 longitude: 6.3895
 postcode: "74420"
 city: Saint-André-de-Boëge
-street: "Route Santadrionne"
-housenumber: 1938
+street: Route Santadrionne
+housenumber: "1938"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:00, 16:00-19:00; Su 09:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:00, 16:00-19:00; Su 09:30-12:00
+website: ""
diff --git a/data/cities/saint-andre-de-boege/garage-carosserie-locatelli.yml b/data/cities/saint-andre-de-boege/garage-carosserie-locatelli.yml
index b7ccf5896..228c78e44 100644
--- a/data/cities/saint-andre-de-boege/garage-carosserie-locatelli.yml
+++ b/data/cities/saint-andre-de-boege/garage-carosserie-locatelli.yml
@@ -1,11 +1,11 @@
 id: 839982758
-type: way
+type: node
 latitude: 46.20166
 longitude: 6.3947
 postcode: "74420"
 city: Saint-André-de-Boëge
-street: "Impasse des Chapotines"
-housenumber: 25
-phone: "+33 4 50 39 16 96"
+street: Impasse des Chapotines
+housenumber: "25"
+phone: +33 4 50 39 16 96
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-de-boege/garage-timon-1-2-3-autoservice.yml b/data/cities/saint-andre-de-boege/garage-timon-1-2-3-autoservice.yml
index dc5202479..53e15ee8f 100644
--- a/data/cities/saint-andre-de-boege/garage-timon-1-2-3-autoservice.yml
+++ b/data/cities/saint-andre-de-boege/garage-timon-1-2-3-autoservice.yml
@@ -1,11 +1,11 @@
 id: 197943994
-type: way
+type: node
 latitude: 46.2015
 longitude: 6.39275
 postcode: "74420"
 city: Saint-André-de-Boëge
-street: "Impasse de Chez Merlin"
-housenumber: 115
-phone: "+33 4 50 95 27 23"
+street: Impasse de Chez Merlin
+housenumber: "115"
+phone: +33 4 50 95 27 23
 opening_hours: ""
-website: "https://www.123autoservice.fr/nos-garages/auvergne-rhone-alpes/haute-savoie/saint-andre-de-boege/garage-timon/"
\ No newline at end of file
+website: https://www.123autoservice.fr/nos-garages/auvergne-rhone-alpes/haute-savoie/saint-andre-de-boege/garage-timon/
diff --git a/data/cities/saint-andre-de-boege/pro-4x4.yml b/data/cities/saint-andre-de-boege/pro-4x4.yml
index 4a2ac5fe2..0f52ab25e 100644
--- a/data/cities/saint-andre-de-boege/pro-4x4.yml
+++ b/data/cities/saint-andre-de-boege/pro-4x4.yml
@@ -1,11 +1,11 @@
 id: 839982759
-type: way
+type: node
 latitude: 46.20172
 longitude: 6.39433
 postcode: "74420"
 city: Saint-André-de-Boëge
-street: "Impasse des Chapotines"
-housenumber: 85
-phone: "+33 4 50 39 53 42"
+street: Impasse des Chapotines
+housenumber: "85"
+phone: +33 4 50 39 53 42
 opening_hours: ""
-website: "https://www.pro4x4-74.com/"
\ No newline at end of file
+website: https://www.pro4x4-74.com/
diff --git a/data/cities/saint-andre-de-corcy/boucherie-charcuterie-penin.yml b/data/cities/saint-andre-de-corcy/boucherie-charcuterie-penin.yml
index 914c31998..3f2ee8016 100644
--- a/data/cities/saint-andre-de-corcy/boucherie-charcuterie-penin.yml
+++ b/data/cities/saint-andre-de-corcy/boucherie-charcuterie-penin.yml
@@ -4,8 +4,8 @@ latitude: 45.92571
 longitude: 4.94959
 postcode: "01390"
 city: Saint-André-de-Corcy
-street: "Rue de la Gare"
-housenumber: 81
+street: Rue de la Gare
+housenumber: "81"
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30,15:00-19:00; Su 07:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,15:00-19:00; Su 07:30-12:00
+website: ""
diff --git a/data/cities/saint-andre-de-corcy/cyclen-co-st-andre.yml b/data/cities/saint-andre-de-corcy/cyclen-co-st-andre.yml
index 8a124b618..7f66550b3 100644
--- a/data/cities/saint-andre-de-corcy/cyclen-co-st-andre.yml
+++ b/data/cities/saint-andre-de-corcy/cyclen-co-st-andre.yml
@@ -4,8 +4,8 @@ latitude: 45.93617
 longitude: 4.96422
 postcode: "01390"
 city: Saint-André-de-Corcy
-street: "Zone Industrielle la Sûre"
-housenumber: 
+street: Zone Industrielle la Sûre
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 18:00+ off"
-website: "https://www.cycle-nco.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 18:00+ off
+website: https://www.cycle-nco.fr/
diff --git a/data/cities/saint-andre-de-corcy/da-silva.yml b/data/cities/saint-andre-de-corcy/da-silva.yml
index f297d0ed3..3e512e779 100644
--- a/data/cities/saint-andre-de-corcy/da-silva.yml
+++ b/data/cities/saint-andre-de-corcy/da-silva.yml
@@ -4,8 +4,8 @@ latitude: 45.92659
 longitude: 4.95174
 postcode: "01390"
 city: Saint-André-de-Corcy
-street: "Route de Bourg-en-Bresse"
-housenumber: 35
-phone: "+33 4 72 26 11 39"
+street: Route de Bourg-en-Bresse
+housenumber: "35"
+phone: +33 4 72 26 11 39
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-de-corcy/naturea-le-boulanger.yml b/data/cities/saint-andre-de-corcy/naturea-le-boulanger.yml
index 27b620ac5..381a9afb1 100644
--- a/data/cities/saint-andre-de-corcy/naturea-le-boulanger.yml
+++ b/data/cities/saint-andre-de-corcy/naturea-le-boulanger.yml
@@ -4,8 +4,8 @@ latitude: 45.92962
 longitude: 4.95551
 postcode: ""
 city: Saint-André-de-Corcy
-street: "Route de Monthieux"
-housenumber: 14
+street: Route de Monthieux
+housenumber: "14"
 phone: ""
-opening_hours: "PH,Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: PH,Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/saint-andre-de-corcy/poc-moto.yml b/data/cities/saint-andre-de-corcy/poc-moto.yml
index 3c64548f1..7b639ae18 100644
--- a/data/cities/saint-andre-de-corcy/poc-moto.yml
+++ b/data/cities/saint-andre-de-corcy/poc-moto.yml
@@ -4,8 +4,8 @@ latitude: 45.93627
 longitude: 4.96441
 postcode: "01390"
 city: Saint-André-de-Corcy
-street: "Rue de l'Industrie"
-housenumber: 
+street: Rue de l'Industrie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-de-corcy/terres-lyonnaises.yml b/data/cities/saint-andre-de-corcy/terres-lyonnaises.yml
index 72bc14327..ca1f966f0 100644
--- a/data/cities/saint-andre-de-corcy/terres-lyonnaises.yml
+++ b/data/cities/saint-andre-de-corcy/terres-lyonnaises.yml
@@ -5,7 +5,7 @@ longitude: 4.95523
 postcode: "01390"
 city: Saint-André-de-Corcy
 street: ""
-housenumber: 
-phone: "+33 4 78 49 67 51"
+housenumber: ""
+phone: +33 4 78 49 67 51
 opening_hours: ""
-website: "https://www.sicoly.fr/le-magasin-terres-lyonnaises-6"
\ No newline at end of file
+website: https://www.sicoly.fr/le-magasin-terres-lyonnaises-6
diff --git a/data/cities/saint-andre-de-cruzieres/epicerie-des-cruzieres.yml b/data/cities/saint-andre-de-cruzieres/epicerie-des-cruzieres.yml
index 800701b94..b680ada98 100644
--- a/data/cities/saint-andre-de-cruzieres/epicerie-des-cruzieres.yml
+++ b/data/cities/saint-andre-de-cruzieres/epicerie-des-cruzieres.yml
@@ -1,11 +1,11 @@
 id: 155801576
-type: way
+type: node
 latitude: 44.3147
 longitude: 4.21172
 postcode: "07460"
 city: Saint-André-de-Cruzières
-street: "Place Maurice Grimaud"
-housenumber: 1
-phone: "+33 4 75 93 65 88"
+street: Place Maurice Grimaud
+housenumber: "1"
+phone: +33 4 75 93 65 88
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-le-gaz/aisthesia.yml b/data/cities/saint-andre-le-gaz/aisthesia.yml
index 22150e471..0397abe6b 100644
--- a/data/cities/saint-andre-le-gaz/aisthesia.yml
+++ b/data/cities/saint-andre-le-gaz/aisthesia.yml
@@ -4,8 +4,8 @@ latitude: 45.54286
 longitude: 5.52457
 postcode: "38490"
 city: Saint-André-le-Gaz
-street: "Rue Pasteur"
-housenumber: 597
-phone: "+33 4 74 97 04 09"
+street: Rue Pasteur
+housenumber: "597"
+phone: +33 4 74 97 04 09
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-le-gaz/boucherie-millon.yml b/data/cities/saint-andre-le-gaz/boucherie-millon.yml
index a96392f56..03cd36de9 100644
--- a/data/cities/saint-andre-le-gaz/boucherie-millon.yml
+++ b/data/cities/saint-andre-le-gaz/boucherie-millon.yml
@@ -4,8 +4,8 @@ latitude: 45.54357
 longitude: 5.52521
 postcode: "38490"
 city: Saint-André-le-Gaz
-street: "Rue Pasteur"
-housenumber: 502
+street: Rue Pasteur
+housenumber: "502"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-le-gaz/boulangerie-les-gourmandises.yml b/data/cities/saint-andre-le-gaz/boulangerie-les-gourmandises.yml
index 01426bb45..373d29aad 100644
--- a/data/cities/saint-andre-le-gaz/boulangerie-les-gourmandises.yml
+++ b/data/cities/saint-andre-le-gaz/boulangerie-les-gourmandises.yml
@@ -4,8 +4,8 @@ latitude: 45.54342
 longitude: 5.52432
 postcode: "38490"
 city: Saint-André-le-Gaz
-street: "Rue Pasteur"
-housenumber: 576
+street: Rue Pasteur
+housenumber: "576"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-le-gaz/gomina-coiffure.yml b/data/cities/saint-andre-le-gaz/gomina-coiffure.yml
index cd4cd8146..1485006fb 100644
--- a/data/cities/saint-andre-le-gaz/gomina-coiffure.yml
+++ b/data/cities/saint-andre-le-gaz/gomina-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.5432
 longitude: 5.52387
 postcode: "38490"
 city: Saint-André-le-Gaz
-street: "Rue Pasteur"
-housenumber: 610
+street: Rue Pasteur
+housenumber: "610"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-le-gaz/le-millesime-by-emilie.yml b/data/cities/saint-andre-le-gaz/le-millesime-by-emilie.yml
index 8ef86c17a..70adc3227 100644
--- a/data/cities/saint-andre-le-gaz/le-millesime-by-emilie.yml
+++ b/data/cities/saint-andre-le-gaz/le-millesime-by-emilie.yml
@@ -4,8 +4,8 @@ latitude: 45.54339
 longitude: 5.52539
 postcode: "38490"
 city: Saint-André-le-Gaz
-street: "Rue Pasteur"
-housenumber: 495
+street: Rue Pasteur
+housenumber: "495"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-le-gaz/le-petit-jardin.yml b/data/cities/saint-andre-le-gaz/le-petit-jardin.yml
index df9ed0668..6ff952fb0 100644
--- a/data/cities/saint-andre-le-gaz/le-petit-jardin.yml
+++ b/data/cities/saint-andre-le-gaz/le-petit-jardin.yml
@@ -4,8 +4,8 @@ latitude: 45.54314
 longitude: 5.52379
 postcode: "38490"
 city: Saint-André-le-Gaz
-street: "Rue Pasteur"
-housenumber: 610
+street: Rue Pasteur
+housenumber: "610"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-andre-le-gaz/tabac-presse.yml b/data/cities/saint-andre-le-gaz/tabac-presse.yml
index 88cc32911..7b3c0dc9f 100644
--- a/data/cities/saint-andre-le-gaz/tabac-presse.yml
+++ b/data/cities/saint-andre-le-gaz/tabac-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.54329
 longitude: 5.52483
 postcode: "38490"
 city: Saint-André-le-Gaz
-street: "Rue Pasteur"
-housenumber: 537
+street: Rue Pasteur
+housenumber: "537"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-avre/cartier.yml b/data/cities/saint-avre/cartier.yml
index 1d933cf6d..e9682bbc5 100644
--- a/data/cities/saint-avre/cartier.yml
+++ b/data/cities/saint-avre/cartier.yml
@@ -4,8 +4,8 @@ latitude: 45.35137
 longitude: 6.30997
 postcode: "73130"
 city: Saint-Avre
-street: "Rue de la Plaine"
-housenumber: 11
-phone: "+33 4 79 56 21 37"
-opening_hours: "Mo-Sa 08:30-12:00, 14:30-19:00; Su 8:30-12:00"
-website: ""
\ No newline at end of file
+street: Rue de la Plaine
+housenumber: "11"
+phone: +33 4 79 56 21 37
+opening_hours: Mo-Sa 08:30-12:00, 14:30-19:00; Su 8:30-12:00
+website: ""
diff --git a/data/cities/saint-baldoph/label-energie.yml b/data/cities/saint-baldoph/label-energie.yml
index edefe8714..2d75cdbb2 100644
--- a/data/cities/saint-baldoph/label-energie.yml
+++ b/data/cities/saint-baldoph/label-energie.yml
@@ -1,11 +1,11 @@
 id: 823111616
-type: way
+type: node
 latitude: 45.53162
 longitude: 5.96078
 postcode: "73190"
 city: Saint-Baldoph
-street: "Impasse de la Roselière"
-housenumber: 94
-phone: "+33 4 79 28 74 99"
-opening_hours: "Mo 08:00-12:30; Tu-Fr 08:00-12:30, 14:00-18:30; Sa 09:00-12:00"
-website: "https://www.labelenergie.com/"
\ No newline at end of file
+street: Impasse de la Roselière
+housenumber: "94"
+phone: +33 4 79 28 74 99
+opening_hours: Mo 08:00-12:30; Tu-Fr 08:00-12:30, 14:00-18:30; Sa 09:00-12:00
+website: https://www.labelenergie.com/
diff --git a/data/cities/saint-barthelemy-lestra/lassiette-godelone.yml b/data/cities/saint-barthelemy-lestra/lassiette-godelone.yml
index 60375a270..e4315cff5 100644
--- a/data/cities/saint-barthelemy-lestra/lassiette-godelone.yml
+++ b/data/cities/saint-barthelemy-lestra/lassiette-godelone.yml
@@ -4,8 +4,8 @@ latitude: 45.72012
 longitude: 4.33985
 postcode: "42110"
 city: Saint-Barthélemy-Lestra
-street: "Place des Godelons"
-housenumber: 10
+street: Place des Godelons
+housenumber: "10"
 phone: "+33477285736"
-opening_hours: "Mo-Su 09:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-21:00
+website: ""
diff --git a/data/cities/saint-benigne/weldom.yml b/data/cities/saint-benigne/weldom.yml
index 0457760dd..4ae62d322 100644
--- a/data/cities/saint-benigne/weldom.yml
+++ b/data/cities/saint-benigne/weldom.yml
@@ -1,11 +1,11 @@
 id: 125873843
-type: way
+type: node
 latitude: 46.4362
 longitude: 4.95334
 postcode: "01190"
 city: Saint-Bénigne
-street: "Route de Saint-Trivier"
-housenumber: 
+street: Route de Saint-Trivier
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-bon-tarentaise/sport-2000.yml b/data/cities/saint-bon-tarentaise/sport-2000.yml
deleted file mode 100644
index 5d83220f3..000000000
--- a/data/cities/saint-bon-tarentaise/sport-2000.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9147573891
-type: node
-latitude: 45.41781
-longitude: 6.65336
-postcode: "73120"
-city: SAINT BON TARENTAISE
-street: "Immeuble Le Marquis Courchevel 1650"
-housenumber: 
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/saint-bonnet-de-mure/intermarche.yml b/data/cities/saint-bonnet-de-mure/intermarche.yml
index 9fd334c75..cfa4c06a2 100644
--- a/data/cities/saint-bonnet-de-mure/intermarche.yml
+++ b/data/cities/saint-bonnet-de-mure/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.69733
 longitude: 5.01524
 postcode: "69720"
 city: Saint-Bonnet-de-Mure
-street: "Avenue Charles de Gaulle"
-housenumber: 151
+street: Avenue Charles de Gaulle
+housenumber: "151"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-bonnet-de-mure/jmt.yml b/data/cities/saint-bonnet-de-mure/jmt.yml
index bc32c8e34..432e362de 100644
--- a/data/cities/saint-bonnet-de-mure/jmt.yml
+++ b/data/cities/saint-bonnet-de-mure/jmt.yml
@@ -1,11 +1,11 @@
 id: 117345238
-type: way
+type: node
 latitude: 45.70247
 longitude: 4.99949
 postcode: "69720"
 city: Saint-Bonnet-de-Mure
-street: "Avenue Charles de Gaulle"
-housenumber: 235
-phone: "+33 9 67 84 68 18"
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Charles de Gaulle
+housenumber: "235"
+phone: +33 9 67 84 68 18
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/saint-bonnet-le-chateau/ap-pneu.yml b/data/cities/saint-bonnet-le-chateau/ap-pneu.yml
index e2224ae6f..add31bfa4 100644
--- a/data/cities/saint-bonnet-le-chateau/ap-pneu.yml
+++ b/data/cities/saint-bonnet-le-chateau/ap-pneu.yml
@@ -4,8 +4,8 @@ latitude: 45.42516
 longitude: 4.06608
 postcode: "42380"
 city: Saint-Bonnet-le-Château
-street: "Rue Paul Verlaine"
-housenumber: 6
-phone: "+33 4 77 57 32 62"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Paul Verlaine
+housenumber: "6"
+phone: +33 4 77 57 32 62
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-bonnet-le-chateau/biocoop-la-cacamerlotte.yml b/data/cities/saint-bonnet-le-chateau/biocoop-la-cacamerlotte.yml
index e76d1f8f7..b9c59a110 100644
--- a/data/cities/saint-bonnet-le-chateau/biocoop-la-cacamerlotte.yml
+++ b/data/cities/saint-bonnet-le-chateau/biocoop-la-cacamerlotte.yml
@@ -4,8 +4,8 @@ latitude: 45.42631
 longitude: 4.06439
 postcode: "42380"
 city: Saint-Bonnet-le-Château
-street: "Boulevard du Haut Forez"
-housenumber: 4
-phone: "+33 4 77 32 99 10"
-opening_hours: "Mo 10:00-19:00; Tu-Th 09:00-19:00; Fr 08:00-19:00; Sa 09:00-19:00"
-website: "https://lacacamerlotte.biocoop.net"
\ No newline at end of file
+street: Boulevard du Haut Forez
+housenumber: "4"
+phone: +33 4 77 32 99 10
+opening_hours: Mo 10:00-19:00; Tu-Th 09:00-19:00; Fr 08:00-19:00; Sa 09:00-19:00
+website: https://lacacamerlotte.biocoop.net
diff --git a/data/cities/saint-bonnet-le-chateau/grand-matin.yml b/data/cities/saint-bonnet-le-chateau/grand-matin.yml
index cc5fe18dc..9d910064c 100644
--- a/data/cities/saint-bonnet-le-chateau/grand-matin.yml
+++ b/data/cities/saint-bonnet-le-chateau/grand-matin.yml
@@ -4,8 +4,8 @@ latitude: 45.42285
 longitude: 4.06485
 postcode: "42380"
 city: Saint-Bonnet-le-Château
-street: "Place du Grand Faubourg"
-housenumber: 22
+street: Place du Grand Faubourg
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: "https://www.kisskissbankbank.com/fr/projects/boulangerie-grand-matin-creation-d-un-point-de-vente-salon-de-the"
\ No newline at end of file
+website: https://www.kisskissbankbank.com/fr/projects/boulangerie-grand-matin-creation-d-un-point-de-vente-salon-de-the
diff --git a/data/cities/saint-bonnet-le-courreau/passe-simple.yml b/data/cities/saint-bonnet-le-courreau/passe-simple.yml
index c7c972484..a3afe0502 100644
--- a/data/cities/saint-bonnet-le-courreau/passe-simple.yml
+++ b/data/cities/saint-bonnet-le-courreau/passe-simple.yml
@@ -4,8 +4,8 @@ latitude: 45.66539
 longitude: 3.91895
 postcode: "42190"
 city: saint bonnet le courreau
-street: "le roure"
-housenumber: 
-phone: "+33 4 77 24 31 22"
+street: le roure
+housenumber: ""
+phone: +33 4 77 24 31 22
 opening_hours: ""
-website: "http://www.passe-simple-aperitifs.com"
\ No newline at end of file
+website: http://www.passe-simple-aperitifs.com
diff --git a/data/cities/saint-bonnet-les-oules/au-jardin-des-oules.yml b/data/cities/saint-bonnet-les-oules/au-jardin-des-oules.yml
index cbacacd70..a030c725b 100644
--- a/data/cities/saint-bonnet-les-oules/au-jardin-des-oules.yml
+++ b/data/cities/saint-bonnet-les-oules/au-jardin-des-oules.yml
@@ -1,11 +1,11 @@
 id: 1095561106
-type: way
+type: node
 latitude: 45.54496
 longitude: 4.32113
 postcode: "42330"
 city: Saint-Bonnet-les-Oules
-street: "Chemin Rouge"
-housenumber: 2
-phone: "+33 6 03 61 36 32"
-opening_hours: "Fr 14:00-19:00"
-website: ""
\ No newline at end of file
+street: Chemin Rouge
+housenumber: "2"
+phone: +33 6 03 61 36 32
+opening_hours: Fr 14:00-19:00
+website: ""
diff --git a/data/cities/saint-bonnet-les-oules/jeune-pousse.yml b/data/cities/saint-bonnet-les-oules/jeune-pousse.yml
index aa09ab4d8..8778487c8 100644
--- a/data/cities/saint-bonnet-les-oules/jeune-pousse.yml
+++ b/data/cities/saint-bonnet-les-oules/jeune-pousse.yml
@@ -4,8 +4,8 @@ latitude: 45.55838
 longitude: 4.31955
 postcode: "42330"
 city: Saint-Bonnet-les-Oules
-street: "Route de Saint-Galmier"
-housenumber: 1891
-phone: "+33 6 22 70 74 05"
-opening_hours: "Lu-Fr 08:30-12:00,14:00-18:00; Sa 08:30-12:00"
-website: "https://jeunepoussehorticulture.fr/"
\ No newline at end of file
+street: Route de Saint-Galmier
+housenumber: "1891"
+phone: +33 6 22 70 74 05
+opening_hours: Lu-Fr 08:30-12:00,14:00-18:00; Sa 08:30-12:00
+website: https://jeunepoussehorticulture.fr/
diff --git a/data/cities/saint-cergues/casino-shop.yml b/data/cities/saint-cergues/casino-shop.yml
index e17fe6c41..4a85b1c01 100644
--- a/data/cities/saint-cergues/casino-shop.yml
+++ b/data/cities/saint-cergues/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 46.23096
 longitude: 6.31854
 postcode: "74140"
 city: Saint-Cergues
-street: "Rue de l'Archet"
-housenumber: 18
+street: Rue de l'Archet
+housenumber: "18"
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30, 15:00-20:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30, 15:00-20:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/saint-cergues/doc-smartphone-74.yml b/data/cities/saint-cergues/doc-smartphone-74.yml
index 743962cab..a53e924ab 100644
--- a/data/cities/saint-cergues/doc-smartphone-74.yml
+++ b/data/cities/saint-cergues/doc-smartphone-74.yml
@@ -1,11 +1,11 @@
 id: 687924448
-type: way
+type: node
 latitude: 46.23072
 longitude: 6.31909
 postcode: "74140"
 city: Saint-Cergues
-street: "Rue de l'Archet"
-housenumber: 86
+street: Rue de l'Archet
+housenumber: "86"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00
+website: ""
diff --git a/data/cities/saint-cergues/lavy-fleurs-route-des-champs-de-bey.yml b/data/cities/saint-cergues/lavy-fleurs-route-des-champs-de-bey.yml
index 484c5a856..2ca91a6ba 100644
--- a/data/cities/saint-cergues/lavy-fleurs-route-des-champs-de-bey.yml
+++ b/data/cities/saint-cergues/lavy-fleurs-route-des-champs-de-bey.yml
@@ -4,8 +4,8 @@ latitude: 46.23344
 longitude: 6.31593
 postcode: "74140"
 city: Saint-Cergues
-street: "Route des Champs de Bey"
-housenumber: 100
+street: Route des Champs de Bey
+housenumber: "100"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-cergues/lavy-fleurs.yml b/data/cities/saint-cergues/lavy-fleurs.yml
index 24542fd01..322c06976 100644
--- a/data/cities/saint-cergues/lavy-fleurs.yml
+++ b/data/cities/saint-cergues/lavy-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 46.23349
 longitude: 6.3193
 postcode: "74140"
 city: Saint-Cergues
-street: "Rue des Allobroges"
-housenumber: 1272
+street: Rue des Allobroges
+housenumber: "1272"
 phone: ""
-opening_hours: "Mo-Sa 08:30-12:00, 14:00-18:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:00, 14:00-18:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-chamond/acoustique-wernert.yml b/data/cities/saint-chamond/acoustique-wernert.yml
index 8793fd015..f885eb3b9 100644
--- a/data/cities/saint-chamond/acoustique-wernert.yml
+++ b/data/cities/saint-chamond/acoustique-wernert.yml
@@ -4,8 +4,8 @@ latitude: 45.47528
 longitude: 4.50825
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 24
+street: Boulevard François Delay
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/action.yml b/data/cities/saint-chamond/action.yml
index ac905f58d..b34539067 100644
--- a/data/cities/saint-chamond/action.yml
+++ b/data/cities/saint-chamond/action.yml
@@ -4,8 +4,8 @@ latitude: 45.46053
 longitude: 4.49085
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 
+street: Rue du 17 Octobre 1961
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.action.com/fr-fr/points-de-vente/saint-chamond/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.action.com/fr-fr/points-de-vente/saint-chamond/
diff --git a/data/cities/saint-chamond/aldi.yml b/data/cities/saint-chamond/aldi.yml
index 3f7ac599f..193763aec 100644
--- a/data/cities/saint-chamond/aldi.yml
+++ b/data/cities/saint-chamond/aldi.yml
@@ -4,8 +4,8 @@ latitude: 45.47184
 longitude: 4.50773
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Maurice Bonnevialle"
-housenumber: 2
-phone: "+33 1 81 09 78 25"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+street: Rue Maurice Bonnevialle
+housenumber: "2"
+phone: +33 1 81 09 78 25
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-chamond/alimentation-generale.yml b/data/cities/saint-chamond/alimentation-generale.yml
index b739ff97b..4f66e6ed5 100644
--- a/data/cities/saint-chamond/alimentation-generale.yml
+++ b/data/cities/saint-chamond/alimentation-generale.yml
@@ -4,8 +4,8 @@ latitude: 45.47319
 longitude: 4.50407
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Président Wilson"
-housenumber: 10
+street: Rue du Président Wilson
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/anne-fleurs.yml b/data/cities/saint-chamond/anne-fleurs.yml
index 9edb1b2b9..511285a38 100644
--- a/data/cities/saint-chamond/anne-fleurs.yml
+++ b/data/cities/saint-chamond/anne-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.46419
 longitude: 4.50322
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Nationale"
-housenumber: 14
+street: Place Nationale
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/apres-lecole.yml b/data/cities/saint-chamond/apres-lecole.yml
index a54083fe8..d4795f836 100644
--- a/data/cities/saint-chamond/apres-lecole.yml
+++ b/data/cities/saint-chamond/apres-lecole.yml
@@ -4,8 +4,8 @@ latitude: 45.47634
 longitude: 4.50898
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 14
+street: Boulevard François Delay
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/artms.yml b/data/cities/saint-chamond/artms.yml
index 62c196072..0edaa4501 100644
--- a/data/cities/saint-chamond/artms.yml
+++ b/data/cities/saint-chamond/artms.yml
@@ -4,8 +4,8 @@ latitude: 45.47487
 longitude: 4.51084
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Rivage"
-housenumber: 3
+street: Rue du Rivage
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Th 09:00-18:00; Fr 08:30-18:00; Sa 08:00-16:30"
-website: "https://artms-artistes-coiffeurs.com/"
\ No newline at end of file
+opening_hours: Tu-Th 09:00-18:00; Fr 08:30-18:00; Sa 08:00-16:30
+website: https://artms-artistes-coiffeurs.com/
diff --git a/data/cities/saint-chamond/atlantis-coiffure.yml b/data/cities/saint-chamond/atlantis-coiffure.yml
index 698ee0535..75f69786a 100644
--- a/data/cities/saint-chamond/atlantis-coiffure.yml
+++ b/data/cities/saint-chamond/atlantis-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.47532
 longitude: 4.50816
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 24
+street: Boulevard François Delay
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/au-pain-dautrefois.yml b/data/cities/saint-chamond/au-pain-dautrefois.yml
index 42854d500..b7f85acfb 100644
--- a/data/cities/saint-chamond/au-pain-dautrefois.yml
+++ b/data/cities/saint-chamond/au-pain-dautrefois.yml
@@ -4,8 +4,8 @@ latitude: 45.47708
 longitude: 4.51025
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 2
+street: Boulevard François Delay
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/au-peche-mignon.yml b/data/cities/saint-chamond/au-peche-mignon.yml
index a2c5802e6..06519d4bc 100644
--- a/data/cities/saint-chamond/au-peche-mignon.yml
+++ b/data/cities/saint-chamond/au-peche-mignon.yml
@@ -4,8 +4,8 @@ latitude: 45.46933
 longitude: 4.51432
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pilat"
-housenumber: 60
-phone: "+33 4 77 22 07 33"
-opening_hours: "Tu-Sa 06:00-19:15; Su 06:00-13:00"
-website: ""
\ No newline at end of file
+street: Rue du Pilat
+housenumber: "60"
+phone: +33 4 77 22 07 33
+opening_hours: Tu-Sa 06:00-19:15; Su 06:00-13:00
+website: ""
diff --git a/data/cities/saint-chamond/audition-conseil.yml b/data/cities/saint-chamond/audition-conseil.yml
index 67010ed2b..32b8d0bc2 100644
--- a/data/cities/saint-chamond/audition-conseil.yml
+++ b/data/cities/saint-chamond/audition-conseil.yml
@@ -4,8 +4,8 @@ latitude: 45.47368
 longitude: 4.51031
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de l'Armistice"
-housenumber: 4
+street: Rue de l'Armistice
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/auto-pieces-42.yml b/data/cities/saint-chamond/auto-pieces-42.yml
index 01285252f..b8f67146f 100644
--- a/data/cities/saint-chamond/auto-pieces-42.yml
+++ b/data/cities/saint-chamond/auto-pieces-42.yml
@@ -4,8 +4,8 @@ latitude: 45.47385
 longitude: 4.51457
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue de la Libération"
-housenumber: 11
+street: Avenue de la Libération
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/auto-thivolle-renault-saint-chamond.yml b/data/cities/saint-chamond/auto-thivolle-renault-saint-chamond.yml
index f21bf33ef..09ae2962d 100644
--- a/data/cities/saint-chamond/auto-thivolle-renault-saint-chamond.yml
+++ b/data/cities/saint-chamond/auto-thivolle-renault-saint-chamond.yml
@@ -1,11 +1,11 @@
 id: 119189798
-type: way
+type: node
 latitude: 45.47979
 longitude: 4.5351
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard de Fonsala"
-housenumber: 18
-phone: "+33 4 77 29 28 27"
-opening_hours: "Mo-Fr 08:30-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su off"
-website: "https://renault-saint-chamond.autothivolle.com/"
\ No newline at end of file
+street: Boulevard de Fonsala
+housenumber: "18"
+phone: +33 4 77 29 28 27
+opening_hours: Mo-Fr 08:30-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su off
+website: https://renault-saint-chamond.autothivolle.com/
diff --git a/data/cities/saint-chamond/automobiles-legends.yml b/data/cities/saint-chamond/automobiles-legends.yml
index 96eeaca4b..50a893994 100644
--- a/data/cities/saint-chamond/automobiles-legends.yml
+++ b/data/cities/saint-chamond/automobiles-legends.yml
@@ -4,8 +4,8 @@ latitude: 45.48394
 longitude: 4.50235
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Chavanne"
-housenumber: 43
+street: Route de Chavanne
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/aux-delices-damandine.yml b/data/cities/saint-chamond/aux-delices-damandine.yml
index e114c97d8..292bbeb64 100644
--- a/data/cities/saint-chamond/aux-delices-damandine.yml
+++ b/data/cities/saint-chamond/aux-delices-damandine.yml
@@ -4,8 +4,8 @@ latitude: 45.45729
 longitude: 4.50462
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Louis Comte"
-housenumber: 4
+street: Place Louis Comte
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/bar-tabac-le-savoie.yml b/data/cities/saint-chamond/bar-tabac-le-savoie.yml
index 09a62aba5..d8ac007ed 100644
--- a/data/cities/saint-chamond/bar-tabac-le-savoie.yml
+++ b/data/cities/saint-chamond/bar-tabac-le-savoie.yml
@@ -4,8 +4,8 @@ latitude: 45.47367
 longitude: 4.52982
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de Savoie"
-housenumber: 7
+street: Place de Savoie
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/baraka.yml b/data/cities/saint-chamond/baraka.yml
index 44b5c7933..e77749c38 100644
--- a/data/cities/saint-chamond/baraka.yml
+++ b/data/cities/saint-chamond/baraka.yml
@@ -4,8 +4,8 @@ latitude: 45.47397
 longitude: 4.5126
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
+street: Rue Gambetta
 housenumber: 1BIS
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/beauty-center.yml b/data/cities/saint-chamond/beauty-center.yml
index dff4db76d..316676732 100644
--- a/data/cities/saint-chamond/beauty-center.yml
+++ b/data/cities/saint-chamond/beauty-center.yml
@@ -4,8 +4,8 @@ latitude: 45.4738
 longitude: 4.5102
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de l'Armistice"
-housenumber: 2
+street: Rue de l'Armistice
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/bistrot-scopello.yml b/data/cities/saint-chamond/bistrot-scopello.yml
index f7eeb9071..f35290ca4 100644
--- a/data/cities/saint-chamond/bistrot-scopello.yml
+++ b/data/cities/saint-chamond/bistrot-scopello.yml
@@ -4,8 +4,8 @@ latitude: 45.46483
 longitude: 4.49895
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des V.A.B."
-housenumber: 6
+street: Rue des V.A.B.
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/bl-artisanale.yml b/data/cities/saint-chamond/bl-artisanale.yml
index 49d5c3214..a29237a92 100644
--- a/data/cities/saint-chamond/bl-artisanale.yml
+++ b/data/cities/saint-chamond/bl-artisanale.yml
@@ -4,8 +4,8 @@ latitude: 45.47592
 longitude: 4.52047
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 23
+street: Rue Victor Hugo
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/blanchisserie-valerie.yml b/data/cities/saint-chamond/blanchisserie-valerie.yml
index f95579fc4..124b18c12 100644
--- a/data/cities/saint-chamond/blanchisserie-valerie.yml
+++ b/data/cities/saint-chamond/blanchisserie-valerie.yml
@@ -4,8 +4,8 @@ latitude: 45.46602
 longitude: 4.51364
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Général de Gaulle"
-housenumber: 8
+street: Rue du Général de Gaulle
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-bouchou.yml b/data/cities/saint-chamond/boucherie-bouchou.yml
index 041e8453e..7343ad30a 100644
--- a/data/cities/saint-chamond/boucherie-bouchou.yml
+++ b/data/cities/saint-chamond/boucherie-bouchou.yml
@@ -4,8 +4,8 @@ latitude: 45.47443
 longitude: 4.50846
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Jules Duclos"
-housenumber: 11
+street: Rue Jules Duclos
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-charcuterie-claude-desfonds.yml b/data/cities/saint-chamond/boucherie-charcuterie-claude-desfonds.yml
index 96bca482e..bdf4495e1 100644
--- a/data/cities/saint-chamond/boucherie-charcuterie-claude-desfonds.yml
+++ b/data/cities/saint-chamond/boucherie-charcuterie-claude-desfonds.yml
@@ -4,8 +4,8 @@ latitude: 45.47357
 longitude: 4.50833
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Jules Duclos"
-housenumber: 21
+street: Rue Jules Duclos
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-charcuterie-decitre.yml b/data/cities/saint-chamond/boucherie-charcuterie-decitre.yml
index 8b46d79d3..986f43e6e 100644
--- a/data/cities/saint-chamond/boucherie-charcuterie-decitre.yml
+++ b/data/cities/saint-chamond/boucherie-charcuterie-decitre.yml
@@ -4,8 +4,8 @@ latitude: 45.45764
 longitude: 4.50407
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Louis Comte"
-housenumber: 1
+street: Place Louis Comte
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-charcuterie-salam.yml b/data/cities/saint-chamond/boucherie-charcuterie-salam.yml
index 39983ef3c..e089a2b84 100644
--- a/data/cities/saint-chamond/boucherie-charcuterie-salam.yml
+++ b/data/cities/saint-chamond/boucherie-charcuterie-salam.yml
@@ -4,8 +4,8 @@ latitude: 45.47535
 longitude: 4.50808
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Alsace Lorraine"
-housenumber: 9
+street: Rue Alsace Lorraine
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-cherif.yml b/data/cities/saint-chamond/boucherie-cherif.yml
index bd5d2d019..b27901464 100644
--- a/data/cities/saint-chamond/boucherie-cherif.yml
+++ b/data/cities/saint-chamond/boucherie-cherif.yml
@@ -4,8 +4,8 @@ latitude: 45.47472
 longitude: 4.51305
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Antoine Pinay"
-housenumber: 5
+street: Avenue Antoine Pinay
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-de-la-liberte.yml b/data/cities/saint-chamond/boucherie-de-la-liberte.yml
index 24c716bee..367f67dfc 100644
--- a/data/cities/saint-chamond/boucherie-de-la-liberte.yml
+++ b/data/cities/saint-chamond/boucherie-de-la-liberte.yml
@@ -4,8 +4,8 @@ latitude: 45.47523
 longitude: 4.50901
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Dorian"
-housenumber: 6
+street: Place Dorian
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-de-la-valette.yml b/data/cities/saint-chamond/boucherie-de-la-valette.yml
index 6cddb8140..a8e066429 100644
--- a/data/cities/saint-chamond/boucherie-de-la-valette.yml
+++ b/data/cities/saint-chamond/boucherie-de-la-valette.yml
@@ -4,8 +4,8 @@ latitude: 45.46977
 longitude: 4.51463
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la République"
-housenumber: 15
+street: Place de la République
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Fr 05:00-12:45,15:00-19:00; Sa 05:00-14:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 05:00-12:45,15:00-19:00; Sa 05:00-14:00
+website: ""
diff --git a/data/cities/saint-chamond/boucherie-despinasse.yml b/data/cities/saint-chamond/boucherie-despinasse.yml
index 7e39a0b0a..3ca1f80ea 100644
--- a/data/cities/saint-chamond/boucherie-despinasse.yml
+++ b/data/cities/saint-chamond/boucherie-despinasse.yml
@@ -4,8 +4,8 @@ latitude: 45.47852
 longitude: 4.5185
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Réclusière"
-housenumber: 8
+street: Rue de la Réclusière
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boulangerie-banette-a-la-brioche-royale.yml b/data/cities/saint-chamond/boulangerie-banette-a-la-brioche-royale.yml
index 7520e03b1..60121a3c3 100644
--- a/data/cities/saint-chamond/boulangerie-banette-a-la-brioche-royale.yml
+++ b/data/cities/saint-chamond/boulangerie-banette-a-la-brioche-royale.yml
@@ -4,8 +4,8 @@ latitude: 45.47525
 longitude: 4.50892
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Dorian"
-housenumber: 7
+street: Place Dorian
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boulangerie-banette.yml b/data/cities/saint-chamond/boulangerie-banette.yml
index 10d0c22c3..35961bd17 100644
--- a/data/cities/saint-chamond/boulangerie-banette.yml
+++ b/data/cities/saint-chamond/boulangerie-banette.yml
@@ -4,8 +4,8 @@ latitude: 45.47537
 longitude: 4.50801
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Alsace Lorraine"
-housenumber: 13
+street: Rue Alsace Lorraine
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boulangerie-patisserie-david-bory.yml b/data/cities/saint-chamond/boulangerie-patisserie-david-bory.yml
index 3c6518d01..2ea960df5 100644
--- a/data/cities/saint-chamond/boulangerie-patisserie-david-bory.yml
+++ b/data/cities/saint-chamond/boulangerie-patisserie-david-bory.yml
@@ -4,8 +4,8 @@ latitude: 45.47815
 longitude: 4.51544
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Charité"
-housenumber: 9
+street: Rue de la Charité
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boulangerie-patisserie-fauvet.yml b/data/cities/saint-chamond/boulangerie-patisserie-fauvet.yml
index ef3645c8a..3eb22fda2 100644
--- a/data/cities/saint-chamond/boulangerie-patisserie-fauvet.yml
+++ b/data/cities/saint-chamond/boulangerie-patisserie-fauvet.yml
@@ -4,8 +4,8 @@ latitude: 45.47437
 longitude: 4.50904
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 32
+street: Place de la Liberté
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boulangerie-patisserie-laporte.yml b/data/cities/saint-chamond/boulangerie-patisserie-laporte.yml
index 7f569611b..0d2972b51 100644
--- a/data/cities/saint-chamond/boulangerie-patisserie-laporte.yml
+++ b/data/cities/saint-chamond/boulangerie-patisserie-laporte.yml
@@ -4,8 +4,8 @@ latitude: 45.47742
 longitude: 4.51227
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 6
+street: Rue Ventefol
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/boulangerie-reocreux.yml b/data/cities/saint-chamond/boulangerie-reocreux.yml
index 860fab01b..9d5d09ebc 100644
--- a/data/cities/saint-chamond/boulangerie-reocreux.yml
+++ b/data/cities/saint-chamond/boulangerie-reocreux.yml
@@ -4,8 +4,8 @@ latitude: 45.46728
 longitude: 4.50005
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
+street: Route de Saint-Étienne
 housenumber: 13BIS
-phone: "+33 4 77 19 60 50"
-opening_hours: "Mo-Fr 06:30-19:00"
-website: ""
\ No newline at end of file
+phone: +33 4 77 19 60 50
+opening_hours: Mo-Fr 06:30-19:00
+website: ""
diff --git a/data/cities/saint-chamond/boutique-penelope.yml b/data/cities/saint-chamond/boutique-penelope.yml
index 7f5a21527..a36983a69 100644
--- a/data/cities/saint-chamond/boutique-penelope.yml
+++ b/data/cities/saint-chamond/boutique-penelope.yml
@@ -4,8 +4,8 @@ latitude: 45.4739
 longitude: 4.51442
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue de la Libération"
-housenumber: 11
+street: Avenue de la Libération
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/bulut-market.yml b/data/cities/saint-chamond/bulut-market.yml
index 77b7d988b..01484ef04 100644
--- a/data/cities/saint-chamond/bulut-market.yml
+++ b/data/cities/saint-chamond/bulut-market.yml
@@ -4,8 +4,8 @@ latitude: 45.47647
 longitude: 4.50496
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Pasteur"
-housenumber: 1
+street: Rue Pasteur
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/bureau-de-tabac-de-la-valette.yml b/data/cities/saint-chamond/bureau-de-tabac-de-la-valette.yml
index eee577fcb..26b75fb93 100644
--- a/data/cities/saint-chamond/bureau-de-tabac-de-la-valette.yml
+++ b/data/cities/saint-chamond/bureau-de-tabac-de-la-valette.yml
@@ -4,8 +4,8 @@ latitude: 45.46979
 longitude: 4.51418
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pilat"
-housenumber: 58
+street: Rue du Pilat
+housenumber: "58"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/bycloud.yml b/data/cities/saint-chamond/bycloud.yml
index 65f2d8bb4..49e1447fb 100644
--- a/data/cities/saint-chamond/bycloud.yml
+++ b/data/cities/saint-chamond/bycloud.yml
@@ -1,11 +1,11 @@
 id: 119198343
-type: way
+type: node
 latitude: 45.47161
 longitude: 4.50576
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Loubet"
-housenumber: 30
+street: Rue Loubet
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: "https://bYcloud.fr"
\ No newline at end of file
+website: https://bYcloud.fr
diff --git a/data/cities/saint-chamond/cabot-chic.yml b/data/cities/saint-chamond/cabot-chic.yml
index 1e69c1008..8997ed55e 100644
--- a/data/cities/saint-chamond/cabot-chic.yml
+++ b/data/cities/saint-chamond/cabot-chic.yml
@@ -4,8 +4,8 @@ latitude: 45.4695
 longitude: 4.50093
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
-housenumber: 10
+street: Route de Saint-Étienne
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/cactus.yml b/data/cities/saint-chamond/cactus.yml
index 23c45594c..718d0807f 100644
--- a/data/cities/saint-chamond/cactus.yml
+++ b/data/cities/saint-chamond/cactus.yml
@@ -4,8 +4,8 @@ latitude: 45.47423
 longitude: 4.50917
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 30
-phone: "+33 6 62 22 46 90"
-opening_hours: "Tu-Sa 09:30-19:30; Su 09:30-13:00"
-website: ""
\ No newline at end of file
+street: Place de la Liberté
+housenumber: "30"
+phone: +33 6 62 22 46 90
+opening_hours: Tu-Sa 09:30-19:30; Su 09:30-13:00
+website: ""
diff --git a/data/cities/saint-chamond/calpain.yml b/data/cities/saint-chamond/calpain.yml
index 534b35dc1..daabd7d3d 100644
--- a/data/cities/saint-chamond/calpain.yml
+++ b/data/cities/saint-chamond/calpain.yml
@@ -4,8 +4,8 @@ latitude: 45.47436
 longitude: 4.51442
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 8
+street: Rue Victor Hugo
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/calvin-v.yml b/data/cities/saint-chamond/calvin-v.yml
index b1f8c6e25..1ce2e720f 100644
--- a/data/cities/saint-chamond/calvin-v.yml
+++ b/data/cities/saint-chamond/calvin-v.yml
@@ -4,8 +4,8 @@ latitude: 45.47435
 longitude: 4.51432
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 8
+street: Rue Victor Hugo
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/camanille-beaute.yml b/data/cities/saint-chamond/camanille-beaute.yml
index 41fe4ed0d..bfb092a98 100644
--- a/data/cities/saint-chamond/camanille-beaute.yml
+++ b/data/cities/saint-chamond/camanille-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.47757
 longitude: 4.51267
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Caure"
-housenumber: 9
+street: Rue de la Caure
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/carrosserie-salanon.yml b/data/cities/saint-chamond/carrosserie-salanon.yml
index cf148ea23..4125b5119 100644
--- a/data/cities/saint-chamond/carrosserie-salanon.yml
+++ b/data/cities/saint-chamond/carrosserie-salanon.yml
@@ -4,8 +4,8 @@ latitude: 45.46875
 longitude: 4.51209
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard Alamagny"
-housenumber: 15
+street: Boulevard Alamagny
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/cathy-coiffure.yml b/data/cities/saint-chamond/cathy-coiffure.yml
index 212e9aebc..90acad17a 100644
--- a/data/cities/saint-chamond/cathy-coiffure.yml
+++ b/data/cities/saint-chamond/cathy-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.46381
 longitude: 4.50416
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Saint-André"
-housenumber: 4
+street: Rue Saint-André
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/chambre-funeraire-eugene-gay.yml b/data/cities/saint-chamond/chambre-funeraire-eugene-gay.yml
index 34bf52772..f4c4aabb7 100644
--- a/data/cities/saint-chamond/chambre-funeraire-eugene-gay.yml
+++ b/data/cities/saint-chamond/chambre-funeraire-eugene-gay.yml
@@ -4,8 +4,8 @@ latitude: 45.48086
 longitude: 4.51518
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de l'Éternité"
-housenumber: 11
+street: Rue de l'Éternité
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/chlore-beaute.yml b/data/cities/saint-chamond/chlore-beaute.yml
index b7e621a46..d0bc477c3 100644
--- a/data/cities/saint-chamond/chlore-beaute.yml
+++ b/data/cities/saint-chamond/chlore-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.47406
 longitude: 4.50893
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des Trois Frères"
-housenumber: 4
+street: Rue des Trois Frères
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/chouchouteve-you.yml b/data/cities/saint-chamond/chouchouteve-you.yml
index ef6143acd..4d2df6af1 100644
--- a/data/cities/saint-chamond/chouchouteve-you.yml
+++ b/data/cities/saint-chamond/chouchouteve-you.yml
@@ -4,8 +4,8 @@ latitude: 45.47852
 longitude: 4.50802
 postcode: "42400"
 city: Saint-Chamond
-street: "Grande Rue de Saint-Ennemond"
-housenumber: 29
+street: Grande Rue de Saint-Ennemond
+housenumber: "29"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/ciseaux-dor.yml b/data/cities/saint-chamond/ciseaux-dor.yml
index f07fbc751..01c224ab3 100644
--- a/data/cities/saint-chamond/ciseaux-dor.yml
+++ b/data/cities/saint-chamond/ciseaux-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.47489
 longitude: 4.51077
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Rivage"
-housenumber: 1
+street: Rue du Rivage
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/coco-vanille.yml b/data/cities/saint-chamond/coco-vanille.yml
index 7c8f62daf..e9cdc331f 100644
--- a/data/cities/saint-chamond/coco-vanille.yml
+++ b/data/cities/saint-chamond/coco-vanille.yml
@@ -4,8 +4,8 @@ latitude: 45.4714
 longitude: 4.51666
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Jules Ferry"
-housenumber: 15
+street: Avenue Jules Ferry
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/coffys-homme.yml b/data/cities/saint-chamond/coffys-homme.yml
index f5f19ca67..d7db4b341 100644
--- a/data/cities/saint-chamond/coffys-homme.yml
+++ b/data/cities/saint-chamond/coffys-homme.yml
@@ -4,8 +4,8 @@ latitude: 45.47501
 longitude: 4.51029
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 10
+street: Place de la Liberté
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/coffys.yml b/data/cities/saint-chamond/coffys.yml
index edc885611..03768bc3d 100644
--- a/data/cities/saint-chamond/coffys.yml
+++ b/data/cities/saint-chamond/coffys.yml
@@ -4,8 +4,8 @@ latitude: 45.47417
 longitude: 4.50941
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
+street: Place de la Liberté
 housenumber: 27, 28
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/colomb-metallerie-serrurerie.yml b/data/cities/saint-chamond/colomb-metallerie-serrurerie.yml
index daf7276c0..27db84cd5 100644
--- a/data/cities/saint-chamond/colomb-metallerie-serrurerie.yml
+++ b/data/cities/saint-chamond/colomb-metallerie-serrurerie.yml
@@ -4,8 +4,8 @@ latitude: 45.47296
 longitude: 4.50821
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Jules Duclos"
-housenumber: 30
+street: Rue Jules Duclos
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/color-espace-reprographie.yml b/data/cities/saint-chamond/color-espace-reprographie.yml
index db0da537f..dcd547b70 100644
--- a/data/cities/saint-chamond/color-espace-reprographie.yml
+++ b/data/cities/saint-chamond/color-espace-reprographie.yml
@@ -4,8 +4,8 @@ latitude: 45.4761
 longitude: 4.52074
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 23
+street: Rue Victor Hugo
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-Th 09:00-12:00,14:00-18:00; Fr 09:00-12:00,14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 09:00-12:00,14:00-18:00; Fr 09:00-12:00,14:00-17:00
+website: ""
diff --git a/data/cities/saint-chamond/coquelicot.yml b/data/cities/saint-chamond/coquelicot.yml
index 87a713621..0d80118f1 100644
--- a/data/cities/saint-chamond/coquelicot.yml
+++ b/data/cities/saint-chamond/coquelicot.yml
@@ -4,8 +4,8 @@ latitude: 45.47716
 longitude: 4.51036
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 2
+street: Boulevard François Delay
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/creatifs.yml b/data/cities/saint-chamond/creatifs.yml
index e823cc77a..aba224e8d 100644
--- a/data/cities/saint-chamond/creatifs.yml
+++ b/data/cities/saint-chamond/creatifs.yml
@@ -4,8 +4,8 @@ latitude: 45.46925
 longitude: 4.51439
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pilat"
-housenumber: 60
+street: Rue du Pilat
+housenumber: "60"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/cycles-mounier.yml b/data/cities/saint-chamond/cycles-mounier.yml
index 34cef035b..32ce5f115 100644
--- a/data/cities/saint-chamond/cycles-mounier.yml
+++ b/data/cities/saint-chamond/cycles-mounier.yml
@@ -4,8 +4,8 @@ latitude: 45.4776
 longitude: 4.51206
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 9
+street: Rue Ventefol
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/cyclo-ptits-soins.yml b/data/cities/saint-chamond/cyclo-ptits-soins.yml
index f1ec39427..84f68bf74 100644
--- a/data/cities/saint-chamond/cyclo-ptits-soins.yml
+++ b/data/cities/saint-chamond/cyclo-ptits-soins.yml
@@ -4,8 +4,8 @@ latitude: 45.46106
 longitude: 4.47432
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Jean-Bonnefonds"
-housenumber: 11
-phone: "+33 6 89 23 00 10"
+street: Route de Saint-Jean-Bonnefonds
+housenumber: "11"
+phone: +33 6 89 23 00 10
 opening_hours: ""
-website: "https://www.cycloptitssoins.fr/"
\ No newline at end of file
+website: https://www.cycloptitssoins.fr/
diff --git a/data/cities/saint-chamond/de-meche-avec-vous.yml b/data/cities/saint-chamond/de-meche-avec-vous.yml
index 2ac2ecb6e..2837a832a 100644
--- a/data/cities/saint-chamond/de-meche-avec-vous.yml
+++ b/data/cities/saint-chamond/de-meche-avec-vous.yml
@@ -4,8 +4,8 @@ latitude: 45.47449
 longitude: 4.51317
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Antoine Pinay"
-housenumber: 9
+street: Avenue Antoine Pinay
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/derail-fleurs.yml b/data/cities/saint-chamond/derail-fleurs.yml
index 02708149f..4a44b4c26 100644
--- a/data/cities/saint-chamond/derail-fleurs.yml
+++ b/data/cities/saint-chamond/derail-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.47497
 longitude: 4.51043
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 12
+street: Place de la Liberté
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/derbi.yml b/data/cities/saint-chamond/derbi.yml
index 77914e8e9..c74761b1d 100644
--- a/data/cities/saint-chamond/derbi.yml
+++ b/data/cities/saint-chamond/derbi.yml
@@ -4,8 +4,8 @@ latitude: 45.45927
 longitude: 4.50557
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Pétin Gaudet"
-housenumber: 139
+street: Rue Pétin Gaudet
+housenumber: "139"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/domaine-la-charade.yml b/data/cities/saint-chamond/domaine-la-charade.yml
index 140d2a188..ad1ae945b 100644
--- a/data/cities/saint-chamond/domaine-la-charade.yml
+++ b/data/cities/saint-chamond/domaine-la-charade.yml
@@ -4,8 +4,8 @@ latitude: 45.46388
 longitude: 4.50418
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Saint-André"
-housenumber: 3
+street: Rue Saint-André
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/es-es-pneus.yml b/data/cities/saint-chamond/es-es-pneus.yml
index 01a462bdd..754d0a160 100644
--- a/data/cities/saint-chamond/es-es-pneus.yml
+++ b/data/cities/saint-chamond/es-es-pneus.yml
@@ -4,8 +4,8 @@ latitude: 45.47637
 longitude: 4.52106
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 25
+street: Rue Victor Hugo
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:00,13:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:00,13:00-19:30
+website: ""
diff --git a/data/cities/saint-chamond/escale-evasion.yml b/data/cities/saint-chamond/escale-evasion.yml
index 1672c0e81..943ce08fb 100644
--- a/data/cities/saint-chamond/escale-evasion.yml
+++ b/data/cities/saint-chamond/escale-evasion.yml
@@ -4,8 +4,8 @@ latitude: 45.47561
 longitude: 4.50688
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Jean et André Dugas"
-housenumber: 12
+street: Rue Jean et André Dugas
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/espace-my-jardin-husqvarna.yml b/data/cities/saint-chamond/espace-my-jardin-husqvarna.yml
index c174983b1..5f35a1aa4 100644
--- a/data/cities/saint-chamond/espace-my-jardin-husqvarna.yml
+++ b/data/cities/saint-chamond/espace-my-jardin-husqvarna.yml
@@ -4,8 +4,8 @@ latitude: 45.46835
 longitude: 4.50094
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
+street: Route de Saint-Étienne
 housenumber: 11BIS
-phone: "+33 4 77 19 57 06"
+phone: +33 4 77 19 57 06
 opening_hours: ""
-website: "https://espace-my-jardin.business.site/"
\ No newline at end of file
+website: https://espace-my-jardin.business.site/
diff --git a/data/cities/saint-chamond/fleur-de-the.yml b/data/cities/saint-chamond/fleur-de-the.yml
index cee2f2afc..be7e30fb9 100644
--- a/data/cities/saint-chamond/fleur-de-the.yml
+++ b/data/cities/saint-chamond/fleur-de-the.yml
@@ -4,8 +4,9 @@ latitude: 45.46929
 longitude: 4.51468
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la République"
-housenumber: 7
+street: Place de la République
+housenumber: "7"
 phone: ""
-opening_hours: "Mo,Tu,Th,Fr 09:30-12:00,15:00-19:00; Sa 10:00-13:00,16:00-19:00; Su,PH 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th,Fr 09:30-12:00,15:00-19:00; Sa 10:00-13:00,16:00-19:00; Su,PH
+    09:30-12:30
+website: ""
diff --git a/data/cities/saint-chamond/ford.yml b/data/cities/saint-chamond/ford.yml
index 87240ffa5..951943b96 100644
--- a/data/cities/saint-chamond/ford.yml
+++ b/data/cities/saint-chamond/ford.yml
@@ -4,8 +4,8 @@ latitude: 45.47615
 longitude: 4.50507
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard Waldeck Rousseau"
+street: Boulevard Waldeck Rousseau
 housenumber: 58BIS
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/fram.yml b/data/cities/saint-chamond/fram.yml
index f86e4c382..dd83cadda 100644
--- a/data/cities/saint-chamond/fram.yml
+++ b/data/cities/saint-chamond/fram.yml
@@ -4,8 +4,8 @@ latitude: 45.47427
 longitude: 4.51382
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 4
+street: Rue Victor Hugo
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/friperie-du-secours-catholique.yml b/data/cities/saint-chamond/friperie-du-secours-catholique.yml
index 025e09fca..bf915e3eb 100644
--- a/data/cities/saint-chamond/friperie-du-secours-catholique.yml
+++ b/data/cities/saint-chamond/friperie-du-secours-catholique.yml
@@ -4,8 +4,8 @@ latitude: 45.47206
 longitude: 4.51005
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pré Château"
-housenumber: 10
+street: Rue du Pré Château
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/fromagerie-baret.yml b/data/cities/saint-chamond/fromagerie-baret.yml
index f9cf5026c..dae5b1f0e 100644
--- a/data/cities/saint-chamond/fromagerie-baret.yml
+++ b/data/cities/saint-chamond/fromagerie-baret.yml
@@ -4,8 +4,8 @@ latitude: 45.47509
 longitude: 4.50993
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 5
+street: Place de la Liberté
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/gamm-vert.yml b/data/cities/saint-chamond/gamm-vert.yml
index 914e58f65..3cc823cf2 100644
--- a/data/cities/saint-chamond/gamm-vert.yml
+++ b/data/cities/saint-chamond/gamm-vert.yml
@@ -4,8 +4,8 @@ latitude: 45.46054
 longitude: 4.48942
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 4
-phone: "+33 4 77 29 26 00"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00"
-website: "http://www.gammvert.fr"
\ No newline at end of file
+street: Rue du 17 Octobre 1961
+housenumber: "4"
+phone: +33 4 77 29 26 00
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00
+website: http://www.gammvert.fr
diff --git a/data/cities/saint-chamond/gamovore.yml b/data/cities/saint-chamond/gamovore.yml
index 270a572e1..98c295e6a 100644
--- a/data/cities/saint-chamond/gamovore.yml
+++ b/data/cities/saint-chamond/gamovore.yml
@@ -4,8 +4,8 @@ latitude: 45.47799
 longitude: 4.51333
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Saint-Pierre"
-housenumber: 8
+street: Place Saint-Pierre
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/garage-ad-expert-des-fraries-rb-autos.yml b/data/cities/saint-chamond/garage-ad-expert-des-fraries-rb-autos.yml
index c3ab42a2b..3d9b181b6 100644
--- a/data/cities/saint-chamond/garage-ad-expert-des-fraries-rb-autos.yml
+++ b/data/cities/saint-chamond/garage-ad-expert-des-fraries-rb-autos.yml
@@ -1,11 +1,11 @@
 id: 119196565
-type: way
+type: node
 latitude: 45.48038
 longitude: 4.53503
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard de Fonsala"
-housenumber: 7
-phone: "+33 4 77 79 80 17"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa,Su off"
-website: "https://www.ad.fr/garage/garage-ad-garage-des-fraries---rb-auto"
\ No newline at end of file
+street: Boulevard de Fonsala
+housenumber: "7"
+phone: +33 4 77 79 80 17
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa,Su off
+website: https://www.ad.fr/garage/garage-ad-garage-des-fraries---rb-auto
diff --git a/data/cities/saint-chamond/garage-coutance.yml b/data/cities/saint-chamond/garage-coutance.yml
index e883916a6..6a75f584b 100644
--- a/data/cities/saint-chamond/garage-coutance.yml
+++ b/data/cities/saint-chamond/garage-coutance.yml
@@ -4,8 +4,8 @@ latitude: 45.46923
 longitude: 4.5139
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard Alamagny"
-housenumber: 4
+street: Boulevard Alamagny
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, Mo-Th 14:00-18:00, Fr 14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, Mo-Th 14:00-18:00, Fr 14:00-17:00
+website: ""
diff --git a/data/cities/saint-chamond/garage-de-la-varizelle.yml b/data/cities/saint-chamond/garage-de-la-varizelle.yml
index 9fb4569d1..6adcb2f82 100644
--- a/data/cities/saint-chamond/garage-de-la-varizelle.yml
+++ b/data/cities/saint-chamond/garage-de-la-varizelle.yml
@@ -4,8 +4,8 @@ latitude: 45.46421
 longitude: 4.49181
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de la Varizelle"
-housenumber: 13
+street: Route de la Varizelle
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/garage-eco-occasions.yml b/data/cities/saint-chamond/garage-eco-occasions.yml
index dde64ed7d..42bd2d363 100644
--- a/data/cities/saint-chamond/garage-eco-occasions.yml
+++ b/data/cities/saint-chamond/garage-eco-occasions.yml
@@ -4,8 +4,8 @@ latitude: 45.47651
 longitude: 4.52125
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 27
+street: Rue Victor Hugo
+housenumber: "27"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/generale-doptique.yml b/data/cities/saint-chamond/generale-doptique.yml
index 3170a5adf..5ec46c443 100644
--- a/data/cities/saint-chamond/generale-doptique.yml
+++ b/data/cities/saint-chamond/generale-doptique.yml
@@ -4,8 +4,8 @@ latitude: 45.4602
 longitude: 4.49028
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 
-phone: "+33 4 77 73 62 63"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.generale-optique.com/opticien/l/saint-chamond/route-du-17-octobre-1961/2978137"
\ No newline at end of file
+street: Rue du 17 Octobre 1961
+housenumber: ""
+phone: +33 4 77 73 62 63
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.generale-optique.com/opticien/l/saint-chamond/route-du-17-octobre-1961/2978137
diff --git a/data/cities/saint-chamond/gifi.yml b/data/cities/saint-chamond/gifi.yml
index 9147bd337..b21eec8dc 100644
--- a/data/cities/saint-chamond/gifi.yml
+++ b/data/cities/saint-chamond/gifi.yml
@@ -4,8 +4,8 @@ latitude: 45.45982
 longitude: 4.49017
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 
+street: Rue du 17 Octobre 1961
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.gifi.fr"
\ No newline at end of file
+website: https://www.gifi.fr
diff --git a/data/cities/saint-chamond/girardon-produits-alimentaires-gpa.yml b/data/cities/saint-chamond/girardon-produits-alimentaires-gpa.yml
index 09bd83982..576fe449e 100644
--- a/data/cities/saint-chamond/girardon-produits-alimentaires-gpa.yml
+++ b/data/cities/saint-chamond/girardon-produits-alimentaires-gpa.yml
@@ -4,8 +4,8 @@ latitude: 45.46485
 longitude: 4.49878
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des V.A.B."
-housenumber: 8
+street: Rue des V.A.B.
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/gomet-granit.yml b/data/cities/saint-chamond/gomet-granit.yml
index 3439af80b..9198d7c0d 100644
--- a/data/cities/saint-chamond/gomet-granit.yml
+++ b/data/cities/saint-chamond/gomet-granit.yml
@@ -4,8 +4,8 @@ latitude: 45.49153
 longitude: 4.52493
 postcode: "42400"
 city: Saint-Chamond
-street: "Allée Michaël Faraday"
-housenumber: 2
+street: Allée Michaël Faraday
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/hairchip.yml b/data/cities/saint-chamond/hairchip.yml
index 22c75055b..91e7a85fc 100644
--- a/data/cities/saint-chamond/hairchip.yml
+++ b/data/cities/saint-chamond/hairchip.yml
@@ -4,8 +4,8 @@ latitude: 45.47493
 longitude: 4.51059
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 13
+street: Place de la Liberté
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/havas-voyages.yml b/data/cities/saint-chamond/havas-voyages.yml
index 5047471ea..dce8c610e 100644
--- a/data/cities/saint-chamond/havas-voyages.yml
+++ b/data/cities/saint-chamond/havas-voyages.yml
@@ -4,8 +4,8 @@ latitude: 45.47409
 longitude: 4.51041
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 18
+street: Place de la Liberté
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/hello-laverie.yml b/data/cities/saint-chamond/hello-laverie.yml
index f867bb1f5..6227712ae 100644
--- a/data/cities/saint-chamond/hello-laverie.yml
+++ b/data/cities/saint-chamond/hello-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.47423
 longitude: 4.50896
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des Trois Frères"
-housenumber: 2
+street: Rue des Trois Frères
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Su 06:00-22:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-22:00
+website: ""
diff --git a/data/cities/saint-chamond/high-society.yml b/data/cities/saint-chamond/high-society.yml
index d92d576f8..deb2d70e2 100644
--- a/data/cities/saint-chamond/high-society.yml
+++ b/data/cities/saint-chamond/high-society.yml
@@ -4,8 +4,8 @@ latitude: 45.47412
 longitude: 4.50962
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 25
-phone: "+33 7 73 14 99 17"
-opening_hours: "Mo-Sa 10:00-14:00, 15:00-19:00"
-website: "https://www.highsociety.fr/fr/?aff=49"
\ No newline at end of file
+street: Place de la Liberté
+housenumber: "25"
+phone: +33 7 73 14 99 17
+opening_hours: Mo-Sa 10:00-14:00, 15:00-19:00
+website: https://www.highsociety.fr/fr/?aff=49
diff --git a/data/cities/saint-chamond/i-dressing.yml b/data/cities/saint-chamond/i-dressing.yml
index 433fb92bf..c8242793b 100644
--- a/data/cities/saint-chamond/i-dressing.yml
+++ b/data/cities/saint-chamond/i-dressing.yml
@@ -4,8 +4,8 @@ latitude: 45.47729
 longitude: 4.51221
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 3
+street: Rue Ventefol
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/identit.yml b/data/cities/saint-chamond/identit.yml
index b7315e275..4e5c71744 100644
--- a/data/cities/saint-chamond/identit.yml
+++ b/data/cities/saint-chamond/identit.yml
@@ -4,8 +4,8 @@ latitude: 45.46411
 longitude: 4.50387
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Nationale"
-housenumber: 7
+street: Place Nationale
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/ilex-auto-services.yml b/data/cities/saint-chamond/ilex-auto-services.yml
index 08330483b..1c5bd244d 100644
--- a/data/cities/saint-chamond/ilex-auto-services.yml
+++ b/data/cities/saint-chamond/ilex-auto-services.yml
@@ -4,8 +4,8 @@ latitude: 45.4721
 longitude: 4.50981
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pré Château"
-housenumber: 8
-phone: "+33 9 53 96 21 42"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Su 9:00-13:00"
-website: ""
\ No newline at end of file
+street: Rue du Pré Château
+housenumber: "8"
+phone: +33 9 53 96 21 42
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Su 9:00-13:00
+website: ""
diff --git a/data/cities/saint-chamond/im-collection.yml b/data/cities/saint-chamond/im-collection.yml
index b67d75c89..6c4cc9492 100644
--- a/data/cities/saint-chamond/im-collection.yml
+++ b/data/cities/saint-chamond/im-collection.yml
@@ -4,8 +4,8 @@ latitude: 45.47795
 longitude: 4.51349
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Saint-Pierre"
-housenumber: 9
+street: Place Saint-Pierre
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/innovation-beaute.yml b/data/cities/saint-chamond/innovation-beaute.yml
index 5d5dad4c8..48f0e7d2b 100644
--- a/data/cities/saint-chamond/innovation-beaute.yml
+++ b/data/cities/saint-chamond/innovation-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.47317
 longitude: 4.5101
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 22
+street: Rue Gambetta
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00; Sa 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa 08:00-12:00
+website: ""
diff --git a/data/cities/saint-chamond/inov-multimedia.yml b/data/cities/saint-chamond/inov-multimedia.yml
index e82ca13ab..635966ba7 100644
--- a/data/cities/saint-chamond/inov-multimedia.yml
+++ b/data/cities/saint-chamond/inov-multimedia.yml
@@ -4,8 +4,8 @@ latitude: 45.47539
 longitude: 4.50942
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Dorian"
-housenumber: 4
+street: Place Dorian
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/intermarche-contact.yml b/data/cities/saint-chamond/intermarche-contact.yml
index 478d8da04..b6bb076cb 100644
--- a/data/cities/saint-chamond/intermarche-contact.yml
+++ b/data/cities/saint-chamond/intermarche-contact.yml
@@ -4,8 +4,8 @@ latitude: 45.47623
 longitude: 4.51107
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Pierre Curie"
-housenumber: 8
+street: Rue Pierre Curie
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 08:00-17:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-17:30
+website: ""
diff --git a/data/cities/saint-chamond/intersport.yml b/data/cities/saint-chamond/intersport.yml
index d417bb1c9..c4c725481 100644
--- a/data/cities/saint-chamond/intersport.yml
+++ b/data/cities/saint-chamond/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.4604
 longitude: 4.49063
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 
+street: Rue du 17 Octobre 1961
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.intersport.fr/Loire-42/SAINTCHAMOND-42400/INTERSPORT-SAINTCHAMOND/04338_000/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.intersport.fr/Loire-42/SAINTCHAMOND-42400/INTERSPORT-SAINTCHAMOND/04338_000/
diff --git a/data/cities/saint-chamond/iris-flow.yml b/data/cities/saint-chamond/iris-flow.yml
index 18cdb62fa..0a4df41c8 100644
--- a/data/cities/saint-chamond/iris-flow.yml
+++ b/data/cities/saint-chamond/iris-flow.yml
@@ -4,8 +4,8 @@ latitude: 45.47633
 longitude: 4.50942
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Jean-Antoine Vial"
-housenumber: 7
+street: Rue Jean-Antoine Vial
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/isocar-sp-auto.yml b/data/cities/saint-chamond/isocar-sp-auto.yml
index e4ba928c5..296a53749 100644
--- a/data/cities/saint-chamond/isocar-sp-auto.yml
+++ b/data/cities/saint-chamond/isocar-sp-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.47387
 longitude: 4.51546
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Richard Chambovet"
+street: Rue Richard Chambovet
 housenumber: 3BIS
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/jardinerie-briat-francerurale.yml b/data/cities/saint-chamond/jardinerie-briat-francerurale.yml
index f135c29cc..4eee78961 100644
--- a/data/cities/saint-chamond/jardinerie-briat-francerurale.yml
+++ b/data/cities/saint-chamond/jardinerie-briat-francerurale.yml
@@ -4,8 +4,8 @@ latitude: 45.46721
 longitude: 4.49982
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
-housenumber: 13
-phone: "+33 4 77 31 94 37"
-opening_hours: "Mo-Sa 08:30-12:00, 14:00-18:30"
-website: "https://www.jardinerie-briat.fr/"
\ No newline at end of file
+street: Route de Saint-Étienne
+housenumber: "13"
+phone: +33 4 77 31 94 37
+opening_hours: Mo-Sa 08:30-12:00, 14:00-18:30
+website: https://www.jardinerie-briat.fr/
diff --git a/data/cities/saint-chamond/jeux-de-meches.yml b/data/cities/saint-chamond/jeux-de-meches.yml
index 3c9949b4c..f032eff8b 100644
--- a/data/cities/saint-chamond/jeux-de-meches.yml
+++ b/data/cities/saint-chamond/jeux-de-meches.yml
@@ -4,8 +4,8 @@ latitude: 45.47661
 longitude: 4.50934
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 10
+street: Boulevard François Delay
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/joueclub.yml b/data/cities/saint-chamond/joueclub.yml
index 046def5d6..f264e462e 100644
--- a/data/cities/saint-chamond/joueclub.yml
+++ b/data/cities/saint-chamond/joueclub.yml
@@ -4,8 +4,8 @@ latitude: 45.47173
 longitude: 4.50748
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de Saint-Étienne"
-housenumber: 1
+street: Rue de Saint-Étienne
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/kakone-artisanat.yml b/data/cities/saint-chamond/kakone-artisanat.yml
index b924ae3fa..439646297 100644
--- a/data/cities/saint-chamond/kakone-artisanat.yml
+++ b/data/cities/saint-chamond/kakone-artisanat.yml
@@ -4,8 +4,8 @@ latitude: 45.48896
 longitude: 4.51559
 postcode: "42400"
 city: Saint-Chamond
-street: "Chemin de Peyrard"
-housenumber: 2
+street: Chemin de Peyrard
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/kramdi-mourad.yml b/data/cities/saint-chamond/kramdi-mourad.yml
index a5d6042d2..9008c6b73 100644
--- a/data/cities/saint-chamond/kramdi-mourad.yml
+++ b/data/cities/saint-chamond/kramdi-mourad.yml
@@ -4,8 +4,8 @@ latitude: 45.47277
 longitude: 4.51065
 postcode: "42400"
 city: Saint-Chamond
-street: "Cours Adrien de Montgolfier"
-housenumber: 6
-phone: "+33 4 77192070"
+street: Cours Adrien de Montgolfier
+housenumber: "6"
+phone: +33 4 77192070
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/l-c-auto.yml b/data/cities/saint-chamond/l-c-auto.yml
index 08c9be537..a23860c7a 100644
--- a/data/cities/saint-chamond/l-c-auto.yml
+++ b/data/cities/saint-chamond/l-c-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.47903
 longitude: 4.52228
 postcode: "42400"
 city: Saint-Chamond
-street: "Grande Rue"
-housenumber: 13
+street: Grande Rue
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-bellauto.yml b/data/cities/saint-chamond/la-bellauto.yml
index 6afb7f974..aca6de2a2 100644
--- a/data/cities/saint-chamond/la-bellauto.yml
+++ b/data/cities/saint-chamond/la-bellauto.yml
@@ -4,8 +4,8 @@ latitude: 45.46131
 longitude: 4.48571
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Jean-Bonnefonds"
-housenumber: 2
+street: Route de Saint-Jean-Bonnefonds
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-boutique-du-store.yml b/data/cities/saint-chamond/la-boutique-du-store.yml
index ee23e4f34..6d1f0f655 100644
--- a/data/cities/saint-chamond/la-boutique-du-store.yml
+++ b/data/cities/saint-chamond/la-boutique-du-store.yml
@@ -4,8 +4,8 @@ latitude: 45.4921
 longitude: 4.52443
 postcode: "42400"
 city: Saint-Chamond
-street: "Allée René Descartes"
-housenumber: 1
+street: Allée René Descartes
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-cave-du-jarez.yml b/data/cities/saint-chamond/la-cave-du-jarez.yml
index b9d8e0231..d508ea83d 100644
--- a/data/cities/saint-chamond/la-cave-du-jarez.yml
+++ b/data/cities/saint-chamond/la-cave-du-jarez.yml
@@ -4,8 +4,8 @@ latitude: 45.47572
 longitude: 4.50744
 postcode: "42400"
 city: Saint-Chamond
-street: "Square Croix Gauthier"
+street: Square Croix Gauthier
 housenumber: 2E
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-chaumiere-fleurie-funeraire.yml b/data/cities/saint-chamond/la-chaumiere-fleurie-funeraire.yml
index 524a3dcae..06bd00512 100644
--- a/data/cities/saint-chamond/la-chaumiere-fleurie-funeraire.yml
+++ b/data/cities/saint-chamond/la-chaumiere-fleurie-funeraire.yml
@@ -4,8 +4,8 @@ latitude: 45.47716
 longitude: 4.51227
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 1
+street: Rue Ventefol
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-cigale-orientale.yml b/data/cities/saint-chamond/la-cigale-orientale.yml
index b3fa8cfca..435532dc5 100644
--- a/data/cities/saint-chamond/la-cigale-orientale.yml
+++ b/data/cities/saint-chamond/la-cigale-orientale.yml
@@ -4,8 +4,8 @@ latitude: 45.47406
 longitude: 4.50909
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des Trois Frères"
-housenumber: 1
+street: Rue des Trois Frères
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-cle-dor.yml b/data/cities/saint-chamond/la-cle-dor.yml
index 9ac2ec140..c4e4e9769 100644
--- a/data/cities/saint-chamond/la-cle-dor.yml
+++ b/data/cities/saint-chamond/la-cle-dor.yml
@@ -4,8 +4,8 @@ latitude: 45.47821
 longitude: 4.5122
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Halle"
-housenumber: 10
+street: Place de la Halle
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-corbeille-de-saison.yml b/data/cities/saint-chamond/la-corbeille-de-saison.yml
index e20ef1d4e..54f9d780a 100644
--- a/data/cities/saint-chamond/la-corbeille-de-saison.yml
+++ b/data/cities/saint-chamond/la-corbeille-de-saison.yml
@@ -4,8 +4,8 @@ latitude: 45.46937
 longitude: 4.51372
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard Alamagny"
-housenumber: 3
+street: Boulevard Alamagny
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-feerie-des-sens.yml b/data/cities/saint-chamond/la-feerie-des-sens.yml
index 0a43f6a77..6a3e5bf5b 100644
--- a/data/cities/saint-chamond/la-feerie-des-sens.yml
+++ b/data/cities/saint-chamond/la-feerie-des-sens.yml
@@ -4,8 +4,8 @@ latitude: 45.45823
 longitude: 4.50535
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Pétin Gaudet"
-housenumber: 153
+street: Rue Pétin Gaudet
+housenumber: "153"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/la-fille-de-dartagnan.yml b/data/cities/saint-chamond/la-fille-de-dartagnan.yml
index 32c16e819..e18841a50 100644
--- a/data/cities/saint-chamond/la-fille-de-dartagnan.yml
+++ b/data/cities/saint-chamond/la-fille-de-dartagnan.yml
@@ -4,8 +4,8 @@ latitude: 45.46973
 longitude: 4.51418
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pilat"
-housenumber: 58
+street: Rue du Pilat
+housenumber: "58"
 phone: ""
-opening_hours: "Tu-Th 08:30-12:00,14:00-18:30; Fr 08:30-18:30; Sa 08:00-14:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 08:30-12:00,14:00-18:30; Fr 08:30-18:30; Sa 08:00-14:00
+website: ""
diff --git a/data/cities/saint-chamond/la-firma-tifs.yml b/data/cities/saint-chamond/la-firma-tifs.yml
index 78dd88183..6550d1cd0 100644
--- a/data/cities/saint-chamond/la-firma-tifs.yml
+++ b/data/cities/saint-chamond/la-firma-tifs.yml
@@ -4,8 +4,8 @@ latitude: 45.47783
 longitude: 4.51523
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Ferréol"
-housenumber: 3
+street: Place Ferréol
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Th 14:00-18:00, Tu-Th 09:00-12:00, Fr 09:00-18:00, Sa 09:00-14:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 14:00-18:00, Tu-Th 09:00-12:00, Fr 09:00-18:00, Sa 09:00-14:00
+website: ""
diff --git a/data/cities/saint-chamond/la-grignotiere.yml b/data/cities/saint-chamond/la-grignotiere.yml
index deab43c14..eefbca4bd 100644
--- a/data/cities/saint-chamond/la-grignotiere.yml
+++ b/data/cities/saint-chamond/la-grignotiere.yml
@@ -4,8 +4,8 @@ latitude: 45.47304
 longitude: 4.51023
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 13
+street: Rue Gambetta
+housenumber: "13"
 phone: ""
-opening_hours: "Mo,Tu,Th,Fr 04:00-19:00; Sa 05:00-19:00; Su 07:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th,Fr 04:00-19:00; Sa 05:00-19:00; Su 07:00-19:00
+website: ""
diff --git a/data/cities/saint-chamond/la-paneterie.yml b/data/cities/saint-chamond/la-paneterie.yml
index fc09afbd6..2fbe2018e 100644
--- a/data/cities/saint-chamond/la-paneterie.yml
+++ b/data/cities/saint-chamond/la-paneterie.yml
@@ -4,8 +4,8 @@ latitude: 45.47816
 longitude: 4.51209
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Halle"
-housenumber: 10
+street: Place de la Halle
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/laiterie-gerentes.yml b/data/cities/saint-chamond/laiterie-gerentes.yml
index 45d479afe..1c37f0ab7 100644
--- a/data/cities/saint-chamond/laiterie-gerentes.yml
+++ b/data/cities/saint-chamond/laiterie-gerentes.yml
@@ -4,8 +4,8 @@ latitude: 45.47856
 longitude: 4.51863
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Réclusière"
-housenumber: 8
+street: Rue de la Réclusière
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/lartisan-dorian.yml b/data/cities/saint-chamond/lartisan-dorian.yml
index db0c620f1..6602f49e5 100644
--- a/data/cities/saint-chamond/lartisan-dorian.yml
+++ b/data/cities/saint-chamond/lartisan-dorian.yml
@@ -4,8 +4,8 @@ latitude: 45.47552
 longitude: 4.50924
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Dorian"
-housenumber: 3
+street: Place Dorian
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/latelier-c.yml b/data/cities/saint-chamond/latelier-c.yml
index 77f88ef4e..4e9071fa8 100644
--- a/data/cities/saint-chamond/latelier-c.yml
+++ b/data/cities/saint-chamond/latelier-c.yml
@@ -4,8 +4,8 @@ latitude: 45.4737
 longitude: 4.51505
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue de la Libération"
-housenumber: 15
+street: Avenue de la Libération
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/latelier-de-sonia.yml b/data/cities/saint-chamond/latelier-de-sonia.yml
index 6decc060e..c7831f891 100644
--- a/data/cities/saint-chamond/latelier-de-sonia.yml
+++ b/data/cities/saint-chamond/latelier-de-sonia.yml
@@ -4,8 +4,8 @@ latitude: 45.4758
 longitude: 4.51999
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des Palermes"
-housenumber: 20
+street: Rue des Palermes
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/latelier-du-bigoudi.yml b/data/cities/saint-chamond/latelier-du-bigoudi.yml
index 0da76bc4e..073a164a3 100644
--- a/data/cities/saint-chamond/latelier-du-bigoudi.yml
+++ b/data/cities/saint-chamond/latelier-du-bigoudi.yml
@@ -4,8 +4,8 @@ latitude: 45.47571
 longitude: 4.50687
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue James Condamin"
-housenumber: 1
+street: Rue James Condamin
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/lavplus.yml b/data/cities/saint-chamond/lavplus.yml
index 11faed775..81ba7acec 100644
--- a/data/cities/saint-chamond/lavplus.yml
+++ b/data/cities/saint-chamond/lavplus.yml
@@ -4,8 +4,8 @@ latitude: 45.47374
 longitude: 4.51491
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue de la Libération"
-housenumber: 13
+street: Avenue de la Libération
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-champ-du-geai.yml b/data/cities/saint-chamond/le-champ-du-geai.yml
index b952fe9e7..bbc8875ce 100644
--- a/data/cities/saint-chamond/le-champ-du-geai.yml
+++ b/data/cities/saint-chamond/le-champ-du-geai.yml
@@ -4,8 +4,8 @@ latitude: 45.47055
 longitude: 4.50166
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
-housenumber: 6
+street: Route de Saint-Étienne
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 06:30-13:00,15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-13:00,15:30-19:30
+website: ""
diff --git a/data/cities/saint-chamond/le-choix-funeraire.yml b/data/cities/saint-chamond/le-choix-funeraire.yml
index 1badfeb50..c7cca1969 100644
--- a/data/cities/saint-chamond/le-choix-funeraire.yml
+++ b/data/cities/saint-chamond/le-choix-funeraire.yml
@@ -4,8 +4,8 @@ latitude: 45.47499
 longitude: 4.51037
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 11
+street: Place de la Liberté
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-courabio.yml b/data/cities/saint-chamond/le-courabio.yml
index 01eb67679..ca7b04551 100644
--- a/data/cities/saint-chamond/le-courabio.yml
+++ b/data/cities/saint-chamond/le-courabio.yml
@@ -4,8 +4,8 @@ latitude: 45.47369
 longitude: 4.51057
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Sadi Carnot"
-housenumber: 3
+street: Avenue Sadi Carnot
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: "http://www.corabio.org/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: http://www.corabio.org/
diff --git a/data/cities/saint-chamond/le-djurdjura-tabac-presse-loto-pmu-bar.yml b/data/cities/saint-chamond/le-djurdjura-tabac-presse-loto-pmu-bar.yml
index 0a2a5f532..00756ea99 100644
--- a/data/cities/saint-chamond/le-djurdjura-tabac-presse-loto-pmu-bar.yml
+++ b/data/cities/saint-chamond/le-djurdjura-tabac-presse-loto-pmu-bar.yml
@@ -4,8 +4,8 @@ latitude: 45.47252
 longitude: 4.51074
 postcode: "42400"
 city: Saint-Chamond
-street: "Cours Adrien de Montgolfier"
-housenumber: 9
+street: Cours Adrien de Montgolfier
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-fontenay.yml b/data/cities/saint-chamond/le-fontenay.yml
index f47d5c765..79a62e9c5 100644
--- a/data/cities/saint-chamond/le-fontenay.yml
+++ b/data/cities/saint-chamond/le-fontenay.yml
@@ -4,8 +4,8 @@ latitude: 45.45751
 longitude: 4.50429
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Louis Comte"
-housenumber: 2
+street: Place Louis Comte
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-gant-elge.yml b/data/cities/saint-chamond/le-gant-elge.yml
index f12fff7a8..4f1fa1426 100644
--- a/data/cities/saint-chamond/le-gant-elge.yml
+++ b/data/cities/saint-chamond/le-gant-elge.yml
@@ -4,8 +4,8 @@ latitude: 45.46513
 longitude: 4.49932
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des V.A.B."
-housenumber: 10
+street: Rue des V.A.B.
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-marigny.yml b/data/cities/saint-chamond/le-marigny.yml
index 18191165c..97a125a08 100644
--- a/data/cities/saint-chamond/le-marigny.yml
+++ b/data/cities/saint-chamond/le-marigny.yml
@@ -4,8 +4,8 @@ latitude: 45.47801
 longitude: 4.51322
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Saint-Pierre"
-housenumber: 7
+street: Place Saint-Pierre
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-mille-coupes.yml b/data/cities/saint-chamond/le-mille-coupes.yml
index 0102d999e..5ec550f4c 100644
--- a/data/cities/saint-chamond/le-mille-coupes.yml
+++ b/data/cities/saint-chamond/le-mille-coupes.yml
@@ -4,8 +4,8 @@ latitude: 45.47498
 longitude: 4.51291
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Antoine Pinay"
-housenumber: 1
+street: Avenue Antoine Pinay
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 08:00-18:00; Sa 08:00-15:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-18:00; Sa 08:00-15:00
+website: ""
diff --git a/data/cities/saint-chamond/le-panier-de-provence.yml b/data/cities/saint-chamond/le-panier-de-provence.yml
index b2ba99f39..a00b8c321 100644
--- a/data/cities/saint-chamond/le-panier-de-provence.yml
+++ b/data/cities/saint-chamond/le-panier-de-provence.yml
@@ -4,8 +4,8 @@ latitude: 45.47472
 longitude: 4.50909
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 32
+street: Place de la Liberté
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-paradis-du-fruit.yml b/data/cities/saint-chamond/le-paradis-du-fruit.yml
index fd0f355ac..692f1c89d 100644
--- a/data/cities/saint-chamond/le-paradis-du-fruit.yml
+++ b/data/cities/saint-chamond/le-paradis-du-fruit.yml
@@ -4,8 +4,8 @@ latitude: 45.47516
 longitude: 4.50965
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 2
+street: Place de la Liberté
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-salon-develyne.yml b/data/cities/saint-chamond/le-salon-develyne.yml
index 632ae5ec0..e5d1cab3d 100644
--- a/data/cities/saint-chamond/le-salon-develyne.yml
+++ b/data/cities/saint-chamond/le-salon-develyne.yml
@@ -4,8 +4,8 @@ latitude: 45.4778
 longitude: 4.51262
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Caure"
-housenumber: 14
+street: Rue de la Caure
+housenumber: "14"
 phone: ""
-opening_hours: "Tu-Fr 08:30-12:00,14:00-18:30; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-12:00,14:00-18:30; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/saint-chamond/le-salon.yml b/data/cities/saint-chamond/le-salon.yml
index 0a609aad7..ca3f8121a 100644
--- a/data/cities/saint-chamond/le-salon.yml
+++ b/data/cities/saint-chamond/le-salon.yml
@@ -4,8 +4,8 @@ latitude: 45.47748
 longitude: 4.51087
 postcode: "42400"
 city: Saint-Chamond
-street: "Place des Fours Banaux"
-housenumber: 6
+street: Place des Fours Banaux
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/le-temps-d1-pose.yml b/data/cities/saint-chamond/le-temps-d1-pose.yml
index 440664272..6b89e9e08 100644
--- a/data/cities/saint-chamond/le-temps-d1-pose.yml
+++ b/data/cities/saint-chamond/le-temps-d1-pose.yml
@@ -4,8 +4,8 @@ latitude: 45.47725
 longitude: 4.51032
 postcode: "42400"
 city: Saint-Chamond
-street: "Place des Fours Banaux"
-housenumber: 1
+street: Place des Fours Banaux
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/les-delices-a-dudu.yml b/data/cities/saint-chamond/les-delices-a-dudu.yml
index efdcfc146..41c85940c 100644
--- a/data/cities/saint-chamond/les-delices-a-dudu.yml
+++ b/data/cities/saint-chamond/les-delices-a-dudu.yml
@@ -4,8 +4,8 @@ latitude: 45.46415
 longitude: 4.5032
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Nationale"
-housenumber: 14
+street: Place Nationale
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/les-rotisseries-foreziennes.yml b/data/cities/saint-chamond/les-rotisseries-foreziennes.yml
index 892023520..0c16d641d 100644
--- a/data/cities/saint-chamond/les-rotisseries-foreziennes.yml
+++ b/data/cities/saint-chamond/les-rotisseries-foreziennes.yml
@@ -4,8 +4,8 @@ latitude: 45.46976
 longitude: 4.50975
 postcode: "42400"
 city: Saint-Chamond
-street: "Cours Adrien de Montgolfier"
-housenumber: 47
+street: Cours Adrien de Montgolfier
+housenumber: "47"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/lessence-de-letre.yml b/data/cities/saint-chamond/lessence-de-letre.yml
index ba88f193a..35aa7a1f8 100644
--- a/data/cities/saint-chamond/lessence-de-letre.yml
+++ b/data/cities/saint-chamond/lessence-de-letre.yml
@@ -4,8 +4,8 @@ latitude: 45.47739
 longitude: 4.51025
 postcode: "42400"
 city: Saint-Chamond
-street: "Place des Fours Banaux"
-housenumber: 3
+street: Place des Fours Banaux
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/lhair-naturel.yml b/data/cities/saint-chamond/lhair-naturel.yml
index a8f411b0c..b04e29f45 100644
--- a/data/cities/saint-chamond/lhair-naturel.yml
+++ b/data/cities/saint-chamond/lhair-naturel.yml
@@ -4,8 +4,8 @@ latitude: 45.47402
 longitude: 4.51273
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
+street: Rue Gambetta
 housenumber: 1BIS
 phone: ""
-opening_hours: "Mo,Tu 08:30-12:00,14:00-18:00; Th,Fr 08:30-18:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu 08:30-12:00,14:00-18:00; Th,Fr 08:30-18:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/saint-chamond/librairie-de-plaisance.yml b/data/cities/saint-chamond/librairie-de-plaisance.yml
index 36c75b384..a80a2ab8b 100644
--- a/data/cities/saint-chamond/librairie-de-plaisance.yml
+++ b/data/cities/saint-chamond/librairie-de-plaisance.yml
@@ -4,8 +4,8 @@ latitude: 45.47409
 longitude: 4.50974
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 24
+street: Place de la Liberté
+housenumber: "24"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 08:30-12:00, 14:00-19:00; Sa 08:30-12:00, 14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 08:30-12:00, 14:00-19:00; Sa 08:30-12:00, 14:30-19:00
+website: ""
diff --git a/data/cities/saint-chamond/lidl.yml b/data/cities/saint-chamond/lidl.yml
index 031064322..88eada2ce 100644
--- a/data/cities/saint-chamond/lidl.yml
+++ b/data/cities/saint-chamond/lidl.yml
@@ -1,11 +1,11 @@
 id: 241115991
-type: way
+type: node
 latitude: 45.47898
 longitude: 4.52026
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Edmond Locard"
-housenumber: 2
+street: Rue Edmond Locard
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/linstant-c.yml b/data/cities/saint-chamond/linstant-c.yml
index ce7f8bc60..db4ba7887 100644
--- a/data/cities/saint-chamond/linstant-c.yml
+++ b/data/cities/saint-chamond/linstant-c.yml
@@ -4,8 +4,8 @@ latitude: 45.47325
 longitude: 4.51032
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 20
+street: Rue Gambetta
+housenumber: "20"
 phone: ""
-opening_hours: "sur rendez-vous les jeudis, vendredis et samedis"
-website: ""
\ No newline at end of file
+opening_hours: '"sur rendez-vous les jeudis, vendredis et samedis"'
+website: ""
diff --git a/data/cities/saint-chamond/mahair-barber-shop.yml b/data/cities/saint-chamond/mahair-barber-shop.yml
index fcb4fa3ce..997fb3360 100644
--- a/data/cities/saint-chamond/mahair-barber-shop.yml
+++ b/data/cities/saint-chamond/mahair-barber-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.47353
 longitude: 4.53045
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de Savoie"
-housenumber: 4
+street: Place de Savoie
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/marie-blachere.yml b/data/cities/saint-chamond/marie-blachere.yml
index fa6c13ac0..a52b514a9 100644
--- a/data/cities/saint-chamond/marie-blachere.yml
+++ b/data/cities/saint-chamond/marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 45.47849
 longitude: 4.51838
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Réclusière"
-housenumber: 8
+street: Rue de la Réclusière
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/mascott.yml b/data/cities/saint-chamond/mascott.yml
index 4c1572728..24e9c97ee 100644
--- a/data/cities/saint-chamond/mascott.yml
+++ b/data/cities/saint-chamond/mascott.yml
@@ -4,8 +4,8 @@ latitude: 45.47526
 longitude: 4.50778
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Alsace Lorraine"
-housenumber: 21
+street: Rue Alsace Lorraine
+housenumber: "21"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/maxi-zoo.yml b/data/cities/saint-chamond/maxi-zoo.yml
index 273b5fe51..e1d784902 100644
--- a/data/cities/saint-chamond/maxi-zoo.yml
+++ b/data/cities/saint-chamond/maxi-zoo.yml
@@ -4,8 +4,8 @@ latitude: 45.46029
 longitude: 4.49044
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 
-phone: "+33 4 81 68 28 06"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.maxizoo.fr/domaine-de-service/magasins/ouvertures/saint-chamond/"
\ No newline at end of file
+street: Rue du 17 Octobre 1961
+housenumber: ""
+phone: +33 4 81 68 28 06
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.maxizoo.fr/domaine-de-service/magasins/ouvertures/saint-chamond/
diff --git a/data/cities/saint-chamond/mega-loisirs.yml b/data/cities/saint-chamond/mega-loisirs.yml
index 4f8e49efd..4cde0b6bd 100644
--- a/data/cities/saint-chamond/mega-loisirs.yml
+++ b/data/cities/saint-chamond/mega-loisirs.yml
@@ -4,8 +4,8 @@ latitude: 45.47023
 longitude: 4.50175
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
+street: Route de Saint-Étienne
 housenumber: 7TER
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/mehditation-coiffure.yml b/data/cities/saint-chamond/mehditation-coiffure.yml
index 285bdd525..becd5e220 100644
--- a/data/cities/saint-chamond/mehditation-coiffure.yml
+++ b/data/cities/saint-chamond/mehditation-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.47352
 longitude: 4.50996
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de l'Asile Alamagny"
-housenumber: 10
+street: Rue de l'Asile Alamagny
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/men-attitude.yml b/data/cities/saint-chamond/men-attitude.yml
index 81c59a227..f00ecf1bb 100644
--- a/data/cities/saint-chamond/men-attitude.yml
+++ b/data/cities/saint-chamond/men-attitude.yml
@@ -4,8 +4,8 @@ latitude: 45.47721
 longitude: 4.51225
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 1
+street: Rue Ventefol
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/metamorphose.yml b/data/cities/saint-chamond/metamorphose.yml
index d1d63b2c7..17f137ee9 100644
--- a/data/cities/saint-chamond/metamorphose.yml
+++ b/data/cities/saint-chamond/metamorphose.yml
@@ -4,8 +4,8 @@ latitude: 45.47547
 longitude: 4.51131
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Pierre Curie"
+street: Rue Pierre Curie
 housenumber: 4BIS
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/mik-cuisines.yml b/data/cities/saint-chamond/mik-cuisines.yml
index a8f12eca5..df5647136 100644
--- a/data/cities/saint-chamond/mik-cuisines.yml
+++ b/data/cities/saint-chamond/mik-cuisines.yml
@@ -4,8 +4,8 @@ latitude: 45.47418
 longitude: 4.51232
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 2
+street: Rue Gambetta
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/mille-et-un-delices.yml b/data/cities/saint-chamond/mille-et-un-delices.yml
index d8c149d0b..a84423897 100644
--- a/data/cities/saint-chamond/mille-et-un-delices.yml
+++ b/data/cities/saint-chamond/mille-et-un-delices.yml
@@ -4,8 +4,8 @@ latitude: 45.47527
 longitude: 4.51922
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
+street: Rue Victor Hugo
 housenumber: 21BIS
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/mob77.yml b/data/cities/saint-chamond/mob77.yml
index 239580b1d..18e98e79e 100644
--- a/data/cities/saint-chamond/mob77.yml
+++ b/data/cities/saint-chamond/mob77.yml
@@ -4,8 +4,8 @@ latitude: 45.47407
 longitude: 4.51238
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 2
+street: Rue Gambetta
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/mod-attitude.yml b/data/cities/saint-chamond/mod-attitude.yml
index 9324a23b0..a63bcc5e7 100644
--- a/data/cities/saint-chamond/mod-attitude.yml
+++ b/data/cities/saint-chamond/mod-attitude.yml
@@ -4,8 +4,8 @@ latitude: 45.47353
 longitude: 4.51145
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 9
+street: Rue Gambetta
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/mode-coiff.yml b/data/cities/saint-chamond/mode-coiff.yml
index 899ec99ab..ff41355c2 100644
--- a/data/cities/saint-chamond/mode-coiff.yml
+++ b/data/cities/saint-chamond/mode-coiff.yml
@@ -4,8 +4,8 @@ latitude: 45.47444
 longitude: 4.5132
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Antoine Pinay"
-housenumber: 9
+street: Avenue Antoine Pinay
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/motrio-garage-mondon.yml b/data/cities/saint-chamond/motrio-garage-mondon.yml
index ee840f55a..a75d5eaa6 100644
--- a/data/cities/saint-chamond/motrio-garage-mondon.yml
+++ b/data/cities/saint-chamond/motrio-garage-mondon.yml
@@ -4,8 +4,8 @@ latitude: 45.46648
 longitude: 4.49868
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
-housenumber: 17
-phone: "+33 4 77 31 78 64"
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00"
-website: "https://www.garage-mondon.fr/"
\ No newline at end of file
+street: Route de Saint-Étienne
+housenumber: "17"
+phone: +33 4 77 31 78 64
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00
+website: https://www.garage-mondon.fr/
diff --git a/data/cities/saint-chamond/mp-carrosserie.yml b/data/cities/saint-chamond/mp-carrosserie.yml
index 1879bebf8..923761277 100644
--- a/data/cities/saint-chamond/mp-carrosserie.yml
+++ b/data/cities/saint-chamond/mp-carrosserie.yml
@@ -4,8 +4,8 @@ latitude: 45.4819
 longitude: 4.52936
 postcode: "42400"
 city: Saint-Chamond
-street: "Grande Rue de Saint-Julien"
-housenumber: 95
+street: Grande Rue de Saint-Julien
+housenumber: "95"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/murat-market.yml b/data/cities/saint-chamond/murat-market.yml
index eedfbc9c2..77ba7b6bb 100644
--- a/data/cities/saint-chamond/murat-market.yml
+++ b/data/cities/saint-chamond/murat-market.yml
@@ -4,8 +4,8 @@ latitude: 45.47344
 longitude: 4.51129
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 9
-phone: "+33477319665;+33622142452"
-opening_hours: "Mo-Su 09:30-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+street: Rue Gambetta
+housenumber: "9"
+phone: +33477319665;+33622142452
+opening_hours: Mo-Su 09:30-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/saint-chamond/myriam-coiffure.yml b/data/cities/saint-chamond/myriam-coiffure.yml
index 1010e85c0..4d7594027 100644
--- a/data/cities/saint-chamond/myriam-coiffure.yml
+++ b/data/cities/saint-chamond/myriam-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.47785
 longitude: 4.51195
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Halle"
-housenumber: 4
+street: Place de la Halle
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/noel-david.yml b/data/cities/saint-chamond/noel-david.yml
index 8440c3b4f..7e41ca0ba 100644
--- a/data/cities/saint-chamond/noel-david.yml
+++ b/data/cities/saint-chamond/noel-david.yml
@@ -4,8 +4,8 @@ latitude: 45.47592
 longitude: 4.50863
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 20
+street: Boulevard François Delay
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/oceane-coiffure.yml b/data/cities/saint-chamond/oceane-coiffure.yml
index 091ccfe77..768a7d5e4 100644
--- a/data/cities/saint-chamond/oceane-coiffure.yml
+++ b/data/cities/saint-chamond/oceane-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.47769
 longitude: 4.51202
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 9
+street: Rue Ventefol
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/onat-pneu.yml b/data/cities/saint-chamond/onat-pneu.yml
index 431c9d8c0..80c9d5286 100644
--- a/data/cities/saint-chamond/onat-pneu.yml
+++ b/data/cities/saint-chamond/onat-pneu.yml
@@ -4,8 +4,8 @@ latitude: 45.47097
 longitude: 4.51026
 postcode: "42400"
 city: Saint-Chamond
-street: "Cours Adrien de Montgolfier"
+street: Cours Adrien de Montgolfier
 housenumber: 29BIS
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/optic-2000.yml b/data/cities/saint-chamond/optic-2000.yml
index 4c5910383..e8f8b2fa1 100644
--- a/data/cities/saint-chamond/optic-2000.yml
+++ b/data/cities/saint-chamond/optic-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.47508
 longitude: 4.51
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 7
+street: Place de la Liberté
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/optical-center.yml b/data/cities/saint-chamond/optical-center.yml
index a75fdc6e1..dc24fa155 100644
--- a/data/cities/saint-chamond/optical-center.yml
+++ b/data/cities/saint-chamond/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.47583
 longitude: 4.50804
 postcode: "42400"
 city: Saint-Chamond
-street: "Square Croix Gauthier"
+street: Square Croix Gauthier
 housenumber: 2B
 phone: "+33477312142"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/186-opticien-saint-chamond-optical-center"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/186-opticien-saint-chamond-optical-center
diff --git a/data/cities/saint-chamond/oriol.yml b/data/cities/saint-chamond/oriol.yml
index cd0874db0..b651b20cf 100644
--- a/data/cities/saint-chamond/oriol.yml
+++ b/data/cities/saint-chamond/oriol.yml
@@ -4,8 +4,8 @@ latitude: 45.46604
 longitude: 4.51388
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Général de Gaulle"
-housenumber: 8
+street: Rue du Général de Gaulle
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/orthopedie-du-gier.yml b/data/cities/saint-chamond/orthopedie-du-gier.yml
index 741e2442e..a81cfa2cf 100644
--- a/data/cities/saint-chamond/orthopedie-du-gier.yml
+++ b/data/cities/saint-chamond/orthopedie-du-gier.yml
@@ -4,8 +4,8 @@ latitude: 45.47523
 longitude: 4.53319
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de l'Île-de-France"
-housenumber: 5
+street: Place de l'Île-de-France
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/panier-sympa.yml b/data/cities/saint-chamond/panier-sympa.yml
index 79e1306b3..fbc4bb89e 100644
--- a/data/cities/saint-chamond/panier-sympa.yml
+++ b/data/cities/saint-chamond/panier-sympa.yml
@@ -4,8 +4,8 @@ latitude: 45.47776
 longitude: 4.51238
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Halle"
-housenumber: 1
+street: Place de la Halle
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pantashop.yml b/data/cities/saint-chamond/pantashop.yml
index bf42ca89b..7c14d0b11 100644
--- a/data/cities/saint-chamond/pantashop.yml
+++ b/data/cities/saint-chamond/pantashop.yml
@@ -4,8 +4,8 @@ latitude: 45.47515
 longitude: 4.50972
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 3
+street: Place de la Liberté
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/patisserie-ducultieux.yml b/data/cities/saint-chamond/patisserie-ducultieux.yml
index c14bc9f75..af8d6fd7a 100644
--- a/data/cities/saint-chamond/patisserie-ducultieux.yml
+++ b/data/cities/saint-chamond/patisserie-ducultieux.yml
@@ -4,8 +4,8 @@ latitude: 45.47398
 longitude: 4.51416
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Sadi Carnot"
-housenumber: 10
+street: Avenue Sadi Carnot
+housenumber: "10"
 phone: ""
-opening_hours: "Tu-Fr 07:30-12:30,13:30-19:00; Sa 07:00-19:00; Su 06:15-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 07:30-12:30,13:30-19:00; Sa 07:00-19:00; Su 06:15-12:30
+website: ""
diff --git a/data/cities/saint-chamond/patissier-chocolatier-glacier-th-cauet.yml b/data/cities/saint-chamond/patissier-chocolatier-glacier-th-cauet.yml
index 730c6a1f1..8c2b58aab 100644
--- a/data/cities/saint-chamond/patissier-chocolatier-glacier-th-cauet.yml
+++ b/data/cities/saint-chamond/patissier-chocolatier-glacier-th-cauet.yml
@@ -4,8 +4,8 @@ latitude: 45.47533
 longitude: 4.50793
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Alsace Lorraine"
-housenumber: 19
+street: Rue Alsace Lorraine
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/patrick-brosse.yml b/data/cities/saint-chamond/patrick-brosse.yml
index 61fb2c733..b0da4019c 100644
--- a/data/cities/saint-chamond/patrick-brosse.yml
+++ b/data/cities/saint-chamond/patrick-brosse.yml
@@ -4,8 +4,8 @@ latitude: 45.47665
 longitude: 4.50434
 postcode: "42400"
 city: Saint-Chamond
-street: "Impasse des Entrepreneurs"
-housenumber: 2
+street: Impasse des Entrepreneurs
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pellegrini-musique.yml b/data/cities/saint-chamond/pellegrini-musique.yml
index 554e55d74..44498451f 100644
--- a/data/cities/saint-chamond/pellegrini-musique.yml
+++ b/data/cities/saint-chamond/pellegrini-musique.yml
@@ -4,8 +4,8 @@ latitude: 45.47446
 longitude: 4.50584
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Alsace Lorraine"
-housenumber: 55
+street: Rue Alsace Lorraine
+housenumber: "55"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/peugeot-icar.yml b/data/cities/saint-chamond/peugeot-icar.yml
index b3d9d5091..63d572ac4 100644
--- a/data/cities/saint-chamond/peugeot-icar.yml
+++ b/data/cities/saint-chamond/peugeot-icar.yml
@@ -4,8 +4,8 @@ latitude: 45.48256
 longitude: 4.52871
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Maladière"
-housenumber: 1
+street: Rue de la Maladière
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 07:30-12:00, 13:30-18:30; Sa 08:00-12:00, 14:00-18:30"
-website: "https://concessions.peugeot.fr/icarstcham/nous-contacter/info-utiles/"
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:00, 13:30-18:30; Sa 08:00-12:00, 14:00-18:30
+website: https://concessions.peugeot.fr/icarstcham/nous-contacter/info-utiles/
diff --git a/data/cities/saint-chamond/photocopie-line.yml b/data/cities/saint-chamond/photocopie-line.yml
index 728b0ab84..f08e0338c 100644
--- a/data/cities/saint-chamond/photocopie-line.yml
+++ b/data/cities/saint-chamond/photocopie-line.yml
@@ -4,8 +4,8 @@ latitude: 45.47518
 longitude: 4.50958
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 1
+street: Place de la Liberté
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/picadilly.yml b/data/cities/saint-chamond/picadilly.yml
index 88e83dc5f..0d95513ba 100644
--- a/data/cities/saint-chamond/picadilly.yml
+++ b/data/cities/saint-chamond/picadilly.yml
@@ -4,8 +4,8 @@ latitude: 45.47734
 longitude: 4.5123
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 4
+street: Rue Ventefol
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/plein-sud-boutique.yml b/data/cities/saint-chamond/plein-sud-boutique.yml
index 9dd7c12dc..aaf1d16b1 100644
--- a/data/cities/saint-chamond/plein-sud-boutique.yml
+++ b/data/cities/saint-chamond/plein-sud-boutique.yml
@@ -4,8 +4,8 @@ latitude: 45.47412
 longitude: 4.5137
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue de la Libération"
-housenumber: 5
+street: Avenue de la Libération
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/poissonerie-robert.yml b/data/cities/saint-chamond/poissonerie-robert.yml
index eb4c95853..5697ac07c 100644
--- a/data/cities/saint-chamond/poissonerie-robert.yml
+++ b/data/cities/saint-chamond/poissonerie-robert.yml
@@ -4,8 +4,8 @@ latitude: 45.47511
 longitude: 4.50986
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 5
+street: Place de la Liberté
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pom-de-pain.yml b/data/cities/saint-chamond/pom-de-pain.yml
index 3bc1e9e61..50c59db44 100644
--- a/data/cities/saint-chamond/pom-de-pain.yml
+++ b/data/cities/saint-chamond/pom-de-pain.yml
@@ -4,8 +4,8 @@ latitude: 45.4718
 longitude: 4.51028
 postcode: "42400"
 city: Saint-Chamond
-street: "Cours Adrien de Montgolfier"
-housenumber: 12
+street: Cours Adrien de Montgolfier
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pompes-funebres-combe-freville.yml b/data/cities/saint-chamond/pompes-funebres-combe-freville.yml
index 06ff6c7b7..3fcc8ad50 100644
--- a/data/cities/saint-chamond/pompes-funebres-combe-freville.yml
+++ b/data/cities/saint-chamond/pompes-funebres-combe-freville.yml
@@ -4,8 +4,8 @@ latitude: 45.47462
 longitude: 4.51608
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 24
+street: Rue Victor Hugo
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pompes-funebres-et-marbrerie-du-forez.yml b/data/cities/saint-chamond/pompes-funebres-et-marbrerie-du-forez.yml
index 378aec55b..35fc96b0a 100644
--- a/data/cities/saint-chamond/pompes-funebres-et-marbrerie-du-forez.yml
+++ b/data/cities/saint-chamond/pompes-funebres-et-marbrerie-du-forez.yml
@@ -4,8 +4,8 @@ latitude: 45.48063
 longitude: 4.51625
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de l'Éternité"
+street: Rue de l'Éternité
 housenumber: 6TER
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pompes-funebres-france-obseques.yml b/data/cities/saint-chamond/pompes-funebres-france-obseques.yml
index f977215a6..bd02aaad3 100644
--- a/data/cities/saint-chamond/pompes-funebres-france-obseques.yml
+++ b/data/cities/saint-chamond/pompes-funebres-france-obseques.yml
@@ -4,8 +4,8 @@ latitude: 45.4741
 longitude: 4.51292
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pilat"
-housenumber: 2
+street: Rue du Pilat
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00,14:00-17:30; Sa 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00,14:00-17:30; Sa 08:30-12:00
+website: ""
diff --git a/data/cities/saint-chamond/pompes-funebres-gouilloud.yml b/data/cities/saint-chamond/pompes-funebres-gouilloud.yml
index 46362a7a7..6f1b25a9e 100644
--- a/data/cities/saint-chamond/pompes-funebres-gouilloud.yml
+++ b/data/cities/saint-chamond/pompes-funebres-gouilloud.yml
@@ -4,8 +4,8 @@ latitude: 45.45735
 longitude: 4.50453
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Louis Comte"
-housenumber: 4
+street: Place Louis Comte
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pompes-funebres-marbrerie-gay.yml b/data/cities/saint-chamond/pompes-funebres-marbrerie-gay.yml
index 74b3a54de..9fc53e4dd 100644
--- a/data/cities/saint-chamond/pompes-funebres-marbrerie-gay.yml
+++ b/data/cities/saint-chamond/pompes-funebres-marbrerie-gay.yml
@@ -4,8 +4,8 @@ latitude: 45.47341
 longitude: 4.51074
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 14
-phone: "+33 4 77220066"
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+street: Rue Gambetta
+housenumber: "14"
+phone: +33 4 77220066
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml b/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml
index fff740700..391b2358d 100644
--- a/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml
+++ b/data/cities/saint-chamond/pratimat-carrelages-chauffage-climatisation-robinetterie.yml
@@ -4,8 +4,8 @@ latitude: 45.46589
 longitude: 4.49781
 postcode: "42400"
 city: Saint-Chamond
-street: "Route du Cantonnement"
-housenumber: 2
-phone: "+33 4 77 29 69 44"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 08:30-12:00,14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+street: Route du Cantonnement
+housenumber: "2"
+phone: +33 4 77 29 69 44
+opening_hours: Mo 14:00-19:00; Tu-Fr 08:30-12:00,14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/saint-chamond/prelude.yml b/data/cities/saint-chamond/prelude.yml
index bf0701a49..794223440 100644
--- a/data/cities/saint-chamond/prelude.yml
+++ b/data/cities/saint-chamond/prelude.yml
@@ -4,8 +4,8 @@ latitude: 45.47728
 longitude: 4.51232
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Ventefol"
-housenumber: 2
+street: Rue Ventefol
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/pressing-2000.yml b/data/cities/saint-chamond/pressing-2000.yml
index 6bfef9eb2..3e3ef2d8e 100644
--- a/data/cities/saint-chamond/pressing-2000.yml
+++ b/data/cities/saint-chamond/pressing-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.47421
 longitude: 4.50928
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 29
+street: Place de la Liberté
+housenumber: "29"
 phone: ""
-opening_hours: "Tu-Fr 09:00-13:00, 14:30-18:30; Sa 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-13:00, 14:30-18:30; Sa 09:00-13:00
+website: ""
diff --git a/data/cities/saint-chamond/promo-couches.yml b/data/cities/saint-chamond/promo-couches.yml
index f2beeefc8..2aac47262 100644
--- a/data/cities/saint-chamond/promo-couches.yml
+++ b/data/cities/saint-chamond/promo-couches.yml
@@ -4,8 +4,8 @@ latitude: 45.47543
 longitude: 4.50708
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue James Condamin"
-housenumber: 3
+street: Rue James Condamin
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/provenchalles.yml b/data/cities/saint-chamond/provenchalles.yml
index 2005937d1..a42e3522e 100644
--- a/data/cities/saint-chamond/provenchalles.yml
+++ b/data/cities/saint-chamond/provenchalles.yml
@@ -4,8 +4,8 @@ latitude: 45.47863
 longitude: 4.51835
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Réclusière"
-housenumber: 8
+street: Rue de la Réclusière
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/proxi.yml b/data/cities/saint-chamond/proxi.yml
index 97ea70b25..eec0f62e1 100644
--- a/data/cities/saint-chamond/proxi.yml
+++ b/data/cities/saint-chamond/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.46407
 longitude: 4.50317
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Nationale"
-housenumber: 15
+street: Place Nationale
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/quiblier-automobiles.yml b/data/cities/saint-chamond/quiblier-automobiles.yml
index 70e3f427d..39730b128 100644
--- a/data/cities/saint-chamond/quiblier-automobiles.yml
+++ b/data/cities/saint-chamond/quiblier-automobiles.yml
@@ -4,8 +4,8 @@ latitude: 45.47905
 longitude: 4.51942
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Réclusière"
-housenumber: 4
+street: Rue de la Réclusière
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/recitroc.yml b/data/cities/saint-chamond/recitroc.yml
index b905ca8a5..12f8d153a 100644
--- a/data/cities/saint-chamond/recitroc.yml
+++ b/data/cities/saint-chamond/recitroc.yml
@@ -4,8 +4,8 @@ latitude: 45.47366
 longitude: 4.50902
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des Trois Frères"
-housenumber: 9
+street: Rue des Trois Frères
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/renault-agence-degand-barre.yml b/data/cities/saint-chamond/renault-agence-degand-barre.yml
index f1faa36f2..caabf39b1 100644
--- a/data/cities/saint-chamond/renault-agence-degand-barre.yml
+++ b/data/cities/saint-chamond/renault-agence-degand-barre.yml
@@ -4,8 +4,8 @@ latitude: 45.46696
 longitude: 4.49919
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
-housenumber: 15
-phone: "+33 477225920"
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+street: Route de Saint-Étienne
+housenumber: "15"
+phone: +33 477225920
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/saint-chamond/roland-triolaire.yml b/data/cities/saint-chamond/roland-triolaire.yml
index e827bcc22..47f871649 100644
--- a/data/cities/saint-chamond/roland-triolaire.yml
+++ b/data/cities/saint-chamond/roland-triolaire.yml
@@ -4,8 +4,8 @@ latitude: 45.47891
 longitude: 4.51882
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de la Réclusière"
-housenumber: 6
+street: Rue de la Réclusière
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/saint-chamonds-primeurs.yml b/data/cities/saint-chamond/saint-chamonds-primeurs.yml
index 2a5097e1d..dcec2617c 100644
--- a/data/cities/saint-chamond/saint-chamonds-primeurs.yml
+++ b/data/cities/saint-chamond/saint-chamonds-primeurs.yml
@@ -4,8 +4,8 @@ latitude: 45.47518
 longitude: 4.50907
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Dorian"
-housenumber: 5
+street: Place Dorian
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/salon-diminutif.yml b/data/cities/saint-chamond/salon-diminutif.yml
index 9c98854e5..53ab26882 100644
--- a/data/cities/saint-chamond/salon-diminutif.yml
+++ b/data/cities/saint-chamond/salon-diminutif.yml
@@ -4,8 +4,8 @@ latitude: 45.47211
 longitude: 4.51059
 postcode: "42400"
 city: Saint-Chamond
-street: "Cours Adrien de Montgolfier"
-housenumber: 13
+street: Cours Adrien de Montgolfier
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/salon-lilou.yml b/data/cities/saint-chamond/salon-lilou.yml
index e470cd9af..041843c36 100644
--- a/data/cities/saint-chamond/salon-lilou.yml
+++ b/data/cities/saint-chamond/salon-lilou.yml
@@ -4,8 +4,8 @@ latitude: 45.47362
 longitude: 4.51035
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de l'Armistice"
-housenumber: 4
+street: Rue de l'Armistice
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/sam-pneus.yml b/data/cities/saint-chamond/sam-pneus.yml
index 30376b2f5..f4b085387 100644
--- a/data/cities/saint-chamond/sam-pneus.yml
+++ b/data/cities/saint-chamond/sam-pneus.yml
@@ -4,8 +4,8 @@ latitude: 45.47301
 longitude: 4.50967
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Gambetta"
-housenumber: 24
+street: Rue Gambetta
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/sarl-garage-de-bellevue-auto-citroen.yml b/data/cities/saint-chamond/sarl-garage-de-bellevue-auto-citroen.yml
index 8f48e5222..8a560c1d4 100644
--- a/data/cities/saint-chamond/sarl-garage-de-bellevue-auto-citroen.yml
+++ b/data/cities/saint-chamond/sarl-garage-de-bellevue-auto-citroen.yml
@@ -4,8 +4,8 @@ latitude: 45.4797
 longitude: 4.52643
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Lyon"
-housenumber: 34
+street: Route de Lyon
+housenumber: "34"
 phone: ""
-opening_hours: "Mo-Fr 07:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-chamond/saveur-des-viandes.yml b/data/cities/saint-chamond/saveur-des-viandes.yml
index 3c95c1688..f75f4beb4 100644
--- a/data/cities/saint-chamond/saveur-des-viandes.yml
+++ b/data/cities/saint-chamond/saveur-des-viandes.yml
@@ -4,8 +4,8 @@ latitude: 45.45722
 longitude: 4.50484
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue François Gillet"
-housenumber: 5
+street: Rue François Gillet
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/saveurs-de-nos-fermes.yml b/data/cities/saint-chamond/saveurs-de-nos-fermes.yml
index 3b4338489..f4633c3ea 100644
--- a/data/cities/saint-chamond/saveurs-de-nos-fermes.yml
+++ b/data/cities/saint-chamond/saveurs-de-nos-fermes.yml
@@ -4,8 +4,8 @@ latitude: 45.47197
 longitude: 4.51719
 postcode: "42400"
 city: Saint-Chamond
-street: "Avenue Jules Ferry"
-housenumber: 23
+street: Avenue Jules Ferry
+housenumber: "23"
 phone: ""
-opening_hours: "We,Fr 08:30-18:00; Th 08:30-12:30; Sa 08:30-13:30"
-website: ""
\ No newline at end of file
+opening_hours: We,Fr 08:30-18:00; Th 08:30-12:30; Sa 08:30-13:30
+website: ""
diff --git a/data/cities/saint-chamond/segaud-christiane.yml b/data/cities/saint-chamond/segaud-christiane.yml
index 4db6a9a34..1754decdb 100644
--- a/data/cities/saint-chamond/segaud-christiane.yml
+++ b/data/cities/saint-chamond/segaud-christiane.yml
@@ -4,8 +4,8 @@ latitude: 45.46426
 longitude: 4.49349
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Maurice Bonnevialle"
-housenumber: 4
+street: Place Maurice Bonnevialle
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/serrurerie-betl.yml b/data/cities/saint-chamond/serrurerie-betl.yml
index 521213347..d2f3a06b5 100644
--- a/data/cities/saint-chamond/serrurerie-betl.yml
+++ b/data/cities/saint-chamond/serrurerie-betl.yml
@@ -4,8 +4,8 @@ latitude: 45.4684
 longitude: 4.53641
 postcode: "42400"
 city: Saint-Chamond
-street: "Route du Coin"
-housenumber: 74
+street: Route du Coin
+housenumber: "74"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/spri-beaute.yml b/data/cities/saint-chamond/spri-beaute.yml
index 47a807234..de6a86a0e 100644
--- a/data/cities/saint-chamond/spri-beaute.yml
+++ b/data/cities/saint-chamond/spri-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.47347
 longitude: 4.509
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des Trois Frères"
-housenumber: 11
+street: Rue des Trois Frères
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/style-ongles-studio.yml b/data/cities/saint-chamond/style-ongles-studio.yml
index 2f2ed7799..42e9f35be 100644
--- a/data/cities/saint-chamond/style-ongles-studio.yml
+++ b/data/cities/saint-chamond/style-ongles-studio.yml
@@ -4,8 +4,8 @@ latitude: 45.45843
 longitude: 4.50539
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Pétin Gaudet"
-housenumber: 151
+street: Rue Pétin Gaudet
+housenumber: "151"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/tabac-lamartine.yml b/data/cities/saint-chamond/tabac-lamartine.yml
index fe243695f..46844b377 100644
--- a/data/cities/saint-chamond/tabac-lamartine.yml
+++ b/data/cities/saint-chamond/tabac-lamartine.yml
@@ -4,8 +4,8 @@ latitude: 45.47437
 longitude: 4.51344
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 3
+street: Rue Victor Hugo
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/tabac-presse-cadeau.yml b/data/cities/saint-chamond/tabac-presse-cadeau.yml
index 1a5e391a3..1bd82ce66 100644
--- a/data/cities/saint-chamond/tabac-presse-cadeau.yml
+++ b/data/cities/saint-chamond/tabac-presse-cadeau.yml
@@ -4,8 +4,8 @@ latitude: 45.47642
 longitude: 4.50905
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 14
+street: Boulevard François Delay
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/tendance-beaute.yml b/data/cities/saint-chamond/tendance-beaute.yml
index 444caef6f..58aa6abdc 100644
--- a/data/cities/saint-chamond/tendance-beaute.yml
+++ b/data/cities/saint-chamond/tendance-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.4761
 longitude: 4.50877
 postcode: "42400"
 city: Saint-Chamond
-street: "Boulevard François Delay"
-housenumber: 18
+street: Boulevard François Delay
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/toolstation.yml b/data/cities/saint-chamond/toolstation.yml
index e09d540bd..fc48fad61 100644
--- a/data/cities/saint-chamond/toolstation.yml
+++ b/data/cities/saint-chamond/toolstation.yml
@@ -4,8 +4,8 @@ latitude: 45.4602
 longitude: 4.48833
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 6
+street: Rue du 17 Octobre 1961
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Fr 07:00-18:00; Sa 08:00-17:00"
-website: "https://www.toolstation.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-18:00; Sa 08:00-17:00
+website: https://www.toolstation.fr
diff --git a/data/cities/saint-chamond/tout-compte-frais.yml b/data/cities/saint-chamond/tout-compte-frais.yml
index cbde8f488..b9af7ec16 100644
--- a/data/cities/saint-chamond/tout-compte-frais.yml
+++ b/data/cities/saint-chamond/tout-compte-frais.yml
@@ -4,8 +4,8 @@ latitude: 45.45953
 longitude: 4.48991
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du 17 Octobre 1961"
-housenumber: 
+street: Rue du 17 Octobre 1961
+housenumber: ""
 phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00
+website: ""
diff --git a/data/cities/saint-chamond/trio-chaussures.yml b/data/cities/saint-chamond/trio-chaussures.yml
index f01fb753e..bef96a740 100644
--- a/data/cities/saint-chamond/trio-chaussures.yml
+++ b/data/cities/saint-chamond/trio-chaussures.yml
@@ -4,8 +4,8 @@ latitude: 45.47522
 longitude: 4.50729
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue James Condamin"
-housenumber: 5
+street: Rue James Condamin
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/vallery-passion.yml b/data/cities/saint-chamond/vallery-passion.yml
index a1cbbc4ad..d06342fd5 100644
--- a/data/cities/saint-chamond/vallery-passion.yml
+++ b/data/cities/saint-chamond/vallery-passion.yml
@@ -4,8 +4,8 @@ latitude: 45.46425
 longitude: 4.50419
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Marché"
-housenumber: 7
+street: Rue du Marché
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/vedrine-peinture.yml b/data/cities/saint-chamond/vedrine-peinture.yml
index b53106a37..3f7e4a111 100644
--- a/data/cities/saint-chamond/vedrine-peinture.yml
+++ b/data/cities/saint-chamond/vedrine-peinture.yml
@@ -4,8 +4,8 @@ latitude: 45.46726
 longitude: 4.52303
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Général de Gaulle"
-housenumber: 48
+street: Rue du Général de Gaulle
+housenumber: "48"
 phone: ""
-opening_hours: "Mo-Th 07:00-12:00,14:00-18:00; Fr 07:00-12:00,14:00-16:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:00-12:00,14:00-18:00; Fr 07:00-12:00,14:00-16:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/saint-chamond/vedrine-peintures.yml b/data/cities/saint-chamond/vedrine-peintures.yml
index 1486d429f..9a8e55d62 100644
--- a/data/cities/saint-chamond/vedrine-peintures.yml
+++ b/data/cities/saint-chamond/vedrine-peintures.yml
@@ -4,8 +4,8 @@ latitude: 45.47122
 longitude: 4.50252
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de Saint-Étienne"
-housenumber: 5
+street: Route de Saint-Étienne
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/vival-place-de-la-liberte.yml b/data/cities/saint-chamond/vival-place-de-la-liberte.yml
index 34344bd93..0ad795112 100644
--- a/data/cities/saint-chamond/vival-place-de-la-liberte.yml
+++ b/data/cities/saint-chamond/vival-place-de-la-liberte.yml
@@ -4,8 +4,8 @@ latitude: 45.47486
 longitude: 4.50911
 postcode: "42400"
 city: Saint-Chamond
-street: "Place de la Liberté"
-housenumber: 33
+street: Place de la Liberté
+housenumber: "33"
 phone: ""
-opening_hours: "Mo-Su 07:30-21:00"
-website: "https://magasins.vival.fr/fr/vival-saint-chamond"
\ No newline at end of file
+opening_hours: Mo-Su 07:30-21:00
+website: https://magasins.vival.fr/fr/vival-saint-chamond
diff --git a/data/cities/saint-chamond/vival-rue-du-pilat.yml b/data/cities/saint-chamond/vival-rue-du-pilat.yml
index bce061f76..8e212a2ab 100644
--- a/data/cities/saint-chamond/vival-rue-du-pilat.yml
+++ b/data/cities/saint-chamond/vival-rue-du-pilat.yml
@@ -4,8 +4,8 @@ latitude: 45.46988
 longitude: 4.51417
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue du Pilat"
-housenumber: 56
-phone: "+33 6 62 79 82 91"
-opening_hours: "Mo-Sa 07:00-20:00; Su 08:00-13:00; PH off; Dec 31 07:30-13:00"
-website: "https://magasins.vival.fr/fr/vival-saint-chamond-pilat"
\ No newline at end of file
+street: Rue du Pilat
+housenumber: "56"
+phone: +33 6 62 79 82 91
+opening_hours: Mo-Sa 07:00-20:00; Su 08:00-13:00; PH off; Dec 31 07:30-13:00
+website: https://magasins.vival.fr/fr/vival-saint-chamond-pilat
diff --git a/data/cities/saint-chamond/vival-rue-victor-hugo.yml b/data/cities/saint-chamond/vival-rue-victor-hugo.yml
index 92d6c4671..bb028f0d1 100644
--- a/data/cities/saint-chamond/vival-rue-victor-hugo.yml
+++ b/data/cities/saint-chamond/vival-rue-victor-hugo.yml
@@ -4,8 +4,8 @@ latitude: 45.4744
 longitude: 4.51361
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 5
+street: Rue Victor Hugo
+housenumber: "5"
 phone: ""
-opening_hours: "PH,Mo-Su 08:00-22:00"
-website: ""
\ No newline at end of file
+opening_hours: PH,Mo-Su 08:00-22:00
+website: ""
diff --git a/data/cities/saint-chamond/vival.yml b/data/cities/saint-chamond/vival.yml
index 3ad2cb04a..94310e20c 100644
--- a/data/cities/saint-chamond/vival.yml
+++ b/data/cities/saint-chamond/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.45759
 longitude: 4.50414
 postcode: "42400"
 city: Saint-Chamond
-street: "Place Louis Comte"
-housenumber: 1
-phone: "+33 6 05 77 62 28"
-opening_hours: "Mo-Su 08:00-22:00"
-website: "https://magasins.vival.fr/fr/vival-saint-chamond-louis-compte"
\ No newline at end of file
+street: Place Louis Comte
+housenumber: "1"
+phone: +33 6 05 77 62 28
+opening_hours: Mo-Su 08:00-22:00
+website: https://magasins.vival.fr/fr/vival-saint-chamond-louis-compte
diff --git a/data/cities/saint-chamond/wb-motors.yml b/data/cities/saint-chamond/wb-motors.yml
index 478c73e6e..8398007d1 100644
--- a/data/cities/saint-chamond/wb-motors.yml
+++ b/data/cities/saint-chamond/wb-motors.yml
@@ -4,8 +4,8 @@ latitude: 45.47228
 longitude: 4.5045
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue de Saint-Étienne"
-housenumber: 14
+street: Rue de Saint-Étienne
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/yama-tattoo.yml b/data/cities/saint-chamond/yama-tattoo.yml
index ace82349d..5c58a778d 100644
--- a/data/cities/saint-chamond/yama-tattoo.yml
+++ b/data/cities/saint-chamond/yama-tattoo.yml
@@ -4,8 +4,8 @@ latitude: 45.47426
 longitude: 4.51372
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Victor Hugo"
-housenumber: 2
+street: Rue Victor Hugo
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/yesss-electrique.yml b/data/cities/saint-chamond/yesss-electrique.yml
index cc3dc1024..15123d246 100644
--- a/data/cities/saint-chamond/yesss-electrique.yml
+++ b/data/cities/saint-chamond/yesss-electrique.yml
@@ -4,8 +4,8 @@ latitude: 45.4866
 longitude: 4.51849
 postcode: "42400"
 city: Saint-Chamond
-street: "Allée Alessandro Volta"
-housenumber: 1
+street: Allée Alessandro Volta
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://www.yesss-fr.com/"
\ No newline at end of file
+website: https://www.yesss-fr.com/
diff --git a/data/cities/saint-chamond/zak-auto.yml b/data/cities/saint-chamond/zak-auto.yml
index b6f79aa32..b8b46c2ab 100644
--- a/data/cities/saint-chamond/zak-auto.yml
+++ b/data/cities/saint-chamond/zak-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.46174
 longitude: 4.50722
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue des Frères Lumière"
-housenumber: 3
+street: Rue des Frères Lumière
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/zeeman.yml b/data/cities/saint-chamond/zeeman.yml
index 6c940c78f..345c3782d 100644
--- a/data/cities/saint-chamond/zeeman.yml
+++ b/data/cities/saint-chamond/zeeman.yml
@@ -4,8 +4,8 @@ latitude: 45.47606
 longitude: 4.51114
 postcode: "42400"
 city: Saint-Chamond
-street: "Rue Pierre Curie"
-housenumber: 8
+street: Rue Pierre Curie
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-chamond/zr-centre-auto-reparation.yml b/data/cities/saint-chamond/zr-centre-auto-reparation.yml
index be1ee91e4..73f3e6f5d 100644
--- a/data/cities/saint-chamond/zr-centre-auto-reparation.yml
+++ b/data/cities/saint-chamond/zr-centre-auto-reparation.yml
@@ -4,8 +4,8 @@ latitude: 45.46468
 longitude: 4.49227
 postcode: "42400"
 city: Saint-Chamond
-street: "Route de la Varizelle"
+street: Route de la Varizelle
 housenumber: 12BIS
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-christo-en-jarez/boulangerie-couzon.yml b/data/cities/saint-christo-en-jarez/boulangerie-couzon.yml
index 202f8452e..7dc620608 100644
--- a/data/cities/saint-christo-en-jarez/boulangerie-couzon.yml
+++ b/data/cities/saint-christo-en-jarez/boulangerie-couzon.yml
@@ -4,8 +4,8 @@ latitude: 45.54402
 longitude: 4.4859
 postcode: "42320"
 city: Saint-Christo-en-Jarez
-street: "Rue de la Mairie"
-housenumber: 5
+street: Rue de la Mairie
+housenumber: "5"
 phone: "+33477208503"
-opening_hours: "Tu-Sa 06:30-13:00,15:00-19:00; Su 06:30-13:00"
-website: "https://patisserie-couzon.com/"
\ No newline at end of file
+opening_hours: Tu-Sa 06:30-13:00,15:00-19:00; Su 06:30-13:00
+website: https://patisserie-couzon.com/
diff --git a/data/cities/saint-christo-en-jarez/garage-xavier-guichard.yml b/data/cities/saint-christo-en-jarez/garage-xavier-guichard.yml
index e0b786353..a5d8f0a19 100644
--- a/data/cities/saint-christo-en-jarez/garage-xavier-guichard.yml
+++ b/data/cities/saint-christo-en-jarez/garage-xavier-guichard.yml
@@ -4,8 +4,8 @@ latitude: 45.54655
 longitude: 4.4887
 postcode: "42320"
 city: Saint-Christo-en-Jarez
-street: "Route de la Combe"
-housenumber: 106
+street: Route de la Combe
+housenumber: "106"
 phone: "+33477208507"
-opening_hours: "Mo-Fr 08:00-12:00,13:30-18:00"
-website: "https://www.garage-guichard.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,13:30-18:00
+website: https://www.garage-guichard.com/
diff --git a/data/cities/saint-christo-en-jarez/imaginatifs-coiffure.yml b/data/cities/saint-christo-en-jarez/imaginatifs-coiffure.yml
index eea43ca3a..30d2d8931 100644
--- a/data/cities/saint-christo-en-jarez/imaginatifs-coiffure.yml
+++ b/data/cities/saint-christo-en-jarez/imaginatifs-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.54426
 longitude: 4.48584
 postcode: "42320"
 city: Saint-Christo-en-Jarez
-street: "Rue de la Mairie"
-housenumber: 11
+street: Rue de la Mairie
+housenumber: "11"
 phone: "+33477207683"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-clair-de-la-tour/yves-rocher.yml b/data/cities/saint-clair-de-la-tour/yves-rocher.yml
index ee1458849..236349675 100644
--- a/data/cities/saint-clair-de-la-tour/yves-rocher.yml
+++ b/data/cities/saint-clair-de-la-tour/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.56878
 longitude: 5.45542
 postcode: "38110"
 city: Saint-Clair-de-la-Tour
-street: "CENTRE C CIAL CARREFOUR MARKET- 1900 AV de SAVOIE"
-housenumber: 
+street: CENTRE C CIAL CARREFOUR MARKET- 1900 AV de SAVOIE
+housenumber: ""
 phone: ""
-opening_hours: "Mo 09:30-12:30,14:00-19:00; Tu-Sa 09:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/st-clair-de-la-tour/la-tour-du-pin/S-FRYROC907"
\ No newline at end of file
+opening_hours: Mo 09:30-12:30,14:00-19:00; Tu-Sa 09:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/st-clair-de-la-tour/la-tour-du-pin/S-FRYROC907
diff --git a/data/cities/saint-clair-du-rhone/biocoop.yml b/data/cities/saint-clair-du-rhone/biocoop.yml
index 7e85a5987..5bf6cce87 100644
--- a/data/cities/saint-clair-du-rhone/biocoop.yml
+++ b/data/cities/saint-clair-du-rhone/biocoop.yml
@@ -5,7 +5,7 @@ longitude: 4.77
 postcode: "38370"
 city: Saint-Clair-du-Rhône
 street: ""
-housenumber: 372
+housenumber: "372"
 phone: ""
-opening_hours: "Mo 15:00-19:30; Tu-Fr 09:00-19:30; Sa 09:00-19:00"
-website: "https://stclairdurhone.biocoop.net"
\ No newline at end of file
+opening_hours: Mo 15:00-19:30; Tu-Fr 09:00-19:30; Sa 09:00-19:00
+website: https://stclairdurhone.biocoop.net
diff --git a/data/cities/saint-clair-du-rhone/e-leclerc.yml b/data/cities/saint-clair-du-rhone/e-leclerc.yml
index 86f2f660f..0f041aeb2 100644
--- a/data/cities/saint-clair-du-rhone/e-leclerc.yml
+++ b/data/cities/saint-clair-du-rhone/e-leclerc.yml
@@ -4,8 +4,8 @@ latitude: 45.44232
 longitude: 4.76865
 postcode: "38370"
 city: Saint-Clair-du-Rhône
-street: "Route de Condrieu"
-housenumber: 
+street: Route de Condrieu
+housenumber: ""
 phone: "+33474563055"
-opening_hours: "Mo-Sa 8:30-20:00; Su 8:30-12:00"
-website: "https://www.e-leclerc.com/st-clair"
\ No newline at end of file
+opening_hours: Mo-Sa 8:30-20:00; Su 8:30-12:00
+website: https://www.e-leclerc.com/st-clair
diff --git a/data/cities/saint-clair/red-moto-07-honda-moto-ardeche.yml b/data/cities/saint-clair/red-moto-07-honda-moto-ardeche.yml
index 33e061650..80c0dd4df 100644
--- a/data/cities/saint-clair/red-moto-07-honda-moto-ardeche.yml
+++ b/data/cities/saint-clair/red-moto-07-honda-moto-ardeche.yml
@@ -1,11 +1,11 @@
 id: 892056069
-type: way
+type: node
 latitude: 45.268
 longitude: 4.68265
 postcode: "07430"
 city: Saint-Clair
-street: "Chemin de Charlieu"
-housenumber: 165
-phone: "+33 4 75 33 69 75"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su,Mo off"
-website: "https://annonay.honda-motos.com/"
\ No newline at end of file
+street: Chemin de Charlieu
+housenumber: "165"
+phone: +33 4 75 33 69 75
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su,Mo off
+website: https://annonay.honda-motos.com/
diff --git a/data/cities/saint-cyr-de-valorges/gaec-au-fil-de-lherbe.yml b/data/cities/saint-cyr-de-valorges/gaec-au-fil-de-lherbe.yml
index bd81a402f..e19267dc1 100644
--- a/data/cities/saint-cyr-de-valorges/gaec-au-fil-de-lherbe.yml
+++ b/data/cities/saint-cyr-de-valorges/gaec-au-fil-de-lherbe.yml
@@ -4,8 +4,8 @@ latitude: 45.88082
 longitude: 4.32686
 postcode: "42114"
 city: Saint-Cyr-de-Valorges
-street: "Chemin de Laval"
-housenumber: 871
+street: Chemin de Laval
+housenumber: "871"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-cyr-de-valorges/gaec-des-verdonnieres.yml b/data/cities/saint-cyr-de-valorges/gaec-des-verdonnieres.yml
index 1253420f9..c49d11aa3 100644
--- a/data/cities/saint-cyr-de-valorges/gaec-des-verdonnieres.yml
+++ b/data/cities/saint-cyr-de-valorges/gaec-des-verdonnieres.yml
@@ -5,7 +5,7 @@ longitude: 4.31055
 postcode: "42114"
 city: Saint-Cyr-de-Valorges
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-cyr-de-valorges/gaec-elevage-de-ressy.yml b/data/cities/saint-cyr-de-valorges/gaec-elevage-de-ressy.yml
index 0bbbbc9eb..3e623d023 100644
--- a/data/cities/saint-cyr-de-valorges/gaec-elevage-de-ressy.yml
+++ b/data/cities/saint-cyr-de-valorges/gaec-elevage-de-ressy.yml
@@ -4,8 +4,8 @@ latitude: 45.89546
 longitude: 4.29331
 postcode: "42114"
 city: Saint-Cyr-de-Valorges
-street: "Route de Ressy"
-housenumber: 1576
-phone: "+33 4 77 62 47 58"
+street: Route de Ressy
+housenumber: "1576"
+phone: +33 4 77 62 47 58
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-cyr-sur-le-rhone/les-barges.yml b/data/cities/saint-cyr-sur-le-rhone/les-barges.yml
index ccc3377f1..a0f642a2a 100644
--- a/data/cities/saint-cyr-sur-le-rhone/les-barges.yml
+++ b/data/cities/saint-cyr-sur-le-rhone/les-barges.yml
@@ -4,8 +4,8 @@ latitude: 45.51259
 longitude: 4.85319
 postcode: "69560"
 city: Saint-Cyr-sur-le-Rhône
-street: "Chemin de la Servonnière"
-housenumber: 
+street: Chemin de la Servonnière
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-cyr-sur-menthon/boulangerie-carine-et-olivier-marie.yml b/data/cities/saint-cyr-sur-menthon/boulangerie-carine-et-olivier-marie.yml
index f7b4d829a..b66b31957 100644
--- a/data/cities/saint-cyr-sur-menthon/boulangerie-carine-et-olivier-marie.yml
+++ b/data/cities/saint-cyr-sur-menthon/boulangerie-carine-et-olivier-marie.yml
@@ -4,8 +4,8 @@ latitude: 46.27759
 longitude: 4.9601
 postcode: "01380"
 city: Saint-Cyr-sur-Menthon
-street: "Route de Mâcon"
-housenumber: 
+street: Route de Mâcon
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 06:00-20:00; Tu off; Su 06:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-20:00; Tu off; Su 06:00-12:30
+website: ""
diff --git a/data/cities/saint-denis-en-bugey/beaute-dange.yml b/data/cities/saint-denis-en-bugey/beaute-dange.yml
index 79b669049..fa94d6701 100644
--- a/data/cities/saint-denis-en-bugey/beaute-dange.yml
+++ b/data/cities/saint-denis-en-bugey/beaute-dange.yml
@@ -4,8 +4,8 @@ latitude: 45.95171
 longitude: 5.32899
 postcode: "01500"
 city: Saint-Denis-en-Bugey
-street: "Rue du Docteur Charcot"
-housenumber: 15
-phone: "+33 4 74 34 01 47"
-opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-18:00"
-website: "https://www.beautedange.fr/"
\ No newline at end of file
+street: Rue du Docteur Charcot
+housenumber: "15"
+phone: +33 4 74 34 01 47
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-18:00
+website: https://www.beautedange.fr/
diff --git a/data/cities/saint-denis-en-bugey/destock-frais.yml b/data/cities/saint-denis-en-bugey/destock-frais.yml
index d98262d24..e2470b4be 100644
--- a/data/cities/saint-denis-en-bugey/destock-frais.yml
+++ b/data/cities/saint-denis-en-bugey/destock-frais.yml
@@ -4,8 +4,8 @@ latitude: 45.95015
 longitude: 5.32259
 postcode: "01500"
 city: Saint-Denis-en-Bugey
-street: "Rue de la République"
+street: Rue de la République
 housenumber: 52A
-phone: "+33 4 74 37 41 74"
-opening_hours: "Mo-Su 09:00-19:00; Su 09:00-12:00"
-website: "https://www.facebook.com/Destock-Frais-Saint-Denis-en-Bugey-102863767735891/"
\ No newline at end of file
+phone: +33 4 74 37 41 74
+opening_hours: Mo-Su 09:00-19:00; Su 09:00-12:00
+website: https://www.facebook.com/Destock-Frais-Saint-Denis-en-Bugey-102863767735891/
diff --git a/data/cities/saint-denis-en-bugey/nuance-coiffure.yml b/data/cities/saint-denis-en-bugey/nuance-coiffure.yml
index 8f80f1f06..1b651d27d 100644
--- a/data/cities/saint-denis-en-bugey/nuance-coiffure.yml
+++ b/data/cities/saint-denis-en-bugey/nuance-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.95152
 longitude: 5.3277
 postcode: "01500"
 city: Saint-Denis-en-Bugey
-street: "Place de la République"
-housenumber: 8
-phone: "+33 4 74 38 28 66"
+street: Place de la République
+housenumber: "8"
+phone: +33 4 74 38 28 66
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-denis-sur-coise/pignon-sur-champ.yml b/data/cities/saint-denis-sur-coise/pignon-sur-champ.yml
index 8f5543c9b..8820cb0be 100644
--- a/data/cities/saint-denis-sur-coise/pignon-sur-champ.yml
+++ b/data/cities/saint-denis-sur-coise/pignon-sur-champ.yml
@@ -5,7 +5,7 @@ longitude: 4.41811
 postcode: "42140"
 city: Saint-Denis-sur-Coise
 street: ""
-housenumber: 
-phone: "+33 6 21 16 85 77"
-opening_hours: "We[2] 17:00+"
-website: "https://www.fermedelamaladiere.fr/la-p%C3%A2te-%C3%A0-bonheur/pignon-sur-champs"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 21 16 85 77
+opening_hours: We[2] 17:00+
+website: https://www.fermedelamaladiere.fr/la-p%C3%A2te-%C3%A0-bonheur/pignon-sur-champs
diff --git a/data/cities/saint-didier-de-la-tour/latelier-de-la-machine-a-coudre-sarl-gsmac.yml b/data/cities/saint-didier-de-la-tour/latelier-de-la-machine-a-coudre-sarl-gsmac.yml
index 44d2593b8..9834309c4 100644
--- a/data/cities/saint-didier-de-la-tour/latelier-de-la-machine-a-coudre-sarl-gsmac.yml
+++ b/data/cities/saint-didier-de-la-tour/latelier-de-la-machine-a-coudre-sarl-gsmac.yml
@@ -4,8 +4,8 @@ latitude: 45.55584
 longitude: 5.48174
 postcode: "38110"
 city: Saint-Didier-de-la-Tour
-street: "Route de Lyon"
-housenumber: 16
-phone: "+33 6 28 72 81 20"
+street: Route de Lyon
+housenumber: "16"
+phone: +33 6 28 72 81 20
 opening_hours: ""
-website: "https://www.ateliermachineacoudre.com/"
\ No newline at end of file
+website: https://www.ateliermachineacoudre.com/
diff --git a/data/cities/saint-didier-de-la-tour/petm-tabac-presse-jeux-alimentation-gaz.yml b/data/cities/saint-didier-de-la-tour/petm-tabac-presse-jeux-alimentation-gaz.yml
index 0ad11a1ad..5cf7b5b7f 100644
--- a/data/cities/saint-didier-de-la-tour/petm-tabac-presse-jeux-alimentation-gaz.yml
+++ b/data/cities/saint-didier-de-la-tour/petm-tabac-presse-jeux-alimentation-gaz.yml
@@ -4,8 +4,8 @@ latitude: 45.55582
 longitude: 5.48192
 postcode: "38110"
 city: Saint-Didier-de-la-Tour
-street: "Route de Lyon"
-housenumber: 14
-phone: "+33 4 74 97 49 38"
+street: Route de Lyon
+housenumber: "14"
+phone: +33 4 74 97 49 38
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-didier-sous-riverie/vival.yml b/data/cities/saint-didier-sous-riverie/vival.yml
index b1698a4e4..9f5f7b12a 100644
--- a/data/cities/saint-didier-sous-riverie/vival.yml
+++ b/data/cities/saint-didier-sous-riverie/vival.yml
@@ -4,8 +4,9 @@ latitude: 45.59606
 longitude: 4.60963
 postcode: "69440"
 city: Saint-Didier-sous-Riverie
-street: "Route des Monts du Lyonnais"
-housenumber: 
-phone: "+33 4 78 81 61 91"
-opening_hours: "Mo 07:30-12:30,15:00-19:00; Tu 07:30-12:30; Th-Sa 07:30-12:30,15:00-19:00; Su 07:30-12:30"
-website: "https://magasins.vival.fr/fr/vival-chabaniere"
\ No newline at end of file
+street: Route des Monts du Lyonnais
+housenumber: ""
+phone: +33 4 78 81 61 91
+opening_hours: Mo 07:30-12:30,15:00-19:00; Tu 07:30-12:30; Th-Sa 07:30-12:30,15:00-19:00;
+    Su 07:30-12:30
+website: https://magasins.vival.fr/fr/vival-chabaniere
diff --git a/data/cities/saint-donat-sur-lherbasse/aux-fleurs-des-collines.yml b/data/cities/saint-donat-sur-lherbasse/aux-fleurs-des-collines.yml
index f2797f2a8..43305c599 100644
--- a/data/cities/saint-donat-sur-lherbasse/aux-fleurs-des-collines.yml
+++ b/data/cities/saint-donat-sur-lherbasse/aux-fleurs-des-collines.yml
@@ -4,8 +4,8 @@ latitude: 45.12365
 longitude: 4.98381
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Place Jean Jaurès"
-housenumber: 12
-phone: "+33 4 75 45 01 33"
-opening_hours: "Tu-Sa 09:00-12:00,15:00-19:00; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Place Jean Jaurès
+housenumber: "12"
+phone: +33 4 75 45 01 33
+opening_hours: Tu-Sa 09:00-12:00,15:00-19:00; Su 09:00-12:00
+website: ""
diff --git a/data/cities/saint-donat-sur-lherbasse/bonhomme-agence-de-st-donat-la-nouvelle-mobilite-avec-le-service-point-s.yml b/data/cities/saint-donat-sur-lherbasse/bonhomme-agence-de-st-donat-la-nouvelle-mobilite-avec-le-service-point-s.yml
index 82fab17d9..6f3c37ba5 100644
--- a/data/cities/saint-donat-sur-lherbasse/bonhomme-agence-de-st-donat-la-nouvelle-mobilite-avec-le-service-point-s.yml
+++ b/data/cities/saint-donat-sur-lherbasse/bonhomme-agence-de-st-donat-la-nouvelle-mobilite-avec-le-service-point-s.yml
@@ -4,8 +4,8 @@ latitude: 45.11776
 longitude: 4.97032
 postcode: "26260"
 city: saint donat sur l'herbasse
-street: "Rue de la Presle"
-housenumber: 15
+street: Rue de la Presle
+housenumber: "15"
 phone: "+33475452655"
-opening_hours: "Mo-Fr 08:00-12:00, 13:00-18:15; Sa 08:00-12:00"
-website: "https://www.points.fr/centre-points/drom-pneus-sas,saint%20donat%20sur%20lherbasse,00002417.html"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 13:00-18:15; Sa 08:00-12:00
+website: https://www.points.fr/centre-points/drom-pneus-sas,saint%20donat%20sur%20lherbasse,00002417.html
diff --git a/data/cities/saint-donat-sur-lherbasse/coiffure-ayme.yml b/data/cities/saint-donat-sur-lherbasse/coiffure-ayme.yml
index 5eb25844d..840518949 100644
--- a/data/cities/saint-donat-sur-lherbasse/coiffure-ayme.yml
+++ b/data/cities/saint-donat-sur-lherbasse/coiffure-ayme.yml
@@ -4,8 +4,8 @@ latitude: 45.12344
 longitude: 4.98421
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Place Jean Jaurès"
-housenumber: 4
-phone: "+33 4 75 45 23 47"
-opening_hours: "Tu,Th 08:30-18:30; We 08:30-12:00,13:30-18:30; Fr 08:30-18:00; Sa 08:00-16:00"
-website: "https://www.coiffure-ayme.fr/"
\ No newline at end of file
+street: Place Jean Jaurès
+housenumber: "4"
+phone: +33 4 75 45 23 47
+opening_hours: Tu,Th 08:30-18:30; We 08:30-12:00,13:30-18:30; Fr 08:30-18:00; Sa 08:00-16:00
+website: https://www.coiffure-ayme.fr/
diff --git a/data/cities/saint-donat-sur-lherbasse/la-boutique-danaick.yml b/data/cities/saint-donat-sur-lherbasse/la-boutique-danaick.yml
index aca7f6ccb..dd7c09451 100644
--- a/data/cities/saint-donat-sur-lherbasse/la-boutique-danaick.yml
+++ b/data/cities/saint-donat-sur-lherbasse/la-boutique-danaick.yml
@@ -4,8 +4,8 @@ latitude: 45.12192
 longitude: 4.98399
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Avenue Georges Bert"
-housenumber: 2
+street: Avenue Georges Bert
+housenumber: "2"
 phone: "+33669562147"
-opening_hours: "Th,We,Fr,Sa 09:30-12:00, 14:30-18:30"
-website: "https://www.laboutiquedanaick.com/"
\ No newline at end of file
+opening_hours: Th,We,Fr,Sa 09:30-12:00, 14:30-18:30
+website: https://www.laboutiquedanaick.com/
diff --git a/data/cities/saint-donat-sur-lherbasse/la-mode-des-collines.yml b/data/cities/saint-donat-sur-lherbasse/la-mode-des-collines.yml
index ff2546293..c02826065 100644
--- a/data/cities/saint-donat-sur-lherbasse/la-mode-des-collines.yml
+++ b/data/cities/saint-donat-sur-lherbasse/la-mode-des-collines.yml
@@ -4,8 +4,8 @@ latitude: 45.12247
 longitude: 4.98403
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Rue Danthony"
-housenumber: 4
-phone: "+33 4 75 45 28 34"
-opening_hours: "Tu-Sa 09:30-12:00, 14:30-19:00"
-website: "https://www.lamodedescollines.fr/"
\ No newline at end of file
+street: Rue Danthony
+housenumber: "4"
+phone: +33 4 75 45 28 34
+opening_hours: Tu-Sa 09:30-12:00, 14:30-19:00
+website: https://www.lamodedescollines.fr/
diff --git a/data/cities/saint-donat-sur-lherbasse/le-fournil-de-charlie-et-angel.yml b/data/cities/saint-donat-sur-lherbasse/le-fournil-de-charlie-et-angel.yml
index 792d59dfd..de1d2cb33 100644
--- a/data/cities/saint-donat-sur-lherbasse/le-fournil-de-charlie-et-angel.yml
+++ b/data/cities/saint-donat-sur-lherbasse/le-fournil-de-charlie-et-angel.yml
@@ -1,11 +1,11 @@
 id: 477466935
-type: way
+type: node
 latitude: 45.11878
 longitude: 4.97277
 postcode: "26260"
 city: saint donat sur l'herbasse
-street: "Avenue du Général de Gaulle"
-housenumber: 154
+street: Avenue du Général de Gaulle
+housenumber: "154"
 phone: "+33785560594"
-opening_hours: "Mo-Sa 06:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:30
+website: ""
diff --git a/data/cities/saint-donat-sur-lherbasse/les-bouchers-de-lherbasse.yml b/data/cities/saint-donat-sur-lherbasse/les-bouchers-de-lherbasse.yml
index adadd1717..8f1c33ced 100644
--- a/data/cities/saint-donat-sur-lherbasse/les-bouchers-de-lherbasse.yml
+++ b/data/cities/saint-donat-sur-lherbasse/les-bouchers-de-lherbasse.yml
@@ -4,8 +4,8 @@ latitude: 45.12201
 longitude: 4.98398
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Avenue Charles Chabert"
-housenumber: 
-phone: "+33 4 75 45 11 18"
-opening_hours: "Mo,We,Fr-Su 07:00-12:30, 14:30-18:30; Tu,Th 07:00-12:30"
-website: ""
\ No newline at end of file
+street: Avenue Charles Chabert
+housenumber: ""
+phone: +33 4 75 45 11 18
+opening_hours: Mo,We,Fr-Su 07:00-12:30, 14:30-18:30; Tu,Th 07:00-12:30
+website: ""
diff --git a/data/cities/saint-donat-sur-lherbasse/mks-informatique.yml b/data/cities/saint-donat-sur-lherbasse/mks-informatique.yml
index 0e29271ec..f8ed87f11 100644
--- a/data/cities/saint-donat-sur-lherbasse/mks-informatique.yml
+++ b/data/cities/saint-donat-sur-lherbasse/mks-informatique.yml
@@ -4,8 +4,8 @@ latitude: 45.12196
 longitude: 4.984
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Avenue Georges Bert"
-housenumber: 2
+street: Avenue Georges Bert
+housenumber: "2"
 phone: "+33980434305"
-opening_hours: "We 10:00-12:00, 13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: We 10:00-12:00, 13:30-19:00
+website: ""
diff --git a/data/cities/saint-donat-sur-lherbasse/optisoin.yml b/data/cities/saint-donat-sur-lherbasse/optisoin.yml
index 4b0868017..cc7cf50a5 100644
--- a/data/cities/saint-donat-sur-lherbasse/optisoin.yml
+++ b/data/cities/saint-donat-sur-lherbasse/optisoin.yml
@@ -4,8 +4,8 @@ latitude: 45.12245
 longitude: 4.98419
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Rue Danthony"
-housenumber: 4
+street: Rue Danthony
+housenumber: "4"
 phone: "+33475451602"
-opening_hours: "Tu-fr 09:00-12:00, 14:00-18:30; sa 09:00-12:00, 14:00-17:30; "
-website: "https://www.opti-soin-drome.fr/"
\ No newline at end of file
+opening_hours: 'Tu-fr 09:00-12:00, 14:00-18:30; sa 09:00-12:00, 14:00-17:30; '
+website: https://www.opti-soin-drome.fr/
diff --git a/data/cities/saint-donat-sur-lherbasse/various-tattoo.yml b/data/cities/saint-donat-sur-lherbasse/various-tattoo.yml
index add2ef27d..cd5534ec8 100644
--- a/data/cities/saint-donat-sur-lherbasse/various-tattoo.yml
+++ b/data/cities/saint-donat-sur-lherbasse/various-tattoo.yml
@@ -4,8 +4,8 @@ latitude: 45.12333
 longitude: 4.98381
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Place Jean Jaurès"
-housenumber: 7
+street: Place Jean Jaurès
+housenumber: "7"
 phone: "+33781976693"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-donat-sur-lherbasse/vie-privee.yml b/data/cities/saint-donat-sur-lherbasse/vie-privee.yml
index 96a7e31b4..398bf174d 100644
--- a/data/cities/saint-donat-sur-lherbasse/vie-privee.yml
+++ b/data/cities/saint-donat-sur-lherbasse/vie-privee.yml
@@ -4,8 +4,9 @@ latitude: 45.1223
 longitude: 4.98402
 postcode: "26260"
 city: Saint-Donat-sur-l'Herbasse
-street: "Rue Danthony"
-housenumber: 1
+street: Rue Danthony
+housenumber: "1"
 phone: "+33987565742"
-opening_hours: "Tu 09:30-12:00, 14:30-18:30; We-Th 14:30-18:30; Fr-Sa 09:30-12:00, 14:30-18:30; "
-website: ""
\ No newline at end of file
+opening_hours: 'Tu 09:30-12:00, 14:30-18:30; We-Th 14:30-18:30; Fr-Sa 09:30-12:00,
+    14:30-18:30; '
+website: ""
diff --git a/data/cities/saint-egreve/action.yml b/data/cities/saint-egreve/action.yml
index 0cd83d695..1e449aed8 100644
--- a/data/cities/saint-egreve/action.yml
+++ b/data/cities/saint-egreve/action.yml
@@ -1,11 +1,11 @@
 id: 305144108
-type: way
+type: node
 latitude: 45.2177
 longitude: 5.68221
 postcode: "38120"
 city: Saint-Égrève
-street: "Avenue René Cassin"
-housenumber: 
+street: Avenue René Cassin
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.action.com/fr-fr/points-de-vente/saint-egreve-avenue-rene-cassin/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.action.com/fr-fr/points-de-vente/saint-egreve-avenue-rene-cassin/
diff --git a/data/cities/saint-egreve/aprecial.yml b/data/cities/saint-egreve/aprecial.yml
index bdef3d039..18ad22a94 100644
--- a/data/cities/saint-egreve/aprecial.yml
+++ b/data/cities/saint-egreve/aprecial.yml
@@ -1,11 +1,11 @@
 id: 723604000
-type: way
+type: node
 latitude: 45.23886
 longitude: 5.66336
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 56 10 14"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 56 10 14
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/aramisauto-grenoble.yml b/data/cities/saint-egreve/aramisauto-grenoble.yml
index ba85984b5..509d74d61 100644
--- a/data/cities/saint-egreve/aramisauto-grenoble.yml
+++ b/data/cities/saint-egreve/aramisauto-grenoble.yml
@@ -5,7 +5,7 @@ longitude: 5.67552
 postcode: "38120"
 city: Saint-Égrève
 street: ""
-housenumber: 17
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-egreve/besson-chaussures.yml b/data/cities/saint-egreve/besson-chaussures.yml
index 372f3e584..0c5bb2adf 100644
--- a/data/cities/saint-egreve/besson-chaussures.yml
+++ b/data/cities/saint-egreve/besson-chaussures.yml
@@ -1,11 +1,11 @@
 id: 305144121
-type: way
+type: node
 latitude: 45.21659
 longitude: 5.68334
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue René Cassin"
-housenumber: 
-phone: "+33 8 25 35 11 34"
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: "https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-grenoble-saint-egreve_saint-egreve_38120/205.html"
\ No newline at end of file
+street: Rue René Cassin
+housenumber: ""
+phone: +33 8 25 35 11 34
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-grenoble-saint-egreve_saint-egreve_38120/205.html
diff --git a/data/cities/saint-egreve/boulangerie-marie-blachere.yml b/data/cities/saint-egreve/boulangerie-marie-blachere.yml
index d16686110..474f30e21 100644
--- a/data/cities/saint-egreve/boulangerie-marie-blachere.yml
+++ b/data/cities/saint-egreve/boulangerie-marie-blachere.yml
@@ -1,11 +1,11 @@
 id: 66954018
-type: way
+type: node
 latitude: 45.22247
 longitude: 5.67522
 postcode: "38120"
 city: Saint-Égrève
-street: "Avenue de l'Île Brune"
-housenumber: 25
-phone: "+33 8 90 21 05 82"
-opening_hours: "Mo-Sa 06:30-19:30"
-website: "https://boulangeries.marieblachere.com/Saint%20Egreve"
\ No newline at end of file
+street: Avenue de l'Île Brune
+housenumber: "25"
+phone: +33 8 90 21 05 82
+opening_hours: Mo-Sa 06:30-19:30
+website: https://boulangeries.marieblachere.com/Saint%20Egreve
diff --git a/data/cities/saint-egreve/carrefour-express.yml b/data/cities/saint-egreve/carrefour-express.yml
index 419a480c0..aecd4b59a 100644
--- a/data/cities/saint-egreve/carrefour-express.yml
+++ b/data/cities/saint-egreve/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.22278
 longitude: 5.688
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue de Prédieu"
+street: Rue de Prédieu
 housenumber: 1 bis
-phone: "+33 4 76 72 83 67"
-opening_hours: "Mo-Sa 07:00-20:00; Su 08:00-13:00"
-website: "https://www.carrefour.fr/magasin/express-saint-egreve"
\ No newline at end of file
+phone: +33 4 76 72 83 67
+opening_hours: Mo-Sa 07:00-20:00; Su 08:00-13:00
+website: https://www.carrefour.fr/magasin/express-saint-egreve
diff --git a/data/cities/saint-egreve/carrefour-saint-egreve.yml b/data/cities/saint-egreve/carrefour-saint-egreve.yml
index d794f4877..a359f39cc 100644
--- a/data/cities/saint-egreve/carrefour-saint-egreve.yml
+++ b/data/cities/saint-egreve/carrefour-saint-egreve.yml
@@ -1,11 +1,11 @@
 id: 723603993
-type: way
+type: node
 latitude: 45.23893
 longitude: 5.66272
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 59 15 99"
-opening_hours: "Mo-Fr 08:30-21:30; Sa 08:30-21:00; Su off"
-website: "https://www.carrefour.fr/magasin/saint-egreve"
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 59 15 99
+opening_hours: Mo-Fr 08:30-21:30; Sa 08:30-21:00; Su off
+website: https://www.carrefour.fr/magasin/saint-egreve
diff --git a/data/cities/saint-egreve/carrefour-spectacles.yml b/data/cities/saint-egreve/carrefour-spectacles.yml
index bd2e98fff..5119bb5bf 100644
--- a/data/cities/saint-egreve/carrefour-spectacles.yml
+++ b/data/cities/saint-egreve/carrefour-spectacles.yml
@@ -4,8 +4,8 @@ latitude: 45.23941
 longitude: 5.66369
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 58 15 07"
-opening_hours: "Mo-Sa 10:00-13:00,14:15-19:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 58 15 07
+opening_hours: Mo-Sa 10:00-13:00,14:15-19:00
+website: ""
diff --git a/data/cities/saint-egreve/carrefour-voyages.yml b/data/cities/saint-egreve/carrefour-voyages.yml
index b69dcdb71..43ec2f6da 100644
--- a/data/cities/saint-egreve/carrefour-voyages.yml
+++ b/data/cities/saint-egreve/carrefour-voyages.yml
@@ -4,8 +4,8 @@ latitude: 45.23942
 longitude: 5.66372
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 58 15 07"
-opening_hours: "Mo-Fr 08:30-21:30; Sa 09:30-20:00"
-website: "https://voyages.carrefour.fr/"
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 58 15 07
+opening_hours: Mo-Fr 08:30-21:30; Sa 09:30-20:00
+website: https://voyages.carrefour.fr/
diff --git a/data/cities/saint-egreve/carrosserie-de-la-priola.yml b/data/cities/saint-egreve/carrosserie-de-la-priola.yml
index cd5222416..96ed83eb5 100644
--- a/data/cities/saint-egreve/carrosserie-de-la-priola.yml
+++ b/data/cities/saint-egreve/carrosserie-de-la-priola.yml
@@ -1,11 +1,11 @@
 id: 373866002
-type: way
+type: node
 latitude: 45.23598
 longitude: 5.66872
 postcode: "38120"
 city: Saint-Egrève
-street: "Rue de la Biolle"
-housenumber: 1
-phone: "+33 4 76 75 10 70"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue de la Biolle
+housenumber: "1"
+phone: +33 4 76 75 10 70
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/saint-egreve/casabio.yml b/data/cities/saint-egreve/casabio.yml
index dc1addc2d..f5d1c6891 100644
--- a/data/cities/saint-egreve/casabio.yml
+++ b/data/cities/saint-egreve/casabio.yml
@@ -1,11 +1,11 @@
 id: 66962177
-type: way
+type: node
 latitude: 45.22217
 longitude: 5.67635
 postcode: "38120"
 city: Saint-Égrève
-street: "Avenue de l'Île Brune"
-housenumber: 22
+street: Avenue de l'Île Brune
+housenumber: "22"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/saint-egreve/centre-commercial-carrefour-saint-egreve.yml b/data/cities/saint-egreve/centre-commercial-carrefour-saint-egreve.yml
index dafc27d5b..70fc05140 100644
--- a/data/cities/saint-egreve/centre-commercial-carrefour-saint-egreve.yml
+++ b/data/cities/saint-egreve/centre-commercial-carrefour-saint-egreve.yml
@@ -1,11 +1,11 @@
 id: 103158706
-type: way
+type: node
 latitude: 45.23972
 longitude: 5.66187
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
+street: Rue des Abattoirs
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 08:30-21:30; Su off"
-website: "https://www.centre-carrefour-saintegreve.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-21:30; Su off
+website: https://www.centre-carrefour-saintegreve.com/
diff --git a/data/cities/saint-egreve/darty.yml b/data/cities/saint-egreve/darty.yml
index 916629de7..99e3fe5f5 100644
--- a/data/cities/saint-egreve/darty.yml
+++ b/data/cities/saint-egreve/darty.yml
@@ -1,11 +1,11 @@
 id: 66954011
-type: way
+type: node
 latitude: 45.23812
 longitude: 5.6623
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Îles"
-housenumber: 1
+street: Rue des Îles
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/saint-egreve/decathlon.yml b/data/cities/saint-egreve/decathlon.yml
index d50df0f84..fab368a84 100644
--- a/data/cities/saint-egreve/decathlon.yml
+++ b/data/cities/saint-egreve/decathlon.yml
@@ -1,11 +1,11 @@
 id: 66959726
-type: way
+type: node
 latitude: 45.24084
 longitude: 5.66844
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue de la Trémollière"
-housenumber: 3
+street: Rue de la Trémollière
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su off
+website: ""
diff --git a/data/cities/saint-egreve/e-reel.yml b/data/cities/saint-egreve/e-reel.yml
index 60ffb8416..6d2896d26 100644
--- a/data/cities/saint-egreve/e-reel.yml
+++ b/data/cities/saint-egreve/e-reel.yml
@@ -1,11 +1,11 @@
 id: 1273526891
-type: way
+type: node
 latitude: 45.22221
 longitude: 5.67644
 postcode: "38120"
 city: Saint-Égrève
-street: "Avenue de l'Île Brune"
-housenumber: 22
+street: Avenue de l'Île Brune
+housenumber: "22"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/saint-egreve/etam.yml b/data/cities/saint-egreve/etam.yml
index 8e4dd6de0..b2fe4c2d4 100644
--- a/data/cities/saint-egreve/etam.yml
+++ b/data/cities/saint-egreve/etam.yml
@@ -1,11 +1,11 @@
 id: 723604018
-type: way
+type: node
 latitude: 45.23963
 longitude: 5.66418
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 75 26 15"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 75 26 15
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/general-doptique.yml b/data/cities/saint-egreve/general-doptique.yml
index c90102eab..e8cb0ab21 100644
--- a/data/cities/saint-egreve/general-doptique.yml
+++ b/data/cities/saint-egreve/general-doptique.yml
@@ -1,11 +1,11 @@
 id: 723604004
-type: way
+type: node
 latitude: 45.23908
 longitude: 5.6635
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 75 00 94"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 75 00 94
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/giant-grenoble-saint-egreve.yml b/data/cities/saint-egreve/giant-grenoble-saint-egreve.yml
index d434c96f1..a7d4b6af8 100644
--- a/data/cities/saint-egreve/giant-grenoble-saint-egreve.yml
+++ b/data/cities/saint-egreve/giant-grenoble-saint-egreve.yml
@@ -5,7 +5,7 @@ longitude: 5.67278
 postcode: "38120"
 city: Saint-Égrève
 street: ""
-housenumber: 27
+housenumber: "27"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00,14:00-19:00, Sa 09:30-12:30,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00,14:00-19:00, Sa 09:30-12:30,13:30-19:00
+website: ""
diff --git a/data/cities/saint-egreve/histoire-dor.yml b/data/cities/saint-egreve/histoire-dor.yml
index d55a5420e..5ceebe222 100644
--- a/data/cities/saint-egreve/histoire-dor.yml
+++ b/data/cities/saint-egreve/histoire-dor.yml
@@ -1,11 +1,11 @@
 id: 723604008
-type: way
+type: node
 latitude: 45.23921
 longitude: 5.66378
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 75 55 27"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 75 55 27
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/intersport.yml b/data/cities/saint-egreve/intersport.yml
index 99ceeebd8..3d20a7f66 100644
--- a/data/cities/saint-egreve/intersport.yml
+++ b/data/cities/saint-egreve/intersport.yml
@@ -1,11 +1,11 @@
 id: 66953355
-type: way
+type: node
 latitude: 45.23927
 longitude: 5.66767
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue de la Trémouillère"
-housenumber: 1
+street: Rue de la Trémouillère
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/saint-egreve/klope-one.yml b/data/cities/saint-egreve/klope-one.yml
index c16817f43..9474da0b2 100644
--- a/data/cities/saint-egreve/klope-one.yml
+++ b/data/cities/saint-egreve/klope-one.yml
@@ -1,11 +1,11 @@
 id: 723603996
-type: way
+type: node
 latitude: 45.23893
 longitude: 5.66302
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 58 22 79"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.facebook.com/KLOPE-ONE-Saint-grve-969884433183611/"
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 58 22 79
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.facebook.com/KLOPE-ONE-Saint-grve-969884433183611/
diff --git a/data/cities/saint-egreve/kokliko.yml b/data/cities/saint-egreve/kokliko.yml
index e3ac06690..23304240f 100644
--- a/data/cities/saint-egreve/kokliko.yml
+++ b/data/cities/saint-egreve/kokliko.yml
@@ -1,11 +1,11 @@
 id: 723604003
-type: way
+type: node
 latitude: 45.23913
 longitude: 5.66334
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 9 86 77 40 00"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://pressing-kokliko.fr/"
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 9 86 77 40 00
+opening_hours: Mo-Sa 09:30-20:00
+website: https://pressing-kokliko.fr/
diff --git a/data/cities/saint-egreve/la-carotte-joyeuse.yml b/data/cities/saint-egreve/la-carotte-joyeuse.yml
index ccc999eb2..1015dd11b 100644
--- a/data/cities/saint-egreve/la-carotte-joyeuse.yml
+++ b/data/cities/saint-egreve/la-carotte-joyeuse.yml
@@ -4,8 +4,8 @@ latitude: 45.22286
 longitude: 5.68805
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue de Prédieu"
+street: Rue de Prédieu
 housenumber: 1 bis
-phone: "+33 4 76 23 25 28"
+phone: +33 4 76 23 25 28
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-egreve/la-dauphine.yml b/data/cities/saint-egreve/la-dauphine.yml
index 65ccd7824..d84235f25 100644
--- a/data/cities/saint-egreve/la-dauphine.yml
+++ b/data/cities/saint-egreve/la-dauphine.yml
@@ -4,8 +4,8 @@ latitude: 45.22272
 longitude: 5.68762
 postcode: "38120"
 city: Saint-Égrève
-street: "Place Saint-Christophe"
-housenumber: 4
-phone: "04 76 75 37 31"
-opening_hours: "Mo 06:30-12:45; Mo 15:15-19:00; We-Su 06:30-12:45; We-Sa 15:15-19:00"
-website: ""
\ No newline at end of file
+street: Place Saint-Christophe
+housenumber: "4"
+phone: 04 76 75 37 31
+opening_hours: Mo 06:30-12:45; Mo 15:15-19:00; We-Su 06:30-12:45; We-Sa 15:15-19:00
+website: ""
diff --git a/data/cities/saint-egreve/le-garage-ma-martinez-ange.yml b/data/cities/saint-egreve/le-garage-ma-martinez-ange.yml
index 9d9f0ecca..cbab98c56 100644
--- a/data/cities/saint-egreve/le-garage-ma-martinez-ange.yml
+++ b/data/cities/saint-egreve/le-garage-ma-martinez-ange.yml
@@ -1,11 +1,11 @@
 id: 66952990
-type: way
+type: node
 latitude: 45.23538
 longitude: 5.66914
 postcode: "38120"
 city: Saint-Egrève
-street: "Avenue de l'Île Brune"
-housenumber: 67
-phone: "+33 4 76 75 17 32"
+street: Avenue de l'Île Brune
+housenumber: "67"
+phone: +33 4 76 75 17 32
 opening_hours: ""
-website: "http://www.le-garage.fr/"
\ No newline at end of file
+website: http://www.le-garage.fr/
diff --git a/data/cities/saint-egreve/leonidas.yml b/data/cities/saint-egreve/leonidas.yml
index 45a63be20..e489b15e0 100644
--- a/data/cities/saint-egreve/leonidas.yml
+++ b/data/cities/saint-egreve/leonidas.yml
@@ -1,11 +1,11 @@
 id: 723604005
-type: way
+type: node
 latitude: 45.2392
 longitude: 5.66348
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 58 22 79"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.leonidas.com/en/shops/saint-egreve/leonidas-saint-egreve"
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 58 22 79
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.leonidas.com/en/shops/saint-egreve/leonidas-saint-egreve
diff --git a/data/cities/saint-egreve/lux-laverie.yml b/data/cities/saint-egreve/lux-laverie.yml
index 77c2897c0..2d3cabb76 100644
--- a/data/cities/saint-egreve/lux-laverie.yml
+++ b/data/cities/saint-egreve/lux-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.2394
 longitude: 5.66531
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
+street: Rue des Abattoirs
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/saint-egreve/lynx-optique.yml b/data/cities/saint-egreve/lynx-optique.yml
index 5bf9569a4..62c7cd517 100644
--- a/data/cities/saint-egreve/lynx-optique.yml
+++ b/data/cities/saint-egreve/lynx-optique.yml
@@ -1,11 +1,11 @@
 id: 723604002
-type: way
+type: node
 latitude: 45.23891
 longitude: 5.66346
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 38 02 04 14"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 38 02 04 14
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/marionnaud.yml b/data/cities/saint-egreve/marionnaud.yml
index 14ef746a7..9d7dd36a8 100644
--- a/data/cities/saint-egreve/marionnaud.yml
+++ b/data/cities/saint-egreve/marionnaud.yml
@@ -1,11 +1,11 @@
 id: 723604011
-type: way
+type: node
 latitude: 45.23931
 longitude: 5.66422
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 75 89 24"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 75 89 24
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/micromania.yml b/data/cities/saint-egreve/micromania.yml
index 76db55e13..bdf2273ab 100644
--- a/data/cities/saint-egreve/micromania.yml
+++ b/data/cities/saint-egreve/micromania.yml
@@ -1,11 +1,11 @@
 id: 723604012
-type: way
+type: node
 latitude: 45.23945
 longitude: 5.66422
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 75 74 44"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.micromania.fr/magasin?storeid=EG"
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 75 74 44
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.micromania.fr/magasin?storeid=EG
diff --git a/data/cities/saint-egreve/mindo-multi-services.yml b/data/cities/saint-egreve/mindo-multi-services.yml
index cec8f650b..62baed62e 100644
--- a/data/cities/saint-egreve/mindo-multi-services.yml
+++ b/data/cities/saint-egreve/mindo-multi-services.yml
@@ -1,11 +1,11 @@
 id: 723603999
-type: way
+type: node
 latitude: 45.2389
 longitude: 5.66332
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 9 83 08 09 11"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 9 83 08 09 11
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/okaidi.yml b/data/cities/saint-egreve/okaidi.yml
index 60fb89a7c..ba7acce14 100644
--- a/data/cities/saint-egreve/okaidi.yml
+++ b/data/cities/saint-egreve/okaidi.yml
@@ -1,11 +1,11 @@
 id: 723604022
-type: way
+type: node
 latitude: 45.23959
 longitude: 5.6646
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 26 33 21"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 26 33 21
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/orange.yml b/data/cities/saint-egreve/orange.yml
index 6daa8b6c2..cdeb33f1f 100644
--- a/data/cities/saint-egreve/orange.yml
+++ b/data/cities/saint-egreve/orange.yml
@@ -1,11 +1,11 @@
 id: 723604009
-type: way
+type: node
 latitude: 45.23936
 longitude: 5.6638
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 56 06 25"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 56 06 25
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/princesse-boutique.yml b/data/cities/saint-egreve/princesse-boutique.yml
index 67687dcc7..5bb02b572 100644
--- a/data/cities/saint-egreve/princesse-boutique.yml
+++ b/data/cities/saint-egreve/princesse-boutique.yml
@@ -1,11 +1,11 @@
 id: 723604021
-type: way
+type: node
 latitude: 45.23964
 longitude: 5.66455
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 58 22 79"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.princesseboutique.com/"
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 58 22 79
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.princesseboutique.com/
diff --git a/data/cities/saint-egreve/routens-electric-bike.yml b/data/cities/saint-egreve/routens-electric-bike.yml
index da620ef6e..87f5566a2 100644
--- a/data/cities/saint-egreve/routens-electric-bike.yml
+++ b/data/cities/saint-egreve/routens-electric-bike.yml
@@ -5,7 +5,7 @@ longitude: 5.6725
 postcode: "38120"
 city: Saint-Egrève
 street: ""
-housenumber: 27
+housenumber: "27"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00,14:00-19:00, Sa 09:30-12:30,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00,14:00-19:00, Sa 09:30-12:30,13:30-19:00
+website: ""
diff --git a/data/cities/saint-egreve/shampoo.yml b/data/cities/saint-egreve/shampoo.yml
index 1e95172d0..0bfd01129 100644
--- a/data/cities/saint-egreve/shampoo.yml
+++ b/data/cities/saint-egreve/shampoo.yml
@@ -1,11 +1,11 @@
 id: 723603997
-type: way
+type: node
 latitude: 45.23902
 longitude: 5.66312
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 75 45 12"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 75 45 12
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/va-bene.yml b/data/cities/saint-egreve/va-bene.yml
index dcccbd371..400d2b1f5 100644
--- a/data/cities/saint-egreve/va-bene.yml
+++ b/data/cities/saint-egreve/va-bene.yml
@@ -1,11 +1,11 @@
 id: 723604007
-type: way
+type: node
 latitude: 45.23918
 longitude: 5.66372
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
-phone: "+33 4 76 56 10 30"
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+street: Rue des Abattoirs
+housenumber: "1"
+phone: +33 4 76 56 10 30
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-egreve/yves-rocher.yml b/data/cities/saint-egreve/yves-rocher.yml
index fb69c6ec1..1d60849aa 100644
--- a/data/cities/saint-egreve/yves-rocher.yml
+++ b/data/cities/saint-egreve/yves-rocher.yml
@@ -1,11 +1,11 @@
 id: 723604023
-type: way
+type: node
 latitude: 45.23946
 longitude: 5.66453
 postcode: "38120"
 city: Saint-Égrève
-street: "Rue des Abattoirs"
-housenumber: 1
+street: Rue des Abattoirs
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00
+website: ""
diff --git a/data/cities/saint-etienne-de-crossey/bikassist.yml b/data/cities/saint-etienne-de-crossey/bikassist.yml
index 4dea1ca7d..a9648b074 100644
--- a/data/cities/saint-etienne-de-crossey/bikassist.yml
+++ b/data/cities/saint-etienne-de-crossey/bikassist.yml
@@ -4,8 +4,8 @@ latitude: 45.37896
 longitude: 5.64448
 postcode: "38690"
 city: Saint-Etienne-de-Crossey
-street: "Rue du Tram"
-housenumber: 689
+street: Rue du Tram
+housenumber: "689"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne-de-saint-geoirs/go-sport-shop-saint-etienne-de-saint-geoirs.yml b/data/cities/saint-etienne-de-saint-geoirs/go-sport-shop-saint-etienne-de-saint-geoirs.yml
index b7bf3938f..9850f4efe 100644
--- a/data/cities/saint-etienne-de-saint-geoirs/go-sport-shop-saint-etienne-de-saint-geoirs.yml
+++ b/data/cities/saint-etienne-de-saint-geoirs/go-sport-shop-saint-etienne-de-saint-geoirs.yml
@@ -4,8 +4,8 @@ latitude: 45.35065
 longitude: 5.33397
 postcode: "38590"
 city: Saint-Étienne-de-Saint-Geoirs
-street: "Chemin de la Pierre Zone super U"
-housenumber: 11
+street: Chemin de la Pierre Zone Super U
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-12:30, 13:30-19:00"
-website: "https://www.go-sport.com/stores?lang=default#/stores/1800"
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-12:30, 13:30-19:00
+website: https://www.go-sport.com/stores?lang=default#/stores/1800
diff --git a/data/cities/saint-etienne-le-molard/comptoir-de-campagne.yml b/data/cities/saint-etienne-le-molard/comptoir-de-campagne.yml
index 0916756c5..90fb0643f 100644
--- a/data/cities/saint-etienne-le-molard/comptoir-de-campagne.yml
+++ b/data/cities/saint-etienne-le-molard/comptoir-de-campagne.yml
@@ -4,8 +4,8 @@ latitude: 45.73078
 longitude: 4.08925
 postcode: "42130"
 city: Saint-Étienne-le-Molard
-street: "Route de la Batie d'urfe"
-housenumber: 14
-phone: "04 27 26 01 27"
+street: Route de la Batie d'urfe
+housenumber: "14"
+phone: 04 27 26 01 27
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/alain-afflelou-accousticien.yml b/data/cities/saint-etienne/alain-afflelou-accousticien.yml
index b9abf1103..57cf85933 100644
--- a/data/cities/saint-etienne/alain-afflelou-accousticien.yml
+++ b/data/cities/saint-etienne/alain-afflelou-accousticien.yml
@@ -4,8 +4,8 @@ latitude: 45.43447
 longitude: 4.38761
 postcode: "42000"
 city: Saint-Étienne
-street: "Place des Ursules"
-housenumber: 22
+street: Place des Ursules
+housenumber: "22"
 phone: ""
-opening_hours: "Tu 15:00-18:00; We-Fr 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 15:00-18:00; We-Fr 14:00-18:00
+website: ""
diff --git a/data/cities/saint-etienne/albaynac-musique.yml b/data/cities/saint-etienne/albaynac-musique.yml
index eabbb773e..c6cc12268 100644
--- a/data/cities/saint-etienne/albaynac-musique.yml
+++ b/data/cities/saint-etienne/albaynac-musique.yml
@@ -4,8 +4,8 @@ latitude: 45.43203
 longitude: 4.39474
 postcode: "42100"
 city: Saint-Étienne
-street: "Place Villebœuf"
-housenumber: 8
-phone: "+33 4 77 49 60 55"
-opening_hours: "Tu,Th,Fr 09:30-12:00,14:00-18:30; We 09:30-18:30; Sa 09:30-18:00"
-website: "https://www.albaynac.fr/"
\ No newline at end of file
+street: Place Villebœuf
+housenumber: "8"
+phone: +33 4 77 49 60 55
+opening_hours: Tu,Th,Fr 09:30-12:00,14:00-18:30; We 09:30-18:30; Sa 09:30-18:00
+website: https://www.albaynac.fr/
diff --git a/data/cities/saint-etienne/atelier-de-la-souris-verte.yml b/data/cities/saint-etienne/atelier-de-la-souris-verte.yml
index 0dd60fc07..d3a867653 100644
--- a/data/cities/saint-etienne/atelier-de-la-souris-verte.yml
+++ b/data/cities/saint-etienne/atelier-de-la-souris-verte.yml
@@ -4,9 +4,10 @@ latitude: 45.43997
 longitude: 4.3966
 postcode: "42000"
 city: Saint-Étienne
-street: "Avenue Denfert Rochereau"
-housenumber: 1
+street: Avenue Denfert Rochereau
+housenumber: "1"
 phone: ""
-opening_hours: "Tu 18:00-21:00;
-We 16:00-20:00"
-website: "https://lasourisverte.org"
\ No newline at end of file
+opening_hours: |-
+    Tu 18:00-21:00;
+    We 16:00-20:00
+website: https://lasourisverte.org
diff --git a/data/cities/saint-etienne/au-coeur-du-vrac.yml b/data/cities/saint-etienne/au-coeur-du-vrac.yml
index e0c1057aa..6117b8567 100644
--- a/data/cities/saint-etienne/au-coeur-du-vrac.yml
+++ b/data/cities/saint-etienne/au-coeur-du-vrac.yml
@@ -4,8 +4,8 @@ latitude: 45.42929
 longitude: 4.39012
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue du Onze Novembre"
-housenumber: 9
+street: Rue du Onze Novembre
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/azara-couture.yml b/data/cities/saint-etienne/azara-couture.yml
index de8af81ed..d0629600a 100644
--- a/data/cities/saint-etienne/azara-couture.yml
+++ b/data/cities/saint-etienne/azara-couture.yml
@@ -5,7 +5,7 @@ longitude: 4.38453
 postcode: "42000"
 city: Saint-Etienne
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/azur-vacances.yml b/data/cities/saint-etienne/azur-vacances.yml
index ad0a1bec7..8f554f00d 100644
--- a/data/cities/saint-etienne/azur-vacances.yml
+++ b/data/cities/saint-etienne/azur-vacances.yml
@@ -4,8 +4,8 @@ latitude: 45.43687
 longitude: 4.38772
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue du Général Foy"
-housenumber: 16
+street: Rue du Général Foy
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Su 09:00-12:00; 14:00-18:00"
-website: "https://azur-vacances.fr/contact-agence-de-saint-etienne/"
\ No newline at end of file
+opening_hours: Mo-Su 09:00-12:00; 14:00-18:00
+website: https://azur-vacances.fr/contact-agence-de-saint-etienne/
diff --git a/data/cities/saint-etienne/biladi-coiffeur.yml b/data/cities/saint-etienne/biladi-coiffeur.yml
index d1660e6b4..5dff14b17 100644
--- a/data/cities/saint-etienne/biladi-coiffeur.yml
+++ b/data/cities/saint-etienne/biladi-coiffeur.yml
@@ -4,8 +4,8 @@ latitude: 45.42615
 longitude: 4.39074
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue du Onze Novembre"
-housenumber: 54
+street: Rue du Onze Novembre
+housenumber: "54"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/blackstore.yml b/data/cities/saint-etienne/blackstore.yml
index b590b2878..e10cf21c6 100644
--- a/data/cities/saint-etienne/blackstore.yml
+++ b/data/cities/saint-etienne/blackstore.yml
@@ -4,8 +4,8 @@ latitude: 45.44664
 longitude: 4.42356
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Ferrer"
-housenumber: 2
+street: Rue Ferrer
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su 09:30-19:00
+website: ""
diff --git a/data/cities/saint-etienne/carglass.yml b/data/cities/saint-etienne/carglass.yml
index 9d2e6cf5e..0c41eef1f 100644
--- a/data/cities/saint-etienne/carglass.yml
+++ b/data/cities/saint-etienne/carglass.yml
@@ -5,7 +5,7 @@ longitude: 4.4261
 postcode: "42650"
 city: Saint-Étienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/casino-shop.yml b/data/cities/saint-etienne/casino-shop.yml
index 5adfdac08..9e2b7276b 100644
--- a/data/cities/saint-etienne/casino-shop.yml
+++ b/data/cities/saint-etienne/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.44072
 longitude: 4.38759
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Gérentet"
-housenumber: 14
+street: Rue Gérentet
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su off
+website: ""
diff --git a/data/cities/saint-etienne/citroen-psa-retail-st-etienne.yml b/data/cities/saint-etienne/citroen-psa-retail-st-etienne.yml
index ada1870bd..9bc11e372 100644
--- a/data/cities/saint-etienne/citroen-psa-retail-st-etienne.yml
+++ b/data/cities/saint-etienne/citroen-psa-retail-st-etienne.yml
@@ -4,8 +4,8 @@ latitude: 45.46283
 longitude: 4.39894
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Victor Grignard"
-housenumber: 1
+street: Rue Victor Grignard
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 07:30-12:30, 13:30-19:00; Sa 09:00-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:30, 13:30-19:00; Sa 09:00-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/saint-etienne/coiffure-mixte.yml b/data/cities/saint-etienne/coiffure-mixte.yml
index f74479ec3..1565c694e 100644
--- a/data/cities/saint-etienne/coiffure-mixte.yml
+++ b/data/cities/saint-etienne/coiffure-mixte.yml
@@ -4,8 +4,8 @@ latitude: 45.42371
 longitude: 4.41068
 postcode: "42100"
 city: Saint-Etienne
-street: "Boulevard Karl Marx"
-housenumber: 8
+street: Boulevard Karl Marx
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/coreme.yml b/data/cities/saint-etienne/coreme.yml
index fb135acc9..e3e225fed 100644
--- a/data/cities/saint-etienne/coreme.yml
+++ b/data/cities/saint-etienne/coreme.yml
@@ -4,8 +4,8 @@ latitude: 45.44452
 longitude: 4.42184
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue Émile Zola"
-housenumber: 33
+street: Rue Émile Zola
+housenumber: "33"
 phone: ""
-opening_hours: "09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-etienne/culture-velo.yml b/data/cities/saint-etienne/culture-velo.yml
index c44d7a675..5b1bd3280 100644
--- a/data/cities/saint-etienne/culture-velo.yml
+++ b/data/cities/saint-etienne/culture-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.44388
 longitude: 4.42634
 postcode: "42100"
 city: Saint-Étienne
-street: "Impasse Cote Thiollière"
-housenumber: 2
+street: Impasse Cote Thiollière
+housenumber: "2"
 phone: "+33477251137"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-12:00, 14:00-19:00"
-website: "https://www.culturevelo.com/"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-12:00, 14:00-19:00
+website: https://www.culturevelo.com/
diff --git a/data/cities/saint-etienne/cycles-ctf-taghbalout.yml b/data/cities/saint-etienne/cycles-ctf-taghbalout.yml
index 165b84a0b..5e692f32c 100644
--- a/data/cities/saint-etienne/cycles-ctf-taghbalout.yml
+++ b/data/cities/saint-etienne/cycles-ctf-taghbalout.yml
@@ -4,8 +4,8 @@ latitude: 45.42902
 longitude: 4.39415
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue Antoine Durafour"
-housenumber: 77
+street: Rue Antoine Durafour
+housenumber: "77"
 phone: "+33477219805"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/deloye-michel.yml b/data/cities/saint-etienne/deloye-michel.yml
index db532b6ef..822fae732 100644
--- a/data/cities/saint-etienne/deloye-michel.yml
+++ b/data/cities/saint-etienne/deloye-michel.yml
@@ -4,8 +4,8 @@ latitude: 45.42661
 longitude: 4.39436
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue Clement Forissier"
-housenumber: 33
+street: Rue Clement Forissier
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/esso.yml b/data/cities/saint-etienne/esso.yml
index eab078e8d..f4c7b7f7b 100644
--- a/data/cities/saint-etienne/esso.yml
+++ b/data/cities/saint-etienne/esso.yml
@@ -1,11 +1,11 @@
 id: 234680954
-type: way
+type: node
 latitude: 45.43355
 longitude: 4.41617
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue de Terrenoire"
-housenumber: 38
+street: Rue de Terrenoire
+housenumber: "38"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-etienne/etablissement-bruneton.yml b/data/cities/saint-etienne/etablissement-bruneton.yml
index cb3f68e80..6429a7ca0 100644
--- a/data/cities/saint-etienne/etablissement-bruneton.yml
+++ b/data/cities/saint-etienne/etablissement-bruneton.yml
@@ -4,8 +4,8 @@ latitude: 45.44054
 longitude: 4.42775
 postcode: "42100"
 city: Saint-Étienne
-street: "Impasse du Général Booth"
-housenumber: 1
+street: Impasse du Général Booth
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/feu-vert.yml b/data/cities/saint-etienne/feu-vert.yml
index 94a80d536..1ccd0eb80 100644
--- a/data/cities/saint-etienne/feu-vert.yml
+++ b/data/cities/saint-etienne/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 63320578
-type: way
+type: node
 latitude: 45.44241
 longitude: 4.42015
 postcode: "42030"
 city: Saint-Étienne
 street: ""
-housenumber: 
-phone: "+33 4 77490787"
-opening_hours: "Mo-Th 09:00-12:00,14:00-19:00; Fr,Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 77490787
+opening_hours: Mo-Th 09:00-12:00,14:00-19:00; Fr,Sa 09:00-19:00
+website: ""
diff --git a/data/cities/saint-etienne/just-cookies.yml b/data/cities/saint-etienne/just-cookies.yml
index a462150cf..ab67a158d 100644
--- a/data/cities/saint-etienne/just-cookies.yml
+++ b/data/cities/saint-etienne/just-cookies.yml
@@ -4,8 +4,8 @@ latitude: 45.43873
 longitude: 4.38879
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Louis Braille"
-housenumber: 6
-phone: "+33 6 37 84 53 52"
-opening_hours: "Tu-Sa 09:30-18:45"
-website: ""
\ No newline at end of file
+street: Rue Louis Braille
+housenumber: "6"
+phone: +33 6 37 84 53 52
+opening_hours: Tu-Sa 09:30-18:45
+website: ""
diff --git a/data/cities/saint-etienne/la-rue-a-velo.yml b/data/cities/saint-etienne/la-rue-a-velo.yml
index 67c03edd4..f93aafec1 100644
--- a/data/cities/saint-etienne/la-rue-a-velo.yml
+++ b/data/cities/saint-etienne/la-rue-a-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.43746
 longitude: 4.39147
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Traversière"
-housenumber: 5
+street: Rue Traversière
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-12:30,14:00-18:30"
-website: "https://saint-etienne.cyclable.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-13:00,14:00-19:00; Sa 10:00-12:30,14:00-18:30
+website: https://saint-etienne.cyclable.com/
diff --git a/data/cities/saint-etienne/la-vie-claire.yml b/data/cities/saint-etienne/la-vie-claire.yml
index 8239df5c7..768f6438f 100644
--- a/data/cities/saint-etienne/la-vie-claire.yml
+++ b/data/cities/saint-etienne/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 45.43224
 longitude: 4.38854
 postcode: "42000"
 city: Saint-Étienne
-street: "Cours Victor Hugo"
-housenumber: 25
+street: Cours Victor Hugo
+housenumber: "25"
 phone: "+33477378214"
-opening_hours: "Mo-Sa 08:30-13:00,14:30-19:30"
-website: "https://www.lavieclaire.com/magasin-bio/saint-etienne.html"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-13:00,14:30-19:30
+website: https://www.lavieclaire.com/magasin-bio/saint-etienne.html
diff --git a/data/cities/saint-etienne/le-boucher-bio.yml b/data/cities/saint-etienne/le-boucher-bio.yml
index b6d7e4b1b..903020660 100644
--- a/data/cities/saint-etienne/le-boucher-bio.yml
+++ b/data/cities/saint-etienne/le-boucher-bio.yml
@@ -4,8 +4,8 @@ latitude: 45.44173
 longitude: 4.41576
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue des Alliés"
-housenumber: 147
-phone: "+33 4 77 33 14 14"
-opening_hours: "Tu 06:30-12:30,16:30-19:15; Th,Fr 06:30-12:30,16:30-19:00"
-website: "https://www.leboucherbio.fr/"
\ No newline at end of file
+street: Rue des Alliés
+housenumber: "147"
+phone: +33 4 77 33 14 14
+opening_hours: Tu 06:30-12:30,16:30-19:15; Th,Fr 06:30-12:30,16:30-19:00
+website: https://www.leboucherbio.fr/
diff --git a/data/cities/saint-etienne/le-ferrailleur.yml b/data/cities/saint-etienne/le-ferrailleur.yml
index d4834196e..24135237c 100644
--- a/data/cities/saint-etienne/le-ferrailleur.yml
+++ b/data/cities/saint-etienne/le-ferrailleur.yml
@@ -1,11 +1,11 @@
 id: 63312115
-type: way
+type: node
 latitude: 45.4231
 longitude: 4.39798
 postcode: "42100"
 city: Saint-Étienne
-street: "Boulevard Valbenoîte"
-housenumber: 119
-phone: "09 81 46 96 65"
-opening_hours: "Th 16:00-23:00; Fr 18:00-21:00; Sa 18:00-25:00"
-website: ""
\ No newline at end of file
+street: Boulevard Valbenoîte
+housenumber: "119"
+phone: 09 81 46 96 65
+opening_hours: Th 16:00-23:00; Fr 18:00-21:00; Sa 18:00-25:00
+website: ""
diff --git a/data/cities/saint-etienne/le-pied-des-marches.yml b/data/cities/saint-etienne/le-pied-des-marches.yml
index bf10c6eba..53c4aaa0d 100644
--- a/data/cities/saint-etienne/le-pied-des-marches.yml
+++ b/data/cities/saint-etienne/le-pied-des-marches.yml
@@ -4,8 +4,8 @@ latitude: 45.44235
 longitude: 4.38903
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Roger Salengro"
-housenumber: 16
+street: Rue Roger Salengro
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: "https://www.ruesdudeveloppementdurable.fr/le-pied-des-marches/"
\ No newline at end of file
+website: https://www.ruesdudeveloppementdurable.fr/le-pied-des-marches/
diff --git a/data/cities/saint-etienne/marmite-et-petrin.yml b/data/cities/saint-etienne/marmite-et-petrin.yml
index a14bf6155..d170db6ed 100644
--- a/data/cities/saint-etienne/marmite-et-petrin.yml
+++ b/data/cities/saint-etienne/marmite-et-petrin.yml
@@ -4,8 +4,8 @@ latitude: 45.45392
 longitude: 4.39026
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Barrouin"
-housenumber: 12
+street: Rue Barrouin
+housenumber: "12"
 phone: ""
-opening_hours: "Mo-Fr 06:00-14:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-14:30
+website: ""
diff --git a/data/cities/saint-etienne/midas.yml b/data/cities/saint-etienne/midas.yml
index 2e1f2405f..27cdd41fb 100644
--- a/data/cities/saint-etienne/midas.yml
+++ b/data/cities/saint-etienne/midas.yml
@@ -1,11 +1,11 @@
 id: 63268328
-type: way
+type: node
 latitude: 45.44409
 longitude: 4.41694
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue de la Montat"
-housenumber: 135
-phone: "+33 4 77 95 34 00"
+street: Rue de la Montat
+housenumber: "135"
+phone: +33 4 77 95 34 00
 opening_hours: ""
-website: "https://www.midas.fr/"
\ No newline at end of file
+website: https://www.midas.fr/
diff --git a/data/cities/saint-etienne/noz.yml b/data/cities/saint-etienne/noz.yml
index aaa69832f..6748c3edc 100644
--- a/data/cities/saint-etienne/noz.yml
+++ b/data/cities/saint-etienne/noz.yml
@@ -4,8 +4,8 @@ latitude: 45.44441
 longitude: 4.41724
 postcode: "42000"
 city: Saint-Étienne
-street: "Impasse du Pont de l'Ane"
-housenumber: 12
+street: Impasse du Pont de l'Ane
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/saint-etienne/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/saint-etienne/
diff --git a/data/cities/saint-etienne/ocivelo.yml b/data/cities/saint-etienne/ocivelo.yml
index 287f62b8f..1b8075b47 100644
--- a/data/cities/saint-etienne/ocivelo.yml
+++ b/data/cities/saint-etienne/ocivelo.yml
@@ -4,8 +4,8 @@ latitude: 45.44008
 longitude: 4.38146
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue d'Arcole"
-housenumber: 38
+street: Rue d'Arcole
+housenumber: "38"
 phone: "+33477211829"
-opening_hours: "Tu-Fr 14:00-20:00; Sa 14:00-19:00"
-website: "https://ocivelo.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 14:00-20:00; Sa 14:00-19:00
+website: https://ocivelo.fr/
diff --git a/data/cities/saint-etienne/optical-center-rue-du-grand-moulin.yml b/data/cities/saint-etienne/optical-center-rue-du-grand-moulin.yml
index 0022059bb..923c34c95 100644
--- a/data/cities/saint-etienne/optical-center-rue-du-grand-moulin.yml
+++ b/data/cities/saint-etienne/optical-center-rue-du-grand-moulin.yml
@@ -4,8 +4,8 @@ latitude: 45.43727
 longitude: 4.38906
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue du Grand Moulin"
-housenumber: 8
+street: Rue du Grand Moulin
+housenumber: "8"
 phone: "+33477320808"
-opening_hours: "Mo 10:00-19:00; Tu-Sa 09:00-19:00"
-website: "https://opticien.optical-center.fr/180-opticien-saint-etienne-optical-center"
\ No newline at end of file
+opening_hours: Mo 10:00-19:00; Tu-Sa 09:00-19:00
+website: https://opticien.optical-center.fr/180-opticien-saint-etienne-optical-center
diff --git a/data/cities/saint-etienne/optical-center.yml b/data/cities/saint-etienne/optical-center.yml
index d5049bd99..47f8c5763 100644
--- a/data/cities/saint-etienne/optical-center.yml
+++ b/data/cities/saint-etienne/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 45.44384
 longitude: 4.42
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue des Rochettes"
-housenumber: 32
+street: Rue des Rochettes
+housenumber: "32"
 phone: "+33477470909"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://opticien.optical-center.fr/181-opticien-saint-etienne-monthieu-optical-center"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://opticien.optical-center.fr/181-opticien-saint-etienne-monthieu-optical-center
diff --git a/data/cities/saint-etienne/patissier-p-bureau-chocolatier.yml b/data/cities/saint-etienne/patissier-p-bureau-chocolatier.yml
index d8eeca7b9..e98a3ab7f 100644
--- a/data/cities/saint-etienne/patissier-p-bureau-chocolatier.yml
+++ b/data/cities/saint-etienne/patissier-p-bureau-chocolatier.yml
@@ -4,8 +4,8 @@ latitude: 45.44831
 longitude: 4.38421
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Clovis Hugues"
-housenumber: 4
-phone: "+33 4 77 74 15 28"
+street: Rue Clovis Hugues
+housenumber: "4"
+phone: +33 4 77 74 15 28
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/peugeot-stellantis-et-you-saint-etienne.yml b/data/cities/saint-etienne/peugeot-stellantis-et-you-saint-etienne.yml
index f3d83786b..71757ec0c 100644
--- a/data/cities/saint-etienne/peugeot-stellantis-et-you-saint-etienne.yml
+++ b/data/cities/saint-etienne/peugeot-stellantis-et-you-saint-etienne.yml
@@ -1,11 +1,11 @@
 id: 63331539
-type: way
+type: node
 latitude: 45.46416
 longitude: 4.40084
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Gustave Delory"
+street: Rue Gustave Delory
 housenumber: 13/15
-phone: "+33 4 77 91 41 91"
+phone: +33 4 77 91 41 91
 opening_hours: ""
-website: "https://concessions.peugeot.fr/boniface/"
\ No newline at end of file
+website: https://concessions.peugeot.fr/boniface/
diff --git a/data/cities/saint-etienne/point-s.yml b/data/cities/saint-etienne/point-s.yml
index f6187e04a..8b997ed6e 100644
--- a/data/cities/saint-etienne/point-s.yml
+++ b/data/cities/saint-etienne/point-s.yml
@@ -5,7 +5,7 @@ longitude: 4.38499
 postcode: "42000"
 city: Saint-Etienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-etienne/polycar.yml b/data/cities/saint-etienne/polycar.yml
index 24a5f2afc..6e93a1ada 100644
--- a/data/cities/saint-etienne/polycar.yml
+++ b/data/cities/saint-etienne/polycar.yml
@@ -4,8 +4,8 @@ latitude: 45.44548
 longitude: 4.38527
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Charles de Gaulle"
-housenumber: 43
-phone: "+33 4 77 32 52 41"
-opening_hours: "Mo 14:00-18:30; Tu-Fr 08:30-12:00,14:00-18:30; Sa,Su off"
-website: "https://www.polycar-quincaillerie.fr/"
\ No newline at end of file
+street: Rue Charles de Gaulle
+housenumber: "43"
+phone: +33 4 77 32 52 41
+opening_hours: Mo 14:00-18:30; Tu-Fr 08:30-12:00,14:00-18:30; Sa,Su off
+website: https://www.polycar-quincaillerie.fr/
diff --git a/data/cities/saint-etienne/ptit-loustic.yml b/data/cities/saint-etienne/ptit-loustic.yml
index 810396b8f..2879d78d7 100644
--- a/data/cities/saint-etienne/ptit-loustic.yml
+++ b/data/cities/saint-etienne/ptit-loustic.yml
@@ -4,8 +4,8 @@ latitude: 45.43613
 longitude: 4.38705
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Mercière"
-housenumber: 5
-phone: "+33 4 77 21 07 57"
-opening_hours: "Tu-Sa 09:30-12:30,14:00-19:00"
-website: "https://ptitloustic.fr/"
\ No newline at end of file
+street: Rue Mercière
+housenumber: "5"
+phone: +33 4 77 21 07 57
+opening_hours: Tu-Sa 09:30-12:30,14:00-19:00
+website: https://ptitloustic.fr/
diff --git a/data/cities/saint-etienne/reparpc-sim-radio.yml b/data/cities/saint-etienne/reparpc-sim-radio.yml
index 61e711199..3c117f5ab 100644
--- a/data/cities/saint-etienne/reparpc-sim-radio.yml
+++ b/data/cities/saint-etienne/reparpc-sim-radio.yml
@@ -4,8 +4,8 @@ latitude: 45.44231
 longitude: 4.38218
 postcode: "42000"
 city: Saint-Étienne
-street: "Place Jacquard"
-housenumber: 18
+street: Place Jacquard
+housenumber: "18"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Th 09:00-12:00,14:00-19:00; Fr-Sa 10:00-12:00,15:00-18:00"
-website: "http://www.reparpc.fr"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Th 09:00-12:00,14:00-19:00; Fr-Sa 10:00-12:00,15:00-18:00
+website: http://www.reparpc.fr
diff --git a/data/cities/saint-etienne/ria-multi-services.yml b/data/cities/saint-etienne/ria-multi-services.yml
index bd02fd99f..7f65dcc54 100644
--- a/data/cities/saint-etienne/ria-multi-services.yml
+++ b/data/cities/saint-etienne/ria-multi-services.yml
@@ -4,8 +4,8 @@ latitude: 45.47214
 longitude: 4.39452
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Franz Liszt"
-housenumber: 38
+street: Rue Franz Liszt
+housenumber: "38"
 phone: ""
-opening_hours: "Tu-Sa 08:00-18:00 Su 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-18:00 Su 09:00-18:00
+website: ""
diff --git a/data/cities/saint-etienne/saq-art-velo.yml b/data/cities/saint-etienne/saq-art-velo.yml
index 8c88cf5d0..15db84902 100644
--- a/data/cities/saint-etienne/saq-art-velo.yml
+++ b/data/cities/saint-etienne/saq-art-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.41845
 longitude: 4.4235
 postcode: ""
 city: Saint-Étienne
-street: "Rue Virgile"
-housenumber: 28
-phone: "+33 6 05 75 54 40"
-opening_hours: "We, Su 13:00-17:00"
-website: "https://saq-art-velo.fr"
\ No newline at end of file
+street: Rue Virgile
+housenumber: "28"
+phone: +33 6 05 75 54 40
+opening_hours: We, Su 13:00-17:00
+website: https://saq-art-velo.fr
diff --git a/data/cities/saint-etienne/satoriz-saint-etienne.yml b/data/cities/saint-etienne/satoriz-saint-etienne.yml
index 82e3c495d..15fa2deac 100644
--- a/data/cities/saint-etienne/satoriz-saint-etienne.yml
+++ b/data/cities/saint-etienne/satoriz-saint-etienne.yml
@@ -4,8 +4,8 @@ latitude: 45.44314
 longitude: 4.42415
 postcode: "42100"
 city: Saint-Étienne
-street: "Rue Marc Charras"
-housenumber: 5
-phone: "+33 4 77 49 03 85"
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.satoriz.fr/satoriz/magasin-satoriz-saint-etienne"
\ No newline at end of file
+street: Rue Marc Charras
+housenumber: "5"
+phone: +33 4 77 49 03 85
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.satoriz.fr/satoriz/magasin-satoriz-saint-etienne
diff --git a/data/cities/saint-etienne/sesame.yml b/data/cities/saint-etienne/sesame.yml
index 13956f029..3ba4fb234 100644
--- a/data/cities/saint-etienne/sesame.yml
+++ b/data/cities/saint-etienne/sesame.yml
@@ -4,8 +4,8 @@ latitude: 45.44107
 longitude: 4.38366
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Paul Bert"
-housenumber: 17
+street: Rue Paul Bert
+housenumber: "17"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/saint-etienne/super-market-kevin-terass.yml b/data/cities/saint-etienne/super-market-kevin-terass.yml
index 9dcb799f6..dd1040a90 100644
--- a/data/cities/saint-etienne/super-market-kevin-terass.yml
+++ b/data/cities/saint-etienne/super-market-kevin-terass.yml
@@ -4,8 +4,8 @@ latitude: 45.43451
 longitude: 4.38206
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Saint-Ennemond"
-housenumber: 3
+street: Rue Saint-Ennemond
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/saint-etienne/velo-en-quartier.yml b/data/cities/saint-etienne/velo-en-quartier.yml
index a3cc9ee13..d2cd83d1e 100644
--- a/data/cities/saint-etienne/velo-en-quartier.yml
+++ b/data/cities/saint-etienne/velo-en-quartier.yml
@@ -4,8 +4,8 @@ latitude: 45.43366
 longitude: 4.37834
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue de l'Apprentissage"
-housenumber: 11
-phone: "+33 6 95 61 86 57"
-opening_hours: "week 2-52/2 We 10:00-12:00, 14:00-16:00; Th 14:00-16:00; Fr 10:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue de l'Apprentissage
+housenumber: "11"
+phone: +33 6 95 61 86 57
+opening_hours: week 2-52/2 We 10:00-12:00, 14:00-16:00; Th 14:00-16:00; Fr 10:00-12:00
+website: ""
diff --git a/data/cities/saint-etienne/vival.yml b/data/cities/saint-etienne/vival.yml
index 365f07657..c80cdd404 100644
--- a/data/cities/saint-etienne/vival.yml
+++ b/data/cities/saint-etienne/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.43965
 longitude: 4.4036
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue des Alliés"
+street: Rue des Alliés
 housenumber: 39-41
-phone: "+33 6 05 98 64 85"
-opening_hours: "Mo-Su 07:30-24:00"
-website: "https://magasins.vival.fr/fr/vival-saint-etienne-allies"
\ No newline at end of file
+phone: +33 6 05 98 64 85
+opening_hours: Mo-Su 07:30-24:00
+website: https://magasins.vival.fr/fr/vival-saint-etienne-allies
diff --git a/data/cities/saint-etienne/vulco.yml b/data/cities/saint-etienne/vulco.yml
index 6954fbc8f..d912b61ca 100644
--- a/data/cities/saint-etienne/vulco.yml
+++ b/data/cities/saint-etienne/vulco.yml
@@ -4,8 +4,8 @@ latitude: 45.45586
 longitude: 4.38846
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue Jean Snella"
-housenumber: 2
+street: Rue Jean Snella
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00; Sa 08:00-12:00"
-website: "https://www.vulco.fr/all-dealers/saint-etienne/vulco-saint-etienne-362221.html"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00; Sa 08:00-12:00
+website: https://www.vulco.fr/all-dealers/saint-etienne/vulco-saint-etienne-362221.html
diff --git a/data/cities/saint-etienne/yves-rocher.yml b/data/cities/saint-etienne/yves-rocher.yml
index 0a381fe6f..92544bb79 100644
--- a/data/cities/saint-etienne/yves-rocher.yml
+++ b/data/cities/saint-etienne/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.43699
 longitude: 4.38789
 postcode: "42000"
 city: Saint-Étienne
-street: "Rue du General Foy"
-housenumber: 17
+street: Rue du General Foy
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/st-etienne/st-etienne-general-foy/S-FRYROC17"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/st-etienne/st-etienne-general-foy/S-FRYROC17
diff --git a/data/cities/saint-felicien/aux-delices-ardehois.yml b/data/cities/saint-felicien/aux-delices-ardehois.yml
index 62003d881..7ef8667f1 100644
--- a/data/cities/saint-felicien/aux-delices-ardehois.yml
+++ b/data/cities/saint-felicien/aux-delices-ardehois.yml
@@ -5,7 +5,7 @@ longitude: 4.62821
 postcode: ""
 city: Saint-Félicien
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-felicien/le-pain-de-sucre.yml b/data/cities/saint-felicien/le-pain-de-sucre.yml
index 319497d35..4f820ed21 100644
--- a/data/cities/saint-felicien/le-pain-de-sucre.yml
+++ b/data/cities/saint-felicien/le-pain-de-sucre.yml
@@ -5,7 +5,7 @@ longitude: 4.62812
 postcode: ""
 city: Saint-Félicien
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-fons/rize-rue-de-la-rochette.yml b/data/cities/saint-fons/rize-rue-de-la-rochette.yml
index d4c6ddf01..4c66fecd3 100644
--- a/data/cities/saint-fons/rize-rue-de-la-rochette.yml
+++ b/data/cities/saint-fons/rize-rue-de-la-rochette.yml
@@ -4,8 +4,8 @@ latitude: 45.6952
 longitude: 4.85709
 postcode: "69190"
 city: Saint-Fons
-street: "Rue de la Rochette"
-housenumber: 8
-phone: "+33 8 90 21 27 98"
-opening_hours: "Mo-Fr 08:30-12:15,15:00-19:00; Sa 09:00-18:45"
-website: ""
\ No newline at end of file
+street: Rue de la Rochette
+housenumber: "8"
+phone: +33 8 90 21 27 98
+opening_hours: Mo-Fr 08:30-12:15,15:00-19:00; Sa 09:00-18:45
+website: ""
diff --git a/data/cities/saint-fons/rize.yml b/data/cities/saint-fons/rize.yml
index a22ba73c9..469d7759f 100644
--- a/data/cities/saint-fons/rize.yml
+++ b/data/cities/saint-fons/rize.yml
@@ -4,8 +4,8 @@ latitude: 45.69519
 longitude: 4.85703
 postcode: "69190"
 city: Saint-Fons
-street: "Rue de la Rochette"
-housenumber: 8
-phone: "+33 8 90 21 27 98"
-opening_hours: "Mo-Fr 08:30-12:15,15:00-19:00; Sa 09:00-18:45"
-website: ""
\ No newline at end of file
+street: Rue de la Rochette
+housenumber: "8"
+phone: +33 8 90 21 27 98
+opening_hours: Mo-Fr 08:30-12:15,15:00-19:00; Sa 09:00-18:45
+website: ""
diff --git a/data/cities/saint-francois-longchamp/centrale-de-reservation.yml b/data/cities/saint-francois-longchamp/centrale-de-reservation.yml
index f12a074ca..f86134d77 100644
--- a/data/cities/saint-francois-longchamp/centrale-de-reservation.yml
+++ b/data/cities/saint-francois-longchamp/centrale-de-reservation.yml
@@ -4,8 +4,8 @@ latitude: 45.41635
 longitude: 6.36281
 postcode: "73130"
 city: Saint-François-Longchamp
-street: "Rue de la Madeleine"
-housenumber: 28
+street: Rue de la Madeleine
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-francois-longchamp/la-boutique-des-cimes.yml b/data/cities/saint-francois-longchamp/la-boutique-des-cimes.yml
index e938e5514..cb15fd374 100644
--- a/data/cities/saint-francois-longchamp/la-boutique-des-cimes.yml
+++ b/data/cities/saint-francois-longchamp/la-boutique-des-cimes.yml
@@ -4,8 +4,8 @@ latitude: 45.42123
 longitude: 6.36398
 postcode: "73130"
 city: Saint-François-Longchamp
-street: "Centre Commercial les 4 Vallées, Plan Mollaret"
-housenumber: 
+street: Centre Commercial les 4 Vallées, Plan Mollaret
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-galmier/chocolaterie-ap.yml b/data/cities/saint-galmier/chocolaterie-ap.yml
index e650bb29b..fde52df91 100644
--- a/data/cities/saint-galmier/chocolaterie-ap.yml
+++ b/data/cities/saint-galmier/chocolaterie-ap.yml
@@ -4,8 +4,8 @@ latitude: 45.58998
 longitude: 4.31838
 postcode: "42330"
 city: Saint-Galmier
-street: "Place de la Devise"
+street: Place de la Devise
 housenumber: 5 bis
 phone: "+33477358883"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-galmier/couleurs-dailleurs.yml b/data/cities/saint-galmier/couleurs-dailleurs.yml
index dc3d7d35e..b9b1d2ce1 100644
--- a/data/cities/saint-galmier/couleurs-dailleurs.yml
+++ b/data/cities/saint-galmier/couleurs-dailleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.59009
 longitude: 4.31888
 postcode: "42330"
 city: Saint-Galmier
-street: "Rue Didier Guetton"
-housenumber: 4
+street: Rue Didier Guetton
+housenumber: "4"
 phone: "+33477540764"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-galmier/lart-et-la-maniere.yml b/data/cities/saint-galmier/lart-et-la-maniere.yml
index a2fba548a..e4a266826 100644
--- a/data/cities/saint-galmier/lart-et-la-maniere.yml
+++ b/data/cities/saint-galmier/lart-et-la-maniere.yml
@@ -4,8 +4,8 @@ latitude: 45.59001
 longitude: 4.31812
 postcode: "42330"
 city: Saint-Galmier
-street: "Place de la Devise"
-housenumber: 9
+street: Place de la Devise
+housenumber: "9"
 phone: "+33477949065"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-galmier/latelier-des-saveurs.yml b/data/cities/saint-galmier/latelier-des-saveurs.yml
index 87f5c2f6f..d0412e43f 100644
--- a/data/cities/saint-galmier/latelier-des-saveurs.yml
+++ b/data/cities/saint-galmier/latelier-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 45.59049
 longitude: 4.3181
 postcode: "42330"
 city: Saint-Galmier
-street: "Montée de l'Église"
-housenumber: 6
+street: Montée de l'Église
+housenumber: "6"
 phone: "+33477520989"
-opening_hours: "Mo,Su 08:30-12:30; We-Sa 08:30-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su 08:30-12:30; We-Sa 08:30-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/saint-galmier/maison-de-la-presse.yml b/data/cities/saint-galmier/maison-de-la-presse.yml
index 10ba65ea5..aeae7068c 100644
--- a/data/cities/saint-galmier/maison-de-la-presse.yml
+++ b/data/cities/saint-galmier/maison-de-la-presse.yml
@@ -4,8 +4,8 @@ latitude: 45.59029
 longitude: 4.31774
 postcode: "42330"
 city: Saint-Galmier
-street: "Place de la Devise"
-housenumber: 17
+street: Place de la Devise
+housenumber: "17"
 phone: "+33477540118"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-galmier/titi-fruits.yml b/data/cities/saint-galmier/titi-fruits.yml
index ead3bab15..5dc42019d 100644
--- a/data/cities/saint-galmier/titi-fruits.yml
+++ b/data/cities/saint-galmier/titi-fruits.yml
@@ -4,8 +4,8 @@ latitude: 45.59042
 longitude: 4.31782
 postcode: "42330"
 city: Saint-Galmier
-street: "Montée de l'Église"
-housenumber: 12
+street: Montée de l'Église
+housenumber: "12"
 phone: "+33477540278"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-galmier/vival.yml b/data/cities/saint-galmier/vival.yml
index 7dd5317eb..b2feb2aba 100644
--- a/data/cities/saint-galmier/vival.yml
+++ b/data/cities/saint-galmier/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.58997
 longitude: 4.31825
 postcode: "42330"
 city: Saint-Galmier
-street: "Place de la Devise"
-housenumber: 7
+street: Place de la Devise
+housenumber: "7"
 phone: "+33477553472"
-opening_hours: "Mo-Sa 07:30-13:00,15:00-19:00; We 07:30-13:00"
-website: "https://magasins.vival.fr/fr/vival-saint-galmier"
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-13:00,15:00-19:00; We 07:30-13:00
+website: https://magasins.vival.fr/fr/vival-saint-galmier
diff --git a/data/cities/saint-genest-lerpt/boucherie-vocanson-liogier.yml b/data/cities/saint-genest-lerpt/boucherie-vocanson-liogier.yml
index 1c1ec4c16..caf8d7841 100644
--- a/data/cities/saint-genest-lerpt/boucherie-vocanson-liogier.yml
+++ b/data/cities/saint-genest-lerpt/boucherie-vocanson-liogier.yml
@@ -4,8 +4,8 @@ latitude: 45.44569
 longitude: 4.33493
 postcode: "42530"
 city: Saint-Genest-Lerpt
-street: "Rue Francis Garnier"
-housenumber: 5
-phone: "+33 4 77 90 29 63"
-opening_hours: "Tu-Fr 06:30-13:00; Tu-Fr 14:30-19:00; Sa 06:30-19:00"
-website: ""
\ No newline at end of file
+street: Rue Francis Garnier
+housenumber: "5"
+phone: +33 4 77 90 29 63
+opening_hours: Tu-Fr 06:30-13:00; Tu-Fr 14:30-19:00; Sa 06:30-19:00
+website: ""
diff --git a/data/cities/saint-genest-lerpt/boulangerie-mendonca.yml b/data/cities/saint-genest-lerpt/boulangerie-mendonca.yml
index 00c36582a..7619b925e 100644
--- a/data/cities/saint-genest-lerpt/boulangerie-mendonca.yml
+++ b/data/cities/saint-genest-lerpt/boulangerie-mendonca.yml
@@ -4,8 +4,8 @@ latitude: 45.44609
 longitude: 4.33364
 postcode: "42530"
 city: Saint-Genest-Lerpt
-street: "Rue Courbet"
-housenumber: 4
-phone: "+334 77 90 47 88"
-opening_hours: "Mo-Fr 06:30-19:30; Sa 06:30-13:00"
-website: ""
\ No newline at end of file
+street: Rue Courbet
+housenumber: "4"
+phone: +334 77 90 47 88
+opening_hours: Mo-Fr 06:30-19:30; Sa 06:30-13:00
+website: ""
diff --git a/data/cities/saint-genest-lerpt/kiki-fruits.yml b/data/cities/saint-genest-lerpt/kiki-fruits.yml
index a9e7ae47f..50c7d74d5 100644
--- a/data/cities/saint-genest-lerpt/kiki-fruits.yml
+++ b/data/cities/saint-genest-lerpt/kiki-fruits.yml
@@ -4,8 +4,8 @@ latitude: 45.44584
 longitude: 4.33482
 postcode: "42530"
 city: Saint-Genest-Lerpt
-street: "Rue Francis Garnier"
-housenumber: 3
-phone: "+33 477464884"
-opening_hours: "Tu-Th 08:00-13:00; Tu-Th 14:30-19:00; Fr-Sa 08:00-19:00; Su 10:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue Francis Garnier
+housenumber: "3"
+phone: +33 477464884
+opening_hours: Tu-Th 08:00-13:00; Tu-Th 14:30-19:00; Fr-Sa 08:00-19:00; Su 10:00-12:00
+website: ""
diff --git a/data/cities/saint-genest-lerpt/la-patisserie.yml b/data/cities/saint-genest-lerpt/la-patisserie.yml
index 340175440..9f721143f 100644
--- a/data/cities/saint-genest-lerpt/la-patisserie.yml
+++ b/data/cities/saint-genest-lerpt/la-patisserie.yml
@@ -4,8 +4,8 @@ latitude: 45.44564
 longitude: 4.33475
 postcode: "42530"
 city: Saint-Genest-Lerpt
-street: "Rue Francis Garnier"
-housenumber: 8
-phone: "+334 77 90 23 72"
+street: Rue Francis Garnier
+housenumber: "8"
+phone: +334 77 90 23 72
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-genest-lerpt/pmu.yml b/data/cities/saint-genest-lerpt/pmu.yml
index 61f59e753..e6cbb7553 100644
--- a/data/cities/saint-genest-lerpt/pmu.yml
+++ b/data/cities/saint-genest-lerpt/pmu.yml
@@ -4,8 +4,8 @@ latitude: 45.44613
 longitude: 4.33462
 postcode: "42530"
 city: Saint-Genest-Lerpt
-street: "Place de l'église"
-housenumber: 
+street: Place de l'église
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-genest-lerpt/reverchon-fleurs.yml b/data/cities/saint-genest-lerpt/reverchon-fleurs.yml
index 72c245cca..af3225024 100644
--- a/data/cities/saint-genest-lerpt/reverchon-fleurs.yml
+++ b/data/cities/saint-genest-lerpt/reverchon-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.44621
 longitude: 4.33484
 postcode: "42530"
 city: Saint-Genest-Lerpt
-street: "Rue Gambetta"
-housenumber: 11
-phone: "+334 77 90 20 89"
+street: Rue Gambetta
+housenumber: "11"
+phone: +334 77 90 20 89
 opening_hours: ""
-website: "https://fleurs-reverchon.fr/"
\ No newline at end of file
+website: https://fleurs-reverchon.fr/
diff --git a/data/cities/saint-genest-malifaux/justun-regard.yml b/data/cities/saint-genest-malifaux/justun-regard.yml
index c0feacf20..13101680d 100644
--- a/data/cities/saint-genest-malifaux/justun-regard.yml
+++ b/data/cities/saint-genest-malifaux/justun-regard.yml
@@ -4,8 +4,8 @@ latitude: 45.34082
 longitude: 4.42036
 postcode: "42660"
 city: Saint-Genest-Malifaux
-street: "Rue du Feuillage"
-housenumber: 1
+street: Rue du Feuillage
+housenumber: "1"
 phone: "+33477366733"
-opening_hours: "Tu-Sa 09:00-19:00, 12:00-14:30"
-website: "https://justunregard.com/magasins/opticien-saint-genest-malifaux/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00, 12:00-14:30
+website: https://justunregard.com/magasins/opticien-saint-genest-malifaux/
diff --git a/data/cities/saint-genest-malifaux/le-petit-casino.yml b/data/cities/saint-genest-malifaux/le-petit-casino.yml
index 739f74075..8b81c3048 100644
--- a/data/cities/saint-genest-malifaux/le-petit-casino.yml
+++ b/data/cities/saint-genest-malifaux/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.34071
 longitude: 4.42011
 postcode: "42660"
 city: Saint-Genest-Malifaux
-street: "Rue du Forez"
-housenumber: 
+street: Rue du Forez
+housenumber: ""
 phone: "+33477512369"
-opening_hours: "Mo-Su 07:30-19:30, 12:30-14:30"
-website: "https://magasins.lepetitcasino.com/fr/s/petit-casino-saint-genesaint-malifaux"
\ No newline at end of file
+opening_hours: Mo-Su 07:30-19:30, 12:30-14:30
+website: https://magasins.lepetitcasino.com/fr/s/petit-casino-saint-genesaint-malifaux
diff --git a/data/cities/saint-genis-largentiere/garage-de-largentiere.yml b/data/cities/saint-genis-largentiere/garage-de-largentiere.yml
index 90c8c594f..398c196e4 100644
--- a/data/cities/saint-genis-largentiere/garage-de-largentiere.yml
+++ b/data/cities/saint-genis-largentiere/garage-de-largentiere.yml
@@ -4,8 +4,8 @@ latitude: 45.71038
 longitude: 4.46753
 postcode: "69610"
 city: Saint-Genis-l'Argentière
-street: "Route de Lyon"
-housenumber: 
+street: Route de Lyon
+housenumber: ""
 phone: "+33474261707"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-genis-largentiere/le-coin-vapote.yml b/data/cities/saint-genis-largentiere/le-coin-vapote.yml
index 5595a0684..a8ac0a499 100644
--- a/data/cities/saint-genis-largentiere/le-coin-vapote.yml
+++ b/data/cities/saint-genis-largentiere/le-coin-vapote.yml
@@ -4,8 +4,8 @@ latitude: 45.71065
 longitude: 4.46811
 postcode: "69610"
 city: Saint-Genis-l'Argentière
-street: "Route de Lyon"
-housenumber: 115
+street: Route de Lyon
+housenumber: "115"
 phone: "+33478223882"
-opening_hours: "Tu-Fr 15:00-19:00; We,Sa 15:00-18:30"
-website: "https://www.lecoinvapote.com"
\ No newline at end of file
+opening_hours: Tu-Fr 15:00-19:00; We,Sa 15:00-18:30
+website: https://www.lecoinvapote.com
diff --git a/data/cities/saint-genis-les-ollieres/latelier-du-levain.yml b/data/cities/saint-genis-les-ollieres/latelier-du-levain.yml
index 700c14a8f..a6a50f790 100644
--- a/data/cities/saint-genis-les-ollieres/latelier-du-levain.yml
+++ b/data/cities/saint-genis-les-ollieres/latelier-du-levain.yml
@@ -4,8 +4,8 @@ latitude: 45.75503
 longitude: 4.72538
 postcode: "69290"
 city: Saint-Genis-les-Ollières
-street: "Rue Jean Piccandet"
-housenumber: 28
+street: Rue Jean Piccandet
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-genis-pouilly/aldi.yml b/data/cities/saint-genis-pouilly/aldi.yml
index 517cd0bd5..b94db13d4 100644
--- a/data/cities/saint-genis-pouilly/aldi.yml
+++ b/data/cities/saint-genis-pouilly/aldi.yml
@@ -1,11 +1,11 @@
 id: 255787213
-type: way
+type: node
 latitude: 46.25596
 longitude: 6.02705
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Mont Rond"
-housenumber: 6
+street: Rue du Mont Rond
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: "https://www.aldi.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: https://www.aldi.fr/
diff --git a/data/cities/saint-genis-pouilly/botanic.yml b/data/cities/saint-genis-pouilly/botanic.yml
index a61e47f64..a39de24e9 100644
--- a/data/cities/saint-genis-pouilly/botanic.yml
+++ b/data/cities/saint-genis-pouilly/botanic.yml
@@ -1,11 +1,11 @@
 id: 121763779
-type: way
+type: node
 latitude: 46.26
 longitude: 6.02977
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Mont Blanc"
-housenumber: 500
+street: Rue du Mont Blanc
+housenumber: "500"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su 09:30-12:30, 14:00-18:00"
-website: "https://www.botanic.com/?_r=true"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su 09:30-12:30, 14:00-18:00
+website: https://www.botanic.com/?_r=true
diff --git a/data/cities/saint-genis-pouilly/boucherie-de-la-prairie.yml b/data/cities/saint-genis-pouilly/boucherie-de-la-prairie.yml
index 2fb490581..c0abca7c1 100644
--- a/data/cities/saint-genis-pouilly/boucherie-de-la-prairie.yml
+++ b/data/cities/saint-genis-pouilly/boucherie-de-la-prairie.yml
@@ -4,8 +4,8 @@ latitude: 46.24287
 longitude: 6.02671
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de la Prairie"
-housenumber: 2
+street: Rue de la Prairie
+housenumber: "2"
 phone: ""
-opening_hours: "Mo,We-Fr 08:30-12:45,14:30-19:00; Sa,Su 08:30-19:00; Tu off"
-website: ""
\ No newline at end of file
+opening_hours: Mo,We-Fr 08:30-12:45,14:30-19:00; Sa,Su 08:30-19:00; Tu off
+website: ""
diff --git a/data/cities/saint-genis-pouilly/brocard.yml b/data/cities/saint-genis-pouilly/brocard.yml
index 39c8e16d4..ef8aa4792 100644
--- a/data/cities/saint-genis-pouilly/brocard.yml
+++ b/data/cities/saint-genis-pouilly/brocard.yml
@@ -4,8 +4,9 @@ latitude: 46.24226
 longitude: 6.01943
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de Lyon"
+street: Rue de Lyon
 housenumber: 9 Bis
 phone: ""
-opening_hours: "Tu-Fr 07:30-13:00,15:00-19:00; Sa 07:30-13:00,14:00-19:00; Su 07:30-13:00; Mo off"
-website: "http://www.brocard-patissier.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 07:30-13:00,15:00-19:00; Sa 07:30-13:00,14:00-19:00; Su 07:30-13:00;
+    Mo off
+website: http://www.brocard-patissier.com/
diff --git a/data/cities/saint-genis-pouilly/carrefour-market.yml b/data/cities/saint-genis-pouilly/carrefour-market.yml
index 8d037e53d..d491b72d6 100644
--- a/data/cities/saint-genis-pouilly/carrefour-market.yml
+++ b/data/cities/saint-genis-pouilly/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 121763448
-type: way
+type: node
 latitude: 46.24163
 longitude: 6.02875
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de Genève"
-housenumber: 
-phone: "+33 4 50 42 24 60"
-opening_hours: "Mo-Sa 08:30-19:30, Su 08:30-12:30"
-website: "https://www.carrefour.fr/magasin/market-saint-genis-pouilly"
\ No newline at end of file
+street: Rue de Genève
+housenumber: ""
+phone: +33 4 50 42 24 60
+opening_hours: Mo-Sa 08:30-19:30, Su 08:30-12:30
+website: https://www.carrefour.fr/magasin/market-saint-genis-pouilly
diff --git a/data/cities/saint-genis-pouilly/centrakor.yml b/data/cities/saint-genis-pouilly/centrakor.yml
index afda44941..211cca08c 100644
--- a/data/cities/saint-genis-pouilly/centrakor.yml
+++ b/data/cities/saint-genis-pouilly/centrakor.yml
@@ -1,11 +1,11 @@
 id: 116481652
-type: way
+type: node
 latitude: 46.25498
 longitude: 6.02664
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Tiocan"
-housenumber: 19
+street: Rue du Tiocan
+housenumber: "19"
 phone: "+33450400288"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.centrakor.com/magasin-centrakor/mpg3/centrakor-saint-genis-pouilly-01630.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.centrakor.com/magasin-centrakor/mpg3/centrakor-saint-genis-pouilly-01630.html
diff --git a/data/cities/saint-genis-pouilly/citroen.yml b/data/cities/saint-genis-pouilly/citroen.yml
index e07f81a5e..31a6cbb1f 100644
--- a/data/cities/saint-genis-pouilly/citroen.yml
+++ b/data/cities/saint-genis-pouilly/citroen.yml
@@ -1,11 +1,11 @@
 id: 116481471
-type: way
+type: node
 latitude: 46.25814
 longitude: 6.02814
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Mont Rond"
-housenumber: 340
-phone: "+33 4 50 42 01 50"
-opening_hours: "Mo-Fr 08:00-12:00, 13:45-19:00; Sa 09:00-12:00, 14:00-19:00"
-website: "https://reseau.citroen.fr/st-genis-pouilly"
\ No newline at end of file
+street: Rue du Mont Rond
+housenumber: "340"
+phone: +33 4 50 42 01 50
+opening_hours: Mo-Fr 08:00-12:00, 13:45-19:00; Sa 09:00-12:00, 14:00-19:00
+website: https://reseau.citroen.fr/st-genis-pouilly
diff --git a/data/cities/saint-genis-pouilly/coiffure-ciseaux-dor.yml b/data/cities/saint-genis-pouilly/coiffure-ciseaux-dor.yml
index 5cc0d1c81..ff9911fbe 100644
--- a/data/cities/saint-genis-pouilly/coiffure-ciseaux-dor.yml
+++ b/data/cities/saint-genis-pouilly/coiffure-ciseaux-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.24522
 longitude: 6.02387
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de la Petite Vie"
+street: Rue de la Petite Vie
 housenumber: 1 bis
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-16:00
+website: ""
diff --git a/data/cities/saint-genis-pouilly/cote-potager.yml b/data/cities/saint-genis-pouilly/cote-potager.yml
index df4a13162..d07a8a5e2 100644
--- a/data/cities/saint-genis-pouilly/cote-potager.yml
+++ b/data/cities/saint-genis-pouilly/cote-potager.yml
@@ -4,8 +4,8 @@ latitude: 46.24372
 longitude: 6.02147
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de Gex"
-housenumber: 8
+street: Rue de Gex
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:30,14:30-19:00; Sa 09:00-18:00; Su,Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:30,14:30-19:00; Sa 09:00-18:00; Su,Mo off
+website: ""
diff --git a/data/cities/saint-genis-pouilly/darty.yml b/data/cities/saint-genis-pouilly/darty.yml
index 78cce9b37..54105ad0a 100644
--- a/data/cities/saint-genis-pouilly/darty.yml
+++ b/data/cities/saint-genis-pouilly/darty.yml
@@ -4,8 +4,8 @@ latitude: 46.25406
 longitude: 6.0274
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Salève"
-housenumber: 
-phone: "+33 892 01 10 10"
-opening_hours: "Mo-Fr 10:00-12:30,14:00-19:00; Sa 10:00-19:00"
-website: "https://magasin.darty.com/629-darty-saint-genis-pouilly"
\ No newline at end of file
+street: Rue du Salève
+housenumber: ""
+phone: +33 892 01 10 10
+opening_hours: Mo-Fr 10:00-12:30,14:00-19:00; Sa 10:00-19:00
+website: https://magasin.darty.com/629-darty-saint-genis-pouilly
diff --git a/data/cities/saint-genis-pouilly/ecocuisine.yml b/data/cities/saint-genis-pouilly/ecocuisine.yml
index 214d9ba97..a2b359580 100644
--- a/data/cities/saint-genis-pouilly/ecocuisine.yml
+++ b/data/cities/saint-genis-pouilly/ecocuisine.yml
@@ -4,8 +4,8 @@ latitude: 46.25473
 longitude: 6.02784
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Mont Blanc"
-housenumber: 34
+street: Rue du Mont Blanc
+housenumber: "34"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00"
-website: "https://www.ecocuisine.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00
+website: https://www.ecocuisine.fr/
diff --git a/data/cities/saint-genis-pouilly/firststop-pneu-01.yml b/data/cities/saint-genis-pouilly/firststop-pneu-01.yml
index 9473ef7d1..8969a6b51 100644
--- a/data/cities/saint-genis-pouilly/firststop-pneu-01.yml
+++ b/data/cities/saint-genis-pouilly/firststop-pneu-01.yml
@@ -1,11 +1,11 @@
 id: 116481602
-type: way
+type: node
 latitude: 46.25513
 longitude: 6.02635
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Tiocan"
-housenumber: 26
-phone: "+33 4 50 42 07 85"
+street: Rue du Tiocan
+housenumber: "26"
+phone: +33 4 50 42 07 85
 opening_hours: ""
-website: "https://www.firststop.fr/"
\ No newline at end of file
+website: https://www.firststop.fr/
diff --git a/data/cities/saint-genis-pouilly/intermarche-super.yml b/data/cities/saint-genis-pouilly/intermarche-super.yml
index 83ec931bd..2939e6b89 100644
--- a/data/cities/saint-genis-pouilly/intermarche-super.yml
+++ b/data/cities/saint-genis-pouilly/intermarche-super.yml
@@ -1,11 +1,11 @@
 id: 257002777
-type: way
+type: node
 latitude: 46.26416
 longitude: 6.02938
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue des Chalets"
-housenumber: 148
+street: Rue des Chalets
+housenumber: "148"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; PH,Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; PH,Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-genis-pouilly/intermarche.yml b/data/cities/saint-genis-pouilly/intermarche.yml
index 38d99bc1a..0962d17bb 100644
--- a/data/cities/saint-genis-pouilly/intermarche.yml
+++ b/data/cities/saint-genis-pouilly/intermarche.yml
@@ -1,11 +1,11 @@
 id: 257002797
-type: way
+type: node
 latitude: 46.26329
 longitude: 6.02988
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue des Chalets"
-housenumber: 148
+street: Rue des Chalets
+housenumber: "148"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-genis-pouilly/intersport.yml b/data/cities/saint-genis-pouilly/intersport.yml
index c978574c4..11f4cd529 100644
--- a/data/cities/saint-genis-pouilly/intersport.yml
+++ b/data/cities/saint-genis-pouilly/intersport.yml
@@ -1,11 +1,11 @@
 id: 254003517
-type: way
+type: node
 latitude: 46.26374
 longitude: 6.02908
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue des Chalets"
-housenumber: 185
+street: Rue des Chalets
+housenumber: "185"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; PH,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; PH,Su off
+website: ""
diff --git a/data/cities/saint-genis-pouilly/krys.yml b/data/cities/saint-genis-pouilly/krys.yml
index b564c5f82..0ca26211b 100644
--- a/data/cities/saint-genis-pouilly/krys.yml
+++ b/data/cities/saint-genis-pouilly/krys.yml
@@ -4,8 +4,8 @@ latitude: 46.25404
 longitude: 6.02755
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Salève"
-housenumber: 126
-phone: "+33 4 85 92 00 68"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.krys.com/opticien/france/ain/opticien-saint-genis-pouilly/stgenis01"
\ No newline at end of file
+street: Rue du Salève
+housenumber: "126"
+phone: +33 4 85 92 00 68
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.krys.com/opticien/france/ain/opticien-saint-genis-pouilly/stgenis01
diff --git a/data/cities/saint-genis-pouilly/la-boite-a-outils.yml b/data/cities/saint-genis-pouilly/la-boite-a-outils.yml
index a5a62bcd4..78e24bf90 100644
--- a/data/cities/saint-genis-pouilly/la-boite-a-outils.yml
+++ b/data/cities/saint-genis-pouilly/la-boite-a-outils.yml
@@ -1,11 +1,11 @@
 id: 254004068
-type: way
+type: node
 latitude: 46.255
 longitude: 6.02876
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Salève"
-housenumber: 5
+street: Rue du Salève
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Fr 07:30-11:45,13:30-17:30; Sa 08:15-11:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-11:45,13:30-17:30; Sa 08:15-11:45
+website: ""
diff --git a/data/cities/saint-genis-pouilly/la-paniere.yml b/data/cities/saint-genis-pouilly/la-paniere.yml
index 3d8320198..44e516b59 100644
--- a/data/cities/saint-genis-pouilly/la-paniere.yml
+++ b/data/cities/saint-genis-pouilly/la-paniere.yml
@@ -4,8 +4,8 @@ latitude: 46.25452
 longitude: 6.02743
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Salève"
-housenumber: 126
+street: Rue du Salève
+housenumber: "126"
 phone: ""
-opening_hours: "Mo-Su 06:00-20:00"
-website: "https://www.lapaniere.com"
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:00
+website: https://www.lapaniere.com
diff --git a/data/cities/saint-genis-pouilly/les-comptoirs-de-la-bio.yml b/data/cities/saint-genis-pouilly/les-comptoirs-de-la-bio.yml
index 2398ffc8b..55ddc0250 100644
--- a/data/cities/saint-genis-pouilly/les-comptoirs-de-la-bio.yml
+++ b/data/cities/saint-genis-pouilly/les-comptoirs-de-la-bio.yml
@@ -1,11 +1,11 @@
 id: 706108443
-type: way
+type: node
 latitude: 46.25448
 longitude: 6.02737
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Salève"
-housenumber: 126
+street: Rue du Salève
+housenumber: "126"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:00"
-website: "https://magasins.lescomptoirsdelabio.fr/fr/les-comptoirs-de-la-bio-st-génis-pouilly-105495"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:00
+website: https://magasins.lescomptoirsdelabio.fr/fr/les-comptoirs-de-la-bio-st-génis-pouilly-105495
diff --git a/data/cities/saint-genis-pouilly/maxi-zoo.yml b/data/cities/saint-genis-pouilly/maxi-zoo.yml
index b79e9f22c..2984c6531 100644
--- a/data/cities/saint-genis-pouilly/maxi-zoo.yml
+++ b/data/cities/saint-genis-pouilly/maxi-zoo.yml
@@ -4,8 +4,8 @@ latitude: 46.25402
 longitude: 6.02764
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Salève"
-housenumber: 
-phone: "+33 4 57 67 50 90"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.maxizoo.fr/stores/maxi-zoo-saint-genis-pouilly/"
\ No newline at end of file
+street: Rue du Salève
+housenumber: ""
+phone: +33 4 57 67 50 90
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.maxizoo.fr/stores/maxi-zoo-saint-genis-pouilly/
diff --git a/data/cities/saint-genis-pouilly/noz.yml b/data/cities/saint-genis-pouilly/noz.yml
index 56d9357e0..a85f9bc72 100644
--- a/data/cities/saint-genis-pouilly/noz.yml
+++ b/data/cities/saint-genis-pouilly/noz.yml
@@ -1,11 +1,11 @@
 id: 116481478
-type: way
+type: node
 latitude: 46.2571
 longitude: 6.02777
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Mont Rond"
-housenumber: 212
+street: Rue du Mont Rond
+housenumber: "212"
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/saint-genis-pouilly/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/saint-genis-pouilly/
diff --git a/data/cities/saint-genis-pouilly/o-ptit-pain.yml b/data/cities/saint-genis-pouilly/o-ptit-pain.yml
index e30c5f120..108930bb1 100644
--- a/data/cities/saint-genis-pouilly/o-ptit-pain.yml
+++ b/data/cities/saint-genis-pouilly/o-ptit-pain.yml
@@ -4,8 +4,8 @@ latitude: 46.24167
 longitude: 6.02678
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de Genève"
-housenumber: 31
+street: Rue de Genève
+housenumber: "31"
 phone: "+33450562217"
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/saint-genis-pouilly/pelletier-l.yml b/data/cities/saint-genis-pouilly/pelletier-l.yml
index 100632fe5..abeb98b55 100644
--- a/data/cities/saint-genis-pouilly/pelletier-l.yml
+++ b/data/cities/saint-genis-pouilly/pelletier-l.yml
@@ -4,8 +4,9 @@ latitude: 46.243
 longitude: 6.02137
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de Genève"
-housenumber: 6
-phone: "+33 4 50 42 12 00"
-opening_hours: "Tu-Th 08:00-12:30,14:30-19:00; Fr 08:00-13:00,14:30-19:00; Sa 08:00-13:00,14:30-17:00; Su,Mo off"
-website: "https://www.boucherie-pelletier-01.fr/"
\ No newline at end of file
+street: Rue de Genève
+housenumber: "6"
+phone: +33 4 50 42 12 00
+opening_hours: Tu-Th 08:00-12:30,14:30-19:00; Fr 08:00-13:00,14:30-19:00; Sa 08:00-13:00,14:30-17:00;
+    Su,Mo off
+website: https://www.boucherie-pelletier-01.fr/
diff --git a/data/cities/saint-genis-pouilly/picard.yml b/data/cities/saint-genis-pouilly/picard.yml
index af608a81c..0361b184a 100644
--- a/data/cities/saint-genis-pouilly/picard.yml
+++ b/data/cities/saint-genis-pouilly/picard.yml
@@ -4,8 +4,8 @@ latitude: 46.25408
 longitude: 6.02729
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Salève"
-housenumber: 
-phone: "+33 4 57 28 00 93"
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: "https://magasins.picard.fr/1112-picard-saint-genis-pouilly"
\ No newline at end of file
+street: Rue du Salève
+housenumber: ""
+phone: +33 4 57 28 00 93
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: https://magasins.picard.fr/1112-picard-saint-genis-pouilly
diff --git a/data/cities/saint-genis-pouilly/poudre-detoiles.yml b/data/cities/saint-genis-pouilly/poudre-detoiles.yml
index ebea3d892..6eba61275 100644
--- a/data/cities/saint-genis-pouilly/poudre-detoiles.yml
+++ b/data/cities/saint-genis-pouilly/poudre-detoiles.yml
@@ -4,8 +4,9 @@ latitude: 46.24368
 longitude: 6.02141
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de Gex"
-housenumber: 8
+street: Rue de Gex
+housenumber: "8"
 phone: ""
-opening_hours: "Tu-Th 10:00-12:30,14:30-18:30; Fr 10:00-12:30,14:30-19:00; Sa 10:00-13:00,14:00-18:00; Su,Mo off"
-website: "https://poudre-detoiles.fr/index.php"
\ No newline at end of file
+opening_hours: Tu-Th 10:00-12:30,14:30-18:30; Fr 10:00-12:30,14:30-19:00; Sa 10:00-13:00,14:00-18:00;
+    Su,Mo off
+website: https://poudre-detoiles.fr/index.php
diff --git a/data/cities/saint-genis-pouilly/renault.yml b/data/cities/saint-genis-pouilly/renault.yml
index 7880cf7b4..d27da4dbb 100644
--- a/data/cities/saint-genis-pouilly/renault.yml
+++ b/data/cities/saint-genis-pouilly/renault.yml
@@ -1,11 +1,11 @@
 id: 254004284
-type: way
+type: node
 latitude: 46.25341
 longitude: 6.02712
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de la Faucille"
-housenumber: 50
+street: Rue de la Faucille
+housenumber: "50"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-genis-pouilly/saint-genis-music.yml b/data/cities/saint-genis-pouilly/saint-genis-music.yml
index 227c903fb..965b7bec8 100644
--- a/data/cities/saint-genis-pouilly/saint-genis-music.yml
+++ b/data/cities/saint-genis-pouilly/saint-genis-music.yml
@@ -4,8 +4,8 @@ latitude: 46.25846
 longitude: 6.02759
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue du Mont Rond"
-housenumber: 433
-phone: "+33 4 50 42 71 95"
-opening_hours: "Tu-Fr 10:30-18:30; Sa 10:00-18:00"
-website: "http://www.sgm01.com/"
\ No newline at end of file
+street: Rue du Mont Rond
+housenumber: "433"
+phone: +33 4 50 42 71 95
+opening_hours: Tu-Fr 10:30-18:30; Sa 10:00-18:00
+website: http://www.sgm01.com/
diff --git a/data/cities/saint-genis-pouilly/studio-54.yml b/data/cities/saint-genis-pouilly/studio-54.yml
index 685236da1..266b03ea7 100644
--- a/data/cities/saint-genis-pouilly/studio-54.yml
+++ b/data/cities/saint-genis-pouilly/studio-54.yml
@@ -1,11 +1,11 @@
 id: 121765758
-type: way
+type: node
 latitude: 46.24377
 longitude: 6.02169
 postcode: "01630"
 city: Saint-Genis-Pouilly
-street: "Rue de Gex"
-housenumber: 10
+street: Rue de Gex
+housenumber: "10"
 phone: "+33450991680"
-opening_hours: "fermé (vérifier les horaires sur le site internet)"
-website: "https://studio54coiffure-barbier.com/studio-54-la-petite-usine/"
\ No newline at end of file
+opening_hours: fermé (vérifier les horaires sur le site internet)
+website: https://studio54coiffure-barbier.com/studio-54-la-petite-usine/
diff --git a/data/cities/saint-genix-les-villages/amour-de-soi.yml b/data/cities/saint-genix-les-villages/amour-de-soi.yml
index b7d8a07a0..403bcf912 100644
--- a/data/cities/saint-genix-les-villages/amour-de-soi.yml
+++ b/data/cities/saint-genix-les-villages/amour-de-soi.yml
@@ -4,8 +4,8 @@ latitude: 45.5996
 longitude: 5.63232
 postcode: "73240"
 city: Saint-Genix-les-Villages
-street: "Rue du Centre"
-housenumber: 94
+street: Rue du Centre
+housenumber: "94"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-genix-les-villages/saint-genix-optique.yml b/data/cities/saint-genix-les-villages/saint-genix-optique.yml
index f6cb58ae0..33736918d 100644
--- a/data/cities/saint-genix-les-villages/saint-genix-optique.yml
+++ b/data/cities/saint-genix-les-villages/saint-genix-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.6
 longitude: 5.63252
 postcode: "73240"
 city: Saint-Genix-les-Villages
-street: "Place de l'Églíse"
-housenumber: 42
+street: Place de l'Églíse
+housenumber: "42"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-genix-sur-guiers/bureau-de-tabac.yml b/data/cities/saint-genix-sur-guiers/bureau-de-tabac.yml
index e751aa467..143baad5c 100644
--- a/data/cities/saint-genix-sur-guiers/bureau-de-tabac.yml
+++ b/data/cities/saint-genix-sur-guiers/bureau-de-tabac.yml
@@ -4,8 +4,8 @@ latitude: 45.59989
 longitude: 5.63222
 postcode: "73240"
 city: Saint-Genix-sur-Guiers
-street: "Place de l'Églíse"
-housenumber: 154
+street: Place de l'Églíse
+housenumber: "154"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-geoire-en-valdaine/crocquodis.yml b/data/cities/saint-geoire-en-valdaine/crocquodis.yml
index f293c2af3..38c6369c7 100644
--- a/data/cities/saint-geoire-en-valdaine/crocquodis.yml
+++ b/data/cities/saint-geoire-en-valdaine/crocquodis.yml
@@ -4,8 +4,9 @@ latitude: 45.45813
 longitude: 5.63275
 postcode: "38620"
 city: Saint-Geoire-en-Valdaine
-street: "Rue de La Rochette"
-housenumber: 536
-phone: "08 92 97 64 29"
-opening_hours: "lundi 08:00-18:00 mardi 08:00-18:00 mercredi 08:00-18:00 jeudi 08:00-18:00 vendredi 08:00-18:00 samedi Fermé dimanche Fermé"
-website: ""
\ No newline at end of file
+street: Rue de La Rochette
+housenumber: "536"
+phone: 08 92 97 64 29
+opening_hours: lundi 08:00-18:00 mardi 08:00-18:00 mercredi 08:00-18:00 jeudi 08:00-18:00
+    vendredi 08:00-18:00 samedi Fermé dimanche Fermé
+website: ""
diff --git a/data/cities/saint-georges-de-reneins/les-ciseaux-dalison.yml b/data/cities/saint-georges-de-reneins/les-ciseaux-dalison.yml
index b2792934b..2ab68c3be 100644
--- a/data/cities/saint-georges-de-reneins/les-ciseaux-dalison.yml
+++ b/data/cities/saint-georges-de-reneins/les-ciseaux-dalison.yml
@@ -5,7 +5,7 @@ longitude: 4.72247
 postcode: ""
 city: SAINT GEORGES DE RENEINS
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-georges-de-reneins/salon-chrystele.yml b/data/cities/saint-georges-de-reneins/salon-chrystele.yml
index d007d2a32..ed5cbbfb3 100644
--- a/data/cities/saint-georges-de-reneins/salon-chrystele.yml
+++ b/data/cities/saint-georges-de-reneins/salon-chrystele.yml
@@ -4,8 +4,8 @@ latitude: 46.05629
 longitude: 4.72291
 postcode: "69830"
 city: Saint Georges de reneins
-street: "Avenue des Tilleuls"
-housenumber: 
+street: Avenue des Tilleuls
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-georges-desperanche/essence-florale.yml b/data/cities/saint-georges-desperanche/essence-florale.yml
index e431fdf96..b7f9c0ea0 100644
--- a/data/cities/saint-georges-desperanche/essence-florale.yml
+++ b/data/cities/saint-georges-desperanche/essence-florale.yml
@@ -4,8 +4,8 @@ latitude: 45.55566
 longitude: 5.07873
 postcode: "38790"
 city: Saint-Georges-d'Espéranche
-street: "Rue Marchande"
-housenumber: 4
+street: Rue Marchande
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-georges-desperanche/garage-lardo.yml b/data/cities/saint-georges-desperanche/garage-lardo.yml
index e26d85204..2c50cfe42 100644
--- a/data/cities/saint-georges-desperanche/garage-lardo.yml
+++ b/data/cities/saint-georges-desperanche/garage-lardo.yml
@@ -1,11 +1,11 @@
 id: 70530143
-type: way
+type: node
 latitude: 45.55657
 longitude: 5.08624
 postcode: "38790"
 city: Saint-Georges-d'Espéranche
-street: "Route des Ayes"
-housenumber: 33
-phone: "+33 4 74 59 03 10"
+street: Route des Ayes
+housenumber: "33"
+phone: +33 4 74 59 03 10
 opening_hours: ""
-website: "https://agents.peugeot.fr/st-georges-d-esperanche"
\ No newline at end of file
+website: https://agents.peugeot.fr/st-georges-d-esperanche
diff --git a/data/cities/saint-georges-desperanche/jacky-coiffure.yml b/data/cities/saint-georges-desperanche/jacky-coiffure.yml
index 6e4dd7a9d..1cb586c31 100644
--- a/data/cities/saint-georges-desperanche/jacky-coiffure.yml
+++ b/data/cities/saint-georges-desperanche/jacky-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.55546
 longitude: 5.08167
 postcode: "38790"
 city: Saint-Georges-d'Espéranche
-street: "Avenue de la Gare"
-housenumber: 4
-phone: "+33 4 74 59 18 95"
+street: Avenue de la Gare
+housenumber: "4"
+phone: +33 4 74 59 18 95
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-georges-desperanche/sale-karactere.yml b/data/cities/saint-georges-desperanche/sale-karactere.yml
index 463907b59..d30a2630e 100644
--- a/data/cities/saint-georges-desperanche/sale-karactere.yml
+++ b/data/cities/saint-georges-desperanche/sale-karactere.yml
@@ -4,8 +4,8 @@ latitude: 45.55575
 longitude: 5.07813
 postcode: "38790"
 city: Saint-Georges-d'Espéranche
-street: "Rue Marchande"
-housenumber: 16
-phone: "+33 4 74 15 03 29"
+street: Rue Marchande
+housenumber: "16"
+phone: +33 4 74 15 03 29
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-germain-de-joux/piscicultures-petit.yml b/data/cities/saint-germain-de-joux/piscicultures-petit.yml
index 0247e5d2d..b833e9416 100644
--- a/data/cities/saint-germain-de-joux/piscicultures-petit.yml
+++ b/data/cities/saint-germain-de-joux/piscicultures-petit.yml
@@ -5,7 +5,7 @@ longitude: 5.72645
 postcode: "01130"
 city: Saint-Germain-de-Joux
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-germain-la-chambotte/la-fruitiere-de-la-chambotte.yml b/data/cities/saint-germain-la-chambotte/la-fruitiere-de-la-chambotte.yml
index 6450b3ed6..c005e0eeb 100644
--- a/data/cities/saint-germain-la-chambotte/la-fruitiere-de-la-chambotte.yml
+++ b/data/cities/saint-germain-la-chambotte/la-fruitiere-de-la-chambotte.yml
@@ -1,11 +1,11 @@
 id: 218666312
-type: way
+type: node
 latitude: 45.78224
 longitude: 5.89046
 postcode: "73410"
 city: SAINT GERMAIN LA CHAMBOTTE
-street: "Route de Mondurand"
-housenumber: 
-phone: "+33 4 79 63 11 67"
+street: Route de Mondurand
+housenumber: ""
+phone: +33 4 79 63 11 67
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-germain-lespinasse/fradin-thierry.yml b/data/cities/saint-germain-lespinasse/fradin-thierry.yml
index 9a4592890..410c65d9c 100644
--- a/data/cities/saint-germain-lespinasse/fradin-thierry.yml
+++ b/data/cities/saint-germain-lespinasse/fradin-thierry.yml
@@ -1,11 +1,11 @@
 id: 362552605
-type: way
+type: node
 latitude: 46.10367
 longitude: 3.96439
 postcode: "42640"
 city: Saint-Germain-Lespinasse
-street: "Rue Persigny"
-housenumber: 7
-phone: "+33 4 77 64 53 91"
-opening_hours: "Tu-Sa 06:30-19:30; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+street: Rue Persigny
+housenumber: "7"
+phone: +33 4 77 64 53 91
+opening_hours: Tu-Sa 06:30-19:30; Su 07:00-13:00
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/carrefour-express.yml b/data/cities/saint-gervais-les-bains/carrefour-express.yml
index e7ab70f0d..78c8e141c 100644
--- a/data/cities/saint-gervais-les-bains/carrefour-express.yml
+++ b/data/cities/saint-gervais-les-bains/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.89236
 longitude: 6.71208
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Rue du Mont Blanc"
-housenumber: 28
+street: Rue du Mont Blanc
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00, Su 08:00-12:30,16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00, Su 08:00-12:30,16:00-19:00
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/claude-penz-sports.yml b/data/cities/saint-gervais-les-bains/claude-penz-sports.yml
index 0839fdad4..0b12ae1ae 100644
--- a/data/cities/saint-gervais-les-bains/claude-penz-sports.yml
+++ b/data/cities/saint-gervais-les-bains/claude-penz-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.8752
 longitude: 6.68662
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "le Bettex"
-housenumber: 4383
+street: le Bettex
+housenumber: "4383"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/french-alps-market.yml b/data/cities/saint-gervais-les-bains/french-alps-market.yml
index 3075b8625..2f8d7d14a 100644
--- a/data/cities/saint-gervais-les-bains/french-alps-market.yml
+++ b/data/cities/saint-gervais-les-bains/french-alps-market.yml
@@ -4,8 +4,8 @@ latitude: 45.89197
 longitude: 6.71198
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Rue de la Comtesse"
-housenumber: 50
-phone: "+33 6 82 55 58 04"
-opening_hours: "15:00-19:00; Th off"
-website: "https://www.frenchalpsmarket.com/"
\ No newline at end of file
+street: Rue de la Comtesse
+housenumber: "50"
+phone: +33 6 82 55 58 04
+opening_hours: 15:00-19:00; Th off
+website: https://www.frenchalpsmarket.com/
diff --git a/data/cities/saint-gervais-les-bains/go-sport-montagne.yml b/data/cities/saint-gervais-les-bains/go-sport-montagne.yml
index bf6979dc5..c4aacc473 100644
--- a/data/cities/saint-gervais-les-bains/go-sport-montagne.yml
+++ b/data/cities/saint-gervais-les-bains/go-sport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.89356
 longitude: 6.71168
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Rue du Mont Blanc"
-housenumber: 168
+street: Rue du Mont Blanc
+housenumber: "168"
 phone: ""
-opening_hours: "Mo-Su 08:00-12:30, 14:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-12:30, 14:00-19:30
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/go-sport.yml b/data/cities/saint-gervais-les-bains/go-sport.yml
index d9263885c..08004957e 100644
--- a/data/cities/saint-gervais-les-bains/go-sport.yml
+++ b/data/cities/saint-gervais-les-bains/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.87598
 longitude: 6.68849
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Route de Cupelin"
-housenumber: 3801
+street: Route de Cupelin
+housenumber: "3801"
 phone: ""
-opening_hours: "Mo-Su 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-19:00
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/intersport.yml b/data/cities/saint-gervais-les-bains/intersport.yml
index a8435ced0..e3ad732f3 100644
--- a/data/cities/saint-gervais-les-bains/intersport.yml
+++ b/data/cities/saint-gervais-les-bains/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.87429
 longitude: 6.68619
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Route du Bettex"
-housenumber: 4239
+street: Route du Bettex
+housenumber: "4239"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/la-ferme-savoyarde.yml b/data/cities/saint-gervais-les-bains/la-ferme-savoyarde.yml
index 2bfff7c4c..957cde502 100644
--- a/data/cities/saint-gervais-les-bains/la-ferme-savoyarde.yml
+++ b/data/cities/saint-gervais-les-bains/la-ferme-savoyarde.yml
@@ -4,8 +4,8 @@ latitude: 45.89265
 longitude: 6.7111
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Avenue du Mont Paccard"
-housenumber: 51
+street: Avenue du Mont Paccard
+housenumber: "51"
 phone: ""
-opening_hours: "Tu-Su 09:00-12:30,15:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 09:00-12:30,15:00-19:30
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/le-petit-casino.yml b/data/cities/saint-gervais-les-bains/le-petit-casino.yml
index c6cf86a32..f1c4fbc12 100644
--- a/data/cities/saint-gervais-les-bains/le-petit-casino.yml
+++ b/data/cities/saint-gervais-les-bains/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.89184
 longitude: 6.71375
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Avenue du Mont d'Arbois"
-housenumber: 211
+street: Avenue du Mont d'Arbois
+housenumber: "211"
 phone: ""
-opening_hours: "Mo-Su 07:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-20:00
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/optique-saint-gervais.yml b/data/cities/saint-gervais-les-bains/optique-saint-gervais.yml
index 111cbdb87..7ec65cab2 100644
--- a/data/cities/saint-gervais-les-bains/optique-saint-gervais.yml
+++ b/data/cities/saint-gervais-les-bains/optique-saint-gervais.yml
@@ -4,8 +4,8 @@ latitude: 45.89249
 longitude: 6.71115
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Avenue du Mont Paccard"
-housenumber: 51
+street: Avenue du Mont Paccard
+housenumber: "51"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:00-12:30, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:00-12:30, 15:00-19:00
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/pierre-penz-et-fils-route-de-saint-nicolas-de-veroce.yml b/data/cities/saint-gervais-les-bains/pierre-penz-et-fils-route-de-saint-nicolas-de-veroce.yml
index a1d8d69f7..2aa9adc32 100644
--- a/data/cities/saint-gervais-les-bains/pierre-penz-et-fils-route-de-saint-nicolas-de-veroce.yml
+++ b/data/cities/saint-gervais-les-bains/pierre-penz-et-fils-route-de-saint-nicolas-de-veroce.yml
@@ -4,8 +4,8 @@ latitude: 45.86208
 longitude: 6.71748
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Route de Saint-Nicolas de Véroce"
-housenumber: 
+street: Route de Saint-Nicolas de Véroce
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.pierrepenz-sports.com/"
\ No newline at end of file
+website: https://www.pierrepenz-sports.com/
diff --git a/data/cities/saint-gervais-les-bains/pierre-penz-et-fils.yml b/data/cities/saint-gervais-les-bains/pierre-penz-et-fils.yml
index aa15e83cd..cb8b0926f 100644
--- a/data/cities/saint-gervais-les-bains/pierre-penz-et-fils.yml
+++ b/data/cities/saint-gervais-les-bains/pierre-penz-et-fils.yml
@@ -4,8 +4,8 @@ latitude: 45.85369
 longitude: 6.72353
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Route de Saint-Nicolas de Véroce"
-housenumber: 
-phone: "+33 4 50 93 21 23"
+street: Route de Saint-Nicolas de Véroce
+housenumber: ""
+phone: +33 4 50 93 21 23
 opening_hours: ""
-website: "https://www.pierrepenz-sports.com/"
\ No newline at end of file
+website: https://www.pierrepenz-sports.com/
diff --git a/data/cities/saint-gervais-les-bains/remontees-mecaniques.yml b/data/cities/saint-gervais-les-bains/remontees-mecaniques.yml
index 2bf5bc099..e92056333 100644
--- a/data/cities/saint-gervais-les-bains/remontees-mecaniques.yml
+++ b/data/cities/saint-gervais-les-bains/remontees-mecaniques.yml
@@ -4,8 +4,8 @@ latitude: 45.85296
 longitude: 6.72388
 postcode: "74190"
 city: Saint-Gervais-les-Bains
-street: "Route de Saint-Nicolas de Véroce"
-housenumber: 
+street: Route de Saint-Nicolas de Véroce
+housenumber: ""
 phone: ""
-opening_hours: "PH,Mo-Su 08:45-17:30"
-website: ""
\ No newline at end of file
+opening_hours: PH,Mo-Su 08:45-17:30
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/sherpa.yml b/data/cities/saint-gervais-les-bains/sherpa.yml
index 8bf64ea67..b7d962cec 100644
--- a/data/cities/saint-gervais-les-bains/sherpa.yml
+++ b/data/cities/saint-gervais-les-bains/sherpa.yml
@@ -4,8 +4,9 @@ latitude: 45.87607
 longitude: 6.68853
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Route de Cupelin"
-housenumber: 3801
+street: Route de Cupelin
+housenumber: "3801"
 phone: ""
-opening_hours: "Dec 21-Apr 13 Mo-Su 08:00-12:30, 15:00-19:30; Jul 07-Aug 31 Mo-Su 08:00-12:30, 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Dec 21-Apr 13 Mo-Su 08:00-12:30, 15:00-19:30; Jul 07-Aug 31 Mo-Su 08:00-12:30,
+    16:00-19:00
+website: ""
diff --git a/data/cities/saint-gervais-les-bains/ski-plus.yml b/data/cities/saint-gervais-les-bains/ski-plus.yml
index ce0317bb6..338246fb3 100644
--- a/data/cities/saint-gervais-les-bains/ski-plus.yml
+++ b/data/cities/saint-gervais-les-bains/ski-plus.yml
@@ -4,8 +4,8 @@ latitude: 45.88916
 longitude: 6.70688
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Avenue du Mont d'Arbois"
-housenumber: 1025
-phone: "+33 4 50 47 03 61"
-opening_hours: "08:30-18:30"
-website: "https://skiplus-saintgervais.notresphere.com/"
\ No newline at end of file
+street: Avenue du Mont d'Arbois
+housenumber: "1025"
+phone: +33 4 50 47 03 61
+opening_hours: 08:30-18:30
+website: https://skiplus-saintgervais.notresphere.com/
diff --git a/data/cities/saint-gervais-les-bains/skimium.yml b/data/cities/saint-gervais-les-bains/skimium.yml
index 48ff8fdb9..f8e972aa7 100644
--- a/data/cities/saint-gervais-les-bains/skimium.yml
+++ b/data/cities/saint-gervais-les-bains/skimium.yml
@@ -4,8 +4,8 @@ latitude: 45.89296
 longitude: 6.71176
 postcode: "74170"
 city: Saint-Gervais-les-Bains
-street: "Rue du Mont Blanc"
-housenumber: 86
+street: Rue du Mont Blanc
+housenumber: "86"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-gingolph/casino-shop.yml b/data/cities/saint-gingolph/casino-shop.yml
index e0a3fbf42..4d570f39f 100644
--- a/data/cities/saint-gingolph/casino-shop.yml
+++ b/data/cities/saint-gingolph/casino-shop.yml
@@ -1,11 +1,11 @@
 id: 66784328
-type: way
+type: node
 latitude: 46.3935
 longitude: 6.80111
 postcode: "74500"
 city: Saint-Gingolph
-street: "Rue Nationale"
-housenumber: 40
+street: Rue Nationale
+housenumber: "40"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:30
+website: ""
diff --git a/data/cities/saint-gingolph/lepicurienne.yml b/data/cities/saint-gingolph/lepicurienne.yml
index e384000d2..d5f30a3f4 100644
--- a/data/cities/saint-gingolph/lepicurienne.yml
+++ b/data/cities/saint-gingolph/lepicurienne.yml
@@ -4,8 +4,8 @@ latitude: 46.3923
 longitude: 6.80467
 postcode: "1898"
 city: Saint-Gingolph
-street: "Rue des Ouches"
-housenumber: 2
-phone: "+41 (0)24 481 81 04"
+street: Rue des Ouches
+housenumber: "2"
+phone: +41 (0)24 481 81 04
 opening_hours: ""
-website: "https://www.epicurienne.ch/"
\ No newline at end of file
+website: https://www.epicurienne.ch/
diff --git a/data/cities/saint-gingolph/longlerie-dandreane.yml b/data/cities/saint-gingolph/longlerie-dandreane.yml
index 355fbc8e2..534610446 100644
--- a/data/cities/saint-gingolph/longlerie-dandreane.yml
+++ b/data/cities/saint-gingolph/longlerie-dandreane.yml
@@ -4,8 +4,8 @@ latitude: 46.39372
 longitude: 6.80449
 postcode: "74500"
 city: Saint-Gingolph
-street: "Rue du Lac"
-housenumber: 8
-phone: "+33 6 43 36 23 47"
+street: Rue du Lac
+housenumber: "8"
+phone: +33 6 43 36 23 47
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-haon-le-chatel/mons-fromager-affineur.yml b/data/cities/saint-haon-le-chatel/mons-fromager-affineur.yml
index 65f7ef849..591be5e51 100644
--- a/data/cities/saint-haon-le-chatel/mons-fromager-affineur.yml
+++ b/data/cities/saint-haon-le-chatel/mons-fromager-affineur.yml
@@ -1,11 +1,11 @@
 id: 362961677
-type: way
+type: node
 latitude: 46.06525
 longitude: 3.92159
 postcode: "42370"
 city: Saint-Haon-le-Châtel
-street: "Le Pré Normand"
-housenumber: 
-phone: "+33 4 77 64 40 79"
+street: Le Pré Normand
+housenumber: ""
+phone: +33 4 77 64 40 79
 opening_hours: ""
-website: "https://www.mons-fromages.com/"
\ No newline at end of file
+website: https://www.mons-fromages.com/
diff --git a/data/cities/saint-hilaire-du-touvet/st-hil-air-shop.yml b/data/cities/saint-hilaire-du-touvet/st-hil-air-shop.yml
index f96aaca92..acbcc43f3 100644
--- a/data/cities/saint-hilaire-du-touvet/st-hil-air-shop.yml
+++ b/data/cities/saint-hilaire-du-touvet/st-hil-air-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.30796
 longitude: 5.88521
 postcode: "38660"
 city: Saint-Hilaire-du-Touvet
-street: "Chemin de la Cour"
-housenumber: 6
+street: Chemin de la Cour
+housenumber: "6"
 phone: "+33786012061"
 opening_hours: ""
-website: "https://www.airshop-parapente.com/"
\ No newline at end of file
+website: https://www.airshop-parapente.com/
diff --git a/data/cities/saint-hilaire/le-disque-bleu.yml b/data/cities/saint-hilaire/le-disque-bleu.yml
index 84e99f1c7..7a9bbd9c0 100644
--- a/data/cities/saint-hilaire/le-disque-bleu.yml
+++ b/data/cities/saint-hilaire/le-disque-bleu.yml
@@ -1,11 +1,12 @@
 id: 37737876
-type: way
+type: node
 latitude: 45.3014
 longitude: 5.87396
 postcode: "38660"
 city: Saint-Hilaire
-street: "route des Trois Villages"
-housenumber: 22
+street: Route des Trois Villages
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-We,Fr 08:00-12:30, Mo-We 15:30-19:30, Sa 08:15-12:30,15:30-19:45, Su 08:15-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr 08:00-12:30, Mo-We 15:30-19:30, Sa 08:15-12:30,15:30-19:45,
+    Su 08:15-12:30
+website: ""
diff --git a/data/cities/saint-ismier/aux-2-gourmets.yml b/data/cities/saint-ismier/aux-2-gourmets.yml
index a675be753..ac5c41fdf 100644
--- a/data/cities/saint-ismier/aux-2-gourmets.yml
+++ b/data/cities/saint-ismier/aux-2-gourmets.yml
@@ -4,8 +4,8 @@ latitude: 45.24758
 longitude: 5.83376
 postcode: "38330"
 city: Saint-Ismier
-street: "Route de Chambéry"
-housenumber: 1488
-phone: "+33 4 76 52 01 42"
-opening_hours: "Tu-Su 06:00-13:00; Tu-Sa 15:30-19:30"
-website: ""
\ No newline at end of file
+street: Route de Chambéry
+housenumber: "1488"
+phone: +33 4 76 52 01 42
+opening_hours: Tu-Su 06:00-13:00; Tu-Sa 15:30-19:30
+website: ""
diff --git a/data/cities/saint-ismier/berenghair.yml b/data/cities/saint-ismier/berenghair.yml
index 79cb940c8..3916e45d0 100644
--- a/data/cities/saint-ismier/berenghair.yml
+++ b/data/cities/saint-ismier/berenghair.yml
@@ -5,7 +5,7 @@ longitude: 5.83164
 postcode: "38330"
 city: Saint-Ismier
 street: ""
-housenumber: 4
+housenumber: "4"
 phone: "+33476522345"
-opening_hours: "Tu-Sa 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-19:00
+website: ""
diff --git a/data/cities/saint-ismier/carrefour-city.yml b/data/cities/saint-ismier/carrefour-city.yml
index a07999b06..101937652 100644
--- a/data/cities/saint-ismier/carrefour-city.yml
+++ b/data/cities/saint-ismier/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.24118
 longitude: 5.84521
 postcode: "38330"
 city: Saint-Ismier
-street: "Chemin des Prêles"
-housenumber: 400
+street: Chemin des Prêles
+housenumber: "400"
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00, Su 09:00-13:00"
-website: "https://www.carrefour.fr/magasin/city-st-ismier"
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-21:00, Su 09:00-13:00
+website: https://www.carrefour.fr/magasin/city-st-ismier
diff --git a/data/cities/saint-ismier/ma-coop.yml b/data/cities/saint-ismier/ma-coop.yml
index 15a652bef..d7449065a 100644
--- a/data/cities/saint-ismier/ma-coop.yml
+++ b/data/cities/saint-ismier/ma-coop.yml
@@ -1,11 +1,11 @@
 id: 156037859
-type: way
+type: node
 latitude: 45.24304
 longitude: 5.82498
 postcode: "38330"
 city: Saint-Ismier
-street: "Route de Chambéry"
-housenumber: 661
-phone: "+33 9 80 94 78 08"
-opening_hours: "Tu-Fr 09:00-12:30; Tu-Fr 15:00-19:00; Sa 09:00-19:00"
-website: "https://ma-coop38.com/"
\ No newline at end of file
+street: Route de Chambéry
+housenumber: "661"
+phone: +33 9 80 94 78 08
+opening_hours: Tu-Fr 09:00-12:30; Tu-Fr 15:00-19:00; Sa 09:00-19:00
+website: https://ma-coop38.com/
diff --git a/data/cities/saint-ismier/maison-floran.yml b/data/cities/saint-ismier/maison-floran.yml
index 35659e215..0eeedd833 100644
--- a/data/cities/saint-ismier/maison-floran.yml
+++ b/data/cities/saint-ismier/maison-floran.yml
@@ -1,11 +1,11 @@
 id: 800740010
-type: way
+type: node
 latitude: 45.24506
 longitude: 5.82985
 postcode: "38330"
 city: Saint-Ismier
-street: "Route de Chambéry"
-housenumber: 1066
-phone: "+33 4 76 77 03 22"
-opening_hours: "Mo-Sa 06:30-19:45; Su 06:30-19:00"
-website: ""
\ No newline at end of file
+street: Route de Chambéry
+housenumber: "1066"
+phone: +33 4 76 77 03 22
+opening_hours: Mo-Sa 06:30-19:45; Su 06:30-19:00
+website: ""
diff --git a/data/cities/saint-ismier/millesime-spa.yml b/data/cities/saint-ismier/millesime-spa.yml
index c422c616e..001b17e7a 100644
--- a/data/cities/saint-ismier/millesime-spa.yml
+++ b/data/cities/saint-ismier/millesime-spa.yml
@@ -1,11 +1,11 @@
 id: 1049881058
-type: way
+type: node
 latitude: 45.24325
 longitude: 5.82541
 postcode: "38330"
 city: Saint-Ismier
-street: "Route de Chambéry"
-housenumber: 700
-phone: "+33 476770303"
+street: Route de Chambéry
+housenumber: "700"
+phone: +33 476770303
 opening_hours: ""
-website: "https://www.millesime-spa.fr/"
\ No newline at end of file
+website: https://www.millesime-spa.fr/
diff --git a/data/cities/saint-ismier/vert-feuille.yml b/data/cities/saint-ismier/vert-feuille.yml
index 191476efb..64fde6c76 100644
--- a/data/cities/saint-ismier/vert-feuille.yml
+++ b/data/cities/saint-ismier/vert-feuille.yml
@@ -4,8 +4,8 @@ latitude: 45.24387
 longitude: 5.82818
 postcode: "38330"
 city: Saint-Ismier
-street: "Route du Rivet"
-housenumber: 67
-phone: "+33 476520748"
+street: Route du Rivet
+housenumber: "67"
+phone: +33 476520748
 opening_hours: ""
-website: "https://www.vertfeuille.fr/"
\ No newline at end of file
+website: https://www.vertfeuille.fr/
diff --git a/data/cities/saint-jean-bonnefonds/pompes-funebres-argaud-paul.yml b/data/cities/saint-jean-bonnefonds/pompes-funebres-argaud-paul.yml
index 9e0ee4dd3..8f074d535 100644
--- a/data/cities/saint-jean-bonnefonds/pompes-funebres-argaud-paul.yml
+++ b/data/cities/saint-jean-bonnefonds/pompes-funebres-argaud-paul.yml
@@ -4,8 +4,8 @@ latitude: 45.44537
 longitude: 4.42611
 postcode: "42650"
 city: Saint-Jean-Bonnefonds
-street: "Rue Émile Zola"
-housenumber: 46
-phone: "+33 4 77 50 34 34"
-opening_hours: "24/7"
-website: "https://www.argaud.fr/index.php"
\ No newline at end of file
+street: Rue Émile Zola
+housenumber: "46"
+phone: +33 4 77 50 34 34
+opening_hours: 24/7
+website: https://www.argaud.fr/index.php
diff --git a/data/cities/saint-jean-darves/intersport.yml b/data/cities/saint-jean-darves/intersport.yml
index 0804acb93..2ff9077cc 100644
--- a/data/cities/saint-jean-darves/intersport.yml
+++ b/data/cities/saint-jean-darves/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.2631
 postcode: "73530"
 city: Saint-Jean-d'Arves
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-darvey/gomes-moto-et-composite.yml b/data/cities/saint-jean-darvey/gomes-moto-et-composite.yml
index 5b9b63808..37adab850 100644
--- a/data/cities/saint-jean-darvey/gomes-moto-et-composite.yml
+++ b/data/cities/saint-jean-darvey/gomes-moto-et-composite.yml
@@ -1,11 +1,11 @@
 id: 164602405
-type: way
+type: node
 latitude: 45.58128
 longitude: 5.97931
 postcode: "73230"
 city: Saint-Jean-d'Arvey
-street: "Route de la Corbière au Bout du Monde"
-housenumber: 
+street: Route de la Corbière au Bout du Monde
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-daulps/carrefour-express.yml b/data/cities/saint-jean-daulps/carrefour-express.yml
index 3d5548b2d..f977c241a 100644
--- a/data/cities/saint-jean-daulps/carrefour-express.yml
+++ b/data/cities/saint-jean-daulps/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 46.23152
 longitude: 6.65672
 postcode: "74430"
 city: Saint-Jean-d'Aulps
-street: "Route des Grandes Alpes"
-housenumber: 2121
+street: Route des Grandes Alpes
+housenumber: "2121"
 phone: ""
-opening_hours: "Mo-Sa 07:30-20:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-20:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/saint-jean-daulps/carrefour-market.yml b/data/cities/saint-jean-daulps/carrefour-market.yml
index 3273e0d52..15269b8df 100644
--- a/data/cities/saint-jean-daulps/carrefour-market.yml
+++ b/data/cities/saint-jean-daulps/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 361136254
-type: way
+type: node
 latitude: 46.21046
 longitude: 6.6734
 postcode: "74430"
 city: Saint-Jean-d'Aulps
-street: "Route des Grandes Alpes"
-housenumber: 4679
+street: Route des Grandes Alpes
+housenumber: "4679"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-jean-daulps/muffat-sport.yml b/data/cities/saint-jean-daulps/muffat-sport.yml
index 7f9e38037..c9dbbedb3 100644
--- a/data/cities/saint-jean-daulps/muffat-sport.yml
+++ b/data/cities/saint-jean-daulps/muffat-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.22634
 longitude: 6.64166
 postcode: "74430"
 city: Saint-Jean-d'Aulps
-street: "Route de la Télécabine"
-housenumber: 47
+street: Route de la Télécabine
+housenumber: "47"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-daulps/sherpa.yml b/data/cities/saint-jean-daulps/sherpa.yml
index 42f1c0989..86646baa8 100644
--- a/data/cities/saint-jean-daulps/sherpa.yml
+++ b/data/cities/saint-jean-daulps/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 46.22627
 longitude: 6.64189
 postcode: "74430"
 city: Saint-Jean-d'Aulps
-street: "Route de la Télécabine"
-housenumber: 71
+street: Route de la Télécabine
+housenumber: "71"
 phone: ""
-opening_hours: "Dec 15-Apr 15 Mo-Su 07:30-13:00, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Dec 15-Apr 15 Mo-Su 07:30-13:00, 15:00-19:00
+website: ""
diff --git a/data/cities/saint-jean-daulps/ski-flash.yml b/data/cities/saint-jean-daulps/ski-flash.yml
index 0fdff4a6b..664730ef6 100644
--- a/data/cities/saint-jean-daulps/ski-flash.yml
+++ b/data/cities/saint-jean-daulps/ski-flash.yml
@@ -4,8 +4,8 @@ latitude: 46.22901
 longitude: 6.65921
 postcode: "74430"
 city: Saint-Jean-d'Aulps
-street: "Route des Grandes Alpes"
-housenumber: 2515
+street: Route des Grandes Alpes
+housenumber: "2515"
 phone: ""
 opening_hours: ""
-website: "https://skiflash.fr/"
\ No newline at end of file
+website: https://skiflash.fr/
diff --git a/data/cities/saint-jean-daulps/sport-2000.yml b/data/cities/saint-jean-daulps/sport-2000.yml
index cacfab47b..4c228ac4a 100644
--- a/data/cities/saint-jean-daulps/sport-2000.yml
+++ b/data/cities/saint-jean-daulps/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.22663
 longitude: 6.64094
 postcode: "74430"
 city: Saint-Jean-d'Aulps
-street: "Route de la Moussière d'en Haut"
-housenumber: 2932
+street: Route de la Moussière d'en Haut
+housenumber: "2932"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/saint-jean-de-bournay/bijouterie-benetti.yml b/data/cities/saint-jean-de-bournay/bijouterie-benetti.yml
index 606efa769..93ea50bd2 100644
--- a/data/cities/saint-jean-de-bournay/bijouterie-benetti.yml
+++ b/data/cities/saint-jean-de-bournay/bijouterie-benetti.yml
@@ -4,8 +4,8 @@ latitude: 45.50246
 longitude: 5.13891
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Rue de la République"
-housenumber: 84
+street: Rue de la République
+housenumber: "84"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-bournay/bleu-indigo.yml b/data/cities/saint-jean-de-bournay/bleu-indigo.yml
index 30fef166e..83062feeb 100644
--- a/data/cities/saint-jean-de-bournay/bleu-indigo.yml
+++ b/data/cities/saint-jean-de-bournay/bleu-indigo.yml
@@ -4,8 +4,8 @@ latitude: 45.50232
 longitude: 5.14153
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-bournay/boucherie-charcuterie-traiteur-poulet.yml b/data/cities/saint-jean-de-bournay/boucherie-charcuterie-traiteur-poulet.yml
index 286c7e9ad..b0b940d61 100644
--- a/data/cities/saint-jean-de-bournay/boucherie-charcuterie-traiteur-poulet.yml
+++ b/data/cities/saint-jean-de-bournay/boucherie-charcuterie-traiteur-poulet.yml
@@ -4,8 +4,8 @@ latitude: 45.5025
 longitude: 5.13867
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Rue de la République"
-housenumber: 90
+street: Rue de la République
+housenumber: "90"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-bournay/breuil-horticulture.yml b/data/cities/saint-jean-de-bournay/breuil-horticulture.yml
index 00728e7a0..c5236008a 100644
--- a/data/cities/saint-jean-de-bournay/breuil-horticulture.yml
+++ b/data/cities/saint-jean-de-bournay/breuil-horticulture.yml
@@ -1,11 +1,11 @@
 id: 556989915
-type: way
+type: node
 latitude: 45.4748
 longitude: 5.14692
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Chemin de Petits Monts"
-housenumber: 
-phone: "+33 6 15 71 10 03"
+street: Chemin de Petits Monts
+housenumber: ""
+phone: +33 6 15 71 10 03
 opening_hours: ""
-website: "https://www.breuilhorticulture.fr"
\ No newline at end of file
+website: https://www.breuilhorticulture.fr
diff --git a/data/cities/saint-jean-de-bournay/fleur-baroque.yml b/data/cities/saint-jean-de-bournay/fleur-baroque.yml
index 1f5a6a9c0..4da097c6e 100644
--- a/data/cities/saint-jean-de-bournay/fleur-baroque.yml
+++ b/data/cities/saint-jean-de-bournay/fleur-baroque.yml
@@ -4,8 +4,8 @@ latitude: 45.5025
 longitude: 5.13859
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Rue de la République"
-housenumber: 
-phone: "04 74 58 64 80"
+street: Rue de la République
+housenumber: ""
+phone: 04 74 58 64 80
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-bournay/intermarche.yml b/data/cities/saint-jean-de-bournay/intermarche.yml
index aae9269df..a2fed5f68 100644
--- a/data/cities/saint-jean-de-bournay/intermarche.yml
+++ b/data/cities/saint-jean-de-bournay/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.49862
 longitude: 5.13742
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Route Nationale"
-housenumber: 51
+street: Route Nationale
+housenumber: "51"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-jean-de-bournay/krys.yml b/data/cities/saint-jean-de-bournay/krys.yml
index 8bc91ef27..35290b104 100644
--- a/data/cities/saint-jean-de-bournay/krys.yml
+++ b/data/cities/saint-jean-de-bournay/krys.yml
@@ -4,8 +4,8 @@ latitude: 45.50234
 longitude: 5.14012
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Rue de la République"
-housenumber: 72
+street: Rue de la République
+housenumber: "72"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-bournay/storebike.yml b/data/cities/saint-jean-de-bournay/storebike.yml
index c5e799d10..5013d441d 100644
--- a/data/cities/saint-jean-de-bournay/storebike.yml
+++ b/data/cities/saint-jean-de-bournay/storebike.yml
@@ -4,8 +4,8 @@ latitude: 45.50244
 longitude: 5.14286
 postcode: "38440"
 city: Saint-Jean-de-Bournay
-street: "Place Louis Montagnat"
-housenumber: 1
+street: Place Louis Montagnat
+housenumber: "1"
 phone: ""
-opening_hours: "Mo 09:00-12:00, 14:00-19:00; We-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 09:00-12:00, 14:00-19:00; We-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/saint-jean-de-la-porte/le-jardin-darclusaz.yml b/data/cities/saint-jean-de-la-porte/le-jardin-darclusaz.yml
index 2d0d8f55d..f8f8e05c3 100644
--- a/data/cities/saint-jean-de-la-porte/le-jardin-darclusaz.yml
+++ b/data/cities/saint-jean-de-la-porte/le-jardin-darclusaz.yml
@@ -4,8 +4,8 @@ latitude: 45.55428
 longitude: 6.13013
 postcode: "73250"
 city: Saint-Jean-de-la-Porte
-street: "Rue du Carnavet"
-housenumber: 333
+street: Rue du Carnavet
+housenumber: "333"
 phone: "+33681406039"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/a-glass.yml b/data/cities/saint-jean-de-maurienne/a-glass.yml
index 9a9907821..bf912b7e5 100644
--- a/data/cities/saint-jean-de-maurienne/a-glass.yml
+++ b/data/cities/saint-jean-de-maurienne/a-glass.yml
@@ -4,8 +4,8 @@ latitude: 45.26713
 longitude: 6.3705
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Avenue d'Italie"
-housenumber: 
+street: Avenue d'Italie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.aplusglass.com/centre-saint-jean-maurienne-73660"
\ No newline at end of file
+website: https://www.aplusglass.com/centre-saint-jean-maurienne-73660
diff --git a/data/cities/saint-jean-de-maurienne/auchan.yml b/data/cities/saint-jean-de-maurienne/auchan.yml
index 7f6af85d2..138423ad3 100644
--- a/data/cities/saint-jean-de-maurienne/auchan.yml
+++ b/data/cities/saint-jean-de-maurienne/auchan.yml
@@ -1,11 +1,11 @@
 id: 929381302
-type: way
+type: node
 latitude: 45.27902
 longitude: 6.34656
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "C C Saint Jean De Maurienne"
-housenumber: 
+street: C C Saint Jean De Maurienne
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/autodistribution-savoie.yml b/data/cities/saint-jean-de-maurienne/autodistribution-savoie.yml
index c6743bb71..20a23f038 100644
--- a/data/cities/saint-jean-de-maurienne/autodistribution-savoie.yml
+++ b/data/cities/saint-jean-de-maurienne/autodistribution-savoie.yml
@@ -4,8 +4,8 @@ latitude: 45.26839
 longitude: 6.36978
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Z.I Les Plans"
-housenumber: 
+street: Z.I Les Plans
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.autodistribution.fr/magasins-pieces-auto/autodistribution-savoie-isere-st-jean-de-maurienne"
\ No newline at end of file
+website: https://www.autodistribution.fr/magasins-pieces-auto/autodistribution-savoie-isere-st-jean-de-maurienne
diff --git a/data/cities/saint-jean-de-maurienne/dvelos-maurienne.yml b/data/cities/saint-jean-de-maurienne/dvelos-maurienne.yml
index 50c02e95e..d15aa965b 100644
--- a/data/cities/saint-jean-de-maurienne/dvelos-maurienne.yml
+++ b/data/cities/saint-jean-de-maurienne/dvelos-maurienne.yml
@@ -5,7 +5,7 @@ longitude: 6.34534
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
 street: ""
-housenumber: 249
-phone: "+33 9 87 14 98 60"
-opening_hours: "Mo 13:30-18:30; Tu-Sa 09:00-12:00,13:30-18:30; Su off"
-website: "https://www.dvelos.com/magasin/16-st-jean-de-maurienne"
\ No newline at end of file
+housenumber: "249"
+phone: +33 9 87 14 98 60
+opening_hours: Mo 13:30-18:30; Tu-Sa 09:00-12:00,13:30-18:30; Su off
+website: https://www.dvelos.com/magasin/16-st-jean-de-maurienne
diff --git a/data/cities/saint-jean-de-maurienne/gamm-vert.yml b/data/cities/saint-jean-de-maurienne/gamm-vert.yml
index ee63b01b7..7355e89ed 100644
--- a/data/cities/saint-jean-de-maurienne/gamm-vert.yml
+++ b/data/cities/saint-jean-de-maurienne/gamm-vert.yml
@@ -4,8 +4,8 @@ latitude: 45.26682
 longitude: 6.36732
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Chemin de Combe Paillarde"
-housenumber: 
+street: Chemin de Combe Paillarde
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/intersport.yml b/data/cities/saint-jean-de-maurienne/intersport.yml
index 82eb324a7..d0646b5af 100644
--- a/data/cities/saint-jean-de-maurienne/intersport.yml
+++ b/data/cities/saint-jean-de-maurienne/intersport.yml
@@ -1,11 +1,11 @@
 id: 163110574
-type: way
+type: node
 latitude: 45.27041
 longitude: 6.36539
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Avenue du 8 Mai 1945"
-housenumber: 
-phone: "+33 4 79 83 38 30"
-opening_hours: "Mo-Fr 09:30-12:15,14:00-19:00; Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+street: Avenue du 8 Mai 1945
+housenumber: ""
+phone: +33 4 79 83 38 30
+opening_hours: Mo-Fr 09:30-12:15,14:00-19:00; Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/krys.yml b/data/cities/saint-jean-de-maurienne/krys.yml
index 055043680..c735d8c80 100644
--- a/data/cities/saint-jean-de-maurienne/krys.yml
+++ b/data/cities/saint-jean-de-maurienne/krys.yml
@@ -4,8 +4,8 @@ latitude: 45.26859
 longitude: 6.36896
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Rue Jean Monnet"
-housenumber: 
+street: Rue Jean Monnet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/metifiot-pneus.yml b/data/cities/saint-jean-de-maurienne/metifiot-pneus.yml
index 6dc9c4cbd..d8424f146 100644
--- a/data/cities/saint-jean-de-maurienne/metifiot-pneus.yml
+++ b/data/cities/saint-jean-de-maurienne/metifiot-pneus.yml
@@ -5,7 +5,7 @@ longitude: 6.36812
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
 street: ""
-housenumber: 80
+housenumber: "80"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/pastore.yml b/data/cities/saint-jean-de-maurienne/pastore.yml
index d5afdb15d..464ce1fc2 100644
--- a/data/cities/saint-jean-de-maurienne/pastore.yml
+++ b/data/cities/saint-jean-de-maurienne/pastore.yml
@@ -5,7 +5,7 @@ longitude: 6.34415
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
 street: ""
-housenumber: 95
+housenumber: "95"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/sonepar-connect.yml b/data/cities/saint-jean-de-maurienne/sonepar-connect.yml
index 5813355d8..b003983b9 100644
--- a/data/cities/saint-jean-de-maurienne/sonepar-connect.yml
+++ b/data/cities/saint-jean-de-maurienne/sonepar-connect.yml
@@ -4,8 +4,8 @@ latitude: 45.26664
 longitude: 6.37004
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Avenue d'Italie"
-housenumber: 
+street: Avenue d'Italie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://agences.sonepar.fr/sonepar/fr/agency/france/auvergne-rhone-alpes/savoie/saint-jean-de-maurienne/saint-jean-de-maurienne/2lu"
\ No newline at end of file
+website: https://agences.sonepar.fr/sonepar/fr/agency/france/auvergne-rhone-alpes/savoie/saint-jean-de-maurienne/saint-jean-de-maurienne/2lu
diff --git a/data/cities/saint-jean-de-maurienne/sport-2000.yml b/data/cities/saint-jean-de-maurienne/sport-2000.yml
index 7e093a612..d000bd5fd 100644
--- a/data/cities/saint-jean-de-maurienne/sport-2000.yml
+++ b/data/cities/saint-jean-de-maurienne/sport-2000.yml
@@ -4,8 +4,9 @@ latitude: 45.26974
 longitude: 6.36511
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Avenue du 8 Mai 1945"
-housenumber: 
-phone: "+33 4 79 83 07 25"
-opening_hours: "Mo-Tu,Th-Fr 09:30-12:00,14:00-19:00; We 09:30-12:30,14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+street: Avenue du 8 Mai 1945
+housenumber: ""
+phone: +33 4 79 83 07 25
+opening_hours: Mo-Tu,Th-Fr 09:30-12:00,14:00-19:00; We 09:30-12:30,14:00-19:00; Sa
+    09:30-19:00; Su off
+website: ""
diff --git a/data/cities/saint-jean-de-maurienne/yesss-electrique.yml b/data/cities/saint-jean-de-maurienne/yesss-electrique.yml
index 85d6fbbdb..866c8d22b 100644
--- a/data/cities/saint-jean-de-maurienne/yesss-electrique.yml
+++ b/data/cities/saint-jean-de-maurienne/yesss-electrique.yml
@@ -4,8 +4,8 @@ latitude: 45.26574
 longitude: 6.37097
 postcode: "73300"
 city: Saint-Jean-de-Maurienne
-street: "Rue Léonard de Vinci"
-housenumber: 
+street: Rue Léonard de Vinci
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.yesss-fr.com/yesss-electrique-france"
\ No newline at end of file
+website: https://www.yesss-fr.com/yesss-electrique-france
diff --git a/data/cities/saint-jean-de-sixt/aravis-quincaillerie.yml b/data/cities/saint-jean-de-sixt/aravis-quincaillerie.yml
index 0f98ecf11..e9a202a27 100644
--- a/data/cities/saint-jean-de-sixt/aravis-quincaillerie.yml
+++ b/data/cities/saint-jean-de-sixt/aravis-quincaillerie.yml
@@ -4,8 +4,8 @@ latitude: 45.92308
 longitude: 6.41064
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "Place Aimé Dupont"
-housenumber: 78
-phone: "+33 4 50 01 19 09"
+street: Place Aimé Dupont
+housenumber: "78"
+phone: +33 4 50 01 19 09
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-sixt/boulangerie-capucine.yml b/data/cities/saint-jean-de-sixt/boulangerie-capucine.yml
index ab132fb44..4b8a6375a 100644
--- a/data/cities/saint-jean-de-sixt/boulangerie-capucine.yml
+++ b/data/cities/saint-jean-de-sixt/boulangerie-capucine.yml
@@ -4,8 +4,8 @@ latitude: 45.92301
 longitude: 6.41049
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "Place Aimé Dupont"
-housenumber: 94
-phone: "+33 4 50 77 36 30"
+street: Place Aimé Dupont
+housenumber: "94"
+phone: +33 4 50 77 36 30
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-sixt/boutik-102.yml b/data/cities/saint-jean-de-sixt/boutik-102.yml
index 7803662a1..a32fe7b16 100644
--- a/data/cities/saint-jean-de-sixt/boutik-102.yml
+++ b/data/cities/saint-jean-de-sixt/boutik-102.yml
@@ -4,8 +4,8 @@ latitude: 45.9232
 longitude: 6.41135
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "place de l'Ancienne École"
-housenumber: 11
-phone: "+33 6 19 39 09 20"
+street: place de l'Ancienne École
+housenumber: "11"
+phone: +33 6 19 39 09 20
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-sixt/carrefour-express.yml b/data/cities/saint-jean-de-sixt/carrefour-express.yml
index 1beba132e..940306249 100644
--- a/data/cities/saint-jean-de-sixt/carrefour-express.yml
+++ b/data/cities/saint-jean-de-sixt/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.92307
 longitude: 6.4108
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "place Aimé Dupont"
-housenumber: 64
+street: place Aimé Dupont
+housenumber: "64"
 phone: ""
-opening_hours: "Mo-Sa 07:30-20:00; Su 07:30-13:00"
-website: "https://www.carrefour.fr/magasin/express-saint-jean-de-sixt"
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-20:00; Su 07:30-13:00
+website: https://www.carrefour.fr/magasin/express-saint-jean-de-sixt
diff --git a/data/cities/saint-jean-de-sixt/contat-sports-saint-jean-de-sixt.yml b/data/cities/saint-jean-de-sixt/contat-sports-saint-jean-de-sixt.yml
index 8a29337fc..b3490bb64 100644
--- a/data/cities/saint-jean-de-sixt/contat-sports-saint-jean-de-sixt.yml
+++ b/data/cities/saint-jean-de-sixt/contat-sports-saint-jean-de-sixt.yml
@@ -4,8 +4,8 @@ latitude: 45.92327
 longitude: 6.41033
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "Route du Grand Bornand"
-housenumber: 74
+street: Route du Grand Bornand
+housenumber: "74"
 phone: ""
 opening_hours: ""
-website: "https://saintjeandesixt.sport2000.fr/fr/?utm_source=google&utm_medium=gmb&utm_content=local"
\ No newline at end of file
+website: https://saintjeandesixt.sport2000.fr/fr/?utm_source=google&utm_medium=gmb&utm_content=local
diff --git a/data/cities/saint-jean-de-sixt/la-fnire.yml b/data/cities/saint-jean-de-sixt/la-fnire.yml
index 079c5eff5..ed19ebd19 100644
--- a/data/cities/saint-jean-de-sixt/la-fnire.yml
+++ b/data/cities/saint-jean-de-sixt/la-fnire.yml
@@ -4,8 +4,8 @@ latitude: 45.92286
 longitude: 6.40998
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "Place Madeleine Lafrance"
-housenumber: 38
-phone: "+33 4 50 02 24 09"
+street: Place Madeleine Lafrance
+housenumber: "38"
+phone: +33 4 50 02 24 09
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-sixt/saint-jean-sport.yml b/data/cities/saint-jean-de-sixt/saint-jean-sport.yml
index 0d5a43bea..25698e60f 100644
--- a/data/cities/saint-jean-de-sixt/saint-jean-sport.yml
+++ b/data/cities/saint-jean-de-sixt/saint-jean-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.92292
 longitude: 6.41188
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "Chemin des Sixt"
-housenumber: 19
-phone: "+33 4 50 02 30 89"
-opening_hours: "Mo-Su 09:00-12:30, 14:30-19:00"
-website: "https://www.saint-jean-sport.com/"
\ No newline at end of file
+street: Chemin des Sixt
+housenumber: "19"
+phone: +33 4 50 02 30 89
+opening_hours: Mo-Su 09:00-12:30, 14:30-19:00
+website: https://www.saint-jean-sport.com/
diff --git a/data/cities/saint-jean-de-sixt/tabac-presse-souvenirs-chez-contat.yml b/data/cities/saint-jean-de-sixt/tabac-presse-souvenirs-chez-contat.yml
index 39deb1de6..1b9af73de 100644
--- a/data/cities/saint-jean-de-sixt/tabac-presse-souvenirs-chez-contat.yml
+++ b/data/cities/saint-jean-de-sixt/tabac-presse-souvenirs-chez-contat.yml
@@ -4,8 +4,8 @@ latitude: 45.92296
 longitude: 6.41005
 postcode: "74450"
 city: Saint-Jean-de-Sixt
-street: "Place Madeleine Lafrance"
-housenumber: 32
-phone: "+33 9 67 85 37 43"
+street: Place Madeleine Lafrance
+housenumber: "32"
+phone: +33 9 67 85 37 43
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-soudain/boulangerie-feuillette.yml b/data/cities/saint-jean-de-soudain/boulangerie-feuillette.yml
index 900ff0a1d..69abd7a93 100644
--- a/data/cities/saint-jean-de-soudain/boulangerie-feuillette.yml
+++ b/data/cities/saint-jean-de-soudain/boulangerie-feuillette.yml
@@ -1,11 +1,11 @@
 id: 1122854102
-type: way
+type: node
 latitude: 45.56882
 longitude: 5.42985
 postcode: "38110"
 city: Saint Jean de Soudain
-street: "Chemin de Chapon"
-housenumber: 17
-phone: "+33 4 74 83 90 24"
+street: Chemin de Chapon
+housenumber: "17"
+phone: +33 4 74 83 90 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-soudain/intermarche.yml b/data/cities/saint-jean-de-soudain/intermarche.yml
index 3fbfcbba0..a088b94a1 100644
--- a/data/cities/saint-jean-de-soudain/intermarche.yml
+++ b/data/cities/saint-jean-de-soudain/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 45.56634
 longitude: 5.42916
 postcode: "38110"
 city: Saint-Jean-de-Soudain
-street: "Route de la Bourbre"
-housenumber: 136
-phone: "+33 4 74 83 26 90"
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:30"
-website: "https://www.intermarche.com/magasins/10103/saint-jean-de-soudain-38110/infos-pratiques"
\ No newline at end of file
+street: Route de la Bourbre
+housenumber: "136"
+phone: +33 4 74 83 26 90
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:30
+website: https://www.intermarche.com/magasins/10103/saint-jean-de-soudain-38110/infos-pratiques
diff --git a/data/cities/saint-jean-de-soudain/la-fabrique-givree.yml b/data/cities/saint-jean-de-soudain/la-fabrique-givree.yml
index 6922d7d19..7da11a863 100644
--- a/data/cities/saint-jean-de-soudain/la-fabrique-givree.yml
+++ b/data/cities/saint-jean-de-soudain/la-fabrique-givree.yml
@@ -1,11 +1,11 @@
 id: 1122854103
-type: way
+type: node
 latitude: 45.56883
 longitude: 5.43003
 postcode: "38110"
 city: Saint-Jean-de-Soudain
-street: "Chemin de Chapon"
-housenumber: 13
+street: Chemin de Chapon
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-soudain/lentrepot-du-bricolage.yml b/data/cities/saint-jean-de-soudain/lentrepot-du-bricolage.yml
index 16414e229..65014f2fd 100644
--- a/data/cities/saint-jean-de-soudain/lentrepot-du-bricolage.yml
+++ b/data/cities/saint-jean-de-soudain/lentrepot-du-bricolage.yml
@@ -1,11 +1,11 @@
 id: 186721182
-type: way
+type: node
 latitude: 45.56457
 longitude: 5.42925
 postcode: "38110"
 city: Saint Jean de Soudain
-street: "Route de la Bourbre"
-housenumber: 510
-phone: "04 74 97 60 76"
-opening_hours: "Mo-Sa 07:30-19:00"
-website: "https://www.entrepot-du-bricolage.fr/mon-magasin/la%20tour%20du%20pin"
\ No newline at end of file
+street: Route de la Bourbre
+housenumber: "510"
+phone: 04 74 97 60 76
+opening_hours: Mo-Sa 07:30-19:00
+website: https://www.entrepot-du-bricolage.fr/mon-magasin/la%20tour%20du%20pin
diff --git a/data/cities/saint-jean-de-soudain/thiriet.yml b/data/cities/saint-jean-de-soudain/thiriet.yml
index e075cdce8..0e0853176 100644
--- a/data/cities/saint-jean-de-soudain/thiriet.yml
+++ b/data/cities/saint-jean-de-soudain/thiriet.yml
@@ -1,11 +1,11 @@
 id: 1122854104
-type: way
+type: node
 latitude: 45.56884
 longitude: 5.43018
 postcode: "38110"
 city: Saint-Jean-de-Soudain
-street: "Chemin de Chapon"
-housenumber: 17
+street: Chemin de Chapon
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-de-touslas/epices-et-tout.yml b/data/cities/saint-jean-de-touslas/epices-et-tout.yml
index e409fb9bd..a3493a933 100644
--- a/data/cities/saint-jean-de-touslas/epices-et-tout.yml
+++ b/data/cities/saint-jean-de-touslas/epices-et-tout.yml
@@ -4,8 +4,8 @@ latitude: 45.57778
 longitude: 4.66174
 postcode: "69700"
 city: Saint-Jean-de-Touslas
-street: "Place du Dîme"
-housenumber: 
-phone: "+33 4 78 86 90 19"
+street: Place du Dîme
+housenumber: ""
+phone: +33 4 78 86 90 19
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jean-soleymieux/boulangerie-patisserie-odier.yml b/data/cities/saint-jean-soleymieux/boulangerie-patisserie-odier.yml
index bfb3507a7..89fcd25ea 100644
--- a/data/cities/saint-jean-soleymieux/boulangerie-patisserie-odier.yml
+++ b/data/cities/saint-jean-soleymieux/boulangerie-patisserie-odier.yml
@@ -4,8 +4,8 @@ latitude: 45.50236
 longitude: 4.04009
 postcode: "42560"
 city: Saint-Jean-Soleymieux
-street: "Le Bourg"
-housenumber: 
+street: Le Bourg
+housenumber: ""
 phone: "+33477767777"
-opening_hours: "Tu-Su 07:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Su 07:00-18:30
+website: ""
diff --git a/data/cities/saint-jean-sur-veyle/le-champ-du-pain.yml b/data/cities/saint-jean-sur-veyle/le-champ-du-pain.yml
index 9a13d5f0a..291fb5141 100644
--- a/data/cities/saint-jean-sur-veyle/le-champ-du-pain.yml
+++ b/data/cities/saint-jean-sur-veyle/le-champ-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 46.25794
 longitude: 4.91485
 postcode: "01290"
 city: Saint-Jean-sur-Veyle
-street: "Rue de la Passerelle"
-housenumber: 5
-phone: "+33 3 45 87 99 94"
-opening_hours: "06:30-13:00,16:00-18:30"
-website: ""
\ No newline at end of file
+street: Rue de la Passerelle
+housenumber: "5"
+phone: +33 3 45 87 99 94
+opening_hours: 06:30-13:00,16:00-18:30
+website: ""
diff --git a/data/cities/saint-jeoire-prieure/troc-sport.yml b/data/cities/saint-jeoire-prieure/troc-sport.yml
index 80822684a..2c2ba3e78 100644
--- a/data/cities/saint-jeoire-prieure/troc-sport.yml
+++ b/data/cities/saint-jeoire-prieure/troc-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.53933
 longitude: 5.99068
 postcode: "73190"
 city: Saint-Jeoire-Prieuré
-street: "Montée de la Boisserette"
-housenumber: 32
-phone: "+33 4 79 71 90 10"
-opening_hours: "Tu-Sa 10:00-12:30, 14:00-19:00; Mo-Su 14:00-19:00"
-website: ""
\ No newline at end of file
+street: Montée de la Boisserette
+housenumber: "32"
+phone: +33 4 79 71 90 10
+opening_hours: Tu-Sa 10:00-12:30, 14:00-19:00; Mo-Su 14:00-19:00
+website: ""
diff --git a/data/cities/saint-jeoire/garage-grillet.yml b/data/cities/saint-jeoire/garage-grillet.yml
index 88f70f089..b6e7e0014 100644
--- a/data/cities/saint-jeoire/garage-grillet.yml
+++ b/data/cities/saint-jeoire/garage-grillet.yml
@@ -4,8 +4,8 @@ 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
+street: Rue des Tovets
+housenumber: "129"
+phone: +33 4 50 35 82 25
+opening_hours: Mo-Fr 08:00-19:00
+website: ""
diff --git a/data/cities/saint-jeoire/intermarche.yml b/data/cities/saint-jeoire/intermarche.yml
index 27235d95d..8d44efcf7 100644
--- a/data/cities/saint-jeoire/intermarche.yml
+++ b/data/cities/saint-jeoire/intermarche.yml
@@ -1,11 +1,11 @@
 id: 1017560045
-type: way
+type: node
 latitude: 46.1353
 longitude: 6.46161
 postcode: "74490"
 city: Saint-Jeoire
-street: "Route de Montrenaz"
-housenumber: 123
+street: Route de Montrenaz
+housenumber: "123"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-jeoire/savoie-bretzel.yml b/data/cities/saint-jeoire/savoie-bretzel.yml
index 975a2903b..c1e9db050 100644
--- a/data/cities/saint-jeoire/savoie-bretzel.yml
+++ b/data/cities/saint-jeoire/savoie-bretzel.yml
@@ -4,8 +4,8 @@ latitude: 46.11955
 longitude: 6.48942
 postcode: "74490"
 city: Saint-Jeoire
-street: "Chemin des Beulets"
-housenumber: 46
+street: Chemin des Beulets
+housenumber: "46"
 phone: ""
-opening_hours: "Mo, Su off; Tu,Fr 09:00-18:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo, Su off; Tu,Fr 09:00-18:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/saint-jeoire/vival.yml b/data/cities/saint-jeoire/vival.yml
deleted file mode 100644
index 98871adb8..000000000
--- a/data/cities/saint-jeoire/vival.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7525546617
-type: node
-latitude: 46.13842
-longitude: 6.45793
-postcode: "74490"
-city: Saint-Jeoire
-street: "Rue Allamand de Saint-Jeoire"
-housenumber: 10
-phone: ""
-opening_hours: "Mo off; Tu-Fr 07:30-12:30, 15:30-19:15; Sa 08:30-12:30, 15:30-19:15; Su 08:30-12:30, 17:00-19:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/saint-jorioz/lamy-audition.yml b/data/cities/saint-jorioz/lamy-audition.yml
index 10e7376e6..2f55db67a 100644
--- a/data/cities/saint-jorioz/lamy-audition.yml
+++ b/data/cities/saint-jorioz/lamy-audition.yml
@@ -4,8 +4,8 @@ latitude: 45.8328
 longitude: 6.16276
 postcode: "74410"
 city: Saint-Jorioz
-street: "Route de l'Église"
-housenumber: 137
+street: Route de l'Église
+housenumber: "137"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-jorioz/super-u.yml b/data/cities/saint-jorioz/super-u.yml
index d1485ff0f..691247dff 100644
--- a/data/cities/saint-jorioz/super-u.yml
+++ b/data/cities/saint-jorioz/super-u.yml
@@ -4,8 +4,8 @@ latitude: 45.83251
 longitude: 6.16288
 postcode: "74410"
 city: Saint-Jorioz
-street: "Route de l'Église"
-housenumber: 
+street: Route de l'Église
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.magasins-u.com/magasin/superu-saintjorioz"
\ No newline at end of file
+website: https://www.magasins-u.com/magasin/superu-saintjorioz
diff --git a/data/cities/saint-joseph-de-riviere/ferme-de-plantimay.yml b/data/cities/saint-joseph-de-riviere/ferme-de-plantimay.yml
index 05d3eb959..00ce17021 100644
--- a/data/cities/saint-joseph-de-riviere/ferme-de-plantimay.yml
+++ b/data/cities/saint-joseph-de-riviere/ferme-de-plantimay.yml
@@ -4,8 +4,8 @@ latitude: 45.37213
 longitude: 5.68008
 postcode: "38134"
 city: Saint-Joseph de Rivière
-street: "Chemin des Roberts"
-housenumber: 1026
-phone: "+33 4 76 55 25 26"
-opening_hours: "We,Fr 10:00-12:00, We-Sa 15:00-18:30, Sa 09:00-12:00"
-website: "https://www.fermedeplantimay.fr/"
\ No newline at end of file
+street: Chemin des Roberts
+housenumber: "1026"
+phone: +33 4 76 55 25 26
+opening_hours: We,Fr 10:00-12:00, We-Sa 15:00-18:30, Sa 09:00-12:00
+website: https://www.fermedeplantimay.fr/
diff --git a/data/cities/saint-joseph-de-riviere/maison-1830.yml b/data/cities/saint-joseph-de-riviere/maison-1830.yml
index b48c42af0..b74b7736c 100644
--- a/data/cities/saint-joseph-de-riviere/maison-1830.yml
+++ b/data/cities/saint-joseph-de-riviere/maison-1830.yml
@@ -4,8 +4,8 @@ latitude: 45.36284
 longitude: 5.67873
 postcode: "38134"
 city: Saint-Joseph-de-Rivière
-street: "Route de Chartreuse"
-housenumber: 3220
+street: Route de Chartreuse
+housenumber: "3220"
 phone: "0456252164"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/saint-julien-du-gua/les-saveurs-de-sophie.yml b/data/cities/saint-julien-du-gua/les-saveurs-de-sophie.yml
index 054a6159d..6e12fe634 100644
--- a/data/cities/saint-julien-du-gua/les-saveurs-de-sophie.yml
+++ b/data/cities/saint-julien-du-gua/les-saveurs-de-sophie.yml
@@ -5,7 +5,7 @@ longitude: 4.4442
 postcode: "07190"
 city: Saint-Julien-du-Gua
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-du-gua/savon-alep-shop.yml b/data/cities/saint-julien-du-gua/savon-alep-shop.yml
index c4cfdeb2e..b22196246 100644
--- a/data/cities/saint-julien-du-gua/savon-alep-shop.yml
+++ b/data/cities/saint-julien-du-gua/savon-alep-shop.yml
@@ -4,8 +4,8 @@ latitude: 44.76843
 longitude: 4.44479
 postcode: "07190"
 city: Saint-Julien-du-Gua
-street: "Le village"
-housenumber: 
+street: Le village
+housenumber: ""
 phone: "+33670310761"
-opening_hours: "Sur rendez-vous"
-website: "https://savon-alep.shop/"
\ No newline at end of file
+opening_hours: '"Sur rendez-vous"'
+website: https://savon-alep.shop/
diff --git a/data/cities/saint-julien-en-genevois/bio-frais.yml b/data/cities/saint-julien-en-genevois/bio-frais.yml
index 0d9942d07..e9c66a131 100644
--- a/data/cities/saint-julien-en-genevois/bio-frais.yml
+++ b/data/cities/saint-julien-en-genevois/bio-frais.yml
@@ -4,8 +4,8 @@ latitude: 46.14113
 longitude: 6.09416
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route de Lathoy"
-housenumber: 4
+street: Route de Lathoy
+housenumber: "4"
 phone: "+33450490910"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-13:00; Aug 15,Nov 1 off"
-website: "https://www.biofrais.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-13:00; Aug 15,Nov 1 off
+website: https://www.biofrais.com/
diff --git a/data/cities/saint-julien-en-genevois/boucherie-charcuterie-martel.yml b/data/cities/saint-julien-en-genevois/boucherie-charcuterie-martel.yml
index db6b5c60d..1918c7438 100644
--- a/data/cities/saint-julien-en-genevois/boucherie-charcuterie-martel.yml
+++ b/data/cities/saint-julien-en-genevois/boucherie-charcuterie-martel.yml
@@ -4,8 +4,8 @@ latitude: 46.14392
 longitude: 6.08222
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Place du Crêt"
-housenumber: 4
+street: Place du Crêt
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/bricomarche.yml b/data/cities/saint-julien-en-genevois/bricomarche.yml
index cad55f560..5ac82e05b 100644
--- a/data/cities/saint-julien-en-genevois/bricomarche.yml
+++ b/data/cities/saint-julien-en-genevois/bricomarche.yml
@@ -4,8 +4,9 @@ latitude: 46.13904
 longitude: 6.07259
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route des Vignes"
-housenumber: 1
+street: Route des Vignes
+housenumber: "1"
 phone: "+33450495500"
-opening_hours: "Mo-Sa 09:00-12:00; 14:00-19:00; Su off; Aug 15 off; nov 1 10:00-12:00; 14:00-18:00"
-website: "https://www.bricomarche.com/magasin/saint-julien-en-genevois/02705"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00; 14:00-19:00; Su off; Aug 15 off; nov 1 10:00-12:00;
+    14:00-18:00
+website: https://www.bricomarche.com/magasin/saint-julien-en-genevois/02705
diff --git a/data/cities/saint-julien-en-genevois/carrefour-market-avenue-de-mossingen.yml b/data/cities/saint-julien-en-genevois/carrefour-market-avenue-de-mossingen.yml
index 1400ce4ba..14cfd5962 100644
--- a/data/cities/saint-julien-en-genevois/carrefour-market-avenue-de-mossingen.yml
+++ b/data/cities/saint-julien-en-genevois/carrefour-market-avenue-de-mossingen.yml
@@ -4,8 +4,8 @@ latitude: 46.14733
 longitude: 6.0862
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Avenue de Mössingen"
-housenumber: 2
+street: Avenue de Mössingen
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 08:30-19:30; Tu-Sa 08:00-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 08:30-19:30; Tu-Sa 08:00-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/carrefour-market.yml b/data/cities/saint-julien-en-genevois/carrefour-market.yml
index b71dcd553..447657184 100644
--- a/data/cities/saint-julien-en-genevois/carrefour-market.yml
+++ b/data/cities/saint-julien-en-genevois/carrefour-market.yml
@@ -4,8 +4,9 @@ latitude: 46.14442
 longitude: 6.0801
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Rue Amédée VIII de Savoie"
-housenumber: 5
+street: Rue Amédée VIII de Savoie
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Th,Sa 08:30-19:30; Fr 08:30-20:00; Su 08:30-12:30; Aug 15,nov 1 08:30-12:30; Nov 11 08:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th,Sa 08:30-19:30; Fr 08:30-20:00; Su 08:30-12:30; Aug 15,nov 1
+    08:30-12:30; Nov 11 08:30-18:00
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/casseroles-et-co.yml b/data/cities/saint-julien-en-genevois/casseroles-et-co.yml
index 7e99895c6..fcf2e9353 100644
--- a/data/cities/saint-julien-en-genevois/casseroles-et-co.yml
+++ b/data/cities/saint-julien-en-genevois/casseroles-et-co.yml
@@ -4,8 +4,8 @@ latitude: 46.14346
 longitude: 6.08106
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 5
-phone: "+33 4 50 49 04 19"
-opening_hours: "Tu-We,Fr 09:30-12:30,14:30-18:30; Th 09:30-12:30,15:30-19:30; Sa 09:30-12:30,14:00-18:00"
-website: "https://st-julien-en-genevois.cuisineplaisir.fr/"
\ No newline at end of file
+street: Grande Rue
+housenumber: "5"
+phone: +33 4 50 49 04 19
+opening_hours: Tu-We,Fr 09:30-12:30,14:30-18:30; Th 09:30-12:30,15:30-19:30; Sa 09:30-12:30,14:00-18:00
+website: https://st-julien-en-genevois.cuisineplaisir.fr/
diff --git a/data/cities/saint-julien-en-genevois/centre-commercial-du-puy-st-martin.yml b/data/cities/saint-julien-en-genevois/centre-commercial-du-puy-st-martin.yml
index 9b7860a63..42a110957 100644
--- a/data/cities/saint-julien-en-genevois/centre-commercial-du-puy-st-martin.yml
+++ b/data/cities/saint-julien-en-genevois/centre-commercial-du-puy-st-martin.yml
@@ -1,11 +1,12 @@
 id: 305046261
-type: way
+type: node
 latitude: 46.14744
 longitude: 6.08574
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Avenue de Mössingen"
-housenumber: 2
+street: Avenue de Mössingen
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 14:00-19:30; Tu-Th 8:00-19:30; Fr 8:00-20:00; Sa 8:00-19:30; Su 8:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:30; Tu-Th 8:00-19:30; Fr 8:00-20:00; Sa 8:00-19:30; Su
+    8:30-12:30
+website: ""
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
index 1deca5692..e2fb795a6 100644
--- a/data/cities/saint-julien-en-genevois/centre-du-pneu-doccasion.yml
+++ b/data/cities/saint-julien-en-genevois/centre-du-pneu-doccasion.yml
@@ -4,8 +4,8 @@ latitude: 46.14297
 longitude: 6.09368
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route d'Annemasse"
-housenumber: 
+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
+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
diff --git a/data/cities/saint-julien-en-genevois/comme-une-empreinte.yml b/data/cities/saint-julien-en-genevois/comme-une-empreinte.yml
index 3f87c3de6..3f3e6640a 100644
--- a/data/cities/saint-julien-en-genevois/comme-une-empreinte.yml
+++ b/data/cities/saint-julien-en-genevois/comme-une-empreinte.yml
@@ -4,8 +4,8 @@ latitude: 46.1426
 longitude: 6.08029
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 25
-phone: "+33 4 50 04 02 76"
-opening_hours: "Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-12:30,14:00-18:30"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "25"
+phone: +33 4 50 04 02 76
+opening_hours: Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-12:30,14:00-18:30
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/desiderata.yml b/data/cities/saint-julien-en-genevois/desiderata.yml
index 2502ec4f6..129afd843 100644
--- a/data/cities/saint-julien-en-genevois/desiderata.yml
+++ b/data/cities/saint-julien-en-genevois/desiderata.yml
@@ -4,8 +4,8 @@ latitude: 46.14361
 longitude: 6.08225
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Rue Fernand David"
-housenumber: 10
+street: Rue Fernand David
+housenumber: "10"
 phone: "+33450047029"
-opening_hours: "Tu-Sa 10:00-12:00, 14:00-19:00"
-website: "www.boutiquedesiderata.fr"
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:00, 14:00-19:00
+website: www.boutiquedesiderata.fr
diff --git a/data/cities/saint-julien-en-genevois/dominique-et-philippe.yml b/data/cities/saint-julien-en-genevois/dominique-et-philippe.yml
index 7419a9fd1..2ee8ade39 100644
--- a/data/cities/saint-julien-en-genevois/dominique-et-philippe.yml
+++ b/data/cities/saint-julien-en-genevois/dominique-et-philippe.yml
@@ -4,8 +4,8 @@ latitude: 46.14233
 longitude: 6.07994
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 16
-phone: "+33 4 50 49 24 88"
-opening_hours: "Tu 8:30-19:00; We-Th 8:30-18:30; Fr 8:30-19:00; Sa 8:00-15:30"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "16"
+phone: +33 4 50 49 24 88
+opening_hours: Tu 8:30-19:00; We-Th 8:30-18:30; Fr 8:30-19:00; Sa 8:00-15:30
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/falda.yml b/data/cities/saint-julien-en-genevois/falda.yml
index f57946b84..f613837cc 100644
--- a/data/cities/saint-julien-en-genevois/falda.yml
+++ b/data/cities/saint-julien-en-genevois/falda.yml
@@ -4,8 +4,8 @@ latitude: 46.13922
 longitude: 6.07174
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route des Vignes"
-housenumber: 3
+street: Route des Vignes
+housenumber: "3"
 phone: "0450492386"
 opening_hours: ""
-website: "http://www.falda.fr/"
\ No newline at end of file
+website: http://www.falda.fr/
diff --git a/data/cities/saint-julien-en-genevois/galerie-juste-autrement.yml b/data/cities/saint-julien-en-genevois/galerie-juste-autrement.yml
index cd4440757..ff7af8460 100644
--- a/data/cities/saint-julien-en-genevois/galerie-juste-autrement.yml
+++ b/data/cities/saint-julien-en-genevois/galerie-juste-autrement.yml
@@ -4,8 +4,8 @@ latitude: 46.14278
 longitude: 6.08022
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande rue"
-housenumber: 10
-phone: "+33 4 50 35 17 35"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "http://m.justeautrement.fr/"
\ No newline at end of file
+street: Grande rue
+housenumber: "10"
+phone: +33 4 50 35 17 35
+opening_hours: Tu-Sa 10:00-19:00
+website: http://m.justeautrement.fr/
diff --git a/data/cities/saint-julien-en-genevois/gamm-vert.yml b/data/cities/saint-julien-en-genevois/gamm-vert.yml
index 2d5c97beb..b37bd9545 100644
--- a/data/cities/saint-julien-en-genevois/gamm-vert.yml
+++ b/data/cities/saint-julien-en-genevois/gamm-vert.yml
@@ -1,11 +1,11 @@
 id: 77600262
-type: way
+type: node
 latitude: 46.13888
 longitude: 6.0783
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Rue des Vieux Moulins"
-housenumber: 3
-phone: "+33 450350769"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:30; Fr 09:00-12:00,14:00-18:00; Aug 15 off"
-website: ""
\ No newline at end of file
+street: Rue des Vieux Moulins
+housenumber: "3"
+phone: +33 450350769
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:30; Fr 09:00-12:00,14:00-18:00; Aug 15 off
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/grand-frais.yml b/data/cities/saint-julien-en-genevois/grand-frais.yml
index 2d74e1152..a704bcc20 100644
--- a/data/cities/saint-julien-en-genevois/grand-frais.yml
+++ b/data/cities/saint-julien-en-genevois/grand-frais.yml
@@ -4,8 +4,8 @@ latitude: 46.14114
 longitude: 6.09386
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route de Lathoy"
-housenumber: 4
+street: Route de Lathoy
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30; Aug 15; Nov 1 off; Dec 24 08:30-17:00"
-website: "https://grandfrais.com"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30; Aug 15; Nov 1 off; Dec 24 08:30-17:00
+website: https://grandfrais.com
diff --git a/data/cities/saint-julien-en-genevois/harmony-cuisines.yml b/data/cities/saint-julien-en-genevois/harmony-cuisines.yml
index 32c83c63f..c18c16698 100644
--- a/data/cities/saint-julien-en-genevois/harmony-cuisines.yml
+++ b/data/cities/saint-julien-en-genevois/harmony-cuisines.yml
@@ -4,8 +4,8 @@ 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
+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
diff --git a/data/cities/saint-julien-en-genevois/jet-7-mobile.yml b/data/cities/saint-julien-en-genevois/jet-7-mobile.yml
index ee35b1edf..505436aaa 100644
--- a/data/cities/saint-julien-en-genevois/jet-7-mobile.yml
+++ b/data/cities/saint-julien-en-genevois/jet-7-mobile.yml
@@ -4,8 +4,8 @@ latitude: 46.14303
 longitude: 6.08067
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 19
+street: Grande Rue
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/just-nine.yml b/data/cities/saint-julien-en-genevois/just-nine.yml
index 9481cc1eb..cbd71e404 100644
--- a/data/cities/saint-julien-en-genevois/just-nine.yml
+++ b/data/cities/saint-julien-en-genevois/just-nine.yml
@@ -4,8 +4,8 @@ latitude: 46.14315
 longitude: 6.08077
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 9
-phone: "+33 4 50 92 04 89"
+street: Grande Rue
+housenumber: "9"
+phone: +33 4 50 92 04 89
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/krys.yml b/data/cities/saint-julien-en-genevois/krys.yml
index 28889701a..dbb63c3f2 100644
--- a/data/cities/saint-julien-en-genevois/krys.yml
+++ b/data/cities/saint-julien-en-genevois/krys.yml
@@ -4,8 +4,8 @@ latitude: 46.14243
 longitude: 6.08
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande rue"
-housenumber: 16
-phone: "+33 4 50 49 05 57"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00"
-website: "https://www.krys.com/krys_shopfinder/shop/index/site_code/362/"
\ No newline at end of file
+street: Grande rue
+housenumber: "16"
+phone: +33 4 50 49 05 57
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00
+website: https://www.krys.com/krys_shopfinder/shop/index/site_code/362/
diff --git a/data/cities/saint-julien-en-genevois/la-boucherie-du-genevois.yml b/data/cities/saint-julien-en-genevois/la-boucherie-du-genevois.yml
index ff0b9946d..1b502de56 100644
--- a/data/cities/saint-julien-en-genevois/la-boucherie-du-genevois.yml
+++ b/data/cities/saint-julien-en-genevois/la-boucherie-du-genevois.yml
@@ -4,8 +4,8 @@ latitude: 46.14218
 longitude: 6.07256
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Rue Madame de Staël"
-housenumber: 67
+street: Rue Madame de Staël
+housenumber: "67"
 phone: "+33986399793"
-opening_hours: "Mo-Sa 09:00-19:45; Su 09:00:14:30"
-website: "https://laboucheriedugenevois.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:45; Su 09:00:14:30
+website: https://laboucheriedugenevois.fr/
diff --git a/data/cities/saint-julien-en-genevois/la-cave-de-latrium.yml b/data/cities/saint-julien-en-genevois/la-cave-de-latrium.yml
index 7a48d1536..f5a146f72 100644
--- a/data/cities/saint-julien-en-genevois/la-cave-de-latrium.yml
+++ b/data/cities/saint-julien-en-genevois/la-cave-de-latrium.yml
@@ -4,8 +4,8 @@ latitude: 46.14161
 longitude: 6.08132
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Le Mail"
-housenumber: 4
+street: Le Mail
+housenumber: "4"
 phone: ""
-opening_hours: "Tu-Fr 10:00-12:30,15:00-19:30; Sa 10:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:30,15:00-19:30; Sa 10:00-19:30
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/la-folle-idee.yml b/data/cities/saint-julien-en-genevois/la-folle-idee.yml
index 7fd6e37b0..cd6b4065e 100644
--- a/data/cities/saint-julien-en-genevois/la-folle-idee.yml
+++ b/data/cities/saint-julien-en-genevois/la-folle-idee.yml
@@ -4,8 +4,8 @@ latitude: 46.1425
 longitude: 6.08027
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 27
+street: Grande Rue
+housenumber: "27"
 phone: "+330983537273"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/la-maison-de-la-couture.yml b/data/cities/saint-julien-en-genevois/la-maison-de-la-couture.yml
index 84b571479..9b26da309 100644
--- a/data/cities/saint-julien-en-genevois/la-maison-de-la-couture.yml
+++ b/data/cities/saint-julien-en-genevois/la-maison-de-la-couture.yml
@@ -4,8 +4,8 @@ latitude: 46.14263
 longitude: 6.07293
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 27
-phone: "+33 4 50 49 03 98"
-opening_hours: "Tu-Fr 09:30-18:30; Sa 09:30-17:30"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "27"
+phone: +33 4 50 49 03 98
+opening_hours: Tu-Fr 09:30-18:30; Sa 09:30-17:30
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/la-nature-du-vin.yml b/data/cities/saint-julien-en-genevois/la-nature-du-vin.yml
index 17a5cf207..fe1b00625 100644
--- a/data/cities/saint-julien-en-genevois/la-nature-du-vin.yml
+++ b/data/cities/saint-julien-en-genevois/la-nature-du-vin.yml
@@ -4,8 +4,8 @@ latitude: 46.13923
 longitude: 6.07198
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route des Vignes"
-housenumber: 3
+street: Route des Vignes
+housenumber: "3"
 phone: "0450833619"
-opening_hours: "We-Sa 09:30-12:00;14:00-19:00"
-website: "http://www.lanatureduvin.fr/"
\ No newline at end of file
+opening_hours: We-Sa 09:30-12:00;14:00-19:00
+website: http://www.lanatureduvin.fr/
diff --git a/data/cities/saint-julien-en-genevois/la-paniere.yml b/data/cities/saint-julien-en-genevois/la-paniere.yml
index f92bc6b8f..401b2b88a 100644
--- a/data/cities/saint-julien-en-genevois/la-paniere.yml
+++ b/data/cities/saint-julien-en-genevois/la-paniere.yml
@@ -4,8 +4,8 @@ latitude: 46.14544
 longitude: 6.08258
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Avenue de Genève"
-housenumber: 11
+street: Avenue de Genève
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/la-vitrine-medicale.yml b/data/cities/saint-julien-en-genevois/la-vitrine-medicale.yml
index 7e2b4c440..401cb9489 100644
--- a/data/cities/saint-julien-en-genevois/la-vitrine-medicale.yml
+++ b/data/cities/saint-julien-en-genevois/la-vitrine-medicale.yml
@@ -4,8 +4,8 @@ latitude: 46.14896
 longitude: 6.08719
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Avenue de Genève"
-housenumber: 28
+street: Avenue de Genève
+housenumber: "28"
 phone: ""
-opening_hours: "Mo 14:30-18:00; Tu-Fr 09:00-12:00, 13:30-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:30-18:00; Tu-Fr 09:00-12:00, 13:30-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/laverie.yml b/data/cities/saint-julien-en-genevois/laverie.yml
index bef136ac3..5657c1fd7 100644
--- a/data/cities/saint-julien-en-genevois/laverie.yml
+++ b/data/cities/saint-julien-en-genevois/laverie.yml
@@ -4,8 +4,8 @@ latitude: 46.13923
 longitude: 6.07231
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route des Vignes"
-housenumber: 1
+street: Route des Vignes
+housenumber: "1"
 phone: ""
-opening_hours: "06:00-22:00"
-website: ""
\ No newline at end of file
+opening_hours: 06:00-22:00
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/le-boudoir-saint-julien.yml b/data/cities/saint-julien-en-genevois/le-boudoir-saint-julien.yml
index 6dc01d32e..568576aba 100644
--- a/data/cities/saint-julien-en-genevois/le-boudoir-saint-julien.yml
+++ b/data/cities/saint-julien-en-genevois/le-boudoir-saint-julien.yml
@@ -4,8 +4,8 @@ latitude: 46.14355
 longitude: 6.08096
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Place de la Libération"
-housenumber: 1
+street: Place de la Libération
+housenumber: "1"
 phone: "+330450490094"
-opening_hours: "Mo-Sa 09:00-12:00; 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00; 14:00-19:00
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/le-fils-de-rene-comte.yml b/data/cities/saint-julien-en-genevois/le-fils-de-rene-comte.yml
index 738ea0cd3..a64dcada6 100644
--- a/data/cities/saint-julien-en-genevois/le-fils-de-rene-comte.yml
+++ b/data/cities/saint-julien-en-genevois/le-fils-de-rene-comte.yml
@@ -4,8 +4,8 @@ latitude: 46.14418
 longitude: 6.08091
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Pl. du Maquis des Glières"
-housenumber: 1
-phone: "+33 4 50 49 01 57"
+street: Pl. du Maquis des Glières
+housenumber: "1"
+phone: +33 4 50 49 01 57
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/les-pensees-dalysse.yml b/data/cities/saint-julien-en-genevois/les-pensees-dalysse.yml
index b71d5b657..eb98ab948 100644
--- a/data/cities/saint-julien-en-genevois/les-pensees-dalysse.yml
+++ b/data/cities/saint-julien-en-genevois/les-pensees-dalysse.yml
@@ -4,8 +4,8 @@ latitude: 46.14192
 longitude: 6.08066
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Le Mail"
-housenumber: 4
-phone: "+33 4 50 37 38 24"
+street: Le Mail
+housenumber: "4"
+phone: +33 4 50 37 38 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/lv-decoration-dinterieur.yml b/data/cities/saint-julien-en-genevois/lv-decoration-dinterieur.yml
index 1e0abcec4..b1824289d 100644
--- a/data/cities/saint-julien-en-genevois/lv-decoration-dinterieur.yml
+++ b/data/cities/saint-julien-en-genevois/lv-decoration-dinterieur.yml
@@ -4,8 +4,8 @@ latitude: 46.14307
 longitude: 6.08049
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
+street: Grande Rue
 housenumber: 6 bis
-phone: "+33 4 50 35 17 15"
+phone: +33 4 50 35 17 15
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/ma-coiffure-et-esthetique.yml b/data/cities/saint-julien-en-genevois/ma-coiffure-et-esthetique.yml
index 2429ada4b..c1dd6c1a0 100644
--- a/data/cities/saint-julien-en-genevois/ma-coiffure-et-esthetique.yml
+++ b/data/cities/saint-julien-en-genevois/ma-coiffure-et-esthetique.yml
@@ -4,8 +4,8 @@ latitude: 46.14223
 longitude: 6.07991
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 15
+street: Grande Rue
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/merveilles-de-pain.yml b/data/cities/saint-julien-en-genevois/merveilles-de-pain.yml
index ba21506f3..646e619a5 100644
--- a/data/cities/saint-julien-en-genevois/merveilles-de-pain.yml
+++ b/data/cities/saint-julien-en-genevois/merveilles-de-pain.yml
@@ -4,8 +4,8 @@ latitude: 46.14175
 longitude: 6.081
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Le Mail"
-housenumber: 4
-phone: "+33 4 50 85 25 96"
-opening_hours: "Mo-Sa 06:30-19:30; Su, PH 07:00-13:30;"
-website: "https://merveillesdepain.com/"
\ No newline at end of file
+street: Le Mail
+housenumber: "4"
+phone: +33 4 50 85 25 96
+opening_hours: Mo-Sa 06:30-19:30; Su, PH 07:00-13:30;
+website: https://merveillesdepain.com/
diff --git a/data/cities/saint-julien-en-genevois/merveilles-de-patisseries-j-l-guerraz.yml b/data/cities/saint-julien-en-genevois/merveilles-de-patisseries-j-l-guerraz.yml
index 1a3e514fd..82bc7da3d 100644
--- a/data/cities/saint-julien-en-genevois/merveilles-de-patisseries-j-l-guerraz.yml
+++ b/data/cities/saint-julien-en-genevois/merveilles-de-patisseries-j-l-guerraz.yml
@@ -4,8 +4,8 @@ latitude: 46.14228
 longitude: 6.07992
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 16
+street: Grande Rue
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su 09:30-12:30
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/nathif-coiffure.yml b/data/cities/saint-julien-en-genevois/nathif-coiffure.yml
index 555232ac2..c77fb9ab4 100644
--- a/data/cities/saint-julien-en-genevois/nathif-coiffure.yml
+++ b/data/cities/saint-julien-en-genevois/nathif-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.14246
 longitude: 6.08023
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 27
+street: Grande Rue
+housenumber: "27"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/nevermind.yml b/data/cities/saint-julien-en-genevois/nevermind.yml
index e2db36a17..5d1062fc3 100644
--- a/data/cities/saint-julien-en-genevois/nevermind.yml
+++ b/data/cities/saint-julien-en-genevois/nevermind.yml
@@ -4,8 +4,8 @@ latitude: 46.1423
 longitude: 6.08013
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 33
+street: Grande Rue
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/o-decharne.yml b/data/cities/saint-julien-en-genevois/o-decharne.yml
index 689b8c802..5c0e5f207 100644
--- a/data/cities/saint-julien-en-genevois/o-decharne.yml
+++ b/data/cities/saint-julien-en-genevois/o-decharne.yml
@@ -4,8 +4,8 @@ latitude: 46.14318
 longitude: 6.08064
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 6
-phone: "+33 4 50 35 17 50"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-17:30"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "6"
+phone: +33 4 50 35 17 50
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-17:30
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/or-le-temps.yml b/data/cities/saint-julien-en-genevois/or-le-temps.yml
index 57249b887..c2f34f4a6 100644
--- a/data/cities/saint-julien-en-genevois/or-le-temps.yml
+++ b/data/cities/saint-julien-en-genevois/or-le-temps.yml
@@ -4,8 +4,8 @@ latitude: 46.14341
 longitude: 6.08087
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 4
+street: Grande Rue
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/picard.yml b/data/cities/saint-julien-en-genevois/picard.yml
index 95189e879..8a87a1b02 100644
--- a/data/cities/saint-julien-en-genevois/picard.yml
+++ b/data/cities/saint-julien-en-genevois/picard.yml
@@ -4,8 +4,8 @@ latitude: 46.14113
 longitude: 6.09449
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Route de Lathoy"
-housenumber: 6
-phone: "04 50 86 13 95"
-opening_hours: "Mo-Sa 09:00-20:00; Su 09:00-12:45; Aug 15 off; Dec 24 09:00-18:00"
-website: "https://magasins.picard.fr/829-picard-saint-julien-en-genevois"
\ No newline at end of file
+street: Route de Lathoy
+housenumber: "6"
+phone: 04 50 86 13 95
+opening_hours: Mo-Sa 09:00-20:00; Su 09:00-12:45; Aug 15 off; Dec 24 09:00-18:00
+website: https://magasins.picard.fr/829-picard-saint-julien-en-genevois
diff --git a/data/cities/saint-julien-en-genevois/resa-box-74.yml b/data/cities/saint-julien-en-genevois/resa-box-74.yml
index 750f57abf..fc8c4d243 100644
--- a/data/cities/saint-julien-en-genevois/resa-box-74.yml
+++ b/data/cities/saint-julien-en-genevois/resa-box-74.yml
@@ -4,8 +4,8 @@ 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
+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
diff --git a/data/cities/saint-julien-en-genevois/roady-saint-julien-en-genevois.yml b/data/cities/saint-julien-en-genevois/roady-saint-julien-en-genevois.yml
index a9bb4ca4c..7693101cd 100644
--- a/data/cities/saint-julien-en-genevois/roady-saint-julien-en-genevois.yml
+++ b/data/cities/saint-julien-en-genevois/roady-saint-julien-en-genevois.yml
@@ -1,11 +1,11 @@
 id: 77598049
-type: way
+type: node
 latitude: 46.14271
 longitude: 6.08872
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Avenue Louis Armand"
-housenumber: 6
-phone: "+33 4 50 35 60 00"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-12:00,14:00-18:00; Aug 15 off"
-website: "https://www.roady.fr/centre-automobile/megale"
\ No newline at end of file
+street: Avenue Louis Armand
+housenumber: "6"
+phone: +33 4 50 35 60 00
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 08:00-12:00,14:00-18:00; Aug 15 off
+website: https://www.roady.fr/centre-automobile/megale
diff --git a/data/cities/saint-julien-en-genevois/rosa-coiffure.yml b/data/cities/saint-julien-en-genevois/rosa-coiffure.yml
index a8b78c706..77b8ada29 100644
--- a/data/cities/saint-julien-en-genevois/rosa-coiffure.yml
+++ b/data/cities/saint-julien-en-genevois/rosa-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.1386
 longitude: 6.06817
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "5 rte Vignes"
-housenumber: 5
+street: 5 rte Vignes
+housenumber: "5"
 phone: "0450794315"
-opening_hours: "Tu-Sa 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-19:00
+website: ""
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
index 264fe95ec..dac4402bc 100644
--- 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
@@ -4,8 +4,8 @@ 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
+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: ""
diff --git a/data/cities/saint-julien-en-genevois/samse.yml b/data/cities/saint-julien-en-genevois/samse.yml
index 8f9a76338..9d349493e 100644
--- a/data/cities/saint-julien-en-genevois/samse.yml
+++ b/data/cities/saint-julien-en-genevois/samse.yml
@@ -4,8 +4,8 @@ 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
+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: ""
diff --git a/data/cities/saint-julien-en-genevois/sapience.yml b/data/cities/saint-julien-en-genevois/sapience.yml
index 9bfa1337f..0cf662d25 100644
--- a/data/cities/saint-julien-en-genevois/sapience.yml
+++ b/data/cities/saint-julien-en-genevois/sapience.yml
@@ -4,8 +4,8 @@ latitude: 46.14312
 longitude: 6.08054
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
+street: Grande Rue
 housenumber: 6 bis
-phone: "+33 4 50 35 08 13"
+phone: +33 4 50 35 08 13
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/un-soupcon-de-magie.yml b/data/cities/saint-julien-en-genevois/un-soupcon-de-magie.yml
index ceebe2796..996a08944 100644
--- a/data/cities/saint-julien-en-genevois/un-soupcon-de-magie.yml
+++ b/data/cities/saint-julien-en-genevois/un-soupcon-de-magie.yml
@@ -4,8 +4,8 @@ latitude: 46.14297
 longitude: 6.08063
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 19
+street: Grande Rue
+housenumber: "19"
 phone: "+330620787316"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-en-genevois/vapostore.yml b/data/cities/saint-julien-en-genevois/vapostore.yml
index cba52f9f1..9d8c79414 100644
--- a/data/cities/saint-julien-en-genevois/vapostore.yml
+++ b/data/cities/saint-julien-en-genevois/vapostore.yml
@@ -4,8 +4,8 @@ latitude: 46.14268
 longitude: 6.08038
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 23
+street: Grande Rue
+housenumber: "23"
 phone: "+330951068117"
-opening_hours: "Tu-Sa 09:30-12:00,14:00-19:00; Su off; Mo off; week 32 off"
-website: "https://vapostore.com"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00,14:00-19:00; Su off; Mo off; week 32 off
+website: https://vapostore.com
diff --git a/data/cities/saint-julien-en-genevois/vitasec.yml b/data/cities/saint-julien-en-genevois/vitasec.yml
index 61bfe98cf..a75d10d7c 100644
--- a/data/cities/saint-julien-en-genevois/vitasec.yml
+++ b/data/cities/saint-julien-en-genevois/vitasec.yml
@@ -4,8 +4,8 @@ latitude: 46.1433
 longitude: 6.0807
 postcode: "74160"
 city: Saint-Julien-en-Genevois
-street: "Grande Rue"
-housenumber: 4
-phone: "+33 450492602"
-opening_hours: "Tu-fr 08:00-12:00,14:00-19:00; Sa 07:00-15:00"
-website: ""
\ No newline at end of file
+street: Grande Rue
+housenumber: "4"
+phone: +33 450492602
+opening_hours: Tu-fr 08:00-12:00,14:00-19:00; Sa 07:00-15:00
+website: ""
diff --git a/data/cities/saint-julien-molin-molette/boutique-creations.yml b/data/cities/saint-julien-molin-molette/boutique-creations.yml
index 40606d018..796170eb5 100644
--- a/data/cities/saint-julien-molin-molette/boutique-creations.yml
+++ b/data/cities/saint-julien-molin-molette/boutique-creations.yml
@@ -4,8 +4,8 @@ latitude: 45.32296
 longitude: 4.61548
 postcode: "42220"
 city: Saint-Julien-Molin-Molette
-street: "Rue du Faubourg"
-housenumber: 
+street: Rue du Faubourg
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-julien-molin-molette/du-vent-dans-les-mollets.yml b/data/cities/saint-julien-molin-molette/du-vent-dans-les-mollets.yml
index 3d3b60ace..92a42267b 100644
--- a/data/cities/saint-julien-molin-molette/du-vent-dans-les-mollets.yml
+++ b/data/cities/saint-julien-molin-molette/du-vent-dans-les-mollets.yml
@@ -4,8 +4,8 @@ latitude: 45.32153
 longitude: 4.6173
 postcode: "42220"
 city: Saint-Julien-Molin-Molette
-street: "Rue Peyronnet"
+street: Rue Peyronnet
 housenumber: 17 bis
 phone: ""
-opening_hours: "week 1-52/2 We 15:00-18:00, Sa 9:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: week 1-52/2 We 15:00-18:00, Sa 9:30-12:30
+website: ""
diff --git a/data/cities/saint-julien-molin-molette/la-rivoire.yml b/data/cities/saint-julien-molin-molette/la-rivoire.yml
index 6ac33032c..800fad591 100644
--- a/data/cities/saint-julien-molin-molette/la-rivoire.yml
+++ b/data/cities/saint-julien-molin-molette/la-rivoire.yml
@@ -1,11 +1,11 @@
 id: 266191770
-type: way
+type: node
 latitude: 45.29487
 longitude: 4.61247
 postcode: "42220"
 city: Saint-Julien-Molin-Molette
-street: "Route du Crêt du Perron"
-housenumber: 285
+street: Route du Crêt du Perron
+housenumber: "285"
 phone: ""
-opening_hours: "We 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: We 16:00-19:00
+website: ""
diff --git a/data/cities/saint-just-dardeche/boucherie-chauviere.yml b/data/cities/saint-just-dardeche/boucherie-chauviere.yml
index 03bed8477..fe85da657 100644
--- a/data/cities/saint-just-dardeche/boucherie-chauviere.yml
+++ b/data/cities/saint-just-dardeche/boucherie-chauviere.yml
@@ -4,8 +4,8 @@ latitude: 44.3029
 longitude: 4.61373
 postcode: "07700"
 city: Saint-Just d'Ardèche
-street: "Route de Pont Saint-Esprit"
-housenumber: 125
-phone: "+33 4 75 52 35 37"
-opening_hours: "Tu-Sa 08:00-12:30,15:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+street: Route de Pont Saint-Esprit
+housenumber: "125"
+phone: +33 4 75 52 35 37
+opening_hours: Tu-Sa 08:00-12:30,15:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-just-de-claix/colruyt.yml b/data/cities/saint-just-de-claix/colruyt.yml
index 67f6bd3c8..4fdca00cf 100644
--- a/data/cities/saint-just-de-claix/colruyt.yml
+++ b/data/cities/saint-just-de-claix/colruyt.yml
@@ -1,11 +1,11 @@
 id: 638554128
-type: way
+type: node
 latitude: 45.06358
 longitude: 5.26948
 postcode: "38680"
 city: Saint-Just-de-Claix
-street: "Chemin de la Motte"
-housenumber: 67
+street: Chemin de la Motte
+housenumber: "67"
 phone: ""
 opening_hours: ""
-website: "https://www.colruyt.fr/"
\ No newline at end of file
+website: https://www.colruyt.fr/
diff --git a/data/cities/saint-just-de-claix/passion-nature.yml b/data/cities/saint-just-de-claix/passion-nature.yml
index a5468ccad..01ba40ed9 100644
--- a/data/cities/saint-just-de-claix/passion-nature.yml
+++ b/data/cities/saint-just-de-claix/passion-nature.yml
@@ -1,11 +1,11 @@
 id: 337264083
-type: way
+type: node
 latitude: 45.06451
 longitude: 5.26739
 postcode: "38680"
 city: Saint-Just-de-Claix
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.valsoleil.fr/"
\ No newline at end of file
+website: https://www.valsoleil.fr/
diff --git a/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml b/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml
index 9ca788e24..1639bb93e 100644
--- a/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml
+++ b/data/cities/saint-just-saint-rambert/brasserie-de-la-loire.yml
@@ -1,11 +1,11 @@
 id: 643827357
-type: way
+type: node
 latitude: 45.51012
 longitude: 4.23652
 postcode: "42170"
 city: Saint-Just-Saint-Rambert
-street: "Chemin du Béchet"
-housenumber: 29
-phone: "04 77 52 17 45"
+street: Chemin du Béchet
+housenumber: "29"
+phone: 04 77 52 17 45
 opening_hours: ""
-website: "https://www.brasseriedelaloire.fr/"
\ No newline at end of file
+website: https://www.brasseriedelaloire.fr/
diff --git a/data/cities/saint-just-saint-rambert/le-verger.yml b/data/cities/saint-just-saint-rambert/le-verger.yml
index 1ecfb8861..10b2e8f8f 100644
--- a/data/cities/saint-just-saint-rambert/le-verger.yml
+++ b/data/cities/saint-just-saint-rambert/le-verger.yml
@@ -4,8 +4,8 @@ latitude: 45.50242
 longitude: 4.26143
 postcode: "42170"
 city: Saint-Just-Saint-Rambert
-street: "Rue Joannès Beaulieu"
-housenumber: 22
+street: Rue Joannès Beaulieu
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-just-saint-rambert/maison-du-velo.yml b/data/cities/saint-just-saint-rambert/maison-du-velo.yml
index 2adf1fca2..33aab2682 100644
--- a/data/cities/saint-just-saint-rambert/maison-du-velo.yml
+++ b/data/cities/saint-just-saint-rambert/maison-du-velo.yml
@@ -4,8 +4,8 @@ latitude: 45.50246
 longitude: 4.2579
 postcode: "42170"
 city: Saint-Just-Saint-Rambert
-street: "Place du Pont"
-housenumber: 9
-phone: "+33 6 18 49 25 47"
-opening_hours: "Tu 17:00-19:00; We 14:30-16:30; Th 16:45-18:45"
-website: "https://www.pont-et-pignons.fr/"
\ No newline at end of file
+street: Place du Pont
+housenumber: "9"
+phone: +33 6 18 49 25 47
+opening_hours: Tu 17:00-19:00; We 14:30-16:30; Th 16:45-18:45
+website: https://www.pont-et-pignons.fr/
diff --git a/data/cities/saint-just-saint-rambert/oasis-jardin-de-cocagne.yml b/data/cities/saint-just-saint-rambert/oasis-jardin-de-cocagne.yml
index 50c92060e..dc019172b 100644
--- a/data/cities/saint-just-saint-rambert/oasis-jardin-de-cocagne.yml
+++ b/data/cities/saint-just-saint-rambert/oasis-jardin-de-cocagne.yml
@@ -4,8 +4,8 @@ latitude: 45.49466
 longitude: 4.24493
 postcode: "42170"
 city: Saint-Just-Saint-Rambert
-street: "Chemin des Muats"
-housenumber: 
+street: Chemin des Muats
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-just-saint-rambert/pansier.yml b/data/cities/saint-just-saint-rambert/pansier.yml
index 6553cb747..a17621984 100644
--- a/data/cities/saint-just-saint-rambert/pansier.yml
+++ b/data/cities/saint-just-saint-rambert/pansier.yml
@@ -4,8 +4,8 @@ latitude: 45.50431
 longitude: 4.26387
 postcode: "42170"
 city: Saint-Just-Saint-Rambert
-street: "Rue du 11 Novembre"
-housenumber: 1
+street: Rue du 11 Novembre
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-just-saint-rambert/poppy.yml b/data/cities/saint-just-saint-rambert/poppy.yml
index f45f4f564..60128a2aa 100644
--- a/data/cities/saint-just-saint-rambert/poppy.yml
+++ b/data/cities/saint-just-saint-rambert/poppy.yml
@@ -4,8 +4,8 @@ latitude: 45.50021
 longitude: 4.24101
 postcode: "42170"
 city: Saint-Just-Saint-Rambert
-street: "Rue Colombet Solle"
-housenumber: 32
+street: Rue Colombet Solle
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Fr 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-17:00
+website: ""
diff --git a/data/cities/saint-laurent-dagny/terres-lyonnaises.yml b/data/cities/saint-laurent-dagny/terres-lyonnaises.yml
index bcef7623c..958d353ef 100644
--- a/data/cities/saint-laurent-dagny/terres-lyonnaises.yml
+++ b/data/cities/saint-laurent-dagny/terres-lyonnaises.yml
@@ -4,8 +4,8 @@ latitude: 45.63576
 longitude: 4.6837
 postcode: "69440"
 city: Saint Laurent d'Agny
-street: "Route de Mornant"
-housenumber: 475
-phone: "+33 4 78 48 30 67"
-opening_hours: "Tu-Fr 09:00-12:30,14:00-19:30; Sa 09:00-12:30"
-website: ""
\ No newline at end of file
+street: Route de Mornant
+housenumber: "475"
+phone: +33 4 78 48 30 67
+opening_hours: Tu-Fr 09:00-12:30,14:00-19:30; Sa 09:00-12:30
+website: ""
diff --git a/data/cities/saint-laurent-de-chamousset/boulangerie-ducreux.yml b/data/cities/saint-laurent-de-chamousset/boulangerie-ducreux.yml
index 980b0a889..d23e9ba8e 100644
--- a/data/cities/saint-laurent-de-chamousset/boulangerie-ducreux.yml
+++ b/data/cities/saint-laurent-de-chamousset/boulangerie-ducreux.yml
@@ -4,8 +4,8 @@ latitude: 45.73823
 longitude: 4.46445
 postcode: "69930"
 city: Saint-Laurent-de-Chamousset
-street: "Rue de l'Église"
-housenumber: 
+street: Rue de l'Église
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-laurent-de-chamousset/garage-michaud.yml b/data/cities/saint-laurent-de-chamousset/garage-michaud.yml
index ddcfc7252..7755c4b2e 100644
--- a/data/cities/saint-laurent-de-chamousset/garage-michaud.yml
+++ b/data/cities/saint-laurent-de-chamousset/garage-michaud.yml
@@ -4,8 +4,8 @@ latitude: 45.73833
 longitude: 4.46769
 postcode: "69930"
 city: Saint-Laurent-de-Chamousset
-street: "Route de la Croix Blanche"
-housenumber: 41
+street: Route de la Croix Blanche
+housenumber: "41"
 phone: "+33474705056"
-opening_hours: "Mo-Fr 07:30-12:30,13:30-19:00; Sa 08:00-12:30"
-website: "http://www.garagemichaud-renault.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:30,13:30-19:00; Sa 08:00-12:30
+website: http://www.garagemichaud-renault.fr
diff --git a/data/cities/saint-laurent-de-chamousset/guilbert-reparation-cycles.yml b/data/cities/saint-laurent-de-chamousset/guilbert-reparation-cycles.yml
index 85319709e..4f1ad1cb5 100644
--- a/data/cities/saint-laurent-de-chamousset/guilbert-reparation-cycles.yml
+++ b/data/cities/saint-laurent-de-chamousset/guilbert-reparation-cycles.yml
@@ -4,8 +4,8 @@ latitude: 45.7387
 longitude: 4.46551
 postcode: "69930"
 city: Saint-Laurent-de-Chamousset
-street: "impasse du Bourrelier"
-housenumber: 22
+street: impasse du Bourrelier
+housenumber: "22"
 phone: "+33617014489"
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-laurent-du-pont/mr-bricolage.yml b/data/cities/saint-laurent-du-pont/mr-bricolage.yml
index 9ce5057d1..34d3ebcaa 100644
--- a/data/cities/saint-laurent-du-pont/mr-bricolage.yml
+++ b/data/cities/saint-laurent-du-pont/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 41435825
-type: way
+type: node
 latitude: 45.38914
 longitude: 5.73292
 postcode: "38380"
 city: Saint-Laurent-du-Pont
-street: "Avenue Jules Ferry"
-housenumber: 3
+street: Avenue Jules Ferry
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-marcel-de-felines/le-salon-demilie.yml b/data/cities/saint-marcel-de-felines/le-salon-demilie.yml
index 4eb974bca..2ef36f9f3 100644
--- a/data/cities/saint-marcel-de-felines/le-salon-demilie.yml
+++ b/data/cities/saint-marcel-de-felines/le-salon-demilie.yml
@@ -4,8 +4,8 @@ latitude: 45.86875
 longitude: 4.19067
 postcode: "42122"
 city: Saint-Marcel-de-Félines
-street: "Rue Henriette des Garets"
-housenumber: 22
-phone: "+33 7 83 15 59 50"
-opening_hours: "Tu-Fr 09:00-18:00 Sat 8:30-15:00"
-website: "https://www.facebook.com/Le-salon-d-Emilie-110549783790942"
\ No newline at end of file
+street: Rue Henriette des Garets
+housenumber: "22"
+phone: +33 7 83 15 59 50
+opening_hours: Tu-Fr 09:00-18:00 Sat 8:30-15:00
+website: https://www.facebook.com/Le-salon-d-Emilie-110549783790942
diff --git a/data/cities/saint-marcel-les-valence/cimalp.yml b/data/cities/saint-marcel-les-valence/cimalp.yml
index 286bb682a..bb6d244d5 100644
--- a/data/cities/saint-marcel-les-valence/cimalp.yml
+++ b/data/cities/saint-marcel-les-valence/cimalp.yml
@@ -4,8 +4,8 @@ latitude: 44.9639
 longitude: 4.94308
 postcode: "26320"
 city: Saint-Marcel-lès-Valence
-street: "Rue de la Roche"
-housenumber: 30
-phone: "+33 4 75 58 90 00"
-opening_hours: "Mo-Th 10:00-12:30,13:30-19:00; Fr-Sa 10:00-19:00"
-website: "https://www.cimalp.fr"
\ No newline at end of file
+street: Rue de la Roche
+housenumber: "30"
+phone: +33 4 75 58 90 00
+opening_hours: Mo-Th 10:00-12:30,13:30-19:00; Fr-Sa 10:00-19:00
+website: https://www.cimalp.fr
diff --git a/data/cities/saint-marcel-les-valence/snackboulangerie-univers-pain.yml b/data/cities/saint-marcel-les-valence/snackboulangerie-univers-pain.yml
index a2d75b246..f11a5b5d3 100644
--- a/data/cities/saint-marcel-les-valence/snackboulangerie-univers-pain.yml
+++ b/data/cities/saint-marcel-les-valence/snackboulangerie-univers-pain.yml
@@ -4,8 +4,8 @@ latitude: 44.96413
 longitude: 4.94249
 postcode: "26320"
 city: Saint-Marcel-lès-Valence
-street: "Rue de la Roche"
-housenumber: 2
-phone: "+33 4 75 83 51 37"
-opening_hours: "Mo 07:00-14:00,16:00-19:00; Tu-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue de la Roche
+housenumber: "2"
+phone: +33 4 75 83 51 37
+opening_hours: Mo 07:00-14:00,16:00-19:00; Tu-Sa 07:00-19:00
+website: ""
diff --git a/data/cities/saint-marcellin-en-forez/moulanger-automobiles.yml b/data/cities/saint-marcellin-en-forez/moulanger-automobiles.yml
index d8cff7b48..ad6597f6d 100644
--- a/data/cities/saint-marcellin-en-forez/moulanger-automobiles.yml
+++ b/data/cities/saint-marcellin-en-forez/moulanger-automobiles.yml
@@ -1,11 +1,11 @@
 id: 834786852
-type: way
+type: node
 latitude: 45.51647
 longitude: 4.20293
 postcode: "42680"
 city: Saint-Marcellin-en-Forez
-street: "Chemin des Lièvres"
-housenumber: 
-phone: "04 77 52 83 73"
+street: Chemin des Lièvres
+housenumber: ""
+phone: 04 77 52 83 73
 opening_hours: ""
-website: "https://www.moulanger-automobiles.com/"
\ No newline at end of file
+website: https://www.moulanger-automobiles.com/
diff --git a/data/cities/saint-marcellin/a-leau-pressing.yml b/data/cities/saint-marcellin/a-leau-pressing.yml
index 79dccff83..9080f10d6 100644
--- a/data/cities/saint-marcellin/a-leau-pressing.yml
+++ b/data/cities/saint-marcellin/a-leau-pressing.yml
@@ -4,8 +4,8 @@ latitude: 45.15467
 longitude: 5.32317
 postcode: "38160"
 city: Saint-Marcellin
-street: "Grande Rue"
-housenumber: 1
+street: Grande Rue
+housenumber: "1"
 phone: ""
-opening_hours: "Tu-Fr 08:00-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:00-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/saint-marcellin/action.yml b/data/cities/saint-marcellin/action.yml
index 29cfb591a..fd7dcb404 100644
--- a/data/cities/saint-marcellin/action.yml
+++ b/data/cities/saint-marcellin/action.yml
@@ -4,8 +4,8 @@ latitude: 45.14964
 longitude: 5.31442
 postcode: "38160"
 city: Saint-Marcellin
-street: "Avenue de Provence"
-housenumber: 34
+street: Avenue de Provence
+housenumber: "34"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-marcellin/carrefour-city.yml b/data/cities/saint-marcellin/carrefour-city.yml
index 17aaf0e00..fca392f92 100644
--- a/data/cities/saint-marcellin/carrefour-city.yml
+++ b/data/cities/saint-marcellin/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.15427
 longitude: 5.31964
 postcode: "38160"
 city: Saint-Marcellin
-street: "Avenue du Collège"
-housenumber: 
+street: Avenue du Collège
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su 08:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-21:00; Su 08:00-18:00
+website: ""
diff --git a/data/cities/saint-marcellin/just-bike.yml b/data/cities/saint-marcellin/just-bike.yml
index 127e67d2a..ac0d169e0 100644
--- a/data/cities/saint-marcellin/just-bike.yml
+++ b/data/cities/saint-marcellin/just-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.1471
 longitude: 5.30688
 postcode: "38160"
 city: Saint-Marcellin
-street: "Rue de la Camponnière"
-housenumber: 9
+street: Rue de la Camponnière
+housenumber: "9"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,13:30-18:30; Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,13:30-18:30; Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/saint-marcellin/le-centralis.yml b/data/cities/saint-marcellin/le-centralis.yml
index 011ad9187..1d9127ddc 100644
--- a/data/cities/saint-marcellin/le-centralis.yml
+++ b/data/cities/saint-marcellin/le-centralis.yml
@@ -4,8 +4,8 @@ latitude: 45.14663
 longitude: 5.31022
 postcode: "38160"
 city: Saint-Marcellin
-street: "Avenue de Romans"
-housenumber: 6
+street: Avenue de Romans
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-marcellin/le-marque-page.yml b/data/cities/saint-marcellin/le-marque-page.yml
index 4fe291c81..0125de793 100644
--- a/data/cities/saint-marcellin/le-marque-page.yml
+++ b/data/cities/saint-marcellin/le-marque-page.yml
@@ -4,8 +4,8 @@ latitude: 45.15462
 longitude: 5.32275
 postcode: "38160"
 city: Saint-Marcellin
-street: "Grande Rue"
-housenumber: 8
-phone: "+33 4 76 38 25 25"
+street: Grande Rue
+housenumber: "8"
+phone: +33 4 76 38 25 25
 opening_hours: ""
-website: "https://www.lemarquepage.net/"
\ No newline at end of file
+website: https://www.lemarquepage.net/
diff --git a/data/cities/saint-marcellin/lidl.yml b/data/cities/saint-marcellin/lidl.yml
index 7d997c878..5062330f7 100644
--- a/data/cities/saint-marcellin/lidl.yml
+++ b/data/cities/saint-marcellin/lidl.yml
@@ -1,11 +1,11 @@
 id: 551622812
-type: way
+type: node
 latitude: 45.14865
 longitude: 5.31206
 postcode: "38160"
 city: Saint-Marcellin
-street: "Avenue de Romans"
-housenumber: 
+street: Avenue de Romans
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/saint-marcellin/loisirs-2000.yml b/data/cities/saint-marcellin/loisirs-2000.yml
index a3b17ed44..5db34923a 100644
--- a/data/cities/saint-marcellin/loisirs-2000.yml
+++ b/data/cities/saint-marcellin/loisirs-2000.yml
@@ -1,11 +1,11 @@
 id: 1077492432
-type: way
+type: node
 latitude: 45.14886
 longitude: 5.31128
 postcode: ""
 city: Saint-Marcellin
-street: "Rue d'Arsonval"
-housenumber: 
+street: Rue d'Arsonval
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-marcellin/maison-brialon.yml b/data/cities/saint-marcellin/maison-brialon.yml
index ea12b6a2c..f2459cb76 100644
--- a/data/cities/saint-marcellin/maison-brialon.yml
+++ b/data/cities/saint-marcellin/maison-brialon.yml
@@ -4,8 +4,8 @@ latitude: 45.14598
 longitude: 5.31029
 postcode: "38160"
 city: Saint-Marcellin
-street: "Avenue de Romans"
-housenumber: 9
+street: Avenue de Romans
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 05:15-19:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 05:15-19:15
+website: ""
diff --git a/data/cities/saint-marcellin/marbrerie-funeraire-carmona.yml b/data/cities/saint-marcellin/marbrerie-funeraire-carmona.yml
index f46632f15..6db2fee83 100644
--- a/data/cities/saint-marcellin/marbrerie-funeraire-carmona.yml
+++ b/data/cities/saint-marcellin/marbrerie-funeraire-carmona.yml
@@ -1,11 +1,11 @@
 id: 118066628
-type: way
+type: node
 latitude: 45.15189
 longitude: 5.32067
 postcode: "38160"
 city: Saint-Marcellin
-street: "Rue Aymard Durivail"
-housenumber: 8
+street: Rue Aymard Durivail
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-marcellin/vival.yml b/data/cities/saint-marcellin/vival.yml
index 31a2da9c6..98ebe87e6 100644
--- a/data/cities/saint-marcellin/vival.yml
+++ b/data/cities/saint-marcellin/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.15345
 longitude: 5.32082
 postcode: "38160"
 city: Saint-Marcellin
-street: "Grande Rue"
-housenumber: 36
-phone: "+33 9 86 51 65 57"
-opening_hours: "Mo-Su 07:30-21:00"
-website: "https://magasins.vival.fr/fr/s/vival-saint-marcellin"
\ No newline at end of file
+street: Grande Rue
+housenumber: "36"
+phone: +33 9 86 51 65 57
+opening_hours: Mo-Su 07:30-21:00
+website: https://magasins.vival.fr/fr/s/vival-saint-marcellin
diff --git a/data/cities/saint-martin-de-belleville/intersport.yml b/data/cities/saint-martin-de-belleville/intersport.yml
index 103422102..7b1c4422d 100644
--- a/data/cities/saint-martin-de-belleville/intersport.yml
+++ b/data/cities/saint-martin-de-belleville/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.50445
 postcode: "73440"
 city: Saint-Martin-de-Belleville
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-de-valamas/la-mi-do-re.yml b/data/cities/saint-martin-de-valamas/la-mi-do-re.yml
index e714be8b2..513272d27 100644
--- a/data/cities/saint-martin-de-valamas/la-mi-do-re.yml
+++ b/data/cities/saint-martin-de-valamas/la-mi-do-re.yml
@@ -5,7 +5,7 @@ longitude: 4.36926
 postcode: ""
 city: Saint-Martin-de-Valamas
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/abc-auto.yml b/data/cities/saint-martin-dheres/abc-auto.yml
index 48e3c4368..b5cc716fe 100644
--- a/data/cities/saint-martin-dheres/abc-auto.yml
+++ b/data/cities/saint-martin-dheres/abc-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.18731
 longitude: 5.7644
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Diderot"
+street: Rue Diderot
 housenumber: 26B
-phone: "+33 6 16 47 72 54"
+phone: +33 6 16 47 72 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/aed.yml b/data/cities/saint-martin-dheres/aed.yml
index ba81593f9..595b19f82 100644
--- a/data/cities/saint-martin-dheres/aed.yml
+++ b/data/cities/saint-martin-dheres/aed.yml
@@ -1,11 +1,11 @@
 id: 133510596
-type: way
+type: node
 latitude: 45.18749
 longitude: 5.76062
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Eugène Chavant"
-housenumber: 7
-phone: "+33 4 76 42 10 65"
-opening_hours: "Mo-Fr 07:30-12:00, Mo-Th 13:30-17:00, Fr 13:30-16:00"
-website: ""
\ No newline at end of file
+street: Rue Eugène Chavant
+housenumber: "7"
+phone: +33 4 76 42 10 65
+opening_hours: Mo-Fr 07:30-12:00, Mo-Th 13:30-17:00, Fr 13:30-16:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/affairs-saint-martin-dheres.yml b/data/cities/saint-martin-dheres/affairs-saint-martin-dheres.yml
index 457e899ef..947aea0aa 100644
--- a/data/cities/saint-martin-dheres/affairs-saint-martin-dheres.yml
+++ b/data/cities/saint-martin-dheres/affairs-saint-martin-dheres.yml
@@ -1,11 +1,11 @@
 id: 160165240
-type: way
+type: node
 latitude: 45.18536
 longitude: 5.76536
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 121
+street: Avenue Gabriel Péri
+housenumber: "121"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/alexandre-cifarelli-coiffure.yml b/data/cities/saint-martin-dheres/alexandre-cifarelli-coiffure.yml
index 2ea514d27..3e567d1bd 100644
--- a/data/cities/saint-martin-dheres/alexandre-cifarelli-coiffure.yml
+++ b/data/cities/saint-martin-dheres/alexandre-cifarelli-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.18244
 longitude: 5.75995
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 157
-phone: "+33 4 76 54 18 70"
-opening_hours: "Tu-Th 08:00-12:00,14:00-19:00; Fr 08:00-19:00; Sa 08:00-17:00"
-website: "http://www.cifarellicoiffure.com/"
\ No newline at end of file
+street: Avenue Ambroise Croizat
+housenumber: "157"
+phone: +33 4 76 54 18 70
+opening_hours: Tu-Th 08:00-12:00,14:00-19:00; Fr 08:00-19:00; Sa 08:00-17:00
+website: http://www.cifarellicoiffure.com/
diff --git a/data/cities/saint-martin-dheres/atre-et-loisirs.yml b/data/cities/saint-martin-dheres/atre-et-loisirs.yml
index bf030d466..a14b343fc 100644
--- a/data/cities/saint-martin-dheres/atre-et-loisirs.yml
+++ b/data/cities/saint-martin-dheres/atre-et-loisirs.yml
@@ -4,8 +4,8 @@ latitude: 45.18471
 longitude: 5.77783
 postcode: "38400"
 city: Saint Martin d'Hères
-street: "Rue du Champ Roman"
-housenumber: 53
-phone: "+33 4 76 44 10 60"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00"
-website: "https://www.atre-loisirs.fr/"
\ No newline at end of file
+street: Rue du Champ Roman
+housenumber: "53"
+phone: +33 4 76 44 10 60
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00
+website: https://www.atre-loisirs.fr/
diff --git a/data/cities/saint-martin-dheres/banette.yml b/data/cities/saint-martin-dheres/banette.yml
index 21d590d39..36abebef7 100644
--- a/data/cities/saint-martin-dheres/banette.yml
+++ b/data/cities/saint-martin-dheres/banette.yml
@@ -4,8 +4,8 @@ latitude: 45.16346
 longitude: 5.75097
 postcode: "38400"
 city: Saint Martin d'Hères
-street: "Avenue Marcel Cachin"
-housenumber: 102
+street: Avenue Marcel Cachin
+housenumber: "102"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/boulangerie-couto.yml b/data/cities/saint-martin-dheres/boulangerie-couto.yml
index a7c44b398..442b86edf 100644
--- a/data/cities/saint-martin-dheres/boulangerie-couto.yml
+++ b/data/cities/saint-martin-dheres/boulangerie-couto.yml
@@ -4,8 +4,8 @@ latitude: 45.18127
 longitude: 5.76338
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 234
-phone: "+33 4 76 51 91 96"
-opening_hours: "Mo-Fr 06:30-13:00,16:00-19:00; Sa 07:00-12:30"
-website: "https://www.facebook.com/SARL.COUTO/"
\ No newline at end of file
+street: Avenue Ambroise Croizat
+housenumber: "234"
+phone: +33 4 76 51 91 96
+opening_hours: Mo-Fr 06:30-13:00,16:00-19:00; Sa 07:00-12:30
+website: https://www.facebook.com/SARL.COUTO/
diff --git a/data/cities/saint-martin-dheres/carglass.yml b/data/cities/saint-martin-dheres/carglass.yml
index f3df45a19..923c4bdca 100644
--- a/data/cities/saint-martin-dheres/carglass.yml
+++ b/data/cities/saint-martin-dheres/carglass.yml
@@ -4,8 +4,8 @@ latitude: 45.18368
 longitude: 5.7761
 postcode: "38400"
 city: Saint Martin d'Hères
-street: "Rue du Champ Roman"
-housenumber: 
-phone: "+33 1 70 96 46 00"
-opening_hours: "Mo-Fr 08:00-12:15,13:45-18:00; Sa 08:00-12:30,13:30-17:30"
-website: "https://www.carglass.fr/centre/38400-83540/st-martin-d-heres"
\ No newline at end of file
+street: Rue du Champ Roman
+housenumber: ""
+phone: +33 1 70 96 46 00
+opening_hours: Mo-Fr 08:00-12:15,13:45-18:00; Sa 08:00-12:30,13:30-17:30
+website: https://www.carglass.fr/centre/38400-83540/st-martin-d-heres
diff --git a/data/cities/saint-martin-dheres/carre-asiatique.yml b/data/cities/saint-martin-dheres/carre-asiatique.yml
index b6db9fdb1..2d8e889b4 100644
--- a/data/cities/saint-martin-dheres/carre-asiatique.yml
+++ b/data/cities/saint-martin-dheres/carre-asiatique.yml
@@ -1,11 +1,11 @@
 id: 149493396
-type: way
+type: node
 latitude: 45.18407
 longitude: 5.76587
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 118
-phone: "+33 4 38 38 88 88"
-opening_hours: "Mo-Fr 9:30-19:30; Sa 9:30-20:00; Su 9:30-13:00"
-website: "https://www.lecarreasiatique.com/"
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "118"
+phone: +33 4 38 38 88 88
+opening_hours: Mo-Fr 9:30-19:30; Sa 9:30-20:00; Su 9:30-13:00
+website: https://www.lecarreasiatique.com/
diff --git a/data/cities/saint-martin-dheres/carrefour-express.yml b/data/cities/saint-martin-dheres/carrefour-express.yml
index 002e943bf..207618752 100644
--- a/data/cities/saint-martin-dheres/carrefour-express.yml
+++ b/data/cities/saint-martin-dheres/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.17845
 longitude: 5.75589
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Benoît Frachon"
-housenumber: 97
-phone: "+33 4 76 44 78 76"
-opening_hours: "Mo-Sa 07:00-20:30; Su 08:30-18:00"
-website: "https://www.carrefour.fr/magasin/express-saint-martin-d-heres"
\ No newline at end of file
+street: Avenue Benoît Frachon
+housenumber: "97"
+phone: +33 4 76 44 78 76
+opening_hours: Mo-Sa 07:00-20:30; Su 08:30-18:00
+website: https://www.carrefour.fr/magasin/express-saint-martin-d-heres
diff --git a/data/cities/saint-martin-dheres/carrosserie-chenal.yml b/data/cities/saint-martin-dheres/carrosserie-chenal.yml
index 9e400244b..99d38010c 100644
--- a/data/cities/saint-martin-dheres/carrosserie-chenal.yml
+++ b/data/cities/saint-martin-dheres/carrosserie-chenal.yml
@@ -1,11 +1,11 @@
 id: 133510599
-type: way
+type: node
 latitude: 45.18741
 longitude: 5.76058
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Eugène Chavant"
-housenumber: 5
+street: Rue Eugène Chavant
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, Mo-Th 14:00-18:00, Fr 14:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, Mo-Th 14:00-18:00, Fr 14:00-17:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/castorama.yml b/data/cities/saint-martin-dheres/castorama.yml
index 603369521..fb3090dd4 100644
--- a/data/cities/saint-martin-dheres/castorama.yml
+++ b/data/cities/saint-martin-dheres/castorama.yml
@@ -4,8 +4,8 @@ latitude: 45.18374
 longitude: 5.77339
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Champ Roman"
-housenumber: 
-phone: "+33 4 76 42 22 18"
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-18:00"
-website: "https://www.castorama.fr/store/1466"
\ No newline at end of file
+street: Rue du Champ Roman
+housenumber: ""
+phone: +33 4 76 42 22 18
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-18:00
+website: https://www.castorama.fr/store/1466
diff --git a/data/cities/saint-martin-dheres/cavaland.yml b/data/cities/saint-martin-dheres/cavaland.yml
index 73403a435..02ad73674 100644
--- a/data/cities/saint-martin-dheres/cavaland.yml
+++ b/data/cities/saint-martin-dheres/cavaland.yml
@@ -1,11 +1,11 @@
 id: 61400099
-type: way
+type: node
 latitude: 45.18413
 longitude: 5.77635
 postcode: "38400"
 city: Saint Martin d'Hères
-street: "Rue du Champ Roman"
-housenumber: 45
+street: Rue du Champ Roman
+housenumber: "45"
 phone: ""
-opening_hours: "Mo 14:30-19:00; Tu-Fr 10:00-12:30,14:30-19:00; Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:30-19:00; Tu-Fr 10:00-12:30,14:30-19:00; Sa 10:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/centrakor.yml b/data/cities/saint-martin-dheres/centrakor.yml
index 54d282f69..bb2e50522 100644
--- a/data/cities/saint-martin-dheres/centrakor.yml
+++ b/data/cities/saint-martin-dheres/centrakor.yml
@@ -1,11 +1,11 @@
 id: 160165244
-type: way
+type: node
 latitude: 45.18519
 longitude: 5.76556
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 125
+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
+opening_hours: Mo-Sa 09:30-19:00; Su 14:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/cged.yml b/data/cities/saint-martin-dheres/cged.yml
index d7a03a6ea..6af956249 100644
--- a/data/cities/saint-martin-dheres/cged.yml
+++ b/data/cities/saint-martin-dheres/cged.yml
@@ -4,8 +4,8 @@ latitude: 45.18664
 longitude: 5.76312
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue des Glairons"
-housenumber: 21
-phone: "+33 4 76 42 16 36"
+street: Rue des Glairons
+housenumber: "21"
+phone: +33 4 76 42 16 36
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/corep.yml b/data/cities/saint-martin-dheres/corep.yml
index 4b01c5bbb..6979a6bc3 100644
--- a/data/cities/saint-martin-dheres/corep.yml
+++ b/data/cities/saint-martin-dheres/corep.yml
@@ -4,8 +4,8 @@ latitude: 45.18621
 longitude: 5.77221
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Tour de l'Eau"
-housenumber: 2
+street: Rue du Tour de l'Eau
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 08:30-19:00; Sa 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-19:00; Sa 09:30-12:30
+website: ""
diff --git a/data/cities/saint-martin-dheres/darty.yml b/data/cities/saint-martin-dheres/darty.yml
index 5ed7a23b4..cf601d43a 100644
--- a/data/cities/saint-martin-dheres/darty.yml
+++ b/data/cities/saint-martin-dheres/darty.yml
@@ -1,11 +1,11 @@
 id: 42485372
-type: way
+type: node
 latitude: 45.18491
 longitude: 5.7689
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue des Glairons"
-housenumber: 
-phone: "+33 892 01 10 10"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://magasin.darty.com/165-darty-st-martin-d-heres"
\ No newline at end of file
+street: Rue des Glairons
+housenumber: ""
+phone: +33 892 01 10 10
+opening_hours: Mo-Sa 09:30-19:30
+website: https://magasin.darty.com/165-darty-st-martin-d-heres
diff --git a/data/cities/saint-martin-dheres/dauphitour.yml b/data/cities/saint-martin-dheres/dauphitour.yml
index c21bdb499..f887fda73 100644
--- a/data/cities/saint-martin-dheres/dauphitour.yml
+++ b/data/cities/saint-martin-dheres/dauphitour.yml
@@ -4,8 +4,8 @@ latitude: 45.18249
 longitude: 5.758
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Pierre Semard"
-housenumber: 1
-phone: "+33 4 76 42 88 02"
-opening_hours: "Mo-Fr 10:00-12:00,14:00-18:00; Sa,Su off"
-website: ""
\ No newline at end of file
+street: Avenue Pierre Semard
+housenumber: "1"
+phone: +33 4 76 42 88 02
+opening_hours: Mo-Fr 10:00-12:00,14:00-18:00; Sa,Su off
+website: ""
diff --git a/data/cities/saint-martin-dheres/distinxion.yml b/data/cities/saint-martin-dheres/distinxion.yml
index ffe517867..009c77bdb 100644
--- a/data/cities/saint-martin-dheres/distinxion.yml
+++ b/data/cities/saint-martin-dheres/distinxion.yml
@@ -1,11 +1,12 @@
 id: 160165314
-type: way
+type: node
 latitude: 45.18727
 longitude: 5.76724
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Georges Perec"
-housenumber: 3
-phone: "+33 4 76 42 64 64"
-opening_hours: "Mo-Th 07:30-12:00,14:00-18:00; Fr 08:00-12:00,14:00-17:00; We,Sa,Su off"
-website: ""
\ No newline at end of file
+street: Rue Georges Perec
+housenumber: "3"
+phone: +33 4 76 42 64 64
+opening_hours: Mo-Th 07:30-12:00,14:00-18:00; Fr 08:00-12:00,14:00-17:00; We,Sa,Su
+    off
+website: ""
diff --git a/data/cities/saint-martin-dheres/e-leclerc.yml b/data/cities/saint-martin-dheres/e-leclerc.yml
index bd464ebbe..1befdb4b7 100644
--- a/data/cities/saint-martin-dheres/e-leclerc.yml
+++ b/data/cities/saint-martin-dheres/e-leclerc.yml
@@ -1,11 +1,11 @@
 id: 191193290
-type: way
+type: node
 latitude: 45.16881
 longitude: 5.75208
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Pré Ruffier"
-housenumber: 
-phone: "+33 4 76 62 97 77"
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: "https://www.e-leclerc.com"
\ No newline at end of file
+street: Rue du Pré Ruffier
+housenumber: ""
+phone: +33 4 76 62 97 77
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: https://www.e-leclerc.com
diff --git a/data/cities/saint-martin-dheres/ecouter-voir.yml b/data/cities/saint-martin-dheres/ecouter-voir.yml
index 1673cf97e..55e891fcc 100644
--- a/data/cities/saint-martin-dheres/ecouter-voir.yml
+++ b/data/cities/saint-martin-dheres/ecouter-voir.yml
@@ -4,8 +4,8 @@ latitude: 45.18242
 longitude: 5.75885
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 166
-phone: "+33 4 76 51 72 70"
-opening_hours: "Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:30-12:30,14:00-18:00"
-website: "https://www.ecoutervoir.fr/trouver-un-magasin/saint-martin-dheres/"
\ No newline at end of file
+street: Avenue Ambroise Croizat
+housenumber: "166"
+phone: +33 4 76 51 72 70
+opening_hours: Mo-Fr 09:30-12:00,14:00-19:00; Sa 09:30-12:30,14:00-18:00
+website: https://www.ecoutervoir.fr/trouver-un-magasin/saint-martin-dheres/
diff --git a/data/cities/saint-martin-dheres/ekosport-avenue-gabriel-peri.yml b/data/cities/saint-martin-dheres/ekosport-avenue-gabriel-peri.yml
index 30885b39e..a260fc3e3 100644
--- a/data/cities/saint-martin-dheres/ekosport-avenue-gabriel-peri.yml
+++ b/data/cities/saint-martin-dheres/ekosport-avenue-gabriel-peri.yml
@@ -1,11 +1,11 @@
 id: 187047388
-type: way
+type: node
 latitude: 45.18704
 longitude: 5.75287
 postcode: "38400"
 city: Saint-Martin d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 30
+street: Avenue Gabriel Péri
+housenumber: "30"
 phone: ""
-opening_hours: "Mo-Sa 09:30-17:45; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-17:45; Su off
+website: ""
diff --git a/data/cities/saint-martin-dheres/ekosport.yml b/data/cities/saint-martin-dheres/ekosport.yml
index 2ee88d75b..1b78ea65f 100644
--- a/data/cities/saint-martin-dheres/ekosport.yml
+++ b/data/cities/saint-martin-dheres/ekosport.yml
@@ -1,11 +1,11 @@
 id: 42736325
-type: way
+type: node
 latitude: 45.18344
 longitude: 5.77099
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Charles Darwin"
-housenumber: 5
+street: Rue Charles Darwin
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:30
+website: ""
diff --git a/data/cities/saint-martin-dheres/envie-grenoble.yml b/data/cities/saint-martin-dheres/envie-grenoble.yml
index a2329c5de..708c27bad 100644
--- a/data/cities/saint-martin-dheres/envie-grenoble.yml
+++ b/data/cities/saint-martin-dheres/envie-grenoble.yml
@@ -4,8 +4,8 @@ latitude: 45.17178
 longitude: 5.75191
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue de la Mogne"
-housenumber: 41
-phone: "+33 4 77 21 99 22"
-opening_hours: "Mo-Fr 10:00-19:00"
-website: "https://grenoble.envie.org"
\ No newline at end of file
+street: Avenue de la Mogne
+housenumber: "41"
+phone: +33 4 77 21 99 22
+opening_hours: Mo-Fr 10:00-19:00
+website: https://grenoble.envie.org
diff --git a/data/cities/saint-martin-dheres/epicerie-du-monde.yml b/data/cities/saint-martin-dheres/epicerie-du-monde.yml
index f9012e705..0df005cba 100644
--- a/data/cities/saint-martin-dheres/epicerie-du-monde.yml
+++ b/data/cities/saint-martin-dheres/epicerie-du-monde.yml
@@ -4,8 +4,8 @@ latitude: 45.18183
 longitude: 5.76137
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 200
+street: Avenue Ambroise Croizat
+housenumber: "200"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/feu-vert.yml b/data/cities/saint-martin-dheres/feu-vert.yml
index 27fc1dfd0..b79fd7b96 100644
--- a/data/cities/saint-martin-dheres/feu-vert.yml
+++ b/data/cities/saint-martin-dheres/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 1230643356
-type: way
+type: node
 latitude: 45.18623
 longitude: 5.76264
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 99
+street: Avenue Gabriel Péri
+housenumber: "99"
 phone: "+33476423472"
-opening_hours: "Mo-Sa 08:30-19:00"
-website: "https://www.feuvert.fr/centres-auto/st-martin-d-heres/feu-vert-grenoble-stmdheres/193.html"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00
+website: https://www.feuvert.fr/centres-auto/st-martin-d-heres/feu-vert-grenoble-stmdheres/193.html
diff --git a/data/cities/saint-martin-dheres/flash-rc.yml b/data/cities/saint-martin-dheres/flash-rc.yml
index 3634a9861..888071093 100644
--- a/data/cities/saint-martin-dheres/flash-rc.yml
+++ b/data/cities/saint-martin-dheres/flash-rc.yml
@@ -4,8 +4,8 @@ latitude: 45.17661
 longitude: 5.75942
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Martin Luther King"
-housenumber: 15
-phone: "+33 4 76 01 05 23"
-opening_hours: "Mo-Fr 09:30-12:30,14:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue Martin Luther King
+housenumber: "15"
+phone: +33 4 76 01 05 23
+opening_hours: Mo-Fr 09:30-12:30,14:00-18:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/france-pare-brise.yml b/data/cities/saint-martin-dheres/france-pare-brise.yml
index adad2fc9d..9465f1aed 100644
--- a/data/cities/saint-martin-dheres/france-pare-brise.yml
+++ b/data/cities/saint-martin-dheres/france-pare-brise.yml
@@ -4,8 +4,8 @@ latitude: 45.18723
 longitude: 5.75912
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue des Glairons"
-housenumber: 9
+street: Rue des Glairons
+housenumber: "9"
 phone: "+33476513636"
-opening_hours: "Mo-Fr 08:00-12:00, Sa 08:00-12:00, Mo-Fr 14:00-18:00"
-website: "http://www.franceparebrise.org/fpb/voir_centre.php?ctr=38s"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, Sa 08:00-12:00, Mo-Fr 14:00-18:00
+website: http://www.franceparebrise.org/fpb/voir_centre.php?ctr=38s
diff --git a/data/cities/saint-martin-dheres/garage-arakelian.yml b/data/cities/saint-martin-dheres/garage-arakelian.yml
index b800a71a6..f21c12752 100644
--- a/data/cities/saint-martin-dheres/garage-arakelian.yml
+++ b/data/cities/saint-martin-dheres/garage-arakelian.yml
@@ -4,8 +4,8 @@ latitude: 45.18206
 longitude: 5.76151
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Alfred Gueymard"
-housenumber: 
-phone: "+33 4 76 42 04 87"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa,Su off"
-website: ""
\ No newline at end of file
+street: Rue Alfred Gueymard
+housenumber: ""
+phone: +33 4 76 42 04 87
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa,Su off
+website: ""
diff --git a/data/cities/saint-martin-dheres/garage-le-portail-rouge.yml b/data/cities/saint-martin-dheres/garage-le-portail-rouge.yml
index 46252ae86..74c8ff945 100644
--- a/data/cities/saint-martin-dheres/garage-le-portail-rouge.yml
+++ b/data/cities/saint-martin-dheres/garage-le-portail-rouge.yml
@@ -4,8 +4,8 @@ latitude: 45.18159
 longitude: 5.76341
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 185
-phone: "+33 4 76 42 29 94"
+street: Avenue Ambroise Croizat
+housenumber: "185"
+phone: +33 4 76 42 29 94
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/gboost.yml b/data/cities/saint-martin-dheres/gboost.yml
index f618b5cbe..6bc256753 100644
--- a/data/cities/saint-martin-dheres/gboost.yml
+++ b/data/cities/saint-martin-dheres/gboost.yml
@@ -4,8 +4,8 @@ latitude: 45.18336
 longitude: 5.77597
 postcode: "38400"
 city: Saint Martin d'Hères
-street: "Rue du Champ Roman"
-housenumber: 60
+street: Rue du Champ Roman
+housenumber: "60"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/gemo.yml b/data/cities/saint-martin-dheres/gemo.yml
index 695794a4c..f2573cd97 100644
--- a/data/cities/saint-martin-dheres/gemo.yml
+++ b/data/cities/saint-martin-dheres/gemo.yml
@@ -1,11 +1,11 @@
 id: 42485370
-type: way
+type: node
 latitude: 45.18523
 longitude: 5.76783
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 137
-phone: "+33 4 76 42 66 47"
-opening_hours: "Mo-Fr 09:30-19:00; Sa 09:30-19:30"
-website: "https://www.gemo.fr/magasin/GEMO_ST_MARTIN_D'HERES_Chaussures_&_V%C3%AAtements/GEMO_2445"
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "137"
+phone: +33 4 76 42 66 47
+opening_hours: Mo-Fr 09:30-19:00; Sa 09:30-19:30
+website: https://www.gemo.fr/magasin/GEMO_ST_MARTIN_D'HERES_Chaussures_&_V%C3%AAtements/GEMO_2445
diff --git a/data/cities/saint-martin-dheres/generale-doptique.yml b/data/cities/saint-martin-dheres/generale-doptique.yml
new file mode 100644
index 000000000..178d820a4
--- /dev/null
+++ b/data/cities/saint-martin-dheres/generale-doptique.yml
@@ -0,0 +1,11 @@
+id: 1267567303
+type: node
+latitude: 45.18519
+longitude: 5.77167
+postcode: "38400"
+city: Saint-Martin-d'Hères
+street: Rue du Champ Roman
+housenumber: "9"
+phone: +33 4 76 89 11 05
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.generale-optique.com/opticien/saint-martin-dheres/240
diff --git a/data/cities/saint-martin-dheres/gonthier-pneus.yml b/data/cities/saint-martin-dheres/gonthier-pneus.yml
index a1fc53cfd..edbce0c1c 100644
--- a/data/cities/saint-martin-dheres/gonthier-pneus.yml
+++ b/data/cities/saint-martin-dheres/gonthier-pneus.yml
@@ -1,11 +1,11 @@
 id: 160165313
-type: way
+type: node
 latitude: 45.18533
 longitude: 5.76677
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 131
-phone: "+33 4 76 54 36 83"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:30; Sa 08:00-12:00,14:00-17:00"
-website: ""
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "131"
+phone: +33 4 76 54 36 83
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:30; Sa 08:00-12:00,14:00-17:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/self-laverie.yml b/data/cities/saint-martin-dheres/hello-laundry.yml
similarity index 51%
rename from data/cities/saint-martin-dheres/self-laverie.yml
rename to data/cities/saint-martin-dheres/hello-laundry.yml
index 987469446..030e23ca9 100644
--- a/data/cities/saint-martin-dheres/self-laverie.yml
+++ b/data/cities/saint-martin-dheres/hello-laundry.yml
@@ -1,11 +1,11 @@
 id: 506503975
-type: way
+type: node
 latitude: 45.18566
 longitude: 5.75832
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 76
+street: Avenue Gabriel Péri
+housenumber: "76"
 phone: ""
-opening_hours: "Mo-Su 07:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-21:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/horizon-montagne.yml b/data/cities/saint-martin-dheres/horizon-montagne.yml
index 6b13aef6a..c8e4fd016 100644
--- a/data/cities/saint-martin-dheres/horizon-montagne.yml
+++ b/data/cities/saint-martin-dheres/horizon-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.18475
 longitude: 5.75716
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Marceau Leyssieux"
-housenumber: 18
+street: Rue Marceau Leyssieux
+housenumber: "18"
 phone: ""
-opening_hours: "Tu-Sa 10:00-13:00, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-13:00, 15:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/hudry-jallut.yml b/data/cities/saint-martin-dheres/hudry-jallut.yml
index 7b49e703a..3ac0764ef 100644
--- a/data/cities/saint-martin-dheres/hudry-jallut.yml
+++ b/data/cities/saint-martin-dheres/hudry-jallut.yml
@@ -4,8 +4,8 @@ latitude: 45.16445
 longitude: 5.75694
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Béal"
-housenumber: 7
+street: Rue du Béal
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/ikea.yml b/data/cities/saint-martin-dheres/ikea.yml
index e6baca77d..f384760b4 100644
--- a/data/cities/saint-martin-dheres/ikea.yml
+++ b/data/cities/saint-martin-dheres/ikea.yml
@@ -1,11 +1,11 @@
 id: 31348922
-type: way
+type: node
 latitude: 45.18197
 longitude: 5.77534
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 150
+street: Avenue Gabriel Péri
+housenumber: "150"
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: "https://www.ikea.com/fr/fr/stores/grenoble/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: https://www.ikea.com/fr/fr/stores/grenoble/
diff --git a/data/cities/saint-martin-dheres/intermarche-hyper.yml b/data/cities/saint-martin-dheres/intermarche-hyper.yml
index a75497d85..00459acfe 100644
--- a/data/cities/saint-martin-dheres/intermarche-hyper.yml
+++ b/data/cities/saint-martin-dheres/intermarche-hyper.yml
@@ -1,11 +1,11 @@
 id: 244945831
-type: way
+type: node
 latitude: 45.18548
 longitude: 5.75814
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 76
-phone: "+33 4 76 15 04 00"
-opening_hours: "Mo-Sa 08:00-21:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "76"
+phone: +33 4 76 15 04 00
+opening_hours: Mo-Sa 08:00-21:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-martin-dheres/intersport.yml b/data/cities/saint-martin-dheres/intersport.yml
index a1450771d..a2ad27c6d 100644
--- a/data/cities/saint-martin-dheres/intersport.yml
+++ b/data/cities/saint-martin-dheres/intersport.yml
@@ -1,11 +1,11 @@
 id: 149485108
-type: way
+type: node
 latitude: 45.1855
 longitude: 5.76449
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 111
+street: Avenue Gabriel Péri
+housenumber: "111"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/saint-martin-dheres/isermat.yml b/data/cities/saint-martin-dheres/isermat.yml
index 200cc5eff..d1225d4d1 100644
--- a/data/cities/saint-martin-dheres/isermat.yml
+++ b/data/cities/saint-martin-dheres/isermat.yml
@@ -4,8 +4,8 @@ latitude: 45.16374
 longitude: 5.75664
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Béal"
-housenumber: 5
+street: Rue du Béal
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/kelvelo.yml b/data/cities/saint-martin-dheres/kelvelo.yml
index ad889a05d..2e86497fb 100644
--- a/data/cities/saint-martin-dheres/kelvelo.yml
+++ b/data/cities/saint-martin-dheres/kelvelo.yml
@@ -1,11 +1,11 @@
 id: 61390203
-type: way
+type: node
 latitude: 45.18586
 longitude: 5.77095
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Champ Roman"
-housenumber: 7
+street: Rue du Champ Roman
+housenumber: "7"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/kiloutou.yml b/data/cities/saint-martin-dheres/kiloutou.yml
index f64b04ad2..b400d0990 100644
--- a/data/cities/saint-martin-dheres/kiloutou.yml
+++ b/data/cities/saint-martin-dheres/kiloutou.yml
@@ -4,8 +4,8 @@ latitude: 45.16294
 longitude: 5.75567
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Béal"
-housenumber: 1
+street: Rue du Béal
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: "https://www.kiloutou.fr/"
\ No newline at end of file
+website: https://www.kiloutou.fr/
diff --git a/data/cities/saint-martin-dheres/la-clinique-du-chausson-et-du-matos.yml b/data/cities/saint-martin-dheres/la-clinique-du-chausson-et-du-matos.yml
index eb02ae383..172326aae 100644
--- a/data/cities/saint-martin-dheres/la-clinique-du-chausson-et-du-matos.yml
+++ b/data/cities/saint-martin-dheres/la-clinique-du-chausson-et-du-matos.yml
@@ -4,8 +4,8 @@ latitude: 45.18682
 longitude: 5.74684
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Pont Carpin"
-housenumber: 11
-phone: "+33 7 87 96 94 80"
-opening_hours: "We 09:00-19:00 || Sur rendez-vous"
-website: "https://reparation-materiel-montagne.fr"
\ No newline at end of file
+street: Rue du Pont Carpin
+housenumber: "11"
+phone: +33 7 87 96 94 80
+opening_hours: We 09:00-19:00 || "Sur rendez-vous"
+website: https://reparation-materiel-montagne.fr
diff --git a/data/cities/saint-martin-dheres/la-ferme-des-maquis.yml b/data/cities/saint-martin-dheres/la-ferme-des-maquis.yml
index 57a08b048..1dcef4873 100644
--- a/data/cities/saint-martin-dheres/la-ferme-des-maquis.yml
+++ b/data/cities/saint-martin-dheres/la-ferme-des-maquis.yml
@@ -1,11 +1,11 @@
 id: 260300527
-type: way
+type: node
 latitude: 45.17077
 longitude: 5.78326
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Route des Maquis"
-housenumber: 165
+street: Route des Maquis
+housenumber: "165"
 phone: ""
-opening_hours: "We,Fr 16:00-19:00; Sa 10:00-12:00,16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: We,Fr 16:00-19:00; Sa 10:00-12:00,16:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/la-fougasse.yml b/data/cities/saint-martin-dheres/la-fougasse.yml
index 88b987c39..b9ea302c5 100644
--- a/data/cities/saint-martin-dheres/la-fougasse.yml
+++ b/data/cities/saint-martin-dheres/la-fougasse.yml
@@ -4,8 +4,8 @@ latitude: 45.16883
 longitude: 5.7625
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue de Malfangeat"
-housenumber: 54
+street: Rue de Malfangeat
+housenumber: "54"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/la-meule-de-pierre.yml b/data/cities/saint-martin-dheres/la-meule-de-pierre.yml
index 3369dbcaa..32ac77d2e 100644
--- a/data/cities/saint-martin-dheres/la-meule-de-pierre.yml
+++ b/data/cities/saint-martin-dheres/la-meule-de-pierre.yml
@@ -1,11 +1,11 @@
 id: 149492495
-type: way
+type: node
 latitude: 45.18382
 longitude: 5.76384
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Jean-Jacques Rousseau"
-housenumber: 30
-phone: "+33 4 76 54 67 56"
-opening_hours: "Mo-Fr 05:30-13:00,16:30-19:30; Sa 05:30-13:00"
-website: ""
\ No newline at end of file
+street: Rue Jean-Jacques Rousseau
+housenumber: "30"
+phone: +33 4 76 54 67 56
+opening_hours: Mo-Fr 05:30-13:00,16:30-19:30; Sa 05:30-13:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/la-paraphonie.yml b/data/cities/saint-martin-dheres/la-paraphonie.yml
index c530cd81c..28db57811 100644
--- a/data/cities/saint-martin-dheres/la-paraphonie.yml
+++ b/data/cities/saint-martin-dheres/la-paraphonie.yml
@@ -1,11 +1,11 @@
 id: 1121915203
-type: way
+type: node
 latitude: 45.16892
 longitude: 5.75301
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Pré Ruffier"
-housenumber: 
+street: Rue du Pré Ruffier
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-21:00"
-website: "http://laparaphonie.co/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-21:00
+website: http://laparaphonie.co/
diff --git a/data/cities/saint-martin-dheres/la-vie-claire.yml b/data/cities/saint-martin-dheres/la-vie-claire.yml
index c19891791..3dbd23df9 100644
--- a/data/cities/saint-martin-dheres/la-vie-claire.yml
+++ b/data/cities/saint-martin-dheres/la-vie-claire.yml
@@ -1,11 +1,11 @@
 id: 149488819
-type: way
+type: node
 latitude: 45.18583
 longitude: 5.76313
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 109
+street: Avenue Gabriel Péri
+housenumber: "109"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/laverie-condillac.yml b/data/cities/saint-martin-dheres/laverie-condillac.yml
index 3b330ac57..11f732c40 100644
--- a/data/cities/saint-martin-dheres/laverie-condillac.yml
+++ b/data/cities/saint-martin-dheres/laverie-condillac.yml
@@ -4,8 +4,8 @@ latitude: 45.18869
 longitude: 5.77375
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue des Résidences"
-housenumber: 1220
-phone: "+33 4 76 82 76 31"
-opening_hours: "Mo-Su 07:00-22:00"
-website: "https://www.crous-grenoble.fr/logement/residence-condillac-b/"
\ No newline at end of file
+street: Rue des Résidences
+housenumber: "1220"
+phone: +33 4 76 82 76 31
+opening_hours: Mo-Su 07:00-22:00
+website: https://www.crous-grenoble.fr/logement/residence-condillac-b/
diff --git a/data/cities/saint-martin-dheres/laverie-du-campus.yml b/data/cities/saint-martin-dheres/laverie-du-campus.yml
index 9b46156f7..6b896b2e6 100644
--- a/data/cities/saint-martin-dheres/laverie-du-campus.yml
+++ b/data/cities/saint-martin-dheres/laverie-du-campus.yml
@@ -4,8 +4,8 @@ latitude: 45.19272
 longitude: 5.77116
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue de la Bibliothèque"
-housenumber: 411
-phone: "+33 4 76 96 28 03"
-opening_hours: "Mo-Su 07:00-20:00"
-website: "https://www.laverie-grenoble.fr/laverie-thiers"
\ No newline at end of file
+street: Avenue de la Bibliothèque
+housenumber: "411"
+phone: +33 4 76 96 28 03
+opening_hours: Mo-Su 07:00-20:00
+website: https://www.laverie-grenoble.fr/laverie-thiers
diff --git a/data/cities/saint-martin-dheres/ldlc.yml b/data/cities/saint-martin-dheres/ldlc.yml
index afdfab33c..18c22bcff 100644
--- a/data/cities/saint-martin-dheres/ldlc.yml
+++ b/data/cities/saint-martin-dheres/ldlc.yml
@@ -1,11 +1,11 @@
 id: 1267570797
-type: way
+type: node
 latitude: 45.18348
 longitude: 5.76847
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Charles Darwin"
-housenumber: 7
-phone: "+33 4 57 93 24 32"
-opening_hours: "Mo 13:00-19:00; Tu-Fr 10:00-13:00, 14:00-19:00; Sa 10:00-13:00, 14:00-18:00"
-website: "https://www.ldlc.com/magasins-ldlc/magasin-470035/38-ldlc-grenoble-st-martin-d-heres/"
\ No newline at end of file
+street: Rue Charles Darwin
+housenumber: "7"
+phone: +33 4 57 93 24 32
+opening_hours: Mo 13:00-19:00; Tu-Fr 10:00-13:00, 14:00-19:00; Sa 10:00-13:00, 14:00-18:00
+website: https://www.ldlc.com/magasins-ldlc/magasin-470035/38-ldlc-grenoble-st-martin-d-heres/
diff --git a/data/cities/saint-martin-dheres/le-chausse-montagne.yml b/data/cities/saint-martin-dheres/le-chausse-montagne.yml
index ac8cb2b8a..82142342e 100644
--- a/data/cities/saint-martin-dheres/le-chausse-montagne.yml
+++ b/data/cities/saint-martin-dheres/le-chausse-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.1882
 longitude: 5.7601
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Barnave"
-housenumber: 28
+street: Rue Barnave
+housenumber: "28"
 phone: ""
-opening_hours: "Mo 13:00-17:00, Tu-Th 13:00-17:30, Fr 13:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 13:00-17:00, Tu-Th 13:00-17:30, Fr 13:00-18:30
+website: ""
diff --git a/data/cities/saint-martin-dheres/le-chiquito.yml b/data/cities/saint-martin-dheres/le-chiquito.yml
index bf195a0ae..fa0ee6a29 100644
--- a/data/cities/saint-martin-dheres/le-chiquito.yml
+++ b/data/cities/saint-martin-dheres/le-chiquito.yml
@@ -4,8 +4,8 @@ latitude: 45.18268
 longitude: 5.75908
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 145
+street: Avenue Ambroise Croizat
+housenumber: "145"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:15,15:15-19:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:15,15:15-19:15
+website: ""
diff --git a/data/cities/saint-martin-dheres/le-fournil-martinerois.yml b/data/cities/saint-martin-dheres/le-fournil-martinerois.yml
index 568550d86..0bc14f8fa 100644
--- a/data/cities/saint-martin-dheres/le-fournil-martinerois.yml
+++ b/data/cities/saint-martin-dheres/le-fournil-martinerois.yml
@@ -1,11 +1,11 @@
 id: 187402304
-type: way
+type: node
 latitude: 45.17154
 longitude: 5.75818
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Potié"
-housenumber: 67
+street: Avenue Potié
+housenumber: "67"
 phone: "0953386635"
-opening_hours: "Mo-Su 06:00-20:10"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-20:10
+website: ""
diff --git a/data/cities/saint-martin-dheres/le-portail-rouge.yml b/data/cities/saint-martin-dheres/le-portail-rouge.yml
index ba70b9417..2997d0763 100644
--- a/data/cities/saint-martin-dheres/le-portail-rouge.yml
+++ b/data/cities/saint-martin-dheres/le-portail-rouge.yml
@@ -1,11 +1,11 @@
 id: 149493042
-type: way
+type: node
 latitude: 45.18095
 longitude: 5.76543
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 205
+street: Avenue Ambroise Croizat
+housenumber: "205"
 phone: ""
-opening_hours: "Mo-Fr 07:00-19:00, Sa 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-19:00, Sa 08:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/lentrepot-du-bricolage.yml b/data/cities/saint-martin-dheres/lentrepot-du-bricolage.yml
index 5661b0fc9..504e5d49e 100644
--- a/data/cities/saint-martin-dheres/lentrepot-du-bricolage.yml
+++ b/data/cities/saint-martin-dheres/lentrepot-du-bricolage.yml
@@ -1,11 +1,11 @@
 id: 61324681
-type: way
+type: node
 latitude: 45.18323
 longitude: 5.77188
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Charles Darwin"
-housenumber: 27
-phone: "04 76 15 30 30"
-opening_hours: "Mo-Sa 07:30-19:00"
-website: "https://www.entrepot-du-bricolage.fr/mon-magasin/st%20martin%20d%20heres"
\ No newline at end of file
+street: Rue Charles Darwin
+housenumber: "27"
+phone: 04 76 15 30 30
+opening_hours: Mo-Sa 07:30-19:00
+website: https://www.entrepot-du-bricolage.fr/mon-magasin/st%20martin%20d%20heres
diff --git a/data/cities/saint-martin-dheres/les-petits-pains-de-manon.yml b/data/cities/saint-martin-dheres/les-petits-pains-de-manon.yml
index cfd8a6e65..523d1bfee 100644
--- a/data/cities/saint-martin-dheres/les-petits-pains-de-manon.yml
+++ b/data/cities/saint-martin-dheres/les-petits-pains-de-manon.yml
@@ -1,11 +1,11 @@
 id: 149492605
-type: way
+type: node
 latitude: 45.18498
 longitude: 5.76347
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 104
-phone: "+33 4 76 97 69 10"
-opening_hours: "Mo-Su 06:00-18:00"
-website: "https://www.facebook.com/sebmandikian/"
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "104"
+phone: +33 4 76 97 69 10
+opening_hours: Mo-Su 06:00-18:00
+website: https://www.facebook.com/sebmandikian/
diff --git a/data/cities/saint-martin-dheres/lidl.yml b/data/cities/saint-martin-dheres/lidl.yml
index 2f433f799..0971c15be 100644
--- a/data/cities/saint-martin-dheres/lidl.yml
+++ b/data/cities/saint-martin-dheres/lidl.yml
@@ -1,11 +1,11 @@
 id: 999291913
-type: way
+type: node
 latitude: 45.18694
 longitude: 5.76149
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue des Glairons"
-housenumber: 17
+street: Rue des Glairons
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.lidl.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.lidl.fr/
diff --git a/data/cities/saint-martin-dheres/lynx-optique.yml b/data/cities/saint-martin-dheres/lynx-optique.yml
index fdad39abe..eb6cda533 100644
--- a/data/cities/saint-martin-dheres/lynx-optique.yml
+++ b/data/cities/saint-martin-dheres/lynx-optique.yml
@@ -1,11 +1,11 @@
 id: 918460891
-type: way
+type: node
 latitude: 45.18562
 longitude: 5.76304
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 103
+street: Avenue Gabriel Péri
+housenumber: "103"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/maliterie.yml b/data/cities/saint-martin-dheres/maliterie.yml
index 2b4fffb27..4d5f23f6d 100644
--- a/data/cities/saint-martin-dheres/maliterie.yml
+++ b/data/cities/saint-martin-dheres/maliterie.yml
@@ -4,8 +4,8 @@ latitude: 45.18374
 longitude: 5.76864
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 140
+street: Avenue Gabriel Péri
+housenumber: "140"
 phone: "+33476547199"
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00, Sa 10:00-19:00"
-website: "https://www.maisondelaliterie.fr/magasins/mdl-st-martin-dheres_161.html"
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00, Sa 10:00-19:00
+website: https://www.maisondelaliterie.fr/magasins/mdl-st-martin-dheres_161.html
diff --git a/data/cities/saint-martin-dheres/maxi-zoo.yml b/data/cities/saint-martin-dheres/maxi-zoo.yml
index b352d33b5..a0bbc4a68 100644
--- a/data/cities/saint-martin-dheres/maxi-zoo.yml
+++ b/data/cities/saint-martin-dheres/maxi-zoo.yml
@@ -1,11 +1,11 @@
 id: 1267567302
-type: way
+type: node
 latitude: 45.1851
 longitude: 5.7714
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Champ Roman"
-housenumber: 9
+street: Rue du Champ Roman
+housenumber: "9"
 phone: "+33476516830"
 opening_hours: ""
-website: "https://www.maxizoo.fr/stores/maxi-zoo-saint-martin-dheres/"
\ No newline at end of file
+website: https://www.maxizoo.fr/stores/maxi-zoo-saint-martin-dheres/
diff --git a/data/cities/saint-martin-dheres/mille-et-un-pains.yml b/data/cities/saint-martin-dheres/mille-et-un-pains.yml
index de6fd0b23..1f3e11ae0 100644
--- a/data/cities/saint-martin-dheres/mille-et-un-pains.yml
+++ b/data/cities/saint-martin-dheres/mille-et-un-pains.yml
@@ -4,8 +4,8 @@ latitude: 45.18246
 longitude: 5.75985
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 155
+street: Avenue Ambroise Croizat
+housenumber: "155"
 phone: ""
-opening_hours: "Tu-Sa 06:00-13:00,15:00-19:00; Su 06:00-13:00; Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:00-13:00,15:00-19:00; Su 06:00-13:00; Mo off
+website: ""
diff --git a/data/cities/saint-martin-dheres/nickel.yml b/data/cities/saint-martin-dheres/nickel.yml
index 3e494097d..344d39d6b 100644
--- a/data/cities/saint-martin-dheres/nickel.yml
+++ b/data/cities/saint-martin-dheres/nickel.yml
@@ -4,8 +4,8 @@ latitude: 45.18263
 longitude: 5.75831
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 160
-phone: "+33 6 24 28 12 16"
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+street: Avenue Ambroise Croizat
+housenumber: "160"
+phone: +33 6 24 28 12 16
+opening_hours: Mo-Su 07:00-20:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/paul.yml b/data/cities/saint-martin-dheres/paul.yml
index 7cbe957a1..00239eb59 100644
--- a/data/cities/saint-martin-dheres/paul.yml
+++ b/data/cities/saint-martin-dheres/paul.yml
@@ -1,11 +1,11 @@
 id: 1230643383
-type: way
+type: node
 latitude: 45.18548
 longitude: 5.76501
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 117
-phone: "+33 4 76 42 84 03"
-opening_hours: "Mo-Sa 06:30-19:00; Su 07:30-14:00"
-website: "https://paul.fr/stores/saint_martin_d_heres"
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "117"
+phone: +33 4 76 42 84 03
+opening_hours: Mo-Sa 06:30-19:00; Su 07:30-14:00
+website: https://paul.fr/stores/saint_martin_d_heres
diff --git a/data/cities/saint-martin-dheres/picard.yml b/data/cities/saint-martin-dheres/picard.yml
index 787b81766..8cce15a9a 100644
--- a/data/cities/saint-martin-dheres/picard.yml
+++ b/data/cities/saint-martin-dheres/picard.yml
@@ -1,11 +1,11 @@
 id: 1267654323
-type: way
+type: node
 latitude: 45.18566
 longitude: 5.76087
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 90
-phone: "+33 4 76 01 17 22"
-opening_hours: "Mo-Sa 09:00-19:00, Su 09:00-12:45"
-website: "https://magasins.picard.fr/835-picard-saint-martin-d-heres"
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "90"
+phone: +33 4 76 01 17 22
+opening_hours: Mo-Sa 09:00-19:00, Su 09:00-12:45
+website: https://magasins.picard.fr/835-picard-saint-martin-d-heres
diff --git a/data/cities/saint-martin-dheres/pro-alp-carrelages.yml b/data/cities/saint-martin-dheres/pro-alp-carrelages.yml
index ce4769338..15ed5ef6f 100644
--- a/data/cities/saint-martin-dheres/pro-alp-carrelages.yml
+++ b/data/cities/saint-martin-dheres/pro-alp-carrelages.yml
@@ -4,8 +4,8 @@ latitude: 45.16208
 longitude: 5.75437
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue de la Prévachère"
-housenumber: 3
+street: Rue de la Prévachère
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: "http://proalp-carrelages.com/"
\ No newline at end of file
+website: http://proalp-carrelages.com/
diff --git a/data/cities/saint-martin-dheres/prolians.yml b/data/cities/saint-martin-dheres/prolians.yml
index 724334964..13d57083b 100644
--- a/data/cities/saint-martin-dheres/prolians.yml
+++ b/data/cities/saint-martin-dheres/prolians.yml
@@ -4,8 +4,8 @@ latitude: 45.16404
 longitude: 5.75736
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Béal"
-housenumber: 7
-phone: "+33 4 76 51 23 23"
+street: Rue du Béal
+housenumber: "7"
+phone: +33 4 76 51 23 23
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/samse.yml b/data/cities/saint-martin-dheres/samse.yml
index 40c863354..1ab79cc71 100644
--- a/data/cities/saint-martin-dheres/samse.yml
+++ b/data/cities/saint-martin-dheres/samse.yml
@@ -1,11 +1,12 @@
 id: 45397133
-type: way
+type: node
 latitude: 45.18935
 longitude: 5.76306
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue Barnave"
-housenumber: 13
-phone: "+33 4 76 63 95 00"
-opening_hours: "Mar-Oct Mo-Fr 07:00-11:45,13:30-17:30; Mar-Oct Sa 08:00-11:45; Nov-Feb Mo-Fr 07:30-11:45,13:30-17:00; Nov-Feb Sa off"
-website: "https://agences.samse.fr/materiaux/saint-martin-d-heres/41"
\ No newline at end of file
+street: Rue Barnave
+housenumber: "13"
+phone: +33 4 76 63 95 00
+opening_hours: Mar-Oct Mo-Fr 07:00-11:45,13:30-17:30; Mar-Oct Sa 08:00-11:45; Nov-Feb
+    Mo-Fr 07:30-11:45,13:30-17:00; Nov-Feb Sa off
+website: https://agences.samse.fr/materiaux/saint-martin-d-heres/41
diff --git a/data/cities/saint-martin-dheres/satoriz-grenoble.yml b/data/cities/saint-martin-dheres/satoriz-grenoble.yml
index 85c3c98a4..8566c545a 100644
--- a/data/cities/saint-martin-dheres/satoriz-grenoble.yml
+++ b/data/cities/saint-martin-dheres/satoriz-grenoble.yml
@@ -4,8 +4,8 @@ latitude: 45.16465
 longitude: 5.75727
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue du Béal"
-housenumber: 9
+street: Rue du Béal
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.satoriz.fr/magasin-bio/satoriz-grenoble/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.satoriz.fr/magasin-bio/satoriz-grenoble/
diff --git a/data/cities/saint-martin-dheres/satoriz-saint-martin-dheres.yml b/data/cities/saint-martin-dheres/satoriz-saint-martin-dheres.yml
index fd44063cf..0918242b9 100644
--- a/data/cities/saint-martin-dheres/satoriz-saint-martin-dheres.yml
+++ b/data/cities/saint-martin-dheres/satoriz-saint-martin-dheres.yml
@@ -1,11 +1,11 @@
 id: 43570574
-type: way
+type: node
 latitude: 45.18782
 longitude: 5.74824
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 2
+street: Avenue Gabriel Péri
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.satoriz.fr/magasin-bio/satoriz-grenoble/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.satoriz.fr/magasin-bio/satoriz-grenoble/
diff --git a/data/cities/saint-martin-dheres/terrasse-de-belledonne.yml b/data/cities/saint-martin-dheres/terrasse-de-belledonne.yml
index f1a863c4a..7a9376ef2 100644
--- a/data/cities/saint-martin-dheres/terrasse-de-belledonne.yml
+++ b/data/cities/saint-martin-dheres/terrasse-de-belledonne.yml
@@ -1,11 +1,11 @@
 id: 28709471
-type: way
+type: node
 latitude: 45.18569
 longitude: 5.75836
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 76
-phone: "+33 1 53 70 56 56"
-opening_hours: "Mo-Sa 08:30-21:00"
-website: "https://www.la-galerie.com/"
\ No newline at end of file
+street: Avenue Gabriel Péri
+housenumber: "76"
+phone: +33 1 53 70 56 56
+opening_hours: Mo-Sa 08:30-21:00
+website: https://www.la-galerie.com/
diff --git a/data/cities/saint-martin-dheres/troc-sport-grenoble.yml b/data/cities/saint-martin-dheres/troc-sport-grenoble.yml
index 80ecdbfa5..9aa2fd250 100644
--- a/data/cities/saint-martin-dheres/troc-sport-grenoble.yml
+++ b/data/cities/saint-martin-dheres/troc-sport-grenoble.yml
@@ -1,11 +1,11 @@
 id: 1267658516
-type: way
+type: node
 latitude: 45.18516
 longitude: 5.76233
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
-housenumber: 96
+street: Avenue Gabriel Péri
+housenumber: "96"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:30, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:30, 14:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/un-ptit-velo-dans-la-tete.yml b/data/cities/saint-martin-dheres/un-ptit-velo-dans-la-tete.yml
index a6a85988e..7fa645ccb 100644
--- a/data/cities/saint-martin-dheres/un-ptit-velo-dans-la-tete.yml
+++ b/data/cities/saint-martin-dheres/un-ptit-velo-dans-la-tete.yml
@@ -4,8 +4,8 @@ latitude: 45.18921
 longitude: 5.76892
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Rue des Résidences"
-housenumber: 921
+street: Rue des Résidences
+housenumber: "921"
 phone: ""
-opening_hours: "Tu 18:00-20:00; Th 18:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 18:00-20:00; Th 18:00-20:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/utile.yml b/data/cities/saint-martin-dheres/utile.yml
index 6f8f495d4..7520e9943 100644
--- a/data/cities/saint-martin-dheres/utile.yml
+++ b/data/cities/saint-martin-dheres/utile.yml
@@ -4,8 +4,8 @@ latitude: 45.1854
 longitude: 5.74955
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Place du 24 Avril 1915"
-housenumber: 13
+street: Place du 24 Avril 1915
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-martin-dheres/velo-dayak.yml b/data/cities/saint-martin-dheres/velo-dayak.yml
index 2ab3d66c3..30c2941c5 100644
--- a/data/cities/saint-martin-dheres/velo-dayak.yml
+++ b/data/cities/saint-martin-dheres/velo-dayak.yml
@@ -4,8 +4,8 @@ latitude: 45.18767
 longitude: 5.74941
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Gabriel Péri"
+street: Avenue Gabriel Péri
 housenumber: 12-14
 phone: ""
-opening_hours: "Mo-Sa 10:00-13:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-13:00,14:30-19:00
+website: ""
diff --git a/data/cities/saint-martin-dheres/vival.yml b/data/cities/saint-martin-dheres/vival.yml
index 5c8d1843f..0f216c7a5 100644
--- a/data/cities/saint-martin-dheres/vival.yml
+++ b/data/cities/saint-martin-dheres/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.18122
 longitude: 5.76363
 postcode: "38400"
 city: Saint-Martin-d'Hères
-street: "Avenue Ambroise Croizat"
-housenumber: 240
+street: Avenue Ambroise Croizat
+housenumber: "240"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-dheres/yesss-electrique.yml b/data/cities/saint-martin-dheres/yesss-electrique.yml
index 105208e82..bf1ed90c6 100644
--- a/data/cities/saint-martin-dheres/yesss-electrique.yml
+++ b/data/cities/saint-martin-dheres/yesss-electrique.yml
@@ -4,8 +4,8 @@ latitude: 45.18423
 longitude: 5.77822
 postcode: "38400"
 city: Saint Martin d'Hères
-street: "Rue du Champ Roman"
-housenumber: 74
-phone: "+33 4 38 37 21 34"
-opening_hours: "Mo-Th 07:15-12:00, 13:30-17:30; Fr 07:15-12:00, 13:30-16:30"
-website: "https://www.yesss-fr.com"
\ No newline at end of file
+street: Rue du Champ Roman
+housenumber: "74"
+phone: +33 4 38 37 21 34
+opening_hours: Mo-Th 07:15-12:00, 13:30-17:30; Fr 07:15-12:00, 13:30-16:30
+website: https://www.yesss-fr.com
diff --git a/data/cities/saint-martin-duriage/allos-bike.yml b/data/cities/saint-martin-duriage/allos-bike.yml
index 4638d7b7e..f3754896d 100644
--- a/data/cities/saint-martin-duriage/allos-bike.yml
+++ b/data/cities/saint-martin-duriage/allos-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.13183
 longitude: 5.83836
 postcode: "38410"
 city: Saint-Martin-d'Uriage
-street: "Route des Oddoz"
-housenumber: 420
+street: Route des Oddoz
+housenumber: "420"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-duriage/coiffure-duo-passion.yml b/data/cities/saint-martin-duriage/coiffure-duo-passion.yml
index 8481fccc5..195802acb 100644
--- a/data/cities/saint-martin-duriage/coiffure-duo-passion.yml
+++ b/data/cities/saint-martin-duriage/coiffure-duo-passion.yml
@@ -4,8 +4,8 @@ latitude: 45.15233
 longitude: 5.83814
 postcode: "38410"
 city: Saint-Martin-d'Uriage
-street: "Place de la Mairie"
-housenumber: 53
+street: Place de la Mairie
+housenumber: "53"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-duriage/comptoir-des-nectars.yml b/data/cities/saint-martin-duriage/comptoir-des-nectars.yml
index 4c5bea0a1..7b43bc03c 100644
--- a/data/cities/saint-martin-duriage/comptoir-des-nectars.yml
+++ b/data/cities/saint-martin-duriage/comptoir-des-nectars.yml
@@ -4,8 +4,8 @@ latitude: 45.15259
 longitude: 5.83835
 postcode: "38410"
 city: Saint Martin d'Uriage
-street: "Route de Chamrousse"
-housenumber: 47
+street: Route de Chamrousse
+housenumber: "47"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-duriage/la-combe-gourmande.yml b/data/cities/saint-martin-duriage/la-combe-gourmande.yml
index 51f627e2a..182efcc60 100644
--- a/data/cities/saint-martin-duriage/la-combe-gourmande.yml
+++ b/data/cities/saint-martin-duriage/la-combe-gourmande.yml
@@ -5,7 +5,7 @@ longitude: 5.82364
 postcode: "38410"
 city: Saint-Martin-d'Uriage
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-19:00
+website: ""
diff --git a/data/cities/saint-martin-duriage/manabio.yml b/data/cities/saint-martin-duriage/manabio.yml
index 4b17d7c7b..2d110a1cc 100644
--- a/data/cities/saint-martin-duriage/manabio.yml
+++ b/data/cities/saint-martin-duriage/manabio.yml
@@ -1,11 +1,11 @@
 id: 63087642
-type: way
+type: node
 latitude: 45.156
 longitude: 5.82423
 postcode: "38410"
 city: Saint-Martin-d'Uriage
 street: ""
-housenumber: 1530
+housenumber: "1530"
 phone: "+33476820993"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.biomonde.fr/manabio,3,328"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.biomonde.fr/manabio,3,328
diff --git a/data/cities/saint-martin-duriage/pressing-du-rocher.yml b/data/cities/saint-martin-duriage/pressing-du-rocher.yml
index e1dc0232b..795634bde 100644
--- a/data/cities/saint-martin-duriage/pressing-du-rocher.yml
+++ b/data/cities/saint-martin-duriage/pressing-du-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.14202
 longitude: 5.82882
 postcode: "38410"
 city: Saint-Martin-d'Uriage
-street: "Avenue des Thermes"
-housenumber: 238
-phone: "+33 4 76 89 20 60"
-opening_hours: "Tu-Fr 08:30-12:30,14:30-19:30; Sa 08:30-12:30,14:30-18:30"
-website: ""
\ No newline at end of file
+street: Avenue des Thermes
+housenumber: "238"
+phone: +33 4 76 89 20 60
+opening_hours: Tu-Fr 08:30-12:30,14:30-19:30; Sa 08:30-12:30,14:30-18:30
+website: ""
diff --git a/data/cities/saint-martin-en-haut/amari-brandao.yml b/data/cities/saint-martin-en-haut/amari-brandao.yml
index fae4f2377..78197b5f9 100644
--- a/data/cities/saint-martin-en-haut/amari-brandao.yml
+++ b/data/cities/saint-martin-en-haut/amari-brandao.yml
@@ -4,8 +4,8 @@ latitude: 45.65916
 longitude: 4.56278
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
+street: Grande Rue
 housenumber: 54BIS
 phone: "+33478485372"
-opening_hours: "Mo-Fr 08:30-12:00,14:00-19:00; Sa 09:00-12:00,14:00-17:00"
-website: "https://st-martin-en-haut.extra.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00,14:00-19:00; Sa 09:00-12:00,14:00-17:00
+website: https://st-martin-en-haut.extra.fr
diff --git a/data/cities/saint-martin-en-haut/aux-petits-pains.yml b/data/cities/saint-martin-en-haut/aux-petits-pains.yml
index 518b15795..a6a036dc4 100644
--- a/data/cities/saint-martin-en-haut/aux-petits-pains.yml
+++ b/data/cities/saint-martin-en-haut/aux-petits-pains.yml
@@ -4,8 +4,8 @@ latitude: 45.66034
 longitude: 4.56023
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Place de l'Église"
-housenumber: 2
+street: Place de l'Église
+housenumber: "2"
 phone: "+33478588355"
-opening_hours: "Mo-We, Fr, Sa 06:00-19:30; Su 06:00-13:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We, Fr, Sa 06:00-19:30; Su 06:00-13:30
+website: ""
diff --git a/data/cities/saint-martin-en-haut/boucherie-charcuterie-traiteur-villard.yml b/data/cities/saint-martin-en-haut/boucherie-charcuterie-traiteur-villard.yml
index 517977729..f6d12909c 100644
--- a/data/cities/saint-martin-en-haut/boucherie-charcuterie-traiteur-villard.yml
+++ b/data/cities/saint-martin-en-haut/boucherie-charcuterie-traiteur-villard.yml
@@ -4,8 +4,8 @@ latitude: 45.65903
 longitude: 4.56373
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
-housenumber: 61
+street: Grande Rue
+housenumber: "61"
 phone: "+33478486132"
 opening_hours: ""
-website: "http://www.villard-traiteur.fr"
\ No newline at end of file
+website: http://www.villard-traiteur.fr
diff --git a/data/cities/saint-martin-en-haut/boulangerie-carra.yml b/data/cities/saint-martin-en-haut/boulangerie-carra.yml
index ea86b1a7d..2c140d054 100644
--- a/data/cities/saint-martin-en-haut/boulangerie-carra.yml
+++ b/data/cities/saint-martin-en-haut/boulangerie-carra.yml
@@ -4,8 +4,8 @@ latitude: 45.66068
 longitude: 4.55953
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Place Neuve"
-housenumber: 5
+street: Place Neuve
+housenumber: "5"
 phone: "+33478588355"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-en-haut/boulangerie-lambert.yml b/data/cities/saint-martin-en-haut/boulangerie-lambert.yml
index 817309eb4..0592e5c62 100644
--- a/data/cities/saint-martin-en-haut/boulangerie-lambert.yml
+++ b/data/cities/saint-martin-en-haut/boulangerie-lambert.yml
@@ -4,8 +4,8 @@ latitude: 45.65907
 longitude: 4.56353
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
-housenumber: 57
+street: Grande Rue
+housenumber: "57"
 phone: "+33478486314"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-en-haut/coccimarket.yml b/data/cities/saint-martin-en-haut/coccimarket.yml
index 3fcef576d..15c561f63 100644
--- a/data/cities/saint-martin-en-haut/coccimarket.yml
+++ b/data/cities/saint-martin-en-haut/coccimarket.yml
@@ -4,8 +4,8 @@ latitude: 45.65966
 longitude: 4.56084
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
-housenumber: 18
+street: Grande Rue
+housenumber: "18"
 phone: "+33478486223"
-opening_hours: "Mo-Sa 07:00-12:30, 14:30-19:30; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-12:30, 14:30-19:30; Su 07:30-12:30
+website: ""
diff --git a/data/cities/saint-martin-en-haut/etablissements-martiniere-la-bonne-cave.yml b/data/cities/saint-martin-en-haut/etablissements-martiniere-la-bonne-cave.yml
index 4b9610959..5408a9c1b 100644
--- a/data/cities/saint-martin-en-haut/etablissements-martiniere-la-bonne-cave.yml
+++ b/data/cities/saint-martin-en-haut/etablissements-martiniere-la-bonne-cave.yml
@@ -4,8 +4,8 @@ latitude: 45.65911
 longitude: 4.56337
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
-housenumber: 55
+street: Grande Rue
+housenumber: "55"
 phone: "+33478486133"
 opening_hours: ""
-website: "http://www.etablissements-martiniere.fr"
\ No newline at end of file
+website: http://www.etablissements-martiniere.fr
diff --git a/data/cities/saint-martin-en-haut/garage-guyot-citroen.yml b/data/cities/saint-martin-en-haut/garage-guyot-citroen.yml
index ad5653667..af788b6c1 100644
--- a/data/cities/saint-martin-en-haut/garage-guyot-citroen.yml
+++ b/data/cities/saint-martin-en-haut/garage-guyot-citroen.yml
@@ -4,8 +4,8 @@ latitude: 45.66085
 longitude: 4.56495
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Route de Lyon"
-housenumber: 
+street: Route de Lyon
+housenumber: ""
 phone: "+33478486237"
-opening_hours: "Mo-Fr 07:00-12:00,13:30-19:00; Sa 07:00-12:00"
-website: "http://citroen-guyot.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:00,13:30-19:00; Sa 07:00-12:00
+website: http://citroen-guyot.fr
diff --git a/data/cities/saint-martin-en-haut/garage-joannon.yml b/data/cities/saint-martin-en-haut/garage-joannon.yml
index 97b0f092b..bff2ed62a 100644
--- a/data/cities/saint-martin-en-haut/garage-joannon.yml
+++ b/data/cities/saint-martin-en-haut/garage-joannon.yml
@@ -1,11 +1,11 @@
 id: 614699525
-type: way
+type: node
 latitude: 45.651
 longitude: 4.5574
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "ZA Des PLAINES"
-housenumber: 
-phone: "+33 4 78 48 67 24"
+street: ZA Des PLAINES
+housenumber: ""
+phone: +33 4 78 48 67 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-en-haut/garage-saint-martinois.yml b/data/cities/saint-martin-en-haut/garage-saint-martinois.yml
index 5504bd9d7..e0851cc4e 100644
--- a/data/cities/saint-martin-en-haut/garage-saint-martinois.yml
+++ b/data/cities/saint-martin-en-haut/garage-saint-martinois.yml
@@ -4,8 +4,8 @@ latitude: 45.65804
 longitude: 4.55675
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Rue Croix-Bertrand"
-housenumber: 
+street: Rue Croix-Bertrand
+housenumber: ""
 phone: "+33478480612"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-en-haut/guillarme-tisseur.yml b/data/cities/saint-martin-en-haut/guillarme-tisseur.yml
index 9713e087a..70880ae0a 100644
--- a/data/cities/saint-martin-en-haut/guillarme-tisseur.yml
+++ b/data/cities/saint-martin-en-haut/guillarme-tisseur.yml
@@ -5,7 +5,7 @@ longitude: 4.56395
 postcode: "69850"
 city: Saint-Martin-en-Haut
 street: ""
-housenumber: 16
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: "http://www.guillarme-tisseur.fr/"
\ No newline at end of file
+website: http://www.guillarme-tisseur.fr/
diff --git a/data/cities/saint-martin-en-haut/le-jardin-de-rochefort.yml b/data/cities/saint-martin-en-haut/le-jardin-de-rochefort.yml
index 0f41c3785..6e7254078 100644
--- a/data/cities/saint-martin-en-haut/le-jardin-de-rochefort.yml
+++ b/data/cities/saint-martin-en-haut/le-jardin-de-rochefort.yml
@@ -1,11 +1,11 @@
 id: 855593257
-type: way
+type: node
 latitude: 45.65166
 longitude: 4.55877
 postcode: ""
 city: Saint-Martin-en-Haut
-street: "Rue Des Fougeres"
-housenumber: 236
-phone: "+33 4 78 48 50 85"
-opening_hours: "Mo-Sa 08:00-12:00,14:00-19:00"
-website: "https://www.lejardinderochefort.fr/"
\ No newline at end of file
+street: Rue Des Fougeres
+housenumber: "236"
+phone: +33 4 78 48 50 85
+opening_hours: Mo-Sa 08:00-12:00,14:00-19:00
+website: https://www.lejardinderochefort.fr/
diff --git a/data/cities/saint-martin-en-haut/le-petit-rochefort.yml b/data/cities/saint-martin-en-haut/le-petit-rochefort.yml
index 13f06a7ec..56fbff82e 100644
--- a/data/cities/saint-martin-en-haut/le-petit-rochefort.yml
+++ b/data/cities/saint-martin-en-haut/le-petit-rochefort.yml
@@ -4,8 +4,8 @@ latitude: 45.65956
 longitude: 4.56172
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
-housenumber: 29
+street: Grande Rue
+housenumber: "29"
 phone: "+33478486241"
-opening_hours: "We-Sa 08:30-12:15, 14:30-19:00; Su 08:30-12:15"
-website: ""
\ No newline at end of file
+opening_hours: We-Sa 08:30-12:15, 14:30-19:00; Su 08:30-12:15
+website: ""
diff --git a/data/cities/saint-martin-en-haut/lherbe-folle.yml b/data/cities/saint-martin-en-haut/lherbe-folle.yml
index fa698f585..dfb2579c3 100644
--- a/data/cities/saint-martin-en-haut/lherbe-folle.yml
+++ b/data/cities/saint-martin-en-haut/lherbe-folle.yml
@@ -4,8 +4,8 @@ latitude: 45.66007
 longitude: 4.56016
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Place de l'Église"
-housenumber: 6
+street: Place de l'Église
+housenumber: "6"
 phone: "+33478486031"
-opening_hours: "Mo-Sa 08:30-12:30,14:30-19:00; Su 08:30-12:30"
-website: "https://www.lherbe-folle.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:30,14:30-19:00; Su 08:30-12:30
+website: https://www.lherbe-folle.fr/
diff --git a/data/cities/saint-martin-en-haut/maquillongle.yml b/data/cities/saint-martin-en-haut/maquillongle.yml
index e29da18d6..4ef1099a8 100644
--- a/data/cities/saint-martin-en-haut/maquillongle.yml
+++ b/data/cities/saint-martin-en-haut/maquillongle.yml
@@ -4,8 +4,8 @@ latitude: 45.65925
 longitude: 4.56286
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
-housenumber: 47
+street: Grande Rue
+housenumber: "47"
 phone: "+33478079338"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-martin-en-haut/quincaillerie.yml b/data/cities/saint-martin-en-haut/quincaillerie.yml
index 47a16e4d6..5a08813b5 100644
--- a/data/cities/saint-martin-en-haut/quincaillerie.yml
+++ b/data/cities/saint-martin-en-haut/quincaillerie.yml
@@ -4,8 +4,8 @@ latitude: 45.65922
 longitude: 4.56303
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Grande Rue"
-housenumber: 49
+street: Grande Rue
+housenumber: "49"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-martin-en-haut/spar.yml b/data/cities/saint-martin-en-haut/spar.yml
index 54d595b70..36f5e4c2f 100644
--- a/data/cities/saint-martin-en-haut/spar.yml
+++ b/data/cities/saint-martin-en-haut/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.65923
 longitude: 4.56391
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Place de la Liberté"
-housenumber: 1
-phone: "+33 4 87 37 19 26"
-opening_hours: "Mo-Sa 07:30-20:00, Su 08:00-13:00"
-website: "https://magasins.spar.fr/fr/s/spar-saint-martin-en-haut"
\ No newline at end of file
+street: Place de la Liberté
+housenumber: "1"
+phone: +33 4 87 37 19 26
+opening_hours: Mo-Sa 07:30-20:00, Su 08:00-13:00
+website: https://magasins.spar.fr/fr/s/spar-saint-martin-en-haut
diff --git a/data/cities/saint-martin-en-haut/vue-dailleurs.yml b/data/cities/saint-martin-en-haut/vue-dailleurs.yml
index a871afda2..4df9d5bf2 100644
--- a/data/cities/saint-martin-en-haut/vue-dailleurs.yml
+++ b/data/cities/saint-martin-en-haut/vue-dailleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.65922
 longitude: 4.56445
 postcode: "69850"
 city: Saint-Martin-en-Haut
-street: "Route de Lyon"
-housenumber: 1
+street: Route de Lyon
+housenumber: "1"
 phone: "+33478169183"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00"
-website: "https://www.vue-dailleurs.fr/"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00
+website: https://www.vue-dailleurs.fr/
diff --git a/data/cities/saint-martin-la-plaine/boulangerie.yml b/data/cities/saint-martin-la-plaine/boulangerie.yml
index 9e2eca6fb..603ae18ed 100644
--- a/data/cities/saint-martin-la-plaine/boulangerie.yml
+++ b/data/cities/saint-martin-la-plaine/boulangerie.yml
@@ -1,11 +1,11 @@
 id: 145214220
-type: way
+type: node
 latitude: 45.54602
 longitude: 4.5922
 postcode: "42800"
 city: Saint-Martin-la-Plaine
-street: "Rue 11 Novembre"
-housenumber: 5
-phone: "+33 4 77 75 81 41"
-opening_hours: "Mo-Fr 06:15-19:00; Sa 07:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue 11 Novembre
+housenumber: "5"
+phone: +33 4 77 75 81 41
+opening_hours: Mo-Fr 06:15-19:00; Sa 07:00-12:00
+website: ""
diff --git a/data/cities/saint-martin-la-plaine/vival.yml b/data/cities/saint-martin-la-plaine/vival.yml
index de8aacbd5..d46d78447 100644
--- a/data/cities/saint-martin-la-plaine/vival.yml
+++ b/data/cities/saint-martin-la-plaine/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.54631
 longitude: 4.59372
 postcode: "42800"
 city: Saint-Martin-la-Plaine
-street: "Rue Béthenod"
-housenumber: 6
-phone: "+33 4 77 56 50 48"
-opening_hours: "Tu-Sa 08:30-12:30,15:00-19:00; Su 07:30-12:30"
-website: "https://magasins.vival.fr/fr/vival-sarl-vivallians"
\ No newline at end of file
+street: Rue Béthenod
+housenumber: "6"
+phone: +33 4 77 56 50 48
+opening_hours: Tu-Sa 08:30-12:30,15:00-19:00; Su 07:30-12:30
+website: https://magasins.vival.fr/fr/vival-sarl-vivallians
diff --git a/data/cities/saint-martin-le-vinoux/atelier-sicklo.yml b/data/cities/saint-martin-le-vinoux/atelier-sicklo.yml
index e1ca480fa..5a7c74a09 100644
--- a/data/cities/saint-martin-le-vinoux/atelier-sicklo.yml
+++ b/data/cities/saint-martin-le-vinoux/atelier-sicklo.yml
@@ -4,8 +4,8 @@ latitude: 45.21515
 longitude: 5.69558
 postcode: "38950"
 city: Saint-Martin-le-Vinoux
-street: "Avenue du Général Leclerc"
-housenumber: 105
+street: Avenue du Général Leclerc
+housenumber: "105"
 phone: ""
-opening_hours: "Mo, We 08:30-12:30; Tu, Fr 13:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo, We 08:30-12:30; Tu, Fr 13:00-18:00
+website: ""
diff --git a/data/cities/saint-martin-le-vinoux/le-fournil-saint-martin.yml b/data/cities/saint-martin-le-vinoux/le-fournil-saint-martin.yml
index c3d074da4..93359510f 100644
--- a/data/cities/saint-martin-le-vinoux/le-fournil-saint-martin.yml
+++ b/data/cities/saint-martin-le-vinoux/le-fournil-saint-martin.yml
@@ -4,8 +4,8 @@ latitude: 45.21317
 longitude: 5.69937
 postcode: "38950"
 city: Saint-Martin-le-Vinoux
-street: "Avenue du Général Leclerc"
-housenumber: 67
+street: Avenue du Général Leclerc
+housenumber: "67"
 phone: "+33476756401"
-opening_hours: "Tu-Fr 06:15-19:15; Sa 07:00-19:00; Su 07:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:15-19:15; Sa 07:00-19:00; Su 07:00-13:00
+website: ""
diff --git a/data/cities/saint-martin-le-vinoux/presse-tabac.yml b/data/cities/saint-martin-le-vinoux/presse-tabac.yml
index 37c4da456..d57bb1b24 100644
--- a/data/cities/saint-martin-le-vinoux/presse-tabac.yml
+++ b/data/cities/saint-martin-le-vinoux/presse-tabac.yml
@@ -4,8 +4,8 @@ latitude: 45.21309
 longitude: 5.69949
 postcode: "38950"
 city: Saint-Martin-le-Vinoux
-street: "Avenue du Général Leclerc"
-housenumber: 61
+street: Avenue du Général Leclerc
+housenumber: "61"
 phone: "+33476752320"
-opening_hours: "Mo-Fr 06:00-20:00; Sa 07:00-20:00; Su 07:00-12:30,15:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-20:00; Sa 07:00-20:00; Su 07:00-12:30,15:00-20:00
+website: ""
diff --git a/data/cities/saint-martin-le-vinoux/renault.yml b/data/cities/saint-martin-le-vinoux/renault.yml
index ed8f0132b..0d6f4328d 100644
--- a/data/cities/saint-martin-le-vinoux/renault.yml
+++ b/data/cities/saint-martin-le-vinoux/renault.yml
@@ -1,11 +1,11 @@
 id: 66621199
-type: way
+type: node
 latitude: 45.21448
 longitude: 5.69648
 postcode: "38950"
 city: Saint-Martin-le-Vinoux
-street: "Avenue du Général Leclerc"
-housenumber: 105
-phone: "+33 4 76 75 78 51"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+street: Avenue du Général Leclerc
+housenumber: "105"
+phone: +33 4 76 75 78 51
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/saint-martin-le-vinoux/velos-papillon.yml b/data/cities/saint-martin-le-vinoux/velos-papillon.yml
index 01e2e13e6..e25a72b9c 100644
--- a/data/cities/saint-martin-le-vinoux/velos-papillon.yml
+++ b/data/cities/saint-martin-le-vinoux/velos-papillon.yml
@@ -4,8 +4,8 @@ latitude: 45.21512
 longitude: 5.69562
 postcode: "38950"
 city: Saint-Martin-le-Vinoux
-street: "Avenue du Général Leclerc"
-housenumber: 105
+street: Avenue du Général Leclerc
+housenumber: "105"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/saint-martin-le-vinoux/vision-plus.yml b/data/cities/saint-martin-le-vinoux/vision-plus.yml
index 426899439..2277d3f94 100644
--- a/data/cities/saint-martin-le-vinoux/vision-plus.yml
+++ b/data/cities/saint-martin-le-vinoux/vision-plus.yml
@@ -4,8 +4,8 @@ latitude: 45.21304
 longitude: 5.69956
 postcode: "38950"
 city: Saint-Martin-le-Vinoux
-street: "Avenue du Général Leclerc"
-housenumber: 57
+street: Avenue du Général Leclerc
+housenumber: "57"
 phone: "+33438021771"
-opening_hours: "Tu-Sa 09:00-12:30,14:30-19:00"
-website: "https://www.lecollectifdeslunetiers.fr/opticien/france/isere/opticien-saint-martin-le-vinoux/saintmartin-leclerc"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:30,14:30-19:00
+website: https://www.lecollectifdeslunetiers.fr/opticien/france/isere/opticien-saint-martin-le-vinoux/saintmartin-leclerc
diff --git a/data/cities/saint-maurice-de-beynost/aldi.yml b/data/cities/saint-maurice-de-beynost/aldi.yml
index f2a6dd9a0..ff35d277d 100644
--- a/data/cities/saint-maurice-de-beynost/aldi.yml
+++ b/data/cities/saint-maurice-de-beynost/aldi.yml
@@ -1,11 +1,11 @@
 id: 126697699
-type: way
+type: node
 latitude: 45.82987
 longitude: 4.98087
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 42
+street: Route de Genève
+housenumber: "42"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/aqualyse-spa.yml b/data/cities/saint-maurice-de-beynost/aqualyse-spa.yml
index a755fdf7b..ef8df9460 100644
--- a/data/cities/saint-maurice-de-beynost/aqualyse-spa.yml
+++ b/data/cities/saint-maurice-de-beynost/aqualyse-spa.yml
@@ -4,8 +4,8 @@ latitude: 45.8231
 longitude: 4.98961
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Chemin des Combes"
-housenumber: 
-phone: "+33 4 78 55 05 06"
+street: Chemin des Combes
+housenumber: ""
+phone: +33 4 78 55 05 06
 opening_hours: ""
-website: "https://aqualyse-institut.fr/"
\ No newline at end of file
+website: https://aqualyse-institut.fr/
diff --git a/data/cities/saint-maurice-de-beynost/au-petrin-dantan.yml b/data/cities/saint-maurice-de-beynost/au-petrin-dantan.yml
index baed75b39..209f18e55 100644
--- a/data/cities/saint-maurice-de-beynost/au-petrin-dantan.yml
+++ b/data/cities/saint-maurice-de-beynost/au-petrin-dantan.yml
@@ -4,8 +4,8 @@ latitude: 45.82898
 longitude: 4.97616
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 35
+street: Route de Genève
+housenumber: "35"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/barber-la-mise-a-jour.yml b/data/cities/saint-maurice-de-beynost/barber-la-mise-a-jour.yml
index 14e08cc69..6474a9076 100644
--- a/data/cities/saint-maurice-de-beynost/barber-la-mise-a-jour.yml
+++ b/data/cities/saint-maurice-de-beynost/barber-la-mise-a-jour.yml
@@ -4,8 +4,8 @@ latitude: 45.82592
 longitude: 4.9809
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Avenue Pasteur"
-housenumber: 18
+street: Avenue Pasteur
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: "https://barber-lamiseajour.fr/artisan-coiffeur-barbier-saint-maurice-de-beynost-ain-01/"
\ No newline at end of file
+website: https://barber-lamiseajour.fr/artisan-coiffeur-barbier-saint-maurice-de-beynost-ain-01/
diff --git a/data/cities/saint-maurice-de-beynost/boucherie-charcuterie-anaya.yml b/data/cities/saint-maurice-de-beynost/boucherie-charcuterie-anaya.yml
index 9105771d5..f7fcb1d2f 100644
--- a/data/cities/saint-maurice-de-beynost/boucherie-charcuterie-anaya.yml
+++ b/data/cities/saint-maurice-de-beynost/boucherie-charcuterie-anaya.yml
@@ -4,8 +4,8 @@ latitude: 45.82892
 longitude: 4.97594
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 27
+street: Route de Genève
+housenumber: "27"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/coiffure-et-style.yml b/data/cities/saint-maurice-de-beynost/coiffure-et-style.yml
index debe26ae2..386047234 100644
--- a/data/cities/saint-maurice-de-beynost/coiffure-et-style.yml
+++ b/data/cities/saint-maurice-de-beynost/coiffure-et-style.yml
@@ -4,8 +4,8 @@ latitude: 45.83033
 longitude: 4.98205
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 48
-phone: "+33 4 72 88 28 31"
+street: Route de Genève
+housenumber: "48"
+phone: +33 4 72 88 28 31
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/imax-auto.yml b/data/cities/saint-maurice-de-beynost/imax-auto.yml
index 43e85f5fd..d8fdb72de 100644
--- a/data/cities/saint-maurice-de-beynost/imax-auto.yml
+++ b/data/cities/saint-maurice-de-beynost/imax-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.82484
 longitude: 4.98804
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Chemin de Thil"
-housenumber: 5
-phone: "+33 4 78 88 37 86"
+street: Chemin de Thil
+housenumber: "5"
+phone: +33 4 78 88 37 86
 opening_hours: ""
-website: "http://www.imaxauto.fr/"
\ No newline at end of file
+website: http://www.imaxauto.fr/
diff --git a/data/cities/saint-maurice-de-beynost/les-saveurs-orientales.yml b/data/cities/saint-maurice-de-beynost/les-saveurs-orientales.yml
index 8d79504aa..d6f0ecdb1 100644
--- a/data/cities/saint-maurice-de-beynost/les-saveurs-orientales.yml
+++ b/data/cities/saint-maurice-de-beynost/les-saveurs-orientales.yml
@@ -4,8 +4,8 @@ latitude: 45.82867
 longitude: 4.9749
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 15
-phone: "+33 4 78 06 81 71"
+street: Route de Genève
+housenumber: "15"
+phone: +33 4 78 06 81 71
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/look-dog.yml b/data/cities/saint-maurice-de-beynost/look-dog.yml
index 0baae5055..e37595a1f 100644
--- a/data/cities/saint-maurice-de-beynost/look-dog.yml
+++ b/data/cities/saint-maurice-de-beynost/look-dog.yml
@@ -4,8 +4,8 @@ latitude: 45.82853
 longitude: 4.97519
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 12
-phone: "+33 4 78 55 60 50"
+street: Route de Genève
+housenumber: "12"
+phone: +33 4 78 55 60 50
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/papeterie-tabac.yml b/data/cities/saint-maurice-de-beynost/papeterie-tabac.yml
index 3363425e1..8b2c4a14f 100644
--- a/data/cities/saint-maurice-de-beynost/papeterie-tabac.yml
+++ b/data/cities/saint-maurice-de-beynost/papeterie-tabac.yml
@@ -4,8 +4,8 @@ latitude: 45.82595
 longitude: 4.98209
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Place d'Arménie"
-housenumber: 1
-phone: "+33 4 78 55 67 21"
-opening_hours: "Mo-Fr 06:00-19:00; Sa,Su 08:00-19:00"
-website: ""
\ No newline at end of file
+street: Place d'Arménie
+housenumber: "1"
+phone: +33 4 78 55 67 21
+opening_hours: Mo-Fr 06:00-19:00; Sa,Su 08:00-19:00
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/reve-line.yml b/data/cities/saint-maurice-de-beynost/reve-line.yml
index dda289d6e..5a951a346 100644
--- a/data/cities/saint-maurice-de-beynost/reve-line.yml
+++ b/data/cities/saint-maurice-de-beynost/reve-line.yml
@@ -4,8 +4,8 @@ latitude: 45.82865
 longitude: 4.97572
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 16
-phone: "+33 4 78 55 08 11"
+street: Route de Genève
+housenumber: "16"
+phone: +33 4 78 55 08 11
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/thalia-institut.yml b/data/cities/saint-maurice-de-beynost/thalia-institut.yml
index a3b404536..9442ff21d 100644
--- a/data/cities/saint-maurice-de-beynost/thalia-institut.yml
+++ b/data/cities/saint-maurice-de-beynost/thalia-institut.yml
@@ -4,8 +4,8 @@ latitude: 45.82896
 longitude: 4.97608
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 33
-phone: "+33 4 72 88 23 99"
+street: Route de Genève
+housenumber: "33"
+phone: +33 4 72 88 23 99
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/un-si-joli-bouquet.yml b/data/cities/saint-maurice-de-beynost/un-si-joli-bouquet.yml
index f701cb757..465575d60 100644
--- a/data/cities/saint-maurice-de-beynost/un-si-joli-bouquet.yml
+++ b/data/cities/saint-maurice-de-beynost/un-si-joli-bouquet.yml
@@ -4,8 +4,8 @@ latitude: 45.82894
 longitude: 4.97604
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Route de Genève"
-housenumber: 31
-phone: "+33 4 78 88 78 20"
+street: Route de Genève
+housenumber: "31"
+phone: +33 4 78 88 78 20
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-maurice-de-beynost/vins-henri-grumel.yml b/data/cities/saint-maurice-de-beynost/vins-henri-grumel.yml
index 9ff4cc846..09fc3f22b 100644
--- a/data/cities/saint-maurice-de-beynost/vins-henri-grumel.yml
+++ b/data/cities/saint-maurice-de-beynost/vins-henri-grumel.yml
@@ -4,8 +4,8 @@ latitude: 45.8331
 longitude: 4.97476
 postcode: "01700"
 city: Saint-Maurice-de-Beynost
-street: "Avenue du Mas Rolland"
-housenumber: 25
-phone: "+33 4 78 55 15 27"
+street: Avenue du Mas Rolland
+housenumber: "25"
+phone: +33 4 78 55 15 27
 opening_hours: ""
-website: "https://www.vins-henri-grumel.fr/"
\ No newline at end of file
+website: https://www.vins-henri-grumel.fr/
diff --git a/data/cities/saint-michel-de-maurienne/au-petit-salon.yml b/data/cities/saint-michel-de-maurienne/au-petit-salon.yml
index d06846089..d1aea45e5 100644
--- a/data/cities/saint-michel-de-maurienne/au-petit-salon.yml
+++ b/data/cities/saint-michel-de-maurienne/au-petit-salon.yml
@@ -5,7 +5,7 @@ longitude: 6.47329
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 23
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: "https://app.kiute.com/au-petit-salon-saint-michel/home"
\ No newline at end of file
+website: https://app.kiute.com/au-petit-salon-saint-michel/home
diff --git a/data/cities/saint-michel-de-maurienne/aux-4-saisons.yml b/data/cities/saint-michel-de-maurienne/aux-4-saisons.yml
index 7e9eb1c70..46c37259a 100644
--- a/data/cities/saint-michel-de-maurienne/aux-4-saisons.yml
+++ b/data/cities/saint-michel-de-maurienne/aux-4-saisons.yml
@@ -5,7 +5,7 @@ longitude: 6.47436
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 8
-phone: "+33 6 11 32 46 74"
+housenumber: "8"
+phone: +33 6 11 32 46 74
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-michel-de-maurienne/boulangerie-au-pain-des-alpes.yml b/data/cities/saint-michel-de-maurienne/boulangerie-au-pain-des-alpes.yml
index 3974230f2..2e38cba2a 100644
--- a/data/cities/saint-michel-de-maurienne/boulangerie-au-pain-des-alpes.yml
+++ b/data/cities/saint-michel-de-maurienne/boulangerie-au-pain-des-alpes.yml
@@ -4,8 +4,8 @@ latitude: 45.21606
 longitude: 6.47509
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
-street: "Place de la Croix Blanche"
-housenumber: 3
-phone: "+33 4 79 59 22 94"
+street: Place de la Croix Blanche
+housenumber: "3"
+phone: +33 4 79 59 22 94
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-michel-de-maurienne/cooperative-laitiere-de-la-vallee-des-arves.yml b/data/cities/saint-michel-de-maurienne/cooperative-laitiere-de-la-vallee-des-arves.yml
index 415b2c66f..b49174e84 100644
--- a/data/cities/saint-michel-de-maurienne/cooperative-laitiere-de-la-vallee-des-arves.yml
+++ b/data/cities/saint-michel-de-maurienne/cooperative-laitiere-de-la-vallee-des-arves.yml
@@ -5,7 +5,7 @@ longitude: 6.47403
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 12
-phone: "+33 4 79 05 04 83"
+housenumber: "12"
+phone: +33 4 79 05 04 83
 opening_hours: ""
-website: "https://www.beaufortdesarves.com/fr/il4-fromage,beaufort_p29-saint-michel-de-maurienne.aspx"
\ No newline at end of file
+website: https://www.beaufortdesarves.com/fr/il4-fromage,beaufort_p29-saint-michel-de-maurienne.aspx
diff --git a/data/cities/saint-michel-de-maurienne/le-cosy-bar.yml b/data/cities/saint-michel-de-maurienne/le-cosy-bar.yml
index feaa3ab19..c921fa942 100644
--- a/data/cities/saint-michel-de-maurienne/le-cosy-bar.yml
+++ b/data/cities/saint-michel-de-maurienne/le-cosy-bar.yml
@@ -5,7 +5,7 @@ longitude: 6.47308
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 30
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-michel-de-maurienne/le-vieux-four.yml b/data/cities/saint-michel-de-maurienne/le-vieux-four.yml
index 1a8e5552a..f0174c403 100644
--- a/data/cities/saint-michel-de-maurienne/le-vieux-four.yml
+++ b/data/cities/saint-michel-de-maurienne/le-vieux-four.yml
@@ -5,7 +5,7 @@ longitude: 6.47072
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-michel-de-maurienne/les-fees-marieuses.yml b/data/cities/saint-michel-de-maurienne/les-fees-marieuses.yml
index ab204215b..3d1023e60 100644
--- a/data/cities/saint-michel-de-maurienne/les-fees-marieuses.yml
+++ b/data/cities/saint-michel-de-maurienne/les-fees-marieuses.yml
@@ -5,7 +5,7 @@ longitude: 6.47419
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 13
-phone: "+33 6 95 38 04 67"
+housenumber: "13"
+phone: +33 6 95 38 04 67
 opening_hours: ""
-website: "https://www.les-fees-marieuses.fr/"
\ No newline at end of file
+website: https://www.les-fees-marieuses.fr/
diff --git a/data/cities/saint-michel-de-maurienne/linstitut.yml b/data/cities/saint-michel-de-maurienne/linstitut.yml
index cef6c24ab..d4fd37fc7 100644
--- a/data/cities/saint-michel-de-maurienne/linstitut.yml
+++ b/data/cities/saint-michel-de-maurienne/linstitut.yml
@@ -5,7 +5,7 @@ longitude: 6.47498
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 2
-phone: "+33 4 79 56 66 79"
+housenumber: "2"
+phone: +33 4 79 56 66 79
 opening_hours: ""
-website: "https://www.facebook.com/LInstitut-715019565174981/"
\ No newline at end of file
+website: https://www.facebook.com/LInstitut-715019565174981/
diff --git a/data/cities/saint-michel-de-maurienne/sublim-et-sens.yml b/data/cities/saint-michel-de-maurienne/sublim-et-sens.yml
index cf7580c38..d94008669 100644
--- a/data/cities/saint-michel-de-maurienne/sublim-et-sens.yml
+++ b/data/cities/saint-michel-de-maurienne/sublim-et-sens.yml
@@ -5,7 +5,7 @@ longitude: 6.47108
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 50
+housenumber: "50"
 phone: "+33479644387"
 opening_hours: ""
-website: "https://www.facebook.com/SublimetSens73"
\ No newline at end of file
+website: https://www.facebook.com/SublimetSens73
diff --git a/data/cities/saint-michel-de-maurienne/tendance-mode.yml b/data/cities/saint-michel-de-maurienne/tendance-mode.yml
index ab710fef5..5e52b5d09 100644
--- a/data/cities/saint-michel-de-maurienne/tendance-mode.yml
+++ b/data/cities/saint-michel-de-maurienne/tendance-mode.yml
@@ -5,7 +5,7 @@ longitude: 6.47363
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 18
-phone: "+33 9 83 73 25 38"
+housenumber: "18"
+phone: +33 9 83 73 25 38
 opening_hours: ""
-website: "https://m.facebook.com/Tendance-Mode-286585412288874/"
\ No newline at end of file
+website: https://m.facebook.com/Tendance-Mode-286585412288874/
diff --git a/data/cities/saint-michel-de-maurienne/traversaz-sports.yml b/data/cities/saint-michel-de-maurienne/traversaz-sports.yml
index e273e9bfc..66daa8e7b 100644
--- a/data/cities/saint-michel-de-maurienne/traversaz-sports.yml
+++ b/data/cities/saint-michel-de-maurienne/traversaz-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.47377
 postcode: "73140"
 city: Saint-Michel-de-Maurienne
 street: ""
-housenumber: 19
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: "https://www.facebook.com/TraversazSport/"
\ No newline at end of file
+website: https://www.facebook.com/TraversazSport/
diff --git a/data/cities/saint-nazaire-en-royans/bonbons-du-vercors.yml b/data/cities/saint-nazaire-en-royans/bonbons-du-vercors.yml
index 613689e52..6379e2916 100644
--- a/data/cities/saint-nazaire-en-royans/bonbons-du-vercors.yml
+++ b/data/cities/saint-nazaire-en-royans/bonbons-du-vercors.yml
@@ -4,8 +4,8 @@ latitude: 45.06006
 longitude: 5.24516
 postcode: "26190"
 city: Saint-Nazaire-en-Royans
-street: "Rue des Mariniers"
-housenumber: 1
+street: Rue des Mariniers
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-nazaire-les-eymes/boulangerie-patisserie-de-nardi.yml b/data/cities/saint-nazaire-les-eymes/boulangerie-patisserie-de-nardi.yml
index f3cb0d4cf..c493fd9ef 100644
--- a/data/cities/saint-nazaire-les-eymes/boulangerie-patisserie-de-nardi.yml
+++ b/data/cities/saint-nazaire-les-eymes/boulangerie-patisserie-de-nardi.yml
@@ -1,11 +1,11 @@
 id: 156325870
-type: way
+type: node
 latitude: 45.25595
 longitude: 5.84517
 postcode: "38330"
 city: Saint-Nazaire-les-Eymes
-street: "Route de Chambéry"
-housenumber: 940
+street: Route de Chambéry
+housenumber: "940"
 phone: ""
-opening_hours: "06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: 06:00-20:00
+website: ""
diff --git a/data/cities/saint-nicolas-de-veroce/mont-joly-sport-route-de-saint-nicolas-de-veroce.yml b/data/cities/saint-nicolas-de-veroce/mont-joly-sport-route-de-saint-nicolas-de-veroce.yml
index a5e9e9a81..44c737393 100644
--- a/data/cities/saint-nicolas-de-veroce/mont-joly-sport-route-de-saint-nicolas-de-veroce.yml
+++ b/data/cities/saint-nicolas-de-veroce/mont-joly-sport-route-de-saint-nicolas-de-veroce.yml
@@ -4,8 +4,8 @@ latitude: 45.85214
 longitude: 6.72392
 postcode: "74170"
 city: Saint-Nicolas de Véroce
-street: "Route de Saint-Nicolas de Véroce"
-housenumber: 
+street: Route de Saint-Nicolas de Véroce
+housenumber: ""
 phone: ""
-opening_hours: "08:30-18:00"
-website: "http://mont-joly-sport.com"
\ No newline at end of file
+opening_hours: 08:30-18:00
+website: http://mont-joly-sport.com
diff --git a/data/cities/saint-nicolas-de-veroce/mont-joly-sport.yml b/data/cities/saint-nicolas-de-veroce/mont-joly-sport.yml
index 8ccd44266..b68f84bf5 100644
--- a/data/cities/saint-nicolas-de-veroce/mont-joly-sport.yml
+++ b/data/cities/saint-nicolas-de-veroce/mont-joly-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.85177
 longitude: 6.72383
 postcode: "74170"
 city: Saint-Nicolas de Véroce
-street: "Route de Saint-Nicolas de Véroce"
-housenumber: 4157
-phone: "+33 4 50 96 49 58"
-opening_hours: "08:30-18:00"
-website: "http://mont-joly-sport.com"
\ No newline at end of file
+street: Route de Saint-Nicolas de Véroce
+housenumber: "4157"
+phone: +33 4 50 96 49 58
+opening_hours: 08:30-18:00
+website: http://mont-joly-sport.com
diff --git a/data/cities/saint-nizier-du-moucherotte/green-e-bike-country.yml b/data/cities/saint-nizier-du-moucherotte/green-e-bike-country.yml
index d5ebbdf60..e31eba205 100644
--- a/data/cities/saint-nizier-du-moucherotte/green-e-bike-country.yml
+++ b/data/cities/saint-nizier-du-moucherotte/green-e-bike-country.yml
@@ -1,11 +1,11 @@
 id: 134897270
-type: way
+type: node
 latitude: 45.15506
 longitude: 5.61947
 postcode: "38250"
 city: Saint-Nizier-du-Moucherotte
-street: "Chemin du Bruyant"
-housenumber: 105
+street: Chemin du Bruyant
+housenumber: "105"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/saint-nizier-du-moucherotte/proxi.yml b/data/cities/saint-nizier-du-moucherotte/proxi.yml
index 2b4425e2a..9ac4c36a4 100644
--- a/data/cities/saint-nizier-du-moucherotte/proxi.yml
+++ b/data/cities/saint-nizier-du-moucherotte/proxi.yml
@@ -5,7 +5,7 @@ longitude: 5.63028
 postcode: "38250"
 city: Saint-Nizier-du-Moucherotte
 street: ""
-housenumber: 1
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-paul-de-varces/vival.yml b/data/cities/saint-paul-de-varces/vival.yml
index a6a18777c..bfb248d5a 100644
--- a/data/cities/saint-paul-de-varces/vival.yml
+++ b/data/cities/saint-paul-de-varces/vival.yml
@@ -6,6 +6,6 @@ postcode: "38760"
 city: Saint-Paul-de-Varces
 street: ""
 housenumber: 1662 B
-phone: "+33 7 82 79 77 77"
-opening_hours: "Mo 15:00-19:30; Tu-Sa 07:00-13:00,15:00-19:30"
-website: "https://magasins.vival.fr/fr/vival-saint-paul-de-varce"
\ No newline at end of file
+phone: +33 7 82 79 77 77
+opening_hours: Mo 15:00-19:30; Tu-Sa 07:00-13:00,15:00-19:30
+website: https://magasins.vival.fr/fr/vival-saint-paul-de-varce
diff --git a/data/cities/saint-paul-en-chablais/bochaton-carburants.yml b/data/cities/saint-paul-en-chablais/bochaton-carburants.yml
index 7c71bfcb3..b018cc0a6 100644
--- a/data/cities/saint-paul-en-chablais/bochaton-carburants.yml
+++ b/data/cities/saint-paul-en-chablais/bochaton-carburants.yml
@@ -4,8 +4,8 @@ latitude: 46.36776
 longitude: 6.61877
 postcode: "74500"
 city: Saint-Paul-en-Chablais
-street: "Route du Chêne"
-housenumber: 100
+street: Route du Chêne
+housenumber: "100"
 phone: ""
-opening_hours: "Mo-Fr 08:00-17:00; Sa 10:00-11:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-17:00; Sa 10:00-11:00; Su off
+website: ""
diff --git a/data/cities/saint-paul-en-chablais/garage-2s-depannage.yml b/data/cities/saint-paul-en-chablais/garage-2s-depannage.yml
index 3bf701a71..7d4819993 100644
--- a/data/cities/saint-paul-en-chablais/garage-2s-depannage.yml
+++ b/data/cities/saint-paul-en-chablais/garage-2s-depannage.yml
@@ -1,11 +1,11 @@
 id: 69397403
-type: way
+type: node
 latitude: 46.36548
 longitude: 6.6526
 postcode: "74500"
 city: Saint-Paul-en-Chablais
-street: "Route du Champ Querbay"
-housenumber: 983
+street: Route du Champ Querbay
+housenumber: "983"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/saint-paul-en-chablais/le-petit-casino.yml b/data/cities/saint-paul-en-chablais/le-petit-casino.yml
index 7af59affa..20f0f6284 100644
--- a/data/cities/saint-paul-en-chablais/le-petit-casino.yml
+++ b/data/cities/saint-paul-en-chablais/le-petit-casino.yml
@@ -1,11 +1,11 @@
 id: 69398414
-type: way
+type: node
 latitude: 46.37838
 longitude: 6.62859
 postcode: "74500"
 city: Saint-Paul-en-Chablais
-street: "Route du Chablais"
-housenumber: 131
+street: Route du Chablais
+housenumber: "131"
 phone: ""
-opening_hours: "Mo-Sa 08:00-13:00, 15:00-20:00; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-13:00, 15:00-20:00; Su 08:00-12:30
+website: ""
diff --git a/data/cities/saint-paul-en-chablais/plus-services.yml b/data/cities/saint-paul-en-chablais/plus-services.yml
index 10385475c..7f1f4cc88 100644
--- a/data/cities/saint-paul-en-chablais/plus-services.yml
+++ b/data/cities/saint-paul-en-chablais/plus-services.yml
@@ -4,8 +4,8 @@ latitude: 46.37841
 longitude: 6.62255
 postcode: "74500"
 city: Saint-Paul-en-Chablais
-street: "Route de la Chaumière"
-housenumber: 409
+street: Route de la Chaumière
+housenumber: "409"
 phone: ""
-opening_hours: "Mo 17:00-19:30, Sa 08:00-18:30; Tu-Fr off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 17:00-19:30, Sa 08:00-18:30; Tu-Fr off
+website: ""
diff --git a/data/cities/saint-paul-les-romans/au-pressoir-saint-paulois.yml b/data/cities/saint-paul-les-romans/au-pressoir-saint-paulois.yml
index 28c5bda4a..5a10c844f 100644
--- a/data/cities/saint-paul-les-romans/au-pressoir-saint-paulois.yml
+++ b/data/cities/saint-paul-les-romans/au-pressoir-saint-paulois.yml
@@ -4,8 +4,8 @@ latitude: 45.06924
 longitude: 5.13042
 postcode: "26750"
 city: Saint-Paul-lès-Romans
-street: "Impasse du Pressoir"
-housenumber: 15
+street: Impasse du Pressoir
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-paul-les-romans/blackstore.yml b/data/cities/saint-paul-les-romans/blackstore.yml
index bc1550858..eff7440cf 100644
--- a/data/cities/saint-paul-les-romans/blackstore.yml
+++ b/data/cities/saint-paul-les-romans/blackstore.yml
@@ -4,8 +4,8 @@ latitude: 45.05867
 longitude: 5.10779
 postcode: "26750"
 city: Saint-Paul-lès-Romans
-street: "Avenue des Pins"
-housenumber: 17
+street: Avenue des Pins
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/saint-paul-les-romans/point-plus.yml b/data/cities/saint-paul-les-romans/point-plus.yml
index f32e0122b..03507b711 100644
--- a/data/cities/saint-paul-les-romans/point-plus.yml
+++ b/data/cities/saint-paul-les-romans/point-plus.yml
@@ -1,11 +1,11 @@
 id: 1182584947
-type: way
+type: node
 latitude: 45.06917
 longitude: 5.13014
 postcode: "26750"
 city: Saint-Paul-lès-Romans
-street: "Impasse du Pressoir"
-housenumber: 30
+street: Impasse du Pressoir
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-peray/elecomac.yml b/data/cities/saint-peray/elecomac.yml
index 26643dd1c..3332d6602 100644
--- a/data/cities/saint-peray/elecomac.yml
+++ b/data/cities/saint-peray/elecomac.yml
@@ -4,8 +4,8 @@ latitude: 44.94057
 longitude: 4.85933
 postcode: "07130"
 city: Saint-Péray
-street: "Rue du Grand Mail"
-housenumber: 8
-phone: "+33 4 75 81 85 40"
-opening_hours: "Mo-Sa 09:30-12:00 14:00-18:30"
-website: "http://www.elecomac.com"
\ No newline at end of file
+street: Rue du Grand Mail
+housenumber: "8"
+phone: +33 4 75 81 85 40
+opening_hours: Mo-Sa 09:30-12:00 14:00-18:30
+website: http://www.elecomac.com
diff --git a/data/cities/saint-peray/gifi.yml b/data/cities/saint-peray/gifi.yml
index cecb4ccbf..23c24db19 100644
--- a/data/cities/saint-peray/gifi.yml
+++ b/data/cities/saint-peray/gifi.yml
@@ -1,11 +1,11 @@
 id: 67749189
-type: way
+type: node
 latitude: 44.944
 longitude: 4.85486
 postcode: "07130"
 city: Saint Peray
-street: "Zone Des Murets"
-housenumber: 
-phone: "+33 4 75 83 45 22"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-12:30,14:00-18:30"
-website: "https://www.gifi.fr/?store_id=10096&utm_source=GMB&utm_medium=groupe&utm_campaign=10096"
\ No newline at end of file
+street: Zone Des Murets
+housenumber: ""
+phone: +33 4 75 83 45 22
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-12:30,14:00-18:30
+website: https://www.gifi.fr/?store_id=10096&utm_source=GMB&utm_medium=groupe&utm_campaign=10096
diff --git a/data/cities/saint-peray/noz.yml b/data/cities/saint-peray/noz.yml
index 10fa28f0f..b67ec2d08 100644
--- a/data/cities/saint-peray/noz.yml
+++ b/data/cities/saint-peray/noz.yml
@@ -1,11 +1,11 @@
 id: 68811362
-type: way
+type: node
 latitude: 44.94171
 longitude: 4.85985
 postcode: "07130"
 city: Saint-Péray
-street: "Rue du Petit-Blanc"
-housenumber: 
+street: Rue du Petit-Blanc
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/saint-peray/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/saint-peray/
diff --git a/data/cities/saint-pierre-dalbigny/garage-gayet.yml b/data/cities/saint-pierre-dalbigny/garage-gayet.yml
index 8ef9e9a04..be9805a65 100644
--- a/data/cities/saint-pierre-dalbigny/garage-gayet.yml
+++ b/data/cities/saint-pierre-dalbigny/garage-gayet.yml
@@ -4,8 +4,8 @@ latitude: 45.55516
 longitude: 6.16568
 postcode: "73250"
 city: Saint-Pierre-d'Albigny
-street: "Zone Industrielle Le Domaine"
-housenumber: 
+street: Zone Industrielle Le Domaine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-dalbigny/lkinformatique.yml b/data/cities/saint-pierre-dalbigny/lkinformatique.yml
index df324f441..2a98e3db6 100644
--- a/data/cities/saint-pierre-dalbigny/lkinformatique.yml
+++ b/data/cities/saint-pierre-dalbigny/lkinformatique.yml
@@ -4,8 +4,8 @@ latitude: 45.55437
 longitude: 6.16687
 postcode: "73250"
 city: Saint-Pierre-d'Albigny
-street: "Rue des Îles"
-housenumber: 15
+street: Rue des Îles
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-dallevard/colruyt.yml b/data/cities/saint-pierre-dallevard/colruyt.yml
index 92b939db7..60dbc6c8f 100644
--- a/data/cities/saint-pierre-dallevard/colruyt.yml
+++ b/data/cities/saint-pierre-dallevard/colruyt.yml
@@ -5,7 +5,7 @@ longitude: 6.05395
 postcode: "38830"
 city: Saint-Pierre-d'Allevard
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Th 08:30-19:30; Fr,Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-19:30; Fr,Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/saint-pierre-de-bressieux/la-ressourcerie-du-pays-de-bievre-valloire.yml b/data/cities/saint-pierre-de-bressieux/la-ressourcerie-du-pays-de-bievre-valloire.yml
index 3f544de35..b2554a2a8 100644
--- a/data/cities/saint-pierre-de-bressieux/la-ressourcerie-du-pays-de-bievre-valloire.yml
+++ b/data/cities/saint-pierre-de-bressieux/la-ressourcerie-du-pays-de-bievre-valloire.yml
@@ -4,8 +4,8 @@ latitude: 45.3155
 longitude: 5.28959
 postcode: "38870"
 city: Saint-Pierre-de-Bressieux
-street: "Route du Village"
-housenumber: 200
+street: Route du Village
+housenumber: "200"
 phone: ""
-opening_hours: "We,Fr 09:00-12:30,13:30-16:30; Sa 10:00-16:30"
-website: ""
\ No newline at end of file
+opening_hours: We,Fr 09:00-12:30,13:30-16:30; Sa 10:00-16:30
+website: ""
diff --git a/data/cities/saint-pierre-de-chandieu/boucherie-la-renaissance.yml b/data/cities/saint-pierre-de-chandieu/boucherie-la-renaissance.yml
index 22566fb97..b9fb182d8 100644
--- a/data/cities/saint-pierre-de-chandieu/boucherie-la-renaissance.yml
+++ b/data/cities/saint-pierre-de-chandieu/boucherie-la-renaissance.yml
@@ -4,8 +4,8 @@ latitude: 45.64479
 longitude: 5.01106
 postcode: "69780"
 city: Saint-Pierre-de-Chandieu
-street: "Place Charles de Gaulle"
-housenumber: 1
+street: Place Charles de Gaulle
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-de-chandieu/coiffactuel.yml b/data/cities/saint-pierre-de-chandieu/coiffactuel.yml
index 83ed20bde..bb3348941 100644
--- a/data/cities/saint-pierre-de-chandieu/coiffactuel.yml
+++ b/data/cities/saint-pierre-de-chandieu/coiffactuel.yml
@@ -4,8 +4,8 @@ latitude: 45.6449
 longitude: 5.01104
 postcode: "69780"
 city: Saint-Pierre-de-Chandieu
-street: "Place Charles de Gaulle"
-housenumber: 1
+street: Place Charles de Gaulle
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-de-chandieu/maison-servage.yml b/data/cities/saint-pierre-de-chandieu/maison-servage.yml
index 2424a18f0..c682ae738 100644
--- a/data/cities/saint-pierre-de-chandieu/maison-servage.yml
+++ b/data/cities/saint-pierre-de-chandieu/maison-servage.yml
@@ -4,8 +4,8 @@ latitude: 45.64482
 longitude: 5.012
 postcode: "69780"
 city: Saint-Pierre-de-Chandieu
-street: "Place Charles de Gaulle"
-housenumber: 13
+street: Place Charles de Gaulle
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-de-chandieu/tabac-le-stade.yml b/data/cities/saint-pierre-de-chandieu/tabac-le-stade.yml
index 57e610282..cc95040ac 100644
--- a/data/cities/saint-pierre-de-chandieu/tabac-le-stade.yml
+++ b/data/cities/saint-pierre-de-chandieu/tabac-le-stade.yml
@@ -4,8 +4,8 @@ latitude: 45.64521
 longitude: 5.01049
 postcode: "69780"
 city: Saint-Pierre-de-Chandieu
-street: "Rue du Stade"
-housenumber: 10
+street: Rue du Stade
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-de-chandieu/vival.yml b/data/cities/saint-pierre-de-chandieu/vival.yml
index dc0cde518..c3759a304 100644
--- a/data/cities/saint-pierre-de-chandieu/vival.yml
+++ b/data/cities/saint-pierre-de-chandieu/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.64488
 longitude: 5.01192
 postcode: "69780"
 city: Saint-Pierre-de-Chandieu
-street: "Avenue Amédée Ronin"
-housenumber: 2
-phone: "+33 7 61 55 64 11"
-opening_hours: "Mo-Su 08:00-22:30"
-website: "https://magasins.vival.fr/fr/s/vival-saint-pierre-de-chandieu"
\ No newline at end of file
+street: Avenue Amédée Ronin
+housenumber: "2"
+phone: +33 7 61 55 64 11
+opening_hours: Mo-Su 08:00-22:30
+website: https://magasins.vival.fr/fr/s/vival-saint-pierre-de-chandieu
diff --git a/data/cities/saint-pierre-de-chartreuse/brun-sports.yml b/data/cities/saint-pierre-de-chartreuse/brun-sports.yml
index 0b05a7ce0..0bd7dae46 100644
--- a/data/cities/saint-pierre-de-chartreuse/brun-sports.yml
+++ b/data/cities/saint-pierre-de-chartreuse/brun-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.34361
 longitude: 5.81487
 postcode: "38380"
 city: Saint-Pierre-de-Chartreuse
-street: "le Bois des Lièvres"
-housenumber: 
+street: le Bois des Lièvres
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-en-faucigny/accueil-minoterie-metral.yml b/data/cities/saint-pierre-en-faucigny/accueil-minoterie-metral.yml
index 7e024355e..85428bd28 100644
--- a/data/cities/saint-pierre-en-faucigny/accueil-minoterie-metral.yml
+++ b/data/cities/saint-pierre-en-faucigny/accueil-minoterie-metral.yml
@@ -4,8 +4,8 @@ latitude: 46.05729
 longitude: 6.37886
 postcode: "74800"
 city: Saint-Pierre-en-Faucigny
-street: "Impasse du Moulin"
-housenumber: 81
+street: Impasse du Moulin
+housenumber: "81"
 phone: "0450037021"
 opening_hours: ""
-website: "https://www.minoterie-metral.com/"
\ No newline at end of file
+website: https://www.minoterie-metral.com/
diff --git a/data/cities/saint-pierre-en-faucigny/fromagerie-lalliard.yml b/data/cities/saint-pierre-en-faucigny/fromagerie-lalliard.yml
index f494a1c0b..742eb0030 100644
--- a/data/cities/saint-pierre-en-faucigny/fromagerie-lalliard.yml
+++ b/data/cities/saint-pierre-en-faucigny/fromagerie-lalliard.yml
@@ -4,8 +4,8 @@ latitude: 46.07261
 longitude: 6.38773
 postcode: "74800"
 city: Saint-Pierre-en-Faucigny
-street: "Route de Toisinges"
-housenumber: 566
-phone: "+33 4 50 97 05 36"
+street: Route de Toisinges
+housenumber: "566"
+phone: +33 4 50 97 05 36
 opening_hours: ""
-website: "https://www.fromagerie-lalliard.com"
\ No newline at end of file
+website: https://www.fromagerie-lalliard.com
diff --git a/data/cities/saint-pierre-en-faucigny/la-fabrique-a-biclou-association-benevole-atelier-dautoreparation-de-velo.yml b/data/cities/saint-pierre-en-faucigny/la-fabrique-a-biclou-association-benevole-atelier-dautoreparation-de-velo.yml
index bec5686ef..1604fd843 100644
--- a/data/cities/saint-pierre-en-faucigny/la-fabrique-a-biclou-association-benevole-atelier-dautoreparation-de-velo.yml
+++ b/data/cities/saint-pierre-en-faucigny/la-fabrique-a-biclou-association-benevole-atelier-dautoreparation-de-velo.yml
@@ -1,11 +1,11 @@
 id: 107967725
-type: way
+type: node
 latitude: 46.07269
 longitude: 6.3736
 postcode: "74800"
 city: Saint-Pierre-en-Faucigny
-street: "Rue des Vanneaux"
-housenumber: 14
+street: Rue des Vanneaux
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: "https://lafabriqueabiclou.fr/"
\ No newline at end of file
+website: https://lafabriqueabiclou.fr/
diff --git a/data/cities/saint-pierre-en-faucigny/la-ferme-des-producteurs.yml b/data/cities/saint-pierre-en-faucigny/la-ferme-des-producteurs.yml
index e15c5b5cc..8323fd77c 100644
--- a/data/cities/saint-pierre-en-faucigny/la-ferme-des-producteurs.yml
+++ b/data/cities/saint-pierre-en-faucigny/la-ferme-des-producteurs.yml
@@ -4,8 +4,8 @@ latitude: 46.07256
 longitude: 6.38956
 postcode: "74800"
 city: Saint-Pierre-en-Faucigny
-street: "Avenue du Mont Blanc"
-housenumber: 3280
+street: Avenue du Mont Blanc
+housenumber: "3280"
 phone: "0450035590"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-en-faucigny/la-paniere.yml b/data/cities/saint-pierre-en-faucigny/la-paniere.yml
index c9de39fc8..4d7725af3 100644
--- a/data/cities/saint-pierre-en-faucigny/la-paniere.yml
+++ b/data/cities/saint-pierre-en-faucigny/la-paniere.yml
@@ -4,8 +4,8 @@ latitude: 46.07277
 longitude: 6.39244
 postcode: ""
 city: Saint-Pierre-en-Faucigny
-street: "Avenue du Mont Blanc"
-housenumber: 3504
-phone: "04 50 07 16 56"
-opening_hours: "Mo-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+street: Avenue du Mont Blanc
+housenumber: "3504"
+phone: 04 50 07 16 56
+opening_hours: Mo-Su 06:00-20:00
+website: ""
diff --git a/data/cities/saint-pierre-en-faucigny/melinda-italie-primeurs.yml b/data/cities/saint-pierre-en-faucigny/melinda-italie-primeurs.yml
index b1c641f6f..6ac88353e 100644
--- a/data/cities/saint-pierre-en-faucigny/melinda-italie-primeurs.yml
+++ b/data/cities/saint-pierre-en-faucigny/melinda-italie-primeurs.yml
@@ -4,8 +4,8 @@ latitude: 46.07264
 longitude: 6.3915
 postcode: ""
 city: Saint-Pierre-en-Faucigny
-street: "Avenue du Mont Blanc"
-housenumber: 3448
-phone: "07 68 26 03 63"
+street: Avenue du Mont Blanc
+housenumber: "3448"
+phone: 07 68 26 03 63
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-pierre-en-faucigny/mr-bricolage.yml b/data/cities/saint-pierre-en-faucigny/mr-bricolage.yml
index af6fc7159..885ad25d1 100644
--- a/data/cities/saint-pierre-en-faucigny/mr-bricolage.yml
+++ b/data/cities/saint-pierre-en-faucigny/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 107966522
-type: way
+type: node
 latitude: 46.0728
 longitude: 6.37762
 postcode: "74250"
 city: Saint-Pierre-en-Faucigny
-street: "Avenue des Jourdies"
-housenumber: 46
+street: Avenue des Jourdies
+housenumber: "46"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-priest-en-jarez/bureau-vallee.yml b/data/cities/saint-priest-en-jarez/bureau-vallee.yml
index b5fdcc659..6c82ffc74 100644
--- a/data/cities/saint-priest-en-jarez/bureau-vallee.yml
+++ b/data/cities/saint-priest-en-jarez/bureau-vallee.yml
@@ -4,8 +4,8 @@ latitude: 45.47362
 longitude: 4.38314
 postcode: "42270"
 city: Saint-Priest-en-Jarez
-street: "Route de l'Étrat"
-housenumber: 32
+street: Route de l'Étrat
+housenumber: "32"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-priest-en-jarez/eurorepar-st-priest-en-jarez.yml b/data/cities/saint-priest-en-jarez/eurorepar-st-priest-en-jarez.yml
index 95880abac..084532936 100644
--- a/data/cities/saint-priest-en-jarez/eurorepar-st-priest-en-jarez.yml
+++ b/data/cities/saint-priest-en-jarez/eurorepar-st-priest-en-jarez.yml
@@ -4,8 +4,8 @@ latitude: 45.47344
 longitude: 4.38319
 postcode: "42270"
 city: Saint-Priest-en-Jarez
-street: "Route de l etrat"
-housenumber: 32
+street: Route de l etrat
+housenumber: "32"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: "www.autossimo.com/garagetechauto"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: www.autossimo.com/garagetechauto
diff --git a/data/cities/saint-priest-en-jarez/fermes-du-forez.yml b/data/cities/saint-priest-en-jarez/fermes-du-forez.yml
index efd1d217e..e7b7c989d 100644
--- a/data/cities/saint-priest-en-jarez/fermes-du-forez.yml
+++ b/data/cities/saint-priest-en-jarez/fermes-du-forez.yml
@@ -1,11 +1,11 @@
 id: 65638473
-type: way
+type: node
 latitude: 45.46958
 longitude: 4.37589
 postcode: "42270"
 city: Saint-Priest-en-Jarez
-street: "Avenue Pierre Mendès France"
-housenumber: 8
+street: Avenue Pierre Mendès France
+housenumber: "8"
 phone: ""
-opening_hours: "Th, Fr 08:30-19:00; Sa 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Th, Fr 08:30-19:00; Sa 09:00-13:00
+website: ""
diff --git a/data/cities/saint-priest-en-jarez/intersport.yml b/data/cities/saint-priest-en-jarez/intersport.yml
index f72109559..cab58e2a2 100644
--- a/data/cities/saint-priest-en-jarez/intersport.yml
+++ b/data/cities/saint-priest-en-jarez/intersport.yml
@@ -1,11 +1,11 @@
 id: 65635027
-type: way
+type: node
 latitude: 45.47855
 longitude: 4.35975
 postcode: "42270"
 city: Saint-Priest-en-Jarez
-street: "Rue de Ratarieux"
-housenumber: 82
+street: Rue de Ratarieux
+housenumber: "82"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30"
-website: "https://www.intersport.fr/Loire-42/STPRIESTENJAREZ-42270/INTERSPORT-STPRIESTENJAREZ/00809_000/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30
+website: https://www.intersport.fr/Loire-42/STPRIESTENJAREZ-42270/INTERSPORT-STPRIESTENJAREZ/00809_000/
diff --git a/data/cities/saint-priest/aushopping-porte-des-alpes.yml b/data/cities/saint-priest/aushopping-porte-des-alpes.yml
index 81b675b59..123203e3a 100644
--- a/data/cities/saint-priest/aushopping-porte-des-alpes.yml
+++ b/data/cities/saint-priest/aushopping-porte-des-alpes.yml
@@ -1,11 +1,11 @@
 id: 155511980
-type: way
+type: node
 latitude: 45.72396
 longitude: 4.92552
 postcode: "69800"
 city: Saint-Priest
-street: "Boulevard André Boulloche"
-housenumber: 1
+street: Boulevard André Boulloche
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-priest/baguettes-sandwichs-et-tradition.yml b/data/cities/saint-priest/baguettes-sandwichs-et-tradition.yml
index 499569787..cfb5cabbe 100644
--- a/data/cities/saint-priest/baguettes-sandwichs-et-tradition.yml
+++ b/data/cities/saint-priest/baguettes-sandwichs-et-tradition.yml
@@ -4,8 +4,8 @@ latitude: 45.70608
 longitude: 4.92304
 postcode: "69800"
 city: Saint-Priest
-street: "Chemin de Revaison"
-housenumber: 46
+street: Chemin de Revaison
+housenumber: "46"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30
+website: ""
diff --git a/data/cities/saint-priest/brico-depot-cours-materiaux.yml b/data/cities/saint-priest/brico-depot-cours-materiaux.yml
index 0697718ce..8d2fec009 100644
--- a/data/cities/saint-priest/brico-depot-cours-materiaux.yml
+++ b/data/cities/saint-priest/brico-depot-cours-materiaux.yml
@@ -1,11 +1,11 @@
 id: 84069822
-type: way
+type: node
 latitude: 45.71591
 longitude: 4.96345
 postcode: ""
 city: Saint-Priest
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:30
+website: ""
diff --git a/data/cities/saint-priest/brico-depot.yml b/data/cities/saint-priest/brico-depot.yml
index 69a35cfff..8932c1531 100644
--- a/data/cities/saint-priest/brico-depot.yml
+++ b/data/cities/saint-priest/brico-depot.yml
@@ -4,8 +4,8 @@ latitude: 45.71591
 longitude: 4.96513
 postcode: "69800"
 city: Saint-Priest
-street: "Route de Grenoble"
-housenumber: 198
+street: Route de Grenoble
+housenumber: "198"
 phone: "+33472475130"
-opening_hours: "Mo-Sa 08:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30
+website: ""
diff --git a/data/cities/saint-priest/centre-porsche-lyon-sud.yml b/data/cities/saint-priest/centre-porsche-lyon-sud.yml
index 7e73fe7a3..96e376a61 100644
--- a/data/cities/saint-priest/centre-porsche-lyon-sud.yml
+++ b/data/cities/saint-priest/centre-porsche-lyon-sud.yml
@@ -4,8 +4,8 @@ latitude: 45.68303
 longitude: 4.96478
 postcode: "69800"
 city: Saint-Priest
-street: "Rue Nicéphore Niepce"
-housenumber: 1
-phone: "+33 4 72 09 02 09"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue Nicéphore Niepce
+housenumber: "1"
+phone: +33 4 72 09 02 09
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/saint-priest/dafy-moto.yml b/data/cities/saint-priest/dafy-moto.yml
index 870ea55b3..469eaf617 100644
--- a/data/cities/saint-priest/dafy-moto.yml
+++ b/data/cities/saint-priest/dafy-moto.yml
@@ -4,8 +4,8 @@ latitude: 45.71675
 longitude: 4.9682
 postcode: "69800"
 city: Saint-Priest
-street: "Rue Monseigneur Ancel"
-housenumber: 26
-phone: "+334 78 70 53 77"
+street: Rue Monseigneur Ancel
+housenumber: "26"
+phone: +334 78 70 53 77
 opening_hours: ""
-website: "https://www.dafy-moto.com/magasin/dafy-moto-saint-priest.html"
\ No newline at end of file
+website: https://www.dafy-moto.com/magasin/dafy-moto-saint-priest.html
diff --git a/data/cities/saint-priest/electro-depot.yml b/data/cities/saint-priest/electro-depot.yml
index 5c7d1e037..a49eb1c7c 100644
--- a/data/cities/saint-priest/electro-depot.yml
+++ b/data/cities/saint-priest/electro-depot.yml
@@ -4,8 +4,8 @@ latitude: 45.71543
 longitude: 4.9604
 postcode: "69800"
 city: Saint-Priest
-street: "Chemin de Genas"
-housenumber: 44
+street: Chemin de Genas
+housenumber: "44"
 phone: "+33472771700"
-opening_hours: "Mo-Sa 10:00-12:30 14:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-12:30 14:00-19:30
+website: ""
diff --git a/data/cities/saint-priest/laquarium-de-steph.yml b/data/cities/saint-priest/laquarium-de-steph.yml
index fa413d22c..1ffaffe29 100644
--- a/data/cities/saint-priest/laquarium-de-steph.yml
+++ b/data/cities/saint-priest/laquarium-de-steph.yml
@@ -4,8 +4,8 @@ latitude: 45.70954
 longitude: 4.98416
 postcode: "69800"
 city: Saint-Priest
-street: "Route de Grenoble"
-housenumber: 90
+street: Route de Grenoble
+housenumber: "90"
 phone: ""
-opening_hours: "Tu-Su 10:00-12:00,14:00-19:00"
-website: "http://www.aquarium-saint-priest.fr/"
\ No newline at end of file
+opening_hours: Tu-Su 10:00-12:00,14:00-19:00
+website: http://www.aquarium-saint-priest.fr/
diff --git a/data/cities/saint-priest/stokomani.yml b/data/cities/saint-priest/stokomani.yml
index f9cb4fd08..b050b55f1 100644
--- a/data/cities/saint-priest/stokomani.yml
+++ b/data/cities/saint-priest/stokomani.yml
@@ -4,8 +4,8 @@ latitude: 45.71623
 longitude: 4.95945
 postcode: "69800"
 city: Saint Priest
-street: "route De Grenoble"
+street: route De Grenoble
 housenumber: 227-229
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.stokomani.fr/saint-priest.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.stokomani.fr/saint-priest.html
diff --git a/data/cities/saint-quentin-fallavier/amandine-et-co.yml b/data/cities/saint-quentin-fallavier/amandine-et-co.yml
index e2741a892..872a0c015 100644
--- a/data/cities/saint-quentin-fallavier/amandine-et-co.yml
+++ b/data/cities/saint-quentin-fallavier/amandine-et-co.yml
@@ -4,8 +4,8 @@ latitude: 45.63143
 longitude: 5.11172
 postcode: "38070"
 city: Saint-Quentin-Fallavier
-street: "Rue du Lac"
-housenumber: 22
+street: Rue du Lac
+housenumber: "22"
 phone: ""
-opening_hours: "Tu,Th,Fr 09:00-19:00; We 09:00-18:00; Sa 08:30-15:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Th,Fr 09:00-19:00; We 09:00-18:00; Sa 08:30-15:30
+website: ""
diff --git a/data/cities/saint-quentin-fallavier/chez-seb-et-hugo.yml b/data/cities/saint-quentin-fallavier/chez-seb-et-hugo.yml
index 37b0987ad..dce62dbdc 100644
--- a/data/cities/saint-quentin-fallavier/chez-seb-et-hugo.yml
+++ b/data/cities/saint-quentin-fallavier/chez-seb-et-hugo.yml
@@ -4,8 +4,8 @@ latitude: 45.63215
 longitude: 5.11128
 postcode: ""
 city: Saint-Quentin-Fallavier
-street: "Rue du Lac"
-housenumber: 10
-phone: "04 74 99 04 16"
+street: Rue du Lac
+housenumber: "10"
+phone: 04 74 99 04 16
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-quentin-sur-isere/maison-franchini.yml b/data/cities/saint-quentin-sur-isere/maison-franchini.yml
index 622528ebd..0f798d7db 100644
--- a/data/cities/saint-quentin-sur-isere/maison-franchini.yml
+++ b/data/cities/saint-quentin-sur-isere/maison-franchini.yml
@@ -4,8 +4,8 @@ latitude: 45.28114
 longitude: 5.54686
 postcode: "38210"
 city: Saint-Quentin-sur-Isère
-street: "Rue du Vercors"
-housenumber: 741
+street: Rue du Vercors
+housenumber: "741"
 phone: ""
-opening_hours: "Tu-Fr 06:00-13:00,16:00-19:30, Sa 06:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:00-13:00,16:00-19:30, Sa 06:00-13:00
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/2000-chaussures.yml b/data/cities/saint-rambert-dalbon/2000-chaussures.yml
index bd2b801b9..07ef18b0c 100644
--- a/data/cities/saint-rambert-dalbon/2000-chaussures.yml
+++ b/data/cities/saint-rambert-dalbon/2000-chaussures.yml
@@ -4,8 +4,8 @@ latitude: 45.2934
 longitude: 4.81314
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
-housenumber: 22
+street: Avenue du Docteur Lucien Steinberg
+housenumber: "22"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/au-bonheur-des-msieurs-dames.yml b/data/cities/saint-rambert-dalbon/au-bonheur-des-msieurs-dames.yml
index f0cb5160d..300d1a4d8 100644
--- a/data/cities/saint-rambert-dalbon/au-bonheur-des-msieurs-dames.yml
+++ b/data/cities/saint-rambert-dalbon/au-bonheur-des-msieurs-dames.yml
@@ -4,8 +4,8 @@ latitude: 45.29385
 longitude: 4.81329
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
-housenumber: 19
-phone: "+33 4 75 03 26 23"
-opening_hours: "Tu-Th 09:00-12:00, 14:00-19:00; Fr 09:00-19:00; Sa 09:00-17:00"
-website: ""
\ No newline at end of file
+street: Avenue du Docteur Lucien Steinberg
+housenumber: "19"
+phone: +33 4 75 03 26 23
+opening_hours: Tu-Th 09:00-12:00, 14:00-19:00; Fr 09:00-19:00; Sa 09:00-17:00
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/aux-delices-rambertoises.yml b/data/cities/saint-rambert-dalbon/aux-delices-rambertoises.yml
index 0b16306fa..f917b4c4d 100644
--- a/data/cities/saint-rambert-dalbon/aux-delices-rambertoises.yml
+++ b/data/cities/saint-rambert-dalbon/aux-delices-rambertoises.yml
@@ -4,8 +4,8 @@ latitude: 45.29259
 longitude: 4.81369
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
-housenumber: 47
-phone: "+33 4 75 31 02 08"
+street: Avenue du Docteur Lucien Steinberg
+housenumber: "47"
+phone: +33 4 75 31 02 08
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/berthet.yml b/data/cities/saint-rambert-dalbon/berthet.yml
index c247b343d..7ee0a2a7f 100644
--- a/data/cities/saint-rambert-dalbon/berthet.yml
+++ b/data/cities/saint-rambert-dalbon/berthet.yml
@@ -4,8 +4,8 @@ latitude: 45.29213
 longitude: 4.81447
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Place Gaston Oriol"
-housenumber: 
-phone: "+33 4 75 31 22 12"
+street: Place Gaston Oriol
+housenumber: ""
+phone: +33 4 75 31 22 12
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/boucherie-roche.yml b/data/cities/saint-rambert-dalbon/boucherie-roche.yml
index 8c7423bb6..839dd4f93 100644
--- a/data/cities/saint-rambert-dalbon/boucherie-roche.yml
+++ b/data/cities/saint-rambert-dalbon/boucherie-roche.yml
@@ -4,8 +4,8 @@ latitude: 45.29343
 longitude: 4.81343
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
-housenumber: 31
-phone: "+33 4 75 03 02 79"
-opening_hours: "Mo-Sa 08:00-12:30; 15:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue du Docteur Lucien Steinberg
+housenumber: "31"
+phone: +33 4 75 03 02 79
+opening_hours: Mo-Sa 08:00-12:30; 15:00-19:00
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/garage-berthet.yml b/data/cities/saint-rambert-dalbon/garage-berthet.yml
index 0b41e41f0..35185a3f6 100644
--- a/data/cities/saint-rambert-dalbon/garage-berthet.yml
+++ b/data/cities/saint-rambert-dalbon/garage-berthet.yml
@@ -4,8 +4,8 @@ latitude: 45.2961
 longitude: 4.81286
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue de Lyon"
-housenumber: 33
-phone: "+33 4 75 31 04 09"
-opening_hours: "Mo-Fr 14:15-18:00; Tu-Fr 08:30-12:00"
-website: ""
\ No newline at end of file
+street: Avenue de Lyon
+housenumber: "33"
+phone: +33 4 75 31 04 09
+opening_hours: Mo-Fr 14:15-18:00; Tu-Fr 08:30-12:00
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/laverie-libre-service.yml b/data/cities/saint-rambert-dalbon/laverie-libre-service.yml
index 077fa1fa7..96f3dca3d 100644
--- a/data/cities/saint-rambert-dalbon/laverie-libre-service.yml
+++ b/data/cities/saint-rambert-dalbon/laverie-libre-service.yml
@@ -4,8 +4,8 @@ latitude: 45.29194
 longitude: 4.81366
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
-housenumber: 54
+street: Avenue du Docteur Lucien Steinberg
+housenumber: "54"
 phone: ""
-opening_hours: "Mo-Su 06:30-20:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:30-20:30
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/ma-coiffure.yml b/data/cities/saint-rambert-dalbon/ma-coiffure.yml
index 9d694fc7d..0ec92e0fa 100644
--- a/data/cities/saint-rambert-dalbon/ma-coiffure.yml
+++ b/data/cities/saint-rambert-dalbon/ma-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.29233
 longitude: 4.81402
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Place Gaston Oriol"
-housenumber: 3
-phone: "+33 4 75 31 02 68"
-opening_hours: "Tu-Fr 08:30-18:00; Sa 08:00-15:30"
-website: ""
\ No newline at end of file
+street: Place Gaston Oriol
+housenumber: "3"
+phone: +33 4 75 31 02 68
+opening_hours: Tu-Fr 08:30-18:00; Sa 08:00-15:30
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/maison-jury.yml b/data/cities/saint-rambert-dalbon/maison-jury.yml
index d61130013..c82eedf25 100644
--- a/data/cities/saint-rambert-dalbon/maison-jury.yml
+++ b/data/cities/saint-rambert-dalbon/maison-jury.yml
@@ -4,8 +4,8 @@ latitude: 45.29227
 longitude: 4.81531
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Place du 8 Mai 1945"
-housenumber: 5
-phone: "04 27 45 72 18"
+street: Place du 8 Mai 1945
+housenumber: "5"
+phone: 04 27 45 72 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/mursol.yml b/data/cities/saint-rambert-dalbon/mursol.yml
index 3a7375132..6797cad21 100644
--- a/data/cities/saint-rambert-dalbon/mursol.yml
+++ b/data/cities/saint-rambert-dalbon/mursol.yml
@@ -4,8 +4,8 @@ latitude: 45.29165
 longitude: 4.81377
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
-housenumber: 60
-phone: "+33 4 75 31 05 22"
+street: Avenue du Docteur Lucien Steinberg
+housenumber: "60"
+phone: +33 4 75 31 05 22
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/nord-drome-automobiles.yml b/data/cities/saint-rambert-dalbon/nord-drome-automobiles.yml
index ea7ffcb0e..1bc581b5f 100644
--- a/data/cities/saint-rambert-dalbon/nord-drome-automobiles.yml
+++ b/data/cities/saint-rambert-dalbon/nord-drome-automobiles.yml
@@ -1,11 +1,11 @@
 id: 486789309
-type: way
+type: node
 latitude: 45.28738
 longitude: 4.82376
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Route d'Anneyron"
-housenumber: 7
+street: Route d'Anneyron
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 08:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-18:00
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/rambert-confection.yml b/data/cities/saint-rambert-dalbon/rambert-confection.yml
index c5ddd5647..393a5a25f 100644
--- a/data/cities/saint-rambert-dalbon/rambert-confection.yml
+++ b/data/cities/saint-rambert-dalbon/rambert-confection.yml
@@ -4,8 +4,8 @@ latitude: 45.294
 longitude: 4.81326
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
-housenumber: 17
-phone: "+33  4 75 31 19 29"
-opening_hours: "Tu-Fr 09:00-12:00 14:30-18:30 Sa 09:12:00"
-website: ""
\ No newline at end of file
+street: Avenue du Docteur Lucien Steinberg
+housenumber: "17"
+phone: +33  4 75 31 19 29
+opening_hours: Tu-Fr 09:00-12:00 14:30-18:30 Sa 09:12:00
+website: ""
diff --git a/data/cities/saint-rambert-dalbon/selin-market.yml b/data/cities/saint-rambert-dalbon/selin-market.yml
index 918231817..b0c5df5ec 100644
--- a/data/cities/saint-rambert-dalbon/selin-market.yml
+++ b/data/cities/saint-rambert-dalbon/selin-market.yml
@@ -4,8 +4,8 @@ latitude: 45.29227
 longitude: 4.81354
 postcode: "26140"
 city: Saint-Rambert-d'Albon
-street: "Avenue du Docteur Lucien Steinberg"
+street: Avenue du Docteur Lucien Steinberg
 housenumber: 44Av.
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-rambert-en-bugey/intermarche-contact.yml b/data/cities/saint-rambert-en-bugey/intermarche-contact.yml
index 5e84f32eb..718e24512 100644
--- a/data/cities/saint-rambert-en-bugey/intermarche-contact.yml
+++ b/data/cities/saint-rambert-en-bugey/intermarche-contact.yml
@@ -1,11 +1,11 @@
 id: 187519794
-type: way
+type: node
 latitude: 45.94422
 longitude: 5.43473
 postcode: "01230"
 city: Saint-Rambert-en-Bugey
-street: "Avenue de l'Europe"
-housenumber: 132
+street: Avenue de l'Europe
+housenumber: "132"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:30,15:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:30,15:00-19:30
+website: ""
diff --git a/data/cities/saint-rambert-en-bugey/la-fromagerie-de-saint-rambert-en-bugey.yml b/data/cities/saint-rambert-en-bugey/la-fromagerie-de-saint-rambert-en-bugey.yml
index a8dfabb8f..c34ed261f 100644
--- a/data/cities/saint-rambert-en-bugey/la-fromagerie-de-saint-rambert-en-bugey.yml
+++ b/data/cities/saint-rambert-en-bugey/la-fromagerie-de-saint-rambert-en-bugey.yml
@@ -4,8 +4,8 @@ latitude: 45.94905
 longitude: 5.44049
 postcode: "01230"
 city: Saint-Rambert-en-Bugey
-street: "Rue Docteur Temporal"
-housenumber: 113
-phone: "+33 4 37 86 03 43"
+street: Rue Docteur Temporal
+housenumber: "113"
+phone: +33 4 37 86 03 43
 opening_hours: ""
-website: "https://www.fromageriedesaintrambertenbugey.fr/"
\ No newline at end of file
+website: https://www.fromageriedesaintrambertenbugey.fr/
diff --git a/data/cities/saint-romain-de-popey/boulangerie-gilardon.yml b/data/cities/saint-romain-de-popey/boulangerie-gilardon.yml
index b19d6da8a..751762727 100644
--- a/data/cities/saint-romain-de-popey/boulangerie-gilardon.yml
+++ b/data/cities/saint-romain-de-popey/boulangerie-gilardon.yml
@@ -4,8 +4,9 @@ latitude: 45.84743
 longitude: 4.53074
 postcode: "69490"
 city: Saint-Romain-de-Popey
-street: "Place du Popey"
-housenumber: 
+street: Place du Popey
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Tu 05:00-13:00, Mo-Tu 15:00-19:30, Th-Sa 05:00-13:00, Th-Sa 15:00-19:30, Su 06:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu 05:00-13:00, Mo-Tu 15:00-19:30, Th-Sa 05:00-13:00, Th-Sa 15:00-19:30,
+    Su 06:00-13:00
+website: ""
diff --git a/data/cities/saint-romain-de-popey/junet-bois.yml b/data/cities/saint-romain-de-popey/junet-bois.yml
index cc61309b3..c18dd3364 100644
--- a/data/cities/saint-romain-de-popey/junet-bois.yml
+++ b/data/cities/saint-romain-de-popey/junet-bois.yml
@@ -1,11 +1,11 @@
 id: 1115771087
-type: way
+type: node
 latitude: 45.86713
 longitude: 4.54654
 postcode: "69490"
 city: Saint-Romain-de-Popey
-street: "Route de Sarcey"
-housenumber: 1050
+street: Route de Sarcey
+housenumber: "1050"
 phone: ""
 opening_hours: ""
-website: "https://www.junet.fr/"
\ No newline at end of file
+website: https://www.junet.fr/
diff --git a/data/cities/saint-romain-en-gal/u-express.yml b/data/cities/saint-romain-en-gal/u-express.yml
index c56ded49f..a6ba7e115 100644
--- a/data/cities/saint-romain-en-gal/u-express.yml
+++ b/data/cities/saint-romain-en-gal/u-express.yml
@@ -1,11 +1,11 @@
 id: 1087159242
-type: way
+type: node
 latitude: 45.52798
 longitude: 4.865
 postcode: "69560"
 city: Saint-Romain-en-Gal
-street: "Avenue de la Gare"
-housenumber: 
+street: Avenue de la Gare
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/saint-romain-en-jarez/ferme-de-verpilleux.yml b/data/cities/saint-romain-en-jarez/ferme-de-verpilleux.yml
index f0d3013e4..08653cfcb 100644
--- a/data/cities/saint-romain-en-jarez/ferme-de-verpilleux.yml
+++ b/data/cities/saint-romain-en-jarez/ferme-de-verpilleux.yml
@@ -4,8 +4,8 @@ latitude: 45.54755
 longitude: 4.5467
 postcode: "42800"
 city: Saint-Romain-en-Jarez
-street: "Route des Vignes"
-housenumber: 2158
-phone: "+33 6 69 50 36 65"
+street: Route des Vignes
+housenumber: "2158"
+phone: +33 6 69 50 36 65
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-romain-en-jarez/vival.yml b/data/cities/saint-romain-en-jarez/vival.yml
index cf94a7917..aceea0565 100644
--- a/data/cities/saint-romain-en-jarez/vival.yml
+++ b/data/cities/saint-romain-en-jarez/vival.yml
@@ -1,11 +1,11 @@
 id: 311965416
-type: way
+type: node
 latitude: 45.5559
 longitude: 4.53453
 postcode: "42800"
 city: Saint-Romain-en-Jarez
-street: "Place Melchior Arod"
-housenumber: 32
-phone: "+33 477206982"
-opening_hours: "Su 07:00-12:00; Sa 07:30-12:30; Tu-Fr 07:30-12:30, 16:00-19:00"
-website: "https://courses.vival.fr/magasin-vival-loire-42-saint-romain-en-jarez-groupe/magasin-e0192-o.html"
\ No newline at end of file
+street: Place Melchior Arod
+housenumber: "32"
+phone: +33 477206982
+opening_hours: Su 07:00-12:00; Sa 07:30-12:30; Tu-Fr 07:30-12:30, 16:00-19:00
+website: https://courses.vival.fr/magasin-vival-loire-42-saint-romain-en-jarez-groupe/magasin-e0192-o.html
diff --git a/data/cities/saint-romain-la-motte/la-baguette-enchantee.yml b/data/cities/saint-romain-la-motte/la-baguette-enchantee.yml
index 8ff6b967a..6fad1973e 100644
--- a/data/cities/saint-romain-la-motte/la-baguette-enchantee.yml
+++ b/data/cities/saint-romain-la-motte/la-baguette-enchantee.yml
@@ -4,8 +4,8 @@ latitude: 46.08468
 longitude: 3.98293
 postcode: "42640"
 city: Saint-Romain-la-Motte
-street: "Rue de Trébande"
-housenumber: 110
+street: Rue de Trébande
+housenumber: "110"
 phone: "+33477645329"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-romain-la-motte/la-ferme-deal.yml b/data/cities/saint-romain-la-motte/la-ferme-deal.yml
index 3992c0a5b..b3170814d 100644
--- a/data/cities/saint-romain-la-motte/la-ferme-deal.yml
+++ b/data/cities/saint-romain-la-motte/la-ferme-deal.yml
@@ -1,11 +1,11 @@
 id: 155891602
-type: way
+type: node
 latitude: 46.08213
 longitude: 3.96373
 postcode: "42640"
 city: Saint-Romain-la-Motte
-street: "Chemin de la Roche"
-housenumber: 285
-phone: "+33 477645096"
-opening_hours: "Mo-Sa 09:00-11:30,17:00-19:00; Su 09:00-11:30; PH closed"
-website: ""
\ No newline at end of file
+street: Chemin de la Roche
+housenumber: "285"
+phone: +33 477645096
+opening_hours: Mo-Sa 09:00-11:30,17:00-19:00; Su 09:00-11:30; PH closed
+website: ""
diff --git a/data/cities/saint-romain-la-motte/terre-de-fleurs.yml b/data/cities/saint-romain-la-motte/terre-de-fleurs.yml
index ebef1fea8..fbe01da73 100644
--- a/data/cities/saint-romain-la-motte/terre-de-fleurs.yml
+++ b/data/cities/saint-romain-la-motte/terre-de-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 46.08454
 longitude: 3.98335
 postcode: "42640"
 city: Saint-Romain-la-Motte
-street: "Rue de Trébande"
-housenumber: 148
+street: Rue de Trébande
+housenumber: "148"
 phone: "+33477648837"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-romain-le-puy/latelier-du-velo-electrique.yml b/data/cities/saint-romain-le-puy/latelier-du-velo-electrique.yml
index 74d9246fd..02d0ea18c 100644
--- a/data/cities/saint-romain-le-puy/latelier-du-velo-electrique.yml
+++ b/data/cities/saint-romain-le-puy/latelier-du-velo-electrique.yml
@@ -4,8 +4,8 @@ latitude: 45.55453
 longitude: 4.15576
 postcode: "42610"
 city: Saint-Romain-le-Puy
-street: "Zone d'Activité des Epalits"
-housenumber: 
-phone: "+33 6 52 87 10 38"
+street: Zone d'Activité des Epalits
+housenumber: ""
+phone: +33 6 52 87 10 38
 opening_hours: ""
-website: "https://latelierduveloelectrique.com/"
\ No newline at end of file
+website: https://latelierduveloelectrique.com/
diff --git a/data/cities/saint-sauveur-de-cruzieres/victoria-per-cor-la-micro-ferm.yml b/data/cities/saint-sauveur-de-cruzieres/victoria-per-cor-la-micro-ferm.yml
index c9325182b..650997092 100644
--- a/data/cities/saint-sauveur-de-cruzieres/victoria-per-cor-la-micro-ferm.yml
+++ b/data/cities/saint-sauveur-de-cruzieres/victoria-per-cor-la-micro-ferm.yml
@@ -4,8 +4,8 @@ latitude: 44.31175
 longitude: 4.27595
 postcode: "07460"
 city: Saint-Sauveur-de-Cruzières
-street: "Le Mas de Dujau"
-housenumber: 
-phone: "07 86 25 19 53"
+street: Le Mas de Dujau
+housenumber: ""
+phone: 07 86 25 19 53
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-sauveur-de-montagut/carrefour-contact.yml b/data/cities/saint-sauveur-de-montagut/carrefour-contact.yml
index a3827bdfc..2bf1d6df8 100644
--- a/data/cities/saint-sauveur-de-montagut/carrefour-contact.yml
+++ b/data/cities/saint-sauveur-de-montagut/carrefour-contact.yml
@@ -1,11 +1,11 @@
 id: 171377024
-type: way
+type: node
 latitude: 44.82143
 longitude: 4.58483
 postcode: "07190"
 city: Saint-sauveur de montagut
-street: "Grande Rue"
-housenumber: 64
-phone: "+33 4 75 30 06 46"
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-20:00"
-website: "https://www.carrefour.fr/magasin/contact-saint-sauveur-de-montagut"
\ No newline at end of file
+street: Grande Rue
+housenumber: "64"
+phone: +33 4 75 30 06 46
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-20:00
+website: https://www.carrefour.fr/magasin/contact-saint-sauveur-de-montagut
diff --git a/data/cities/saint-sauveur/boulangerie-marie-praline.yml b/data/cities/saint-sauveur/boulangerie-marie-praline.yml
index ee54c9375..c6e53a33e 100644
--- a/data/cities/saint-sauveur/boulangerie-marie-praline.yml
+++ b/data/cities/saint-sauveur/boulangerie-marie-praline.yml
@@ -4,8 +4,8 @@ latitude: 45.15826
 longitude: 5.33357
 postcode: "38160"
 city: Saint-Sauveur
-street: "Route Grenoble"
-housenumber: 41
+street: Route Grenoble
+housenumber: "41"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-sauveur/mister-bed.yml b/data/cities/saint-sauveur/mister-bed.yml
index d7fb04088..2800ec6c3 100644
--- a/data/cities/saint-sauveur/mister-bed.yml
+++ b/data/cities/saint-sauveur/mister-bed.yml
@@ -4,8 +4,8 @@ latitude: 45.15844
 longitude: 5.33354
 postcode: "38160"
 city: Saint-Sauveur
-street: "Route de grenoble"
-housenumber: 43
+street: Route de Grenoble
+housenumber: "43"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-sauveur/yggor.yml b/data/cities/saint-sauveur/yggor.yml
index 4ad8d95ad..094e7ee6f 100644
--- a/data/cities/saint-sauveur/yggor.yml
+++ b/data/cities/saint-sauveur/yggor.yml
@@ -4,8 +4,8 @@ latitude: 45.15806
 longitude: 5.33552
 postcode: "38160"
 city: Saint-Sauveur
-street: "Rue des Lavandes"
-housenumber: 868
+street: Rue des Lavandes
+housenumber: "868"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-sorlin-darves/intersport.yml b/data/cities/saint-sorlin-darves/intersport.yml
index fe6641ae2..a4f9b581f 100644
--- a/data/cities/saint-sorlin-darves/intersport.yml
+++ b/data/cities/saint-sorlin-darves/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.22945
 postcode: "73530"
 city: Saint-Sorlin-d'Arves
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-symphorien-dozon/la-maison-verte-route-de-corbas.yml b/data/cities/saint-symphorien-dozon/la-maison-verte-route-de-corbas.yml
index 87cdfefc0..5a3e4d0a4 100644
--- a/data/cities/saint-symphorien-dozon/la-maison-verte-route-de-corbas.yml
+++ b/data/cities/saint-symphorien-dozon/la-maison-verte-route-de-corbas.yml
@@ -4,8 +4,8 @@ latitude: 45.64741
 longitude: 4.89171
 postcode: "69360"
 city: Saint-Symphorien-d'Ozon
-street: "Route de Corbas"
-housenumber: 2500
+street: Route de Corbas
+housenumber: "2500"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00 14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00 14:00-18:30
+website: ""
diff --git a/data/cities/saint-symphorien-dozon/la-maison-verte.yml b/data/cities/saint-symphorien-dozon/la-maison-verte.yml
index 150e2398b..161c3c81f 100644
--- a/data/cities/saint-symphorien-dozon/la-maison-verte.yml
+++ b/data/cities/saint-symphorien-dozon/la-maison-verte.yml
@@ -4,8 +4,8 @@ latitude: 45.64363
 longitude: 4.88664
 postcode: "69360"
 city: Saint Symphorien d'ozon
-street: "Route de Corbas"
-housenumber: 1750
+street: Route de Corbas
+housenumber: "1750"
 phone: ""
-opening_hours: "Mo-Su 08:00-12:00,13:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-12:00,13:30-18:00
+website: ""
diff --git a/data/cities/saint-symphorien-dozon/laetitia-coiffure.yml b/data/cities/saint-symphorien-dozon/laetitia-coiffure.yml
index 5ff0fbd11..ee2a20420 100644
--- a/data/cities/saint-symphorien-dozon/laetitia-coiffure.yml
+++ b/data/cities/saint-symphorien-dozon/laetitia-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.63416
 longitude: 4.85891
 postcode: "69360"
 city: Saint-Symphorien-d'Ozon
-street: "Avenue du Champ de Mars"
-housenumber: 30
+street: Avenue du Champ de Mars
+housenumber: "30"
 phone: ""
-opening_hours: "09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: 09:00-19:00
+website: ""
diff --git a/data/cities/saint-symphorien-dozon/nels-moto-69.yml b/data/cities/saint-symphorien-dozon/nels-moto-69.yml
index 0164e5013..566277921 100644
--- a/data/cities/saint-symphorien-dozon/nels-moto-69.yml
+++ b/data/cities/saint-symphorien-dozon/nels-moto-69.yml
@@ -5,7 +5,7 @@ longitude: 4.85983
 postcode: ""
 city: Saint-Symphorien-d'Ozon
 street: ""
-housenumber: 1
-phone: "+33 4 78 02 80 57"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: "1"
+phone: +33 4 78 02 80 57
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/a-et-c-automobiles-renault.yml b/data/cities/saint-symphorien-sur-coise/a-et-c-automobiles-renault.yml
index 95d07bc13..d07317508 100644
--- a/data/cities/saint-symphorien-sur-coise/a-et-c-automobiles-renault.yml
+++ b/data/cities/saint-symphorien-sur-coise/a-et-c-automobiles-renault.yml
@@ -5,7 +5,7 @@ longitude: 4.43518
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
 street: ""
-housenumber: 
+housenumber: ""
 phone: "+33478484141"
-opening_hours: "Mo-Fr 08:00-12:00,13:30-19:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,13:30-19:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/ad-garage-g-f-r-auto.yml b/data/cities/saint-symphorien-sur-coise/ad-garage-g-f-r-auto.yml
index 952730986..b47f8f819 100644
--- a/data/cities/saint-symphorien-sur-coise/ad-garage-g-f-r-auto.yml
+++ b/data/cities/saint-symphorien-sur-coise/ad-garage-g-f-r-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.63117
 longitude: 4.44211
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "ZI de Clérimbert"
-housenumber: 1
+street: ZI de Clérimbert
+housenumber: "1"
 phone: "+33478444334"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00"
-website: "https://ad.fr/garage/garage-ad-expert-gfr-auto"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00
+website: https://ad.fr/garage/garage-ad-expert-gfr-auto
diff --git a/data/cities/saint-symphorien-sur-coise/au-diablotin.yml b/data/cities/saint-symphorien-sur-coise/au-diablotin.yml
index 707a94498..e7c2eda46 100644
--- a/data/cities/saint-symphorien-sur-coise/au-diablotin.yml
+++ b/data/cities/saint-symphorien-sur-coise/au-diablotin.yml
@@ -4,8 +4,8 @@ latitude: 45.63159
 longitude: 4.45515
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue Centrale"
-housenumber: 30
+street: Rue Centrale
+housenumber: "30"
 phone: "+33478484408"
-opening_hours: "Tu-Fr 06:15-19:00; Sa 06:30-12:30,15:00-19:00; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:15-19:00; Sa 06:30-12:30,15:00-19:00; Su 06:30-13:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/audiopros.yml b/data/cities/saint-symphorien-sur-coise/audiopros.yml
index 7453e7d33..c053c5acf 100644
--- a/data/cities/saint-symphorien-sur-coise/audiopros.yml
+++ b/data/cities/saint-symphorien-sur-coise/audiopros.yml
@@ -4,8 +4,8 @@ latitude: 45.63256
 longitude: 4.45534
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place du Marché"
-housenumber: 39
+street: Place du Marché
+housenumber: "39"
 phone: "+33985195787"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:00; We 08:30-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:00; We 08:30-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/berne-fleurs.yml b/data/cities/saint-symphorien-sur-coise/berne-fleurs.yml
index baba26e40..a3066348c 100644
--- a/data/cities/saint-symphorien-sur-coise/berne-fleurs.yml
+++ b/data/cities/saint-symphorien-sur-coise/berne-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.63245
 longitude: 4.45626
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Grande Rue"
-housenumber: 84
+street: Grande Rue
+housenumber: "84"
 phone: "+33478445057"
-opening_hours: "Tu-Sa 08:30-12:00,14:30-19:00; Th 08:30-12:00,14:00-17:00; Su 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-12:00,14:30-19:00; Th 08:30-12:00,14:00-17:00; Su 08:30-12:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/bigmat.yml b/data/cities/saint-symphorien-sur-coise/bigmat.yml
index 5605189a3..77a1146ab 100644
--- a/data/cities/saint-symphorien-sur-coise/bigmat.yml
+++ b/data/cities/saint-symphorien-sur-coise/bigmat.yml
@@ -4,8 +4,8 @@ latitude: 45.63071
 longitude: 4.43593
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue du Forez"
-housenumber: 1685
+street: Avenue du Forez
+housenumber: "1685"
 phone: "+33478445950"
-opening_hours: "Mo-Fr 07:30-12:00,13:30-18:30; Sa 08:00-12:00"
-website: "http://www.bigmatsagra.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:00,13:30-18:30; Sa 08:00-12:00
+website: http://www.bigmatsagra.fr
diff --git a/data/cities/saint-symphorien-sur-coise/bijouterie-laperouse.yml b/data/cities/saint-symphorien-sur-coise/bijouterie-laperouse.yml
index 240559ab0..0d107f95c 100644
--- a/data/cities/saint-symphorien-sur-coise/bijouterie-laperouse.yml
+++ b/data/cities/saint-symphorien-sur-coise/bijouterie-laperouse.yml
@@ -4,8 +4,8 @@ latitude: 45.63224
 longitude: 4.4565
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place des Terreaux"
-housenumber: 30
+street: Place des Terreaux
+housenumber: "30"
 phone: "+33478484184"
-opening_hours: "Tu-Sa 09:00-12:00,14:30-19:00"
-website: "https://www.bijouterie-laperouse.com"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:30-19:00
+website: https://www.bijouterie-laperouse.com
diff --git a/data/cities/saint-symphorien-sur-coise/bleu-charrette.yml b/data/cities/saint-symphorien-sur-coise/bleu-charrette.yml
index b8e6e2988..23c7b3a2b 100644
--- a/data/cities/saint-symphorien-sur-coise/bleu-charrette.yml
+++ b/data/cities/saint-symphorien-sur-coise/bleu-charrette.yml
@@ -4,8 +4,8 @@ latitude: 45.63106
 longitude: 4.45579
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue Pierre Catherin Anier"
-housenumber: 95
-phone: "+339 86 46 97 14"
-opening_hours: "We,Sa 09:00-12:00; Th 15:00-19:00"
-website: "https://bleucharrette.fr/lepicerie/"
\ No newline at end of file
+street: Rue Pierre Catherin Anier
+housenumber: "95"
+phone: +339 86 46 97 14
+opening_hours: We,Sa 09:00-12:00; Th 15:00-19:00
+website: https://bleucharrette.fr/lepicerie/
diff --git a/data/cities/saint-symphorien-sur-coise/boreal.yml b/data/cities/saint-symphorien-sur-coise/boreal.yml
index de18f8727..dce31324b 100644
--- a/data/cities/saint-symphorien-sur-coise/boreal.yml
+++ b/data/cities/saint-symphorien-sur-coise/boreal.yml
@@ -4,8 +4,8 @@ latitude: 45.6328
 longitude: 4.45763
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue de la Libération"
-housenumber: 72
+street: Avenue de la Libération
+housenumber: "72"
 phone: "+33478443591"
 opening_hours: ""
-website: "https://www.boreal-verandas.com/"
\ No newline at end of file
+website: https://www.boreal-verandas.com/
diff --git a/data/cities/saint-symphorien-sur-coise/brasserie-des-terreaux.yml b/data/cities/saint-symphorien-sur-coise/brasserie-des-terreaux.yml
index cc0bfb34a..d5015b412 100644
--- a/data/cities/saint-symphorien-sur-coise/brasserie-des-terreaux.yml
+++ b/data/cities/saint-symphorien-sur-coise/brasserie-des-terreaux.yml
@@ -4,8 +4,8 @@ latitude: 45.63202
 longitude: 4.45681
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place des Terreaux"
-housenumber: 51
+street: Place des Terreaux
+housenumber: "51"
 phone: "+33478519480"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/buisson-fleurs.yml b/data/cities/saint-symphorien-sur-coise/buisson-fleurs.yml
index 79da40afd..a0e9a291a 100644
--- a/data/cities/saint-symphorien-sur-coise/buisson-fleurs.yml
+++ b/data/cities/saint-symphorien-sur-coise/buisson-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.6309
 longitude: 4.45568
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place de la République"
-housenumber: 3
+street: Place de la République
+housenumber: "3"
 phone: "+33478190018"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/carrefour-market.yml b/data/cities/saint-symphorien-sur-coise/carrefour-market.yml
index a3df0f52c..524757289 100644
--- a/data/cities/saint-symphorien-sur-coise/carrefour-market.yml
+++ b/data/cities/saint-symphorien-sur-coise/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 45.63582
 longitude: 4.46193
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue Emmanuel Clément"
-housenumber: 182
-phone: "+33 4 78 44 48 45"
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:00"
-website: "https://www.carrefour.fr/magasin/market-saint-symphorien-sur-coise"
\ No newline at end of file
+street: Avenue Emmanuel Clément
+housenumber: "182"
+phone: +33 4 78 44 48 45
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:00
+website: https://www.carrefour.fr/magasin/market-saint-symphorien-sur-coise
diff --git a/data/cities/saint-symphorien-sur-coise/cochonou-magasin-detail.yml b/data/cities/saint-symphorien-sur-coise/cochonou-magasin-detail.yml
index bd23b309e..aa5c4bb1c 100644
--- a/data/cities/saint-symphorien-sur-coise/cochonou-magasin-detail.yml
+++ b/data/cities/saint-symphorien-sur-coise/cochonou-magasin-detail.yml
@@ -4,8 +4,9 @@ latitude: 45.63243
 longitude: 4.45594
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Grande Rue"
+street: Grande Rue
 housenumber: 55-59
 phone: "+33478484231"
-opening_hours: "Tu,Th 09:00-12:00,15:00-18:30; We 08:00-18:00; Fr 09:00-12:30,15:00-18:30; Sa 08:00-12:30,15:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu,Th 09:00-12:00,15:00-18:30; We 08:00-18:00; Fr 09:00-12:30,15:00-18:30;
+    Sa 08:00-12:30,15:00-18:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/cochonou.yml b/data/cities/saint-symphorien-sur-coise/cochonou.yml
index bb368dadb..063c61c74 100644
--- a/data/cities/saint-symphorien-sur-coise/cochonou.yml
+++ b/data/cities/saint-symphorien-sur-coise/cochonou.yml
@@ -4,8 +4,8 @@ latitude: 45.63216
 longitude: 4.43891
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue du Forez"
-housenumber: 
+street: Avenue du Forez
+housenumber: ""
 phone: "+33478874000"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/cote-zen-esthetique.yml b/data/cities/saint-symphorien-sur-coise/cote-zen-esthetique.yml
index 542e7c049..0ed8b02f0 100644
--- a/data/cities/saint-symphorien-sur-coise/cote-zen-esthetique.yml
+++ b/data/cities/saint-symphorien-sur-coise/cote-zen-esthetique.yml
@@ -4,8 +4,8 @@ latitude: 45.63074
 longitude: 4.45793
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du 11 Novembre"
-housenumber: 202
+street: Boulevard du 11 Novembre
+housenumber: "202"
 phone: "+33478442867"
-opening_hours: "Tu,We 08:30-19:00; Th 08:30-18:00; Fr 08:30-19:00; Sa 08:00-16:00"
-website: "https://www.symbiose-cotezen.fr/"
\ No newline at end of file
+opening_hours: Tu,We 08:30-19:00; Th 08:30-18:00; Fr 08:30-19:00; Sa 08:00-16:00
+website: https://www.symbiose-cotezen.fr/
diff --git a/data/cities/saint-symphorien-sur-coise/de-la-truffe-a-la-griffe.yml b/data/cities/saint-symphorien-sur-coise/de-la-truffe-a-la-griffe.yml
index 3386e1160..9772a7e41 100644
--- a/data/cities/saint-symphorien-sur-coise/de-la-truffe-a-la-griffe.yml
+++ b/data/cities/saint-symphorien-sur-coise/de-la-truffe-a-la-griffe.yml
@@ -4,8 +4,9 @@ latitude: 45.63256
 longitude: 4.45656
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 12
+street: Rue de Lyon
+housenumber: "12"
 phone: "+33668661984"
-opening_hours: "Mo 14:00-19:00; Tu,Fr 09:00-12:00,14:00-19:00; We 09:00-18:30; Th,Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu,Fr 09:00-12:00,14:00-19:00; We 09:00-18:30; Th,Sa
+    09:00-12:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/edouard-beckert.yml b/data/cities/saint-symphorien-sur-coise/edouard-beckert.yml
index 81847db74..576254dd7 100644
--- a/data/cities/saint-symphorien-sur-coise/edouard-beckert.yml
+++ b/data/cities/saint-symphorien-sur-coise/edouard-beckert.yml
@@ -4,8 +4,8 @@ latitude: 45.63122
 longitude: 4.44314
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Côteau de Clérimbert"
-housenumber: 172
+street: Côteau de Clérimbert
+housenumber: "172"
 phone: "+33478484264"
 opening_hours: ""
-website: "https://www.antiquaire-edouard-beckert.com"
\ No newline at end of file
+website: https://www.antiquaire-edouard-beckert.com
diff --git a/data/cities/saint-symphorien-sur-coise/garage-viricel-citroen.yml b/data/cities/saint-symphorien-sur-coise/garage-viricel-citroen.yml
index 541bd1710..c1adffb63 100644
--- a/data/cities/saint-symphorien-sur-coise/garage-viricel-citroen.yml
+++ b/data/cities/saint-symphorien-sur-coise/garage-viricel-citroen.yml
@@ -4,8 +4,8 @@ latitude: 45.63143
 longitude: 4.45842
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue André Loste"
-housenumber: 
+street: Rue André Loste
+housenumber: ""
 phone: "+33478484026"
-opening_hours: "Mo-Fr 07:00-12:00,13:30-19:00; Sa 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:00,13:30-19:00; Sa 08:00-12:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/gitem.yml b/data/cities/saint-symphorien-sur-coise/gitem.yml
index 43f99dd25..91b2f7069 100644
--- a/data/cities/saint-symphorien-sur-coise/gitem.yml
+++ b/data/cities/saint-symphorien-sur-coise/gitem.yml
@@ -4,8 +4,8 @@ latitude: 45.63229
 longitude: 4.45633
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 31
+street: Rue de Lyon
+housenumber: "31"
 phone: "+33478484194"
-opening_hours: "Tu-Sa 08:30-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:30-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/gm-pneus-vianor.yml b/data/cities/saint-symphorien-sur-coise/gm-pneus-vianor.yml
index 68a945f8a..90ed5e822 100644
--- a/data/cities/saint-symphorien-sur-coise/gm-pneus-vianor.yml
+++ b/data/cities/saint-symphorien-sur-coise/gm-pneus-vianor.yml
@@ -4,8 +4,8 @@ latitude: 45.63059
 longitude: 4.43677
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Traverse du Colombier"
-housenumber: 7
+street: Traverse du Colombier
+housenumber: "7"
 phone: "+33472245039"
 opening_hours: ""
-website: "http://vianor.fr/points-de-vente/vianor-st-symphorien-coise--gm-pneus/"
\ No newline at end of file
+website: http://vianor.fr/points-de-vente/vianor-st-symphorien-coise--gm-pneus/
diff --git a/data/cities/saint-symphorien-sur-coise/imaginhair.yml b/data/cities/saint-symphorien-sur-coise/imaginhair.yml
index 550b7c844..9c5d699e8 100644
--- a/data/cities/saint-symphorien-sur-coise/imaginhair.yml
+++ b/data/cities/saint-symphorien-sur-coise/imaginhair.yml
@@ -4,8 +4,8 @@ latitude: 45.63179
 longitude: 4.45496
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place du Marché"
-housenumber: 143
+street: Place du Marché
+housenumber: "143"
 phone: "+33478484188"
-opening_hours: "Tu 09:00-12:00,14:00-18:00; We 08:00-18:30; Th,Fr 08:00-19:00; Sa 07:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 09:00-12:00,14:00-18:00; We 08:00-18:30; Th,Fr 08:00-19:00; Sa 07:00-17:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/joueclub.yml b/data/cities/saint-symphorien-sur-coise/joueclub.yml
index ce48faaee..b5731ea74 100644
--- a/data/cities/saint-symphorien-sur-coise/joueclub.yml
+++ b/data/cities/saint-symphorien-sur-coise/joueclub.yml
@@ -4,8 +4,8 @@ latitude: 45.6284
 longitude: 4.44367
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue du Forez"
-housenumber: 903
+street: Avenue du Forez
+housenumber: "903"
 phone: "+33478190621"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/justun-regard.yml b/data/cities/saint-symphorien-sur-coise/justun-regard.yml
index 47cc38c51..001f90da2 100644
--- a/data/cities/saint-symphorien-sur-coise/justun-regard.yml
+++ b/data/cities/saint-symphorien-sur-coise/justun-regard.yml
@@ -4,8 +4,8 @@ latitude: 45.63222
 longitude: 4.45539
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place du Mézel"
-housenumber: 43
+street: Place du Mézel
+housenumber: "43"
 phone: "+33478445304"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00"
-website: "https://justunregard.com/magasins/opticien-saint-symphorien-coise/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00
+website: https://justunregard.com/magasins/opticien-saint-symphorien-coise/
diff --git a/data/cities/saint-symphorien-sur-coise/kia-ora-tattoo.yml b/data/cities/saint-symphorien-sur-coise/kia-ora-tattoo.yml
index 0582d46fb..1ef1d6435 100644
--- a/data/cities/saint-symphorien-sur-coise/kia-ora-tattoo.yml
+++ b/data/cities/saint-symphorien-sur-coise/kia-ora-tattoo.yml
@@ -4,8 +4,8 @@ latitude: 45.63231
 longitude: 4.4561
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 54
+street: Rue de Lyon
+housenumber: "54"
 phone: "+33643942403"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/la-belle-epoque.yml b/data/cities/saint-symphorien-sur-coise/la-belle-epoque.yml
index 0e9d95f6d..92dfc4394 100644
--- a/data/cities/saint-symphorien-sur-coise/la-belle-epoque.yml
+++ b/data/cities/saint-symphorien-sur-coise/la-belle-epoque.yml
@@ -4,8 +4,8 @@ latitude: 45.63242
 longitude: 4.45497
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place du Marché"
-housenumber: 64
+street: Place du Marché
+housenumber: "64"
 phone: "+33426554671"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/la-boulangerie-du-coin.yml b/data/cities/saint-symphorien-sur-coise/la-boulangerie-du-coin.yml
index 45718a7a9..4281acfc3 100644
--- a/data/cities/saint-symphorien-sur-coise/la-boulangerie-du-coin.yml
+++ b/data/cities/saint-symphorien-sur-coise/la-boulangerie-du-coin.yml
@@ -4,8 +4,8 @@ latitude: 45.63041
 longitude: 4.45753
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du 11 Novembre"
-housenumber: 160
+street: Boulevard du 11 Novembre
+housenumber: "160"
 phone: "+33478565045"
-opening_hours: "Mo-Fr 05:30-19:00; Sa 06:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 05:30-19:00; Sa 06:00-13:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/la-chocolaterie.yml b/data/cities/saint-symphorien-sur-coise/la-chocolaterie.yml
index 7285da7cf..4925f7955 100644
--- a/data/cities/saint-symphorien-sur-coise/la-chocolaterie.yml
+++ b/data/cities/saint-symphorien-sur-coise/la-chocolaterie.yml
@@ -4,8 +4,8 @@ latitude: 45.6321
 longitude: 4.45547
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place du Mézel"
-housenumber: 17
+street: Place du Mézel
+housenumber: "17"
 phone: "+33973294752"
-opening_hours: "Tu-Fr 09:00-12:15,14:30-19:00; Sa 09:00-12:15,14:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:15,14:30-19:00; Sa 09:00-12:15,14:30-18:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/la-rosee-du-matin.yml b/data/cities/saint-symphorien-sur-coise/la-rosee-du-matin.yml
index 816dab064..6f677c7bc 100644
--- a/data/cities/saint-symphorien-sur-coise/la-rosee-du-matin.yml
+++ b/data/cities/saint-symphorien-sur-coise/la-rosee-du-matin.yml
@@ -4,8 +4,8 @@ latitude: 45.63234
 longitude: 4.45494
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place du Marché"
-housenumber: 74
+street: Place du Marché
+housenumber: "74"
 phone: "+33478814072"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; We 09:00-12:00; Sa 09:00-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; We 09:00-12:00; Sa 09:00-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/le-cinq-15.yml b/data/cities/saint-symphorien-sur-coise/le-cinq-15.yml
index df499193d..ca0d975ad 100644
--- a/data/cities/saint-symphorien-sur-coise/le-cinq-15.yml
+++ b/data/cities/saint-symphorien-sur-coise/le-cinq-15.yml
@@ -4,8 +4,9 @@ latitude: 45.63647
 longitude: 4.46244
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue Emmanuel Clément"
-housenumber: 240
+street: Avenue Emmanuel Clément
+housenumber: "240"
 phone: "+33472243786"
-opening_hours: "Mo 14:30-18:30; Tu,Fr 09:30-12:00,14:30-19:00; We 09:30-19:00; Th 10:00-12:00,15:00-19:00; Sa 09:30-12:30,14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:30-18:30; Tu,Fr 09:30-12:00,14:30-19:00; We 09:30-19:00; Th 10:00-12:00,15:00-19:00;
+    Sa 09:30-12:30,14:00-18:30
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/le-comptoir-des-saveurs.yml b/data/cities/saint-symphorien-sur-coise/le-comptoir-des-saveurs.yml
index 468f28806..f9e026767 100644
--- a/data/cities/saint-symphorien-sur-coise/le-comptoir-des-saveurs.yml
+++ b/data/cities/saint-symphorien-sur-coise/le-comptoir-des-saveurs.yml
@@ -4,8 +4,9 @@ latitude: 45.63214
 longitude: 4.45587
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 80
+street: Rue de Lyon
+housenumber: "80"
 phone: "+33478484216"
-opening_hours: "Tu,Fr 07:00-12:30,14:00-19:00; We 07:00-19:00; Th 07:00-12:30; Sa 07:00-12:30,14:00-18:00; Su 07:30-12:00"
-website: "https://comptoirdessaveurs-stsym.fr"
\ No newline at end of file
+opening_hours: Tu,Fr 07:00-12:30,14:00-19:00; We 07:00-19:00; Th 07:00-12:30; Sa 07:00-12:30,14:00-18:00;
+    Su 07:30-12:00
+website: https://comptoirdessaveurs-stsym.fr
diff --git a/data/cities/saint-symphorien-sur-coise/les-delices-du-fournil.yml b/data/cities/saint-symphorien-sur-coise/les-delices-du-fournil.yml
index a76a9601e..08abac2b8 100644
--- a/data/cities/saint-symphorien-sur-coise/les-delices-du-fournil.yml
+++ b/data/cities/saint-symphorien-sur-coise/les-delices-du-fournil.yml
@@ -4,8 +4,8 @@ latitude: 45.63209
 longitude: 4.45609
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 67
+street: Rue de Lyon
+housenumber: "67"
 phone: "+33478484289"
-opening_hours: "Mo-Sa 06:00-19:30; Th off; Su 06:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:30; Th off; Su 06:30-12:30
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/les-sens-des-mots.yml b/data/cities/saint-symphorien-sur-coise/les-sens-des-mots.yml
index a3375bd0b..9229939f5 100644
--- a/data/cities/saint-symphorien-sur-coise/les-sens-des-mots.yml
+++ b/data/cities/saint-symphorien-sur-coise/les-sens-des-mots.yml
@@ -4,8 +4,8 @@ latitude: 45.63256
 longitude: 4.45594
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Grande Rue"
-housenumber: 54
+street: Grande Rue
+housenumber: "54"
 phone: "+33478444199"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; Th 09:00-12:00; Sa 09:00-12:00,15:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; Th 09:00-12:00; Sa 09:00-12:00,15:00-18:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/librairie-de-derriere-les-fagots.yml b/data/cities/saint-symphorien-sur-coise/librairie-de-derriere-les-fagots.yml
index 55773036e..b3168e9b5 100644
--- a/data/cities/saint-symphorien-sur-coise/librairie-de-derriere-les-fagots.yml
+++ b/data/cities/saint-symphorien-sur-coise/librairie-de-derriere-les-fagots.yml
@@ -4,8 +4,9 @@ latitude: 45.63084
 longitude: 4.45701
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du 11 Novembre"
-housenumber: 181
+street: Boulevard du 11 Novembre
+housenumber: "181"
 phone: ""
-opening_hours: "Tu 15:00-19:00; We 09:30-12:30,15:00-18:30; Th 15:00-18:30; Fr 14:30-19:00; Sa 09:30-12:30"
-website: "https://librairie-dederrierelesfagots.fr/"
\ No newline at end of file
+opening_hours: Tu 15:00-19:00; We 09:30-12:30,15:00-18:30; Th 15:00-18:30; Fr 14:30-19:00;
+    Sa 09:30-12:30
+website: https://librairie-dederrierelesfagots.fr/
diff --git a/data/cities/saint-symphorien-sur-coise/lideal.yml b/data/cities/saint-symphorien-sur-coise/lideal.yml
index 41c055f1f..0d60134aa 100644
--- a/data/cities/saint-symphorien-sur-coise/lideal.yml
+++ b/data/cities/saint-symphorien-sur-coise/lideal.yml
@@ -4,8 +4,8 @@ latitude: 45.63631
 longitude: 4.46224
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue Emmanuel Clément"
-housenumber: 240
+street: Avenue Emmanuel Clément
+housenumber: "240"
 phone: "+33478191262"
-opening_hours: "Mo 14:30-18:30; Tu-Fr 09:30-12:00,14:30-19:00; Sa 09:30-12:00,14:30-18:30"
-website: "http://lidealboutique.fr/"
\ No newline at end of file
+opening_hours: Mo 14:30-18:30; Tu-Fr 09:30-12:00,14:30-19:00; Sa 09:30-12:00,14:30-18:30
+website: http://lidealboutique.fr/
diff --git a/data/cities/saint-symphorien-sur-coise/liness-coiffure.yml b/data/cities/saint-symphorien-sur-coise/liness-coiffure.yml
index abd78c8f9..3514a34f2 100644
--- a/data/cities/saint-symphorien-sur-coise/liness-coiffure.yml
+++ b/data/cities/saint-symphorien-sur-coise/liness-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.63161
 longitude: 4.45332
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du Docteur André Margot"
-housenumber: 154
+street: Boulevard du Docteur André Margot
+housenumber: "154"
 phone: "+33478484344"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/linstant-s.yml b/data/cities/saint-symphorien-sur-coise/linstant-s.yml
index 59b7983a9..1384904ec 100644
--- a/data/cities/saint-symphorien-sur-coise/linstant-s.yml
+++ b/data/cities/saint-symphorien-sur-coise/linstant-s.yml
@@ -4,8 +4,9 @@ latitude: 45.63221
 longitude: 4.4562
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 45
+street: Rue de Lyon
+housenumber: "45"
 phone: "+33478487622"
-opening_hours: "Mo 14:00-18:00; Tu-Fr 09:00-12:00,14:00-19:00; We 09:00-12:00,14:00-18:00; Sa 09:00-16:00"
-website: "https://www.linstants.com/"
\ No newline at end of file
+opening_hours: Mo 14:00-18:00; Tu-Fr 09:00-12:00,14:00-19:00; We 09:00-12:00,14:00-18:00;
+    Sa 09:00-16:00
+website: https://www.linstants.com/
diff --git a/data/cities/saint-symphorien-sur-coise/literie-davanie.yml b/data/cities/saint-symphorien-sur-coise/literie-davanie.yml
index 2d07da874..d6968c84b 100644
--- a/data/cities/saint-symphorien-sur-coise/literie-davanie.yml
+++ b/data/cities/saint-symphorien-sur-coise/literie-davanie.yml
@@ -4,8 +4,8 @@ latitude: 45.63182
 longitude: 4.45547
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue Symphorien Champier"
-housenumber: 20
+street: Rue Symphorien Champier
+housenumber: "20"
 phone: "+33616406034"
-opening_hours: "We,Sa 08:00-12:00"
-website: "https://literie-davanie.fr"
\ No newline at end of file
+opening_hours: We,Sa 08:00-12:00
+website: https://literie-davanie.fr
diff --git a/data/cities/saint-symphorien-sur-coise/lo-thentik-spa.yml b/data/cities/saint-symphorien-sur-coise/lo-thentik-spa.yml
index fab6ebc17..d724c7dfb 100644
--- a/data/cities/saint-symphorien-sur-coise/lo-thentik-spa.yml
+++ b/data/cities/saint-symphorien-sur-coise/lo-thentik-spa.yml
@@ -4,8 +4,8 @@ latitude: 45.63183
 longitude: 4.4563
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue Centrale"
-housenumber: 115
+street: Rue Centrale
+housenumber: "115"
 phone: "+33650218670"
-opening_hours: "We,Sa 10:00-12:00"
-website: "https://lothentikspa.fr/"
\ No newline at end of file
+opening_hours: We,Sa 10:00-12:00
+website: https://lothentikspa.fr/
diff --git a/data/cities/saint-symphorien-sur-coise/mondocar.yml b/data/cities/saint-symphorien-sur-coise/mondocar.yml
index 057ace362..68ee8b13d 100644
--- a/data/cities/saint-symphorien-sur-coise/mondocar.yml
+++ b/data/cities/saint-symphorien-sur-coise/mondocar.yml
@@ -4,8 +4,8 @@ latitude: 45.63134
 longitude: 4.4371
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue du Forez"
+street: Avenue du Forez
 housenumber: 1592E
 phone: "+33472305503"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00,14:00-17:00"
-website: "https://www.mondocar.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00,14:00-17:00
+website: https://www.mondocar.fr/
diff --git a/data/cities/saint-symphorien-sur-coise/nouvel-hair.yml b/data/cities/saint-symphorien-sur-coise/nouvel-hair.yml
index 1bc0b7749..7216f3a3a 100644
--- a/data/cities/saint-symphorien-sur-coise/nouvel-hair.yml
+++ b/data/cities/saint-symphorien-sur-coise/nouvel-hair.yml
@@ -4,8 +4,8 @@ latitude: 45.63243
 longitude: 4.4553
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place du Marché"
-housenumber: 53
+street: Place du Marché
+housenumber: "53"
 phone: "+33478190201"
-opening_hours: "Tu,Fr 08:30-18:30; We 08:30-12:00; Th 09:00-18:30; Sa 08:30-16:00"
-website: "https://nouvel-hair-vegetal.com/"
\ No newline at end of file
+opening_hours: Tu,Fr 08:30-18:30; We 08:30-12:00; Th 09:00-18:30; Sa 08:30-16:00
+website: https://nouvel-hair-vegetal.com/
diff --git a/data/cities/saint-symphorien-sur-coise/o-chat-gourmand.yml b/data/cities/saint-symphorien-sur-coise/o-chat-gourmand.yml
index 107d8cd40..75f6f95ea 100644
--- a/data/cities/saint-symphorien-sur-coise/o-chat-gourmand.yml
+++ b/data/cities/saint-symphorien-sur-coise/o-chat-gourmand.yml
@@ -4,8 +4,9 @@ latitude: 45.63222
 longitude: 4.45685
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place des Terreaux"
-housenumber: 29
+street: Place des Terreaux
+housenumber: "29"
 phone: "+33469607637"
-opening_hours: "Tu 16:00-19:00; We,Fr 09:00-12:00,14:30-19:00; Th 09:00-12:00,15:30-19:00; Sa 09:00-12:30,14:30-19:00; Su 10:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 16:00-19:00; We,Fr 09:00-12:00,14:30-19:00; Th 09:00-12:00,15:30-19:00;
+    Sa 09:00-12:30,14:30-19:00; Su 10:00-12:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/papeterie-des-hauts-du-lyonnais.yml b/data/cities/saint-symphorien-sur-coise/papeterie-des-hauts-du-lyonnais.yml
index 8f2007bd9..ffce13890 100644
--- a/data/cities/saint-symphorien-sur-coise/papeterie-des-hauts-du-lyonnais.yml
+++ b/data/cities/saint-symphorien-sur-coise/papeterie-des-hauts-du-lyonnais.yml
@@ -4,8 +4,8 @@ latitude: 45.63236
 longitude: 4.45614
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 48
+street: Rue de Lyon
+housenumber: "48"
 phone: "+33478445104"
-opening_hours: "Mo-Fr 06:15-12:15,14:00-19:15; Sa 06:30-12:30,14:30-19:15; Su 07:00-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:15-12:15,14:00-19:15; Sa 06:30-12:30,14:30-19:15; Su 07:00-12:15
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/passe-recompose.yml b/data/cities/saint-symphorien-sur-coise/passe-recompose.yml
index 17fc2d9f3..3ceb5aa97 100644
--- a/data/cities/saint-symphorien-sur-coise/passe-recompose.yml
+++ b/data/cities/saint-symphorien-sur-coise/passe-recompose.yml
@@ -4,8 +4,8 @@ latitude: 45.62828
 longitude: 4.44394
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Avenue du Forez"
-housenumber: 899
+street: Avenue du Forez
+housenumber: "899"
 phone: ""
 opening_hours: ""
-website: "https://www.atelier-passe-recompose.fr"
\ No newline at end of file
+website: https://www.atelier-passe-recompose.fr
diff --git a/data/cities/saint-symphorien-sur-coise/petit-casino.yml b/data/cities/saint-symphorien-sur-coise/petit-casino.yml
index e7a9785e9..e1f51a955 100644
--- a/data/cities/saint-symphorien-sur-coise/petit-casino.yml
+++ b/data/cities/saint-symphorien-sur-coise/petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.63142
 longitude: 4.45418
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de la Doue"
-housenumber: 11
+street: Rue de la Doue
+housenumber: "11"
 phone: "+33472669762"
-opening_hours: "Tu-Sa 08:00-12:15,15:00-19:00; Su 08:00-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-12:15,15:00-19:00; Su 08:00-12:15
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/quincaillerie-droguerie-menage.yml b/data/cities/saint-symphorien-sur-coise/quincaillerie-droguerie-menage.yml
index 39382b704..3a5c51bdb 100644
--- a/data/cities/saint-symphorien-sur-coise/quincaillerie-droguerie-menage.yml
+++ b/data/cities/saint-symphorien-sur-coise/quincaillerie-droguerie-menage.yml
@@ -4,8 +4,8 @@ latitude: 45.63251
 longitude: 4.45608
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Grande Rue"
-housenumber: 70
+street: Grande Rue
+housenumber: "70"
 phone: "+33478445795"
-opening_hours: "Mo-Sa 08:00-12:00,14:00-19:00"
-website: "https://www.quincaillerie-droguerie-menage.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:00,14:00-19:00
+website: https://www.quincaillerie-droguerie-menage.fr/
diff --git a/data/cities/saint-symphorien-sur-coise/recto-verso-decoration.yml b/data/cities/saint-symphorien-sur-coise/recto-verso-decoration.yml
index 9eba75d98..f595cf2fc 100644
--- a/data/cities/saint-symphorien-sur-coise/recto-verso-decoration.yml
+++ b/data/cities/saint-symphorien-sur-coise/recto-verso-decoration.yml
@@ -4,8 +4,8 @@ latitude: 45.63243
 longitude: 4.4566
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Place des Terreaux"
-housenumber: 2
+street: Place des Terreaux
+housenumber: "2"
 phone: "+33478444915"
-opening_hours: "Tu-Sa 09:30-12:00,14:30-18:30"
-website: "https://rectoverso-decoration.fr"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00,14:30-18:30
+website: https://rectoverso-decoration.fr
diff --git a/data/cities/saint-symphorien-sur-coise/ressourcerie-des-monts-du-lyonnais-magasin-saint-symphorien.yml b/data/cities/saint-symphorien-sur-coise/ressourcerie-des-monts-du-lyonnais-magasin-saint-symphorien.yml
index 124be2b64..e6395ccad 100644
--- a/data/cities/saint-symphorien-sur-coise/ressourcerie-des-monts-du-lyonnais-magasin-saint-symphorien.yml
+++ b/data/cities/saint-symphorien-sur-coise/ressourcerie-des-monts-du-lyonnais-magasin-saint-symphorien.yml
@@ -4,8 +4,8 @@ latitude: 45.63104
 longitude: 4.45707
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du 11 Novembre"
-housenumber: 181
-phone: "+33 487913030"
-opening_hours: "We 09:00-12:00; Fr 14:00-18:00; Sa 09:00-12:00"
-website: "https://ressourcerie-lebonplan.fr/"
\ No newline at end of file
+street: Boulevard du 11 Novembre
+housenumber: "181"
+phone: +33 487913030
+opening_hours: We 09:00-12:00; Fr 14:00-18:00; Sa 09:00-12:00
+website: https://ressourcerie-lebonplan.fr/
diff --git a/data/cities/saint-symphorien-sur-coise/station-service-avia.yml b/data/cities/saint-symphorien-sur-coise/station-service-avia.yml
index d99c1759a..5979ca604 100644
--- a/data/cities/saint-symphorien-sur-coise/station-service-avia.yml
+++ b/data/cities/saint-symphorien-sur-coise/station-service-avia.yml
@@ -4,8 +4,8 @@ latitude: 45.63094
 longitude: 4.4576
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du 11 Novembre"
-housenumber: 191
+street: Boulevard du 11 Novembre
+housenumber: "191"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/symbiose-coiffure.yml b/data/cities/saint-symphorien-sur-coise/symbiose-coiffure.yml
index 39ae3fc03..919d21fa4 100644
--- a/data/cities/saint-symphorien-sur-coise/symbiose-coiffure.yml
+++ b/data/cities/saint-symphorien-sur-coise/symbiose-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.63064
 longitude: 4.45786
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du 11 Novembre"
-housenumber: 202
+street: Boulevard du 11 Novembre
+housenumber: "202"
 phone: "+33478484520"
-opening_hours: "Tu-We 08:30-19:00; Th 08:30-18:00; Fr 08:30-20:00; Sa 07:30-17:00"
-website: "http://www.symbiose-cotezen.fr/index.php/contact-symbiose"
\ No newline at end of file
+opening_hours: Tu-We 08:30-19:00; Th 08:30-18:00; Fr 08:30-20:00; Sa 07:30-17:00
+website: http://www.symbiose-cotezen.fr/index.php/contact-symbiose
diff --git a/data/cities/saint-symphorien-sur-coise/tendre-passion.yml b/data/cities/saint-symphorien-sur-coise/tendre-passion.yml
index e2abfa791..b1007ac5f 100644
--- a/data/cities/saint-symphorien-sur-coise/tendre-passion.yml
+++ b/data/cities/saint-symphorien-sur-coise/tendre-passion.yml
@@ -4,8 +4,8 @@ latitude: 45.63215
 longitude: 4.45614
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue de Lyon"
-housenumber: 53
+street: Rue de Lyon
+housenumber: "53"
 phone: "+33478444788"
-opening_hours: "Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-19:00; Sa 09:00-12:00,14:30-18:00
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/tomme-et-bouchons.yml b/data/cities/saint-symphorien-sur-coise/tomme-et-bouchons.yml
index 1e478904a..1f8e2fa16 100644
--- a/data/cities/saint-symphorien-sur-coise/tomme-et-bouchons.yml
+++ b/data/cities/saint-symphorien-sur-coise/tomme-et-bouchons.yml
@@ -4,8 +4,8 @@ latitude: 45.63309
 longitude: 4.45596
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Rue des Maréchaux"
-housenumber: 15
+street: Rue des Maréchaux
+housenumber: "15"
 phone: "+33437228535"
-opening_hours: "Tu-Fr 09:00-12:00,15:00-19:00; Sa 08:30-12:00,15:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,15:00-19:00; Sa 08:30-12:00,15:30-18:30
+website: ""
diff --git a/data/cities/saint-symphorien-sur-coise/vue-dailleurs.yml b/data/cities/saint-symphorien-sur-coise/vue-dailleurs.yml
index da4b02b26..e9490248d 100644
--- a/data/cities/saint-symphorien-sur-coise/vue-dailleurs.yml
+++ b/data/cities/saint-symphorien-sur-coise/vue-dailleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.63083
 longitude: 4.45794
 postcode: "69590"
 city: Saint-Symphorien-sur-Coise
-street: "Boulevard du 11 Novembre"
-housenumber: 202
+street: Boulevard du 11 Novembre
+housenumber: "202"
 phone: "+33478194810"
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.vue-dailleurs.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: https://www.vue-dailleurs.fr/
diff --git a/data/cities/saint-thomas-en-royans/jacopain.yml b/data/cities/saint-thomas-en-royans/jacopain.yml
index cc1fcdb6f..a8c453c73 100644
--- a/data/cities/saint-thomas-en-royans/jacopain.yml
+++ b/data/cities/saint-thomas-en-royans/jacopain.yml
@@ -4,8 +4,8 @@ latitude: 45.04835
 longitude: 5.29499
 postcode: "26190"
 city: Saint-Thomas-en-Royans
-street: "Route du Vercors"
-housenumber: 140
+street: Route du Vercors
+housenumber: "140"
 phone: ""
 opening_hours: ""
-website: "https://www.jacopain.fr/"
\ No newline at end of file
+website: https://www.jacopain.fr/
diff --git a/data/cities/saint-verand/fabienne-coiffure.yml b/data/cities/saint-verand/fabienne-coiffure.yml
index ade0b84b5..1b8f10dcc 100644
--- a/data/cities/saint-verand/fabienne-coiffure.yml
+++ b/data/cities/saint-verand/fabienne-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.17373
 longitude: 5.3326
 postcode: "38160"
 city: Saint-Vérand
-street: "Le Village"
-housenumber: 440
-phone: "+33 4 76 36 13 87"
-opening_hours: "Mo-Th 08:30-18:30, Fr 08:00-18:30, Sa 08:00-16:30"
-website: ""
\ No newline at end of file
+street: Le Village
+housenumber: "440"
+phone: +33 4 76 36 13 87
+opening_hours: Mo-Th 08:30-18:30, Fr 08:00-18:30, Sa 08:00-16:30
+website: ""
diff --git a/data/cities/saint-verand/ferme-de-rossat.yml b/data/cities/saint-verand/ferme-de-rossat.yml
index 46a23587c..d00eaac47 100644
--- a/data/cities/saint-verand/ferme-de-rossat.yml
+++ b/data/cities/saint-verand/ferme-de-rossat.yml
@@ -4,8 +4,8 @@ latitude: 45.17109
 longitude: 5.36093
 postcode: "38160"
 city: Saint-Vérand
-street: "Chemin du Haut Rossat"
-housenumber: 915
-phone: "+33 4 76 64 15 02"
-opening_hours: "Fr 15:00-19:00; Sa 10:00-12h30"
-website: "https://www.fermederossat.fr/"
\ No newline at end of file
+street: Chemin du Haut Rossat
+housenumber: "915"
+phone: +33 4 76 64 15 02
+opening_hours: Fr 15:00-19:00; Sa 10:00-12h30
+website: https://www.fermederossat.fr/
diff --git a/data/cities/saint-verand/sensation-douce-heure.yml b/data/cities/saint-verand/sensation-douce-heure.yml
index d04dddf0a..215491814 100644
--- a/data/cities/saint-verand/sensation-douce-heure.yml
+++ b/data/cities/saint-verand/sensation-douce-heure.yml
@@ -4,8 +4,8 @@ latitude: 45.17429
 longitude: 5.33311
 postcode: "38160"
 city: Saint-Vérand
-street: "Le Clos des Rosiers"
-housenumber: 1
-phone: "+33 7 89 45 59 20"
+street: Le Clos des Rosiers
+housenumber: "1"
+phone: +33 7 89 45 59 20
 opening_hours: ""
-website: "https://sensationdouceheure.fr/"
\ No newline at end of file
+website: https://sensationdouceheure.fr/
diff --git a/data/cities/saint-vulbas/a-vos-viandes.yml b/data/cities/saint-vulbas/a-vos-viandes.yml
index 0745dda7a..6a207d3f0 100644
--- a/data/cities/saint-vulbas/a-vos-viandes.yml
+++ b/data/cities/saint-vulbas/a-vos-viandes.yml
@@ -4,8 +4,8 @@ latitude: 45.83326
 longitude: 5.29101
 postcode: "01150"
 city: Saint-Vulbas
-street: "Rue de Claires-Fontaines"
-housenumber: 797
-phone: "+33 9 51 10 08 67"
-opening_hours: "Tu-Sa 08:30-12:30,15:00-19:00"
-website: "https://www.avosviandes.fr/"
\ No newline at end of file
+street: Rue de Claires-Fontaines
+housenumber: "797"
+phone: +33 9 51 10 08 67
+opening_hours: Tu-Sa 08:30-12:30,15:00-19:00
+website: https://www.avosviandes.fr/
diff --git a/data/cities/saint-vulbas/latelier.yml b/data/cities/saint-vulbas/latelier.yml
index 03d270efc..c92682036 100644
--- a/data/cities/saint-vulbas/latelier.yml
+++ b/data/cities/saint-vulbas/latelier.yml
@@ -4,8 +4,8 @@ latitude: 45.83732
 longitude: 5.29374
 postcode: "01150"
 city: Saint-Vulbas
-street: "Rue de Claires-Fontaines"
-housenumber: 229
-phone: "+33 4 74 38 56 66"
-opening_hours: "Mo-Fr 04:00-18:15; Sa 04:00-12:30"
-website: ""
\ No newline at end of file
+street: Rue de Claires-Fontaines
+housenumber: "229"
+phone: +33 4 74 38 56 66
+opening_hours: Mo-Fr 04:00-18:15; Sa 04:00-12:30
+website: ""
diff --git a/data/cities/saint-vulbas/station-service-total.yml b/data/cities/saint-vulbas/station-service-total.yml
index efdfb92ee..d0ea1bbdf 100644
--- a/data/cities/saint-vulbas/station-service-total.yml
+++ b/data/cities/saint-vulbas/station-service-total.yml
@@ -1,11 +1,11 @@
 id: 142814962
-type: way
+type: node
 latitude: 45.83771
 longitude: 5.28649
 postcode: "01150"
 city: Saint-Vulbas
 street: ""
-housenumber: 140
+housenumber: "140"
 phone: ""
-opening_hours: "Mo-Fr 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-20:00
+website: ""
diff --git a/data/cities/saint-vulbas/total.yml b/data/cities/saint-vulbas/total.yml
index efc38a2c5..c0a0b53fe 100644
--- a/data/cities/saint-vulbas/total.yml
+++ b/data/cities/saint-vulbas/total.yml
@@ -1,11 +1,11 @@
 id: 142816171
-type: way
+type: node
 latitude: 45.83765
 longitude: 5.28659
 postcode: "01150"
 city: Saint-Vulbas
-street: "Avenue Charles de Gaulle"
-housenumber: 140
+street: Avenue Charles de Gaulle
+housenumber: "140"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/sainte-colombe-sur-gand/bistrot-des-colombes.yml b/data/cities/sainte-colombe-sur-gand/bistrot-des-colombes.yml
index 659b65c6c..d2b05283a 100644
--- a/data/cities/sainte-colombe-sur-gand/bistrot-des-colombes.yml
+++ b/data/cities/sainte-colombe-sur-gand/bistrot-des-colombes.yml
@@ -4,8 +4,8 @@ latitude: 45.87969
 longitude: 4.27437
 postcode: "42540"
 city: Sainte-Colombe-sur-Gand
-street: "Place de l'Église"
-housenumber: 26
-phone: "+33 9 54 66 92 71"
-opening_hours: "Mo-Su 08:00-14:00"
-website: ""
\ No newline at end of file
+street: Place de l'Église
+housenumber: "26"
+phone: +33 9 54 66 92 71
+opening_hours: Mo-Su 08:00-14:00
+website: ""
diff --git a/data/cities/sainte-colombe/boulangerie-patisserie-la-passerelle-gourmande-de-ste-colombe.yml b/data/cities/sainte-colombe/boulangerie-patisserie-la-passerelle-gourmande-de-ste-colombe.yml
index 8eede1d20..b8de6c81b 100644
--- a/data/cities/sainte-colombe/boulangerie-patisserie-la-passerelle-gourmande-de-ste-colombe.yml
+++ b/data/cities/sainte-colombe/boulangerie-patisserie-la-passerelle-gourmande-de-ste-colombe.yml
@@ -1,11 +1,11 @@
 id: 136822381
-type: way
+type: node
 latitude: 45.52568
 longitude: 4.86831
 postcode: "69560"
 city: Sainte-Colombe
 street: ""
-housenumber: 86
+housenumber: "86"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-consorce/boucherie-gacon.yml b/data/cities/sainte-consorce/boucherie-gacon.yml
index 188464631..abfcf9fc2 100644
--- a/data/cities/sainte-consorce/boucherie-gacon.yml
+++ b/data/cities/sainte-consorce/boucherie-gacon.yml
@@ -4,8 +4,8 @@ latitude: 45.77554
 longitude: 4.68991
 postcode: "69280"
 city: Sainte-Consorce
-street: "Rue Antoine Brun"
-housenumber: 6
+street: Rue Antoine Brun
+housenumber: "6"
 phone: "+33437226304"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-consorce/boulangerie-meurget.yml b/data/cities/sainte-consorce/boulangerie-meurget.yml
index 380c8cad6..4bff0ef7d 100644
--- a/data/cities/sainte-consorce/boulangerie-meurget.yml
+++ b/data/cities/sainte-consorce/boulangerie-meurget.yml
@@ -4,8 +4,8 @@ latitude: 45.77549
 longitude: 4.68981
 postcode: "69280"
 city: Sainte-Consorce
-street: "Rue Antoine Brun"
-housenumber: 6
+street: Rue Antoine Brun
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-eulalie/produits-bachasson.yml b/data/cities/sainte-eulalie/produits-bachasson.yml
index 4bef1b28f..692d6349d 100644
--- a/data/cities/sainte-eulalie/produits-bachasson.yml
+++ b/data/cities/sainte-eulalie/produits-bachasson.yml
@@ -4,8 +4,8 @@ latitude: 44.84027
 longitude: 4.20929
 postcode: "07510"
 city: Sainte-Eulalie
-street: "Route des sources"
-housenumber: 
-phone: "+33 4 75 87 27 82"
+street: Route des sources
+housenumber: ""
+phone: +33 4 75 87 27 82
 opening_hours: ""
-website: "https://www.produits-ardeche.com/"
\ No newline at end of file
+website: https://www.produits-ardeche.com/
diff --git a/data/cities/sainte-euphemie/le-pain-euphemien.yml b/data/cities/sainte-euphemie/le-pain-euphemien.yml
index e1bf4d88d..231f2e423 100644
--- a/data/cities/sainte-euphemie/le-pain-euphemien.yml
+++ b/data/cities/sainte-euphemie/le-pain-euphemien.yml
@@ -4,8 +4,8 @@ latitude: 45.9701
 longitude: 4.79942
 postcode: "01600"
 city: Sainte-Euphémie
-street: "Route d'Ars"
-housenumber: 405
+street: Route d'Ars
+housenumber: "405"
 phone: ""
-opening_hours: "Mo-Su 05:00-13:30,15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:00-13:30,15:00-19:00
+website: ""
diff --git a/data/cities/sainte-foy-largentiere/a-la-godasse.yml b/data/cities/sainte-foy-largentiere/a-la-godasse.yml
index 1a3efc318..cfcddd13d 100644
--- a/data/cities/sainte-foy-largentiere/a-la-godasse.yml
+++ b/data/cities/sainte-foy-largentiere/a-la-godasse.yml
@@ -4,8 +4,8 @@ latitude: 45.70948
 longitude: 4.46853
 postcode: "69610"
 city: Sainte-Foy-l'Argentière
-street: "Grande Rue"
-housenumber: 132
+street: Grande Rue
+housenumber: "132"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:30-18:30; Sa 09:00-12:00,14:30-17:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:30-18:30; Sa 09:00-12:00,14:30-17:30
+website: ""
diff --git a/data/cities/sainte-foy-largentiere/amazone.yml b/data/cities/sainte-foy-largentiere/amazone.yml
index d83392241..be8b3b85a 100644
--- a/data/cities/sainte-foy-largentiere/amazone.yml
+++ b/data/cities/sainte-foy-largentiere/amazone.yml
@@ -4,8 +4,8 @@ latitude: 45.70856
 longitude: 4.47339
 postcode: "69610"
 city: Sainte-Foy-l'Argentière
-street: "Grande Rue"
-housenumber: 
+street: Grande Rue
+housenumber: ""
 phone: "+33474261459"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-foy-largentiere/colruyt.yml b/data/cities/sainte-foy-largentiere/colruyt.yml
index 639ccbccc..7accbb2bd 100644
--- a/data/cities/sainte-foy-largentiere/colruyt.yml
+++ b/data/cities/sainte-foy-largentiere/colruyt.yml
@@ -4,8 +4,8 @@ latitude: 45.71154
 longitude: 4.47263
 postcode: "69610"
 city: Sainte-Foy-l'Argentière
-street: "Rue du Stade"
-housenumber: 11
+street: Rue du Stade
+housenumber: "11"
 phone: "+33478407345"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: "http://www.colruyt.fr/colruytfr/static/magasin.shtml#4882"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: http://www.colruyt.fr/colruytfr/static/magasin.shtml#4882
diff --git a/data/cities/sainte-foy-largentiere/garage-des-rossandes.yml b/data/cities/sainte-foy-largentiere/garage-des-rossandes.yml
index 0b6b7cf32..663cfbd80 100644
--- a/data/cities/sainte-foy-largentiere/garage-des-rossandes.yml
+++ b/data/cities/sainte-foy-largentiere/garage-des-rossandes.yml
@@ -1,11 +1,11 @@
 id: 148891362
-type: way
+type: node
 latitude: 45.7127
 longitude: 4.47484
 postcode: "69610"
 city: Sainte-Foy-l'Argentière
-street: "Route de Lyon"
-housenumber: 774
-phone: "+33 4 74 26 10 00"
-opening_hours: "Mo-Fr 07:30-12:30,13:30-19:00; Sa 08:30-12:00"
-website: "https://garagerossandes.fr/"
\ No newline at end of file
+street: Route de Lyon
+housenumber: "774"
+phone: +33 4 74 26 10 00
+opening_hours: Mo-Fr 07:30-12:30,13:30-19:00; Sa 08:30-12:00
+website: https://garagerossandes.fr/
diff --git a/data/cities/sainte-foy-largentiere/tiakochop.yml b/data/cities/sainte-foy-largentiere/tiakochop.yml
index 1bd95f4b8..f31e347a4 100644
--- a/data/cities/sainte-foy-largentiere/tiakochop.yml
+++ b/data/cities/sainte-foy-largentiere/tiakochop.yml
@@ -4,8 +4,8 @@ latitude: 45.71038
 longitude: 4.4689
 postcode: "69610"
 city: Sainte-Foy-l'Argentière
-street: "Grande Rue"
-housenumber: 45
-phone: "+33 6 41 03 29 03"
-opening_hours: "Tu-Sa 09:30-12:30,14:00-19:00"
-website: "https://tiakochop.sumup.link/"
\ No newline at end of file
+street: Grande Rue
+housenumber: "45"
+phone: +33 6 41 03 29 03
+opening_hours: Tu-Sa 09:30-12:30,14:00-19:00
+website: https://tiakochop.sumup.link/
diff --git a/data/cities/sainte-foy-les-lyon/auto-sainte-foy.yml b/data/cities/sainte-foy-les-lyon/auto-sainte-foy.yml
index f569d9e2c..1a4a50042 100644
--- a/data/cities/sainte-foy-les-lyon/auto-sainte-foy.yml
+++ b/data/cities/sainte-foy-les-lyon/auto-sainte-foy.yml
@@ -4,8 +4,8 @@ latitude: 45.7454
 longitude: 4.78665
 postcode: ""
 city: Sainte-Foy-lès-Lyon
-street: "Rue Commandant Charcot"
-housenumber: 113
+street: Rue Commandant Charcot
+housenumber: "113"
 phone: ""
 opening_hours: ""
-website: "https://www.allogarage.fr/garages/details-garage-AUTO-SAINTE-FOY-49305.html"
\ No newline at end of file
+website: https://www.allogarage.fr/garages/details-garage-AUTO-SAINTE-FOY-49305.html
diff --git a/data/cities/sainte-foy-les-lyon/la-caserne-des-pains.yml b/data/cities/sainte-foy-les-lyon/la-caserne-des-pains.yml
index 3016cbeeb..10aa7082b 100644
--- a/data/cities/sainte-foy-les-lyon/la-caserne-des-pains.yml
+++ b/data/cities/sainte-foy-les-lyon/la-caserne-des-pains.yml
@@ -4,8 +4,8 @@ latitude: 45.73422
 longitude: 4.78006
 postcode: "69110"
 city: Sainte-Foy-lès-Lyon
-street: "Avenue de Limburg"
-housenumber: 
+street: Avenue de Limburg
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-foy-tarentaise/intersport.yml b/data/cities/sainte-foy-tarentaise/intersport.yml
index ba198d5ae..c7aa99ecf 100644
--- a/data/cities/sainte-foy-tarentaise/intersport.yml
+++ b/data/cities/sainte-foy-tarentaise/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.8935
 postcode: "73640"
 city: Sainte-Foy-Tarentaise
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-foy-tarentaise/ski-republic.yml b/data/cities/sainte-foy-tarentaise/ski-republic.yml
index 5df1aac45..0b34329fe 100644
--- a/data/cities/sainte-foy-tarentaise/ski-republic.yml
+++ b/data/cities/sainte-foy-tarentaise/ski-republic.yml
@@ -5,7 +5,7 @@ longitude: 6.89407
 postcode: "73640"
 city: Sainte-Foy-Tarentaise
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-foy-tarentaise/skiset-sainte-foye-sports.yml b/data/cities/sainte-foy-tarentaise/skiset-sainte-foye-sports.yml
index 120694929..2377fb495 100644
--- a/data/cities/sainte-foy-tarentaise/skiset-sainte-foye-sports.yml
+++ b/data/cities/sainte-foy-tarentaise/skiset-sainte-foye-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.89409
 postcode: "73640"
 city: Sainte-Foy-Tarentaise
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.skiset.com/station-ski/sainte-foy-en-tarentaise/magasins/sainte-foy-sports-1"
\ No newline at end of file
+website: https://www.skiset.com/station-ski/sainte-foy-en-tarentaise/magasins/sainte-foy-sports-1
diff --git a/data/cities/sainte-helene-du-lac/laiterie-la-savoyarde.yml b/data/cities/sainte-helene-du-lac/laiterie-la-savoyarde.yml
index 02d65c237..760b941d2 100644
--- a/data/cities/sainte-helene-du-lac/laiterie-la-savoyarde.yml
+++ b/data/cities/sainte-helene-du-lac/laiterie-la-savoyarde.yml
@@ -5,7 +5,7 @@ longitude: 6.03745
 postcode: "73800"
 city: Sainte-Hélène-du-Lac
 street: ""
-housenumber: 90
-phone: "04 79 85 10 24"
+housenumber: "90"
+phone: 04 79 85 10 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sainte-helene-sur-isere/les-sens-des-alpes.yml b/data/cities/sainte-helene-sur-isere/les-sens-des-alpes.yml
index e77fa19e5..4f0fabe0f 100644
--- a/data/cities/sainte-helene-sur-isere/les-sens-des-alpes.yml
+++ b/data/cities/sainte-helene-sur-isere/les-sens-des-alpes.yml
@@ -5,7 +5,7 @@ longitude: 6.32611
 postcode: "73460"
 city: Sainte-Hélène-sur-Isère
 street: ""
-housenumber: 325
-phone: "+33(0)650015775"
+housenumber: "325"
+phone: +33(0)650015775
 opening_hours: ""
-website: "https://lessensdesalpes.fr"
\ No newline at end of file
+website: https://lessensdesalpes.fr
diff --git a/data/cities/sainte-jalle/coccimarket.yml b/data/cities/sainte-jalle/coccimarket.yml
index 036c23db7..bb60a7dfe 100644
--- a/data/cities/sainte-jalle/coccimarket.yml
+++ b/data/cities/sainte-jalle/coccimarket.yml
@@ -1,11 +1,11 @@
 id: 615388531
-type: way
+type: node
 latitude: 44.34238
 longitude: 5.28373
 postcode: "26110"
 city: Sainte Jalle
-street: "allée des platanes"
-housenumber: 235
+street: allée des platanes
+housenumber: "235"
 phone: "+33475273101"
-opening_hours: "Mo-Sa 08:30-12:30,15:00-19:00 / Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:30,15:00-19:00 / Su 08:30-12:30
+website: ""
diff --git a/data/cities/salaise-sur-sanne/action.yml b/data/cities/salaise-sur-sanne/action.yml
index 790a909b3..6f4983a22 100644
--- a/data/cities/salaise-sur-sanne/action.yml
+++ b/data/cities/salaise-sur-sanne/action.yml
@@ -5,7 +5,7 @@ longitude: 4.80429
 postcode: "38150"
 city: Salaise-sur-Sanne
 street: ""
-housenumber: 7
+housenumber: "7"
 phone: "+33155564152"
-opening_hours: "Mo-Sa 08:30-19:00"
-website: "https://www.action.com/fr-fr/points-de-vente/salaise-sur-sanne-avenue-plein-sud---parc-commercial-green/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:00
+website: https://www.action.com/fr-fr/points-de-vente/salaise-sur-sanne-avenue-plein-sud---parc-commercial-green/
diff --git a/data/cities/salaise-sur-sanne/decathlon.yml b/data/cities/salaise-sur-sanne/decathlon.yml
index 577a90331..11a218990 100644
--- a/data/cities/salaise-sur-sanne/decathlon.yml
+++ b/data/cities/salaise-sur-sanne/decathlon.yml
@@ -1,11 +1,11 @@
 id: 323897722
-type: way
+type: node
 latitude: 45.32786
 longitude: 4.80443
 postcode: "38150"
 city: Salaise-sur-Sanne
-street: "Avenue Plein Sud"
-housenumber: 
-phone: "+33 4 74 31 92 15"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-salaise-sur-sanne-0070072400724"
\ No newline at end of file
+street: Avenue Plein Sud
+housenumber: ""
+phone: +33 4 74 31 92 15
+opening_hours: Mo-Sa 09:00-19:30
+website: https://www.decathlon.fr/store-view/magasin-de-sports-salaise-sur-sanne-0070072400724
diff --git a/data/cities/salaise-sur-sanne/grand-frais.yml b/data/cities/salaise-sur-sanne/grand-frais.yml
index ff2da7953..2a83aa1ea 100644
--- a/data/cities/salaise-sur-sanne/grand-frais.yml
+++ b/data/cities/salaise-sur-sanne/grand-frais.yml
@@ -1,11 +1,11 @@
 id: 347257584
-type: way
+type: node
 latitude: 45.32632
 longitude: 4.80521
 postcode: "38150"
 city: Salaise-sur-Sanne
 street: ""
-housenumber: 11
-phone: "+33 4 74 54 09 24"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: "https://www.grandfrais.com/salaise-sur-sanne/magasin-179.html"
\ No newline at end of file
+housenumber: "11"
+phone: +33 4 74 54 09 24
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: https://www.grandfrais.com/salaise-sur-sanne/magasin-179.html
diff --git a/data/cities/salaise-sur-sanne/intersport-salaise-sur-sanne.yml b/data/cities/salaise-sur-sanne/intersport-salaise-sur-sanne.yml
index facf70a81..add109020 100644
--- a/data/cities/salaise-sur-sanne/intersport-salaise-sur-sanne.yml
+++ b/data/cities/salaise-sur-sanne/intersport-salaise-sur-sanne.yml
@@ -4,8 +4,8 @@ latitude: 45.34545
 longitude: 4.80482
 postcode: "38150"
 city: Salaise-sur-Sanne
-street: "zone du Jonchain"
-housenumber: 4
+street: Zone du Jonchain
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/salaise-sur-sanne/kiabi.yml b/data/cities/salaise-sur-sanne/kiabi.yml
index 49357d07d..6d449cb2d 100644
--- a/data/cities/salaise-sur-sanne/kiabi.yml
+++ b/data/cities/salaise-sur-sanne/kiabi.yml
@@ -1,11 +1,11 @@
 id: 323897718
-type: way
+type: node
 latitude: 45.32847
 longitude: 4.8048
 postcode: "38150"
 city: Salaise-sur-Sanne
-street: "Avenue Plein Sud"
-housenumber: 
+street: Avenue Plein Sud
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/salaise-sur-sanne/nca-et-associes.yml b/data/cities/salaise-sur-sanne/nca-et-associes.yml
index 9ed6e584e..e1d9be30b 100644
--- a/data/cities/salaise-sur-sanne/nca-et-associes.yml
+++ b/data/cities/salaise-sur-sanne/nca-et-associes.yml
@@ -4,8 +4,8 @@ latitude: 45.34242
 longitude: 4.80279
 postcode: "38150"
 city: Salaise-sur-Sanne
-street: "Rue DANIEL BALAVOINE"
-housenumber: 9
+street: Rue DANIEL BALAVOINE
+housenumber: "9"
 phone: ""
-opening_hours: "Mo 09:00-12:00, 14:00-19:00; Tu-Fr 09:00-19:00; Sa 09:00-18:00"
-website: "www.auto-motive-concept.fr"
\ No newline at end of file
+opening_hours: Mo 09:00-12:00, 14:00-19:00; Tu-Fr 09:00-19:00; Sa 09:00-18:00
+website: www.auto-motive-concept.fr
diff --git a/data/cities/salaise-sur-sanne/optical-center.yml b/data/cities/salaise-sur-sanne/optical-center.yml
index 6d808a67d..7417b172e 100644
--- a/data/cities/salaise-sur-sanne/optical-center.yml
+++ b/data/cities/salaise-sur-sanne/optical-center.yml
@@ -5,7 +5,7 @@ longitude: 4.80337
 postcode: "38150"
 city: Salaise-sur-Sanne
 street: ""
-housenumber: 151
+housenumber: "151"
 phone: "+33474863240"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://opticien.optical-center.fr/163-opticien-salaise-sur-sanne-optical-center"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://opticien.optical-center.fr/163-opticien-salaise-sur-sanne-optical-center
diff --git a/data/cities/salaise-sur-sanne/rostaingt.yml b/data/cities/salaise-sur-sanne/rostaingt.yml
index 3170ea791..0e764b7a9 100644
--- a/data/cities/salaise-sur-sanne/rostaingt.yml
+++ b/data/cities/salaise-sur-sanne/rostaingt.yml
@@ -1,11 +1,11 @@
 id: 108559905
-type: way
+type: node
 latitude: 45.34103
 longitude: 4.81613
 postcode: "38150"
 city: Salaise sur Sanne
 street: ""
-housenumber: 28
-phone: "+33 4 27 69 13 36"
-opening_hours: "Mo-Sa 06:30-13:00, 15:00-19:30; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+housenumber: "28"
+phone: +33 4 27 69 13 36
+opening_hours: Mo-Sa 06:30-13:00, 15:00-19:30; Su 06:30-13:00
+website: ""
diff --git a/data/cities/salavre/la-fine-bouch.yml b/data/cities/salavre/la-fine-bouch.yml
index 179bb9186..18943f35a 100644
--- a/data/cities/salavre/la-fine-bouch.yml
+++ b/data/cities/salavre/la-fine-bouch.yml
@@ -5,7 +5,7 @@ longitude: 5.33908
 postcode: "01270"
 city: Salavre
 street: ""
-housenumber: 
-phone: "+33 4 74 45 15 09"
+housenumber: ""
+phone: +33 4 74 45 15 09
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/aldi.yml b/data/cities/sallanches/aldi.yml
index 4e742ed1a..84a899845 100644
--- a/data/cities/sallanches/aldi.yml
+++ b/data/cities/sallanches/aldi.yml
@@ -4,8 +4,8 @@ latitude: 45.95167
 longitude: 6.63443
 postcode: "74700"
 city: Sallanches
-street: "Avenue André Lasquin"
-housenumber: 1431
+street: Avenue André Lasquin
+housenumber: "1431"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: ""
diff --git a/data/cities/sallanches/alterovrac.yml b/data/cities/sallanches/alterovrac.yml
index c32d2c3ea..148db8161 100644
--- a/data/cities/sallanches/alterovrac.yml
+++ b/data/cities/sallanches/alterovrac.yml
@@ -4,8 +4,8 @@ latitude: 45.93661
 longitude: 6.63009
 postcode: "74700"
 city: Sallanches
-street: "Rue Justin"
-housenumber: 23
+street: Rue Justin
+housenumber: "23"
 phone: ""
-opening_hours: "Mo 14:30-19:00; Tu-Sa 09:30-12:30,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:30-19:00; Tu-Sa 09:30-12:30,14:30-19:00
+website: ""
diff --git a/data/cities/sallanches/au-vieux-campeur.yml b/data/cities/sallanches/au-vieux-campeur.yml
index 3967a05cb..4669ed91e 100644
--- a/data/cities/sallanches/au-vieux-campeur.yml
+++ b/data/cities/sallanches/au-vieux-campeur.yml
@@ -1,11 +1,11 @@
 id: 817543276
-type: way
+type: node
 latitude: 45.92689
 longitude: 6.64014
 postcode: "74700"
 city: Sallanches
-street: "Route du Fayet"
-housenumber: 925
+street: Route du Fayet
+housenumber: "925"
 phone: ""
-opening_hours: "Mo-Fr 10:30-19:00; Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:30-19:00; Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/sallanches/bijouterie-chatelard.yml b/data/cities/sallanches/bijouterie-chatelard.yml
index e070cbdeb..fe3b478b2 100644
--- a/data/cities/sallanches/bijouterie-chatelard.yml
+++ b/data/cities/sallanches/bijouterie-chatelard.yml
@@ -4,8 +4,8 @@ latitude: 45.9353
 longitude: 6.63255
 postcode: "74700"
 city: Sallanches
-street: "Place charles albert"
-housenumber: 202
+street: Place charles albert
+housenumber: "202"
 phone: ""
-opening_hours: "Tu-Sa 09:30-19:00"
-website: "https://guildedesorfevres.fr/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-19:00
+website: https://guildedesorfevres.fr/
diff --git a/data/cities/sallanches/biscuiterie-saint-agone-les-saintoiseries.yml b/data/cities/sallanches/biscuiterie-saint-agone-les-saintoiseries.yml
index 0baefe049..1cc124580 100644
--- a/data/cities/sallanches/biscuiterie-saint-agone-les-saintoiseries.yml
+++ b/data/cities/sallanches/biscuiterie-saint-agone-les-saintoiseries.yml
@@ -4,8 +4,8 @@ latitude: 45.93718
 longitude: 6.62981
 postcode: "74700"
 city: Sallanches
-street: "Rue Justin"
-housenumber: 87
+street: Rue Justin
+housenumber: "87"
 phone: ""
 opening_hours: ""
-website: "https://saintagone.com/"
\ No newline at end of file
+website: https://saintagone.com/
diff --git a/data/cities/sallanches/carrefour-express.yml b/data/cities/sallanches/carrefour-express.yml
index 584ed6b33..c69b448d7 100644
--- a/data/cities/sallanches/carrefour-express.yml
+++ b/data/cities/sallanches/carrefour-express.yml
@@ -4,8 +4,8 @@ latitude: 45.9363
 longitude: 6.62829
 postcode: "74700"
 city: Sallanches
-street: "Quai Saint-Jacques"
-housenumber: 26
+street: Quai Saint-Jacques
+housenumber: "26"
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-20:00; Su 08:30-12:00
+website: ""
diff --git a/data/cities/sallanches/carrefour-market.yml b/data/cities/sallanches/carrefour-market.yml
index 47481d7be..e3d455b68 100644
--- a/data/cities/sallanches/carrefour-market.yml
+++ b/data/cities/sallanches/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 45.94201
 longitude: 6.63097
 postcode: "74700"
 city: Sallanches
-street: "Rue Emma Lanche"
-housenumber: 99
+street: Rue Emma Lanche
+housenumber: "99"
 phone: ""
-opening_hours: "Mo-Th 08:00-19:30; Fr-Sa 08:00-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:00-19:30; Fr-Sa 08:00-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/sallanches/carrefour.yml b/data/cities/sallanches/carrefour.yml
index 4074e840b..2532aaa65 100644
--- a/data/cities/sallanches/carrefour.yml
+++ b/data/cities/sallanches/carrefour.yml
@@ -1,11 +1,11 @@
 id: 607114011
-type: way
+type: node
 latitude: 45.95238
 longitude: 6.62615
 postcode: "74700"
 city: Sallanches
-street: "Avenue de Genève"
-housenumber: 1751
+street: Avenue de Genève
+housenumber: "1751"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:30; Su off
+website: ""
diff --git a/data/cities/sallanches/centrakor.yml b/data/cities/sallanches/centrakor.yml
index 989330d35..474aa50bf 100644
--- a/data/cities/sallanches/centrakor.yml
+++ b/data/cities/sallanches/centrakor.yml
@@ -4,8 +4,8 @@ latitude: 45.95843
 longitude: 6.63042
 postcode: "74700"
 city: Sallanches
-street: "Avenue du Général de Gaulle"
-housenumber: 1458
+street: Avenue du Général de Gaulle
+housenumber: "1458"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/coiffure-onaturel.yml b/data/cities/sallanches/coiffure-onaturel.yml
index 2359f81b2..720cb6a8d 100644
--- a/data/cities/sallanches/coiffure-onaturel.yml
+++ b/data/cities/sallanches/coiffure-onaturel.yml
@@ -4,8 +4,8 @@ latitude: 45.93699
 longitude: 6.6315
 postcode: "74700"
 city: Sallanches
-street: "Quai de Warens"
-housenumber: 39
+street: Quai de Warens
+housenumber: "39"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/cone-mobile.yml b/data/cities/sallanches/cone-mobile.yml
index d31ca5410..62425d789 100644
--- a/data/cities/sallanches/cone-mobile.yml
+++ b/data/cities/sallanches/cone-mobile.yml
@@ -4,8 +4,8 @@ latitude: 45.93486
 longitude: 6.63121
 postcode: "74700"
 city: Sallanches
-street: "Rue de la République"
-housenumber: 99
+street: Rue de la République
+housenumber: "99"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/sallanches/courir.yml b/data/cities/sallanches/courir.yml
index 0afacec84..4d6edefff 100644
--- a/data/cities/sallanches/courir.yml
+++ b/data/cities/sallanches/courir.yml
@@ -4,8 +4,8 @@ latitude: 45.95388
 longitude: 6.6294
 postcode: "74700"
 city: Sallanches
-street: "Clos de l'Île Roche"
-housenumber: 503
+street: Clos de l'Île Roche
+housenumber: "503"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/darty.yml b/data/cities/sallanches/darty.yml
index a1b6db590..33da4c576 100644
--- a/data/cities/sallanches/darty.yml
+++ b/data/cities/sallanches/darty.yml
@@ -4,8 +4,8 @@ latitude: 45.95429
 longitude: 6.62763
 postcode: "74700"
 city: Sallanches
-street: "Clos de l'Île Roche"
-housenumber: 474
+street: Clos de l'Île Roche
+housenumber: "474"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/feu-vert.yml b/data/cities/sallanches/feu-vert.yml
index f683ab3b0..1f7dd5e61 100644
--- a/data/cities/sallanches/feu-vert.yml
+++ b/data/cities/sallanches/feu-vert.yml
@@ -1,11 +1,11 @@
 id: 65188370
-type: way
+type: node
 latitude: 45.95197
 longitude: 6.63023
 postcode: "74700"
 city: Sallanches
-street: "Avenue de Genève"
-housenumber: 1748
+street: Avenue de Genève
+housenumber: "1748"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00; su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00; su off
+website: ""
diff --git a/data/cities/sallanches/fnac.yml b/data/cities/sallanches/fnac.yml
index 0d12425dc..5ff8b115c 100644
--- a/data/cities/sallanches/fnac.yml
+++ b/data/cities/sallanches/fnac.yml
@@ -4,8 +4,8 @@ latitude: 45.95428
 longitude: 6.62777
 postcode: "74700"
 city: Sallanches
-street: "Clos de l'Île Roche"
-housenumber: 474
+street: Clos de l'Île Roche
+housenumber: "474"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/sallanches/gemo.yml b/data/cities/sallanches/gemo.yml
index 171448810..a315af87e 100644
--- a/data/cities/sallanches/gemo.yml
+++ b/data/cities/sallanches/gemo.yml
@@ -4,8 +4,8 @@ latitude: 45.95431
 longitude: 6.62729
 postcode: "74700"
 city: Sallanches
-street: "Clos de l'Île Roche"
-housenumber: 472
+street: Clos de l'Île Roche
+housenumber: "472"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/gifi.yml b/data/cities/sallanches/gifi.yml
index d35a7a109..8f270900d 100644
--- a/data/cities/sallanches/gifi.yml
+++ b/data/cities/sallanches/gifi.yml
@@ -4,8 +4,8 @@ latitude: 45.95417
 longitude: 6.62699
 postcode: "74700"
 city: Sallanches
-street: "Clos de l'Île Roche"
-housenumber: 470
+street: Clos de l'Île Roche
+housenumber: "470"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/intersport.yml b/data/cities/sallanches/intersport.yml
index ee0ddca03..a5ea3ba58 100644
--- a/data/cities/sallanches/intersport.yml
+++ b/data/cities/sallanches/intersport.yml
@@ -1,11 +1,11 @@
 id: 65193464
-type: way
+type: node
 latitude: 45.95501
 longitude: 6.63016
 postcode: "74700"
 city: Sallanches
-street: "Avenue de Genève"
-housenumber: 2074
+street: Avenue de Genève
+housenumber: "2074"
 phone: "0485300001"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.intersport.fr/-/SALLANCHES-74400/INTERSPORT-SALLANCHES/00820_000/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.intersport.fr/-/SALLANCHES-74400/INTERSPORT-SALLANCHES/00820_000/
diff --git a/data/cities/sallanches/joueclub.yml b/data/cities/sallanches/joueclub.yml
index bb5ae57d5..6d1a9e335 100644
--- a/data/cities/sallanches/joueclub.yml
+++ b/data/cities/sallanches/joueclub.yml
@@ -4,8 +4,8 @@ latitude: 45.95152
 longitude: 6.63046
 postcode: "74700"
 city: Sallanches
-street: "Rue de Verdun"
-housenumber: 65
+street: Rue de Verdun
+housenumber: "65"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/le-petit-coin-portugais.yml b/data/cities/sallanches/le-petit-coin-portugais.yml
index 811be9a36..dbc97ab1a 100644
--- a/data/cities/sallanches/le-petit-coin-portugais.yml
+++ b/data/cities/sallanches/le-petit-coin-portugais.yml
@@ -4,8 +4,8 @@ latitude: 45.93646
 longitude: 6.63002
 postcode: "74700"
 city: Sallanches
-street: "Quai de l'Hôtel de Ville"
-housenumber: 82
+street: Quai de l'Hôtel de Ville
+housenumber: "82"
 phone: ""
-opening_hours: "Mo,Tu,Th-Sa 09:00-12:00,15:00-19:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th-Sa 09:00-12:00,15:00-19:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/sallanches/le-talon-dachille.yml b/data/cities/sallanches/le-talon-dachille.yml
index 6dc687fbf..40b0725f5 100644
--- a/data/cities/sallanches/le-talon-dachille.yml
+++ b/data/cities/sallanches/le-talon-dachille.yml
@@ -4,8 +4,8 @@ latitude: 45.93522
 longitude: 6.63041
 postcode: "74700"
 city: Sallanches
-street: "Rue du Commerce"
-housenumber: 40
+street: Rue du Commerce
+housenumber: "40"
 phone: ""
-opening_hours: "Mo 14:30-19:00; Tu-Sa 09:30-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:30-19:00; Tu-Sa 09:30-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/sallanches/mondial-tissus.yml b/data/cities/sallanches/mondial-tissus.yml
index 2e2b26b4d..ed40cc3fe 100644
--- a/data/cities/sallanches/mondial-tissus.yml
+++ b/data/cities/sallanches/mondial-tissus.yml
@@ -4,8 +4,8 @@ latitude: 45.95455
 longitude: 6.6305
 postcode: "74700"
 city: Sallanches
-street: "Avenue de Genève"
-housenumber: 2018
-phone: "+331 70 18 16 00"
+street: Avenue de Genève
+housenumber: "2018"
+phone: +331 70 18 16 00
 opening_hours: ""
-website: "https://magasins.mondialtissus.fr/tissu-mercerie/sallanches/M015"
\ No newline at end of file
+website: https://magasins.mondialtissus.fr/tissu-mercerie/sallanches/M015
diff --git a/data/cities/sallanches/roue-libre.yml b/data/cities/sallanches/roue-libre.yml
index dc1f3ce12..e8e11f371 100644
--- a/data/cities/sallanches/roue-libre.yml
+++ b/data/cities/sallanches/roue-libre.yml
@@ -4,8 +4,8 @@ latitude: 45.93789
 longitude: 6.62844
 postcode: "74700"
 city: Sallanches
-street: "Rue Saint-Eloi"
-housenumber: 191
+street: Rue Saint-Eloi
+housenumber: "191"
 phone: "+33983869667"
 opening_hours: ""
-website: "https://www.roue-libre-sallanches.fr/"
\ No newline at end of file
+website: https://www.roue-libre-sallanches.fr/
diff --git a/data/cities/sallanches/sallanches-meubles.yml b/data/cities/sallanches/sallanches-meubles.yml
index fabc466d6..7392b1235 100644
--- a/data/cities/sallanches/sallanches-meubles.yml
+++ b/data/cities/sallanches/sallanches-meubles.yml
@@ -4,8 +4,8 @@ latitude: 45.95888
 longitude: 6.63047
 postcode: "74700"
 city: Sallanches
-street: "Avenue du Général de Gaulle"
-housenumber: 1490
+street: Avenue du Général de Gaulle
+housenumber: "1490"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallanches/satoriz.yml b/data/cities/sallanches/satoriz.yml
index f967bf944..ace6b93cb 100644
--- a/data/cities/sallanches/satoriz.yml
+++ b/data/cities/sallanches/satoriz.yml
@@ -4,8 +4,8 @@ latitude: 45.95305
 longitude: 6.63058
 postcode: "74700"
 city: Sallanches
-street: "Avenue de Genève"
-housenumber: 1894
+street: Avenue de Genève
+housenumber: "1894"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.satoriz.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.satoriz.fr/
diff --git a/data/cities/sallanches/vetb.yml b/data/cities/sallanches/vetb.yml
index c69475ff0..6fd82437f 100644
--- a/data/cities/sallanches/vetb.yml
+++ b/data/cities/sallanches/vetb.yml
@@ -4,8 +4,8 @@ latitude: 45.9538
 longitude: 6.62827
 postcode: "74700"
 city: Sallanches
-street: "Clos de l'Île Roche"
-housenumber: 504
+street: Clos de l'Île Roche
+housenumber: "504"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sallenoves/aux-caprices-des-saisons.yml b/data/cities/sallenoves/aux-caprices-des-saisons.yml
index 27d86dbf2..34d493476 100644
--- a/data/cities/sallenoves/aux-caprices-des-saisons.yml
+++ b/data/cities/sallenoves/aux-caprices-des-saisons.yml
@@ -4,8 +4,8 @@ latitude: 46.01113
 longitude: 5.99245
 postcode: "74270"
 city: Sallenôves
-street: "Route de Marlioz"
-housenumber: 23
-phone: "+33 4 50 01 28 86"
-opening_hours: "Mo-Sa 09:00-12:30,15:00-19:00; Su off"
-website: ""
\ No newline at end of file
+street: Route de Marlioz
+housenumber: "23"
+phone: +33 4 50 01 28 86
+opening_hours: Mo-Sa 09:00-12:30,15:00-19:00; Su off
+website: ""
diff --git a/data/cities/sallenoves/bon-lieu-coiffure.yml b/data/cities/sallenoves/bon-lieu-coiffure.yml
index d481fcc95..9a87c0aa8 100644
--- a/data/cities/sallenoves/bon-lieu-coiffure.yml
+++ b/data/cities/sallenoves/bon-lieu-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 46.01101
 longitude: 5.99237
 postcode: "74270"
 city: Sallenôves
-street: "Route de Marlioz"
-housenumber: 11
-phone: "+33 4 50 77 80 37"
-opening_hours: "Mo 14:00-19:00; Tu 09:00-12:00,14:00-19:00; We 09:00-12:00; Th 09:00-19:00; Fr 09:00-20:00; Sa 08:00-15:00; Su off"
-website: "https://bon-lieu-coiffure.com/"
\ No newline at end of file
+street: Route de Marlioz
+housenumber: "11"
+phone: +33 4 50 77 80 37
+opening_hours: Mo 14:00-19:00; Tu 09:00-12:00,14:00-19:00; We 09:00-12:00; Th 09:00-19:00;
+    Fr 09:00-20:00; Sa 08:00-15:00; Su off
+website: https://bon-lieu-coiffure.com/
diff --git a/data/cities/samoens/a-la-jaysinia.yml b/data/cities/samoens/a-la-jaysinia.yml
index 168de97f7..d30efead9 100644
--- a/data/cities/samoens/a-la-jaysinia.yml
+++ b/data/cities/samoens/a-la-jaysinia.yml
@@ -4,8 +4,8 @@ latitude: 46.08382
 longitude: 6.72505
 postcode: "74340"
 city: Samoëns
-street: "Grande Rue"
-housenumber: 111
-phone: "+33 4 50 34 40 31"
-opening_hours: "Mo-Su 7:00-12:45, 14:30-19:30"
-website: "https://www.a-la-jaysinia.com"
\ No newline at end of file
+street: Grande Rue
+housenumber: "111"
+phone: +33 4 50 34 40 31
+opening_hours: Mo-Su 7:00-12:45, 14:30-19:30
+website: https://www.a-la-jaysinia.com
diff --git a/data/cities/samoens/carrefour-market.yml b/data/cities/samoens/carrefour-market.yml
index 9e3499925..d8d2a89b5 100644
--- a/data/cities/samoens/carrefour-market.yml
+++ b/data/cities/samoens/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 126621093
-type: way
+type: node
 latitude: 46.08404
 longitude: 6.70592
 postcode: "74340"
 city: Samoëns
-street: "Route de Taninges"
-housenumber: 1365
+street: Route de Taninges
+housenumber: "1365"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/samoens/entraide-solidarite.yml b/data/cities/samoens/entraide-solidarite.yml
index 4ed9f13d1..64b17ee23 100644
--- a/data/cities/samoens/entraide-solidarite.yml
+++ b/data/cities/samoens/entraide-solidarite.yml
@@ -4,8 +4,8 @@ latitude: 46.08349
 longitude: 6.72903
 postcode: "74340"
 city: Samoëns
-street: "Place des Dents Blanches"
-housenumber: 
+street: Place des Dents Blanches
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/samoens/espace-soan.yml b/data/cities/samoens/espace-soan.yml
index a51a613d1..e3bb771e8 100644
--- a/data/cities/samoens/espace-soan.yml
+++ b/data/cities/samoens/espace-soan.yml
@@ -5,7 +5,7 @@ longitude: 6.72739
 postcode: "74340"
 city: Samoëns
 street: ""
-housenumber: 175
+housenumber: "175"
 phone: ""
-opening_hours: "Mo-Fr"
-website: "https://www.espace-soan.com"
\ No newline at end of file
+opening_hours: Mo-Fr
+website: https://www.espace-soan.com
diff --git a/data/cities/samoens/intersport-montagne.yml b/data/cities/samoens/intersport-montagne.yml
index 53ff02a94..86f85cf13 100644
--- a/data/cities/samoens/intersport-montagne.yml
+++ b/data/cities/samoens/intersport-montagne.yml
@@ -5,7 +5,7 @@ longitude: 6.72361
 postcode: "74340"
 city: Samoëns
 street: ""
-housenumber: 84
+housenumber: "84"
 phone: ""
-opening_hours: "Mo-Th 08:30-12:30, 14:30-19:00; Fr-Sa 08:30-19:30; Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:30, 14:30-19:00; Fr-Sa 08:30-19:30; Su 08:30-19:00
+website: ""
diff --git a/data/cities/samoens/la-clinique-tattoo-art-gallery.yml b/data/cities/samoens/la-clinique-tattoo-art-gallery.yml
index 7abbe8842..5d614692e 100644
--- a/data/cities/samoens/la-clinique-tattoo-art-gallery.yml
+++ b/data/cities/samoens/la-clinique-tattoo-art-gallery.yml
@@ -4,8 +4,8 @@ latitude: 46.08343
 longitude: 6.72414
 postcode: "74340"
 city: Samoëns
-street: "Galerie des Dents Blanches"
-housenumber: 77
+street: Galerie des Dents Blanches
+housenumber: "77"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/samoens/la-fruitiere.yml b/data/cities/samoens/la-fruitiere.yml
index 1d5ef42c3..6b32feb15 100644
--- a/data/cities/samoens/la-fruitiere.yml
+++ b/data/cities/samoens/la-fruitiere.yml
@@ -4,8 +4,8 @@ latitude: 46.0798
 longitude: 6.72944
 postcode: "74340"
 city: Samoëns
-street: "Avenue du Fer à Cheval"
-housenumber: 502
-phone: "+33 4 50 89 52 85"
-opening_hours: "Mo-Sa 09:00-12:30,15:00-19:00; Su 09:00-12:00,16:00-19:00"
-website: "https://www.samoens.com/fromagerie-fruitiere-des-hauts-de-savoie/"
\ No newline at end of file
+street: Avenue du Fer à Cheval
+housenumber: "502"
+phone: +33 4 50 89 52 85
+opening_hours: Mo-Sa 09:00-12:30,15:00-19:00; Su 09:00-12:00,16:00-19:00
+website: https://www.samoens.com/fromagerie-fruitiere-des-hauts-de-savoie/
diff --git a/data/cities/samoens/la-tour-gourmande.yml b/data/cities/samoens/la-tour-gourmande.yml
index a0c03294a..911a6b938 100644
--- a/data/cities/samoens/la-tour-gourmande.yml
+++ b/data/cities/samoens/la-tour-gourmande.yml
@@ -5,7 +5,7 @@ longitude: 6.72624
 postcode: "74340"
 city: Samoëns
 street: ""
-housenumber: 1
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Su 09:30-12:30, 14:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:30-12:30, 14:30-19:30
+website: ""
diff --git a/data/cities/samoens/le-petit-casino.yml b/data/cities/samoens/le-petit-casino.yml
index a89a4f340..882733e18 100644
--- a/data/cities/samoens/le-petit-casino.yml
+++ b/data/cities/samoens/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 46.08343
 longitude: 6.7261
 postcode: "74340"
 city: Samoëns
-street: "Grande Rue"
-housenumber: 14
+street: Grande Rue
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Tu,Th-Sa 08:00-12:30, 15:30-19:00; We,Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Sa 08:00-12:30, 15:30-19:00; We,Su 08:00-12:30
+website: ""
diff --git a/data/cities/samoens/le-pied-de-poule.yml b/data/cities/samoens/le-pied-de-poule.yml
index 02b31f994..294bef5a7 100644
--- a/data/cities/samoens/le-pied-de-poule.yml
+++ b/data/cities/samoens/le-pied-de-poule.yml
@@ -4,8 +4,8 @@ latitude: 46.08257
 longitude: 6.72897
 postcode: "74340"
 city: Samoëns
-street: "Route de Sixt"
-housenumber: 20
+street: Route de Sixt
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/samoens/m-guillot.yml b/data/cities/samoens/m-guillot.yml
index 9bd3778bf..4ec59ee1f 100644
--- a/data/cities/samoens/m-guillot.yml
+++ b/data/cities/samoens/m-guillot.yml
@@ -1,11 +1,11 @@
 id: 126618481
-type: way
+type: node
 latitude: 46.07471
 longitude: 6.74377
 postcode: "74340"
 city: Samoëns
-street: "Route de Vallon d'en Bas"
-housenumber: 
+street: Route de Vallon d'en Bas
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/samoens/mountain-spirit.yml b/data/cities/samoens/mountain-spirit.yml
index 6d2fdaaaf..b461b4a5a 100644
--- a/data/cities/samoens/mountain-spirit.yml
+++ b/data/cities/samoens/mountain-spirit.yml
@@ -5,7 +5,7 @@ longitude: 6.72739
 postcode: "74340"
 city: Samoëns
 street: ""
-housenumber: 135
+housenumber: "135"
 phone: ""
 opening_hours: ""
-website: "https://mountainspirit-sports.com/"
\ No newline at end of file
+website: https://mountainspirit-sports.com/
diff --git a/data/cities/samoens/sherpa.yml b/data/cities/samoens/sherpa.yml
index 2f9d67825..78d3c759b 100644
--- a/data/cities/samoens/sherpa.yml
+++ b/data/cities/samoens/sherpa.yml
@@ -5,7 +5,8 @@ longitude: 6.72677
 postcode: "74340"
 city: Samoëns
 street: ""
-housenumber: 224
+housenumber: "224"
 phone: ""
-opening_hours: "Dec 11-May 31 Mo,We-Su 07:30-13:00, 16:00-19:00, Tu 07:30-13:00; Jun 21-Sep 13 Mo,We-Su 07:30-20:00, Tu 07:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Dec 11-May 31 Mo,We-Su 07:30-13:00, 16:00-19:00, Tu 07:30-13:00; Jun
+    21-Sep 13 Mo,We-Su 07:30-20:00, Tu 07:30-13:00
+website: ""
diff --git a/data/cities/samoens/xtreme-glisses.yml b/data/cities/samoens/xtreme-glisses.yml
index 9bb38be65..04c65c3cd 100644
--- a/data/cities/samoens/xtreme-glisses.yml
+++ b/data/cities/samoens/xtreme-glisses.yml
@@ -5,7 +5,7 @@ longitude: 6.71964
 postcode: "74340"
 city: samoens
 street: ""
-housenumber: 730
+housenumber: "730"
 phone: ""
 opening_hours: ""
-website: "https://www.xtremeglisses-samoens.com"
\ No newline at end of file
+website: https://www.xtremeglisses-samoens.com
diff --git a/data/cities/sardieu/les-delices-de-sardieu.yml b/data/cities/sardieu/les-delices-de-sardieu.yml
index fba529658..de13a2827 100644
--- a/data/cities/sardieu/les-delices-de-sardieu.yml
+++ b/data/cities/sardieu/les-delices-de-sardieu.yml
@@ -4,8 +4,8 @@ latitude: 45.36933
 longitude: 5.2122
 postcode: ""
 city: Sardieu
-street: "Chemin Neuf"
-housenumber: 12
-phone: "+ 33 474202473"
-opening_hours: "Tu-Sa 06:30-13:00,15:30-18:00; Su 06:30-13:00"
-website: "https://lesdelicesdesardieu.business.site/"
\ No newline at end of file
+street: Chemin Neuf
+housenumber: "12"
+phone: + 33 474202473
+opening_hours: Tu-Sa 06:30-13:00,15:30-18:00; Su 06:30-13:00
+website: https://lesdelicesdesardieu.business.site/
diff --git a/data/cities/sarras/estampille.yml b/data/cities/sarras/estampille.yml
index fe0ea2897..74bd6faa7 100644
--- a/data/cities/sarras/estampille.yml
+++ b/data/cities/sarras/estampille.yml
@@ -4,8 +4,8 @@ latitude: 45.18672
 longitude: 4.79788
 postcode: "07370"
 city: Sarras
-street: "Avenue des Cévennes"
-housenumber: 6
+street: Avenue des Cévennes
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sassenage/halle-aux-fleurs.yml b/data/cities/sassenage/halle-aux-fleurs.yml
index 8da3d7fb2..c20fc9c40 100644
--- a/data/cities/sassenage/halle-aux-fleurs.yml
+++ b/data/cities/sassenage/halle-aux-fleurs.yml
@@ -4,8 +4,9 @@ latitude: 45.20407
 longitude: 5.6644
 postcode: "38360"
 city: Sassenage
-street: "Place de l'Europe"
-housenumber: 3
+street: Place de l'Europe
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-We 08:30-12:15,15:00-19:00; Th 08:30-13:00, 13:00-19:00; Fr-Sa 08:30-13:00, 13:00-19:15; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-We 08:30-12:15,15:00-19:00; Th 08:30-13:00, 13:00-19:00; Fr-Sa 08:30-13:00,
+    13:00-19:15; Su 08:30-12:30
+website: ""
diff --git a/data/cities/sassenage/les-locavores.yml b/data/cities/sassenage/les-locavores.yml
index f2f72ed02..61bdc9135 100644
--- a/data/cities/sassenage/les-locavores.yml
+++ b/data/cities/sassenage/les-locavores.yml
@@ -4,8 +4,8 @@ latitude: 45.20528
 longitude: 5.66732
 postcode: "38360"
 city: Sassenage
-street: "Chemin du Billery"
-housenumber: 1
+street: Chemin du Billery
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sassenage/lesprit-des-velos.yml b/data/cities/sassenage/lesprit-des-velos.yml
index 82a03e450..9b6d4c969 100644
--- a/data/cities/sassenage/lesprit-des-velos.yml
+++ b/data/cities/sassenage/lesprit-des-velos.yml
@@ -4,8 +4,8 @@ latitude: 45.2076
 longitude: 5.65841
 postcode: "38360"
 city: Sassenage
-street: "Rue de la République"
-housenumber: 42
+street: Rue de la République
+housenumber: "42"
 phone: ""
-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
+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: ""
diff --git a/data/cities/sault-brenaz/boulangerie-du-rhone.yml b/data/cities/sault-brenaz/boulangerie-du-rhone.yml
index 8d350db9a..6de16cf45 100644
--- a/data/cities/sault-brenaz/boulangerie-du-rhone.yml
+++ b/data/cities/sault-brenaz/boulangerie-du-rhone.yml
@@ -4,8 +4,8 @@ latitude: 45.85671
 longitude: 5.40624
 postcode: "01150"
 city: Sault-Brénaz
-street: "Grande Rue"
-housenumber: 50
+street: Grande Rue
+housenumber: "50"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/savigneux/boulangerie.yml b/data/cities/savigneux/boulangerie.yml
index 96f5441c4..310131b71 100644
--- a/data/cities/savigneux/boulangerie.yml
+++ b/data/cities/savigneux/boulangerie.yml
@@ -4,8 +4,8 @@ latitude: 46.00132
 longitude: 4.84841
 postcode: "01480"
 city: Savigneux
-street: "Rue de l'Église"
-housenumber: 55
+street: Rue de l'Église
+housenumber: "55"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/savigneux/celine-coiffure.yml b/data/cities/savigneux/celine-coiffure.yml
index 708792262..ab2fd7a81 100644
--- a/data/cities/savigneux/celine-coiffure.yml
+++ b/data/cities/savigneux/celine-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.00125
 longitude: 4.84841
 postcode: "01480"
 city: Savigneux
-street: "Rue de l'Église"
-housenumber: 49
-phone: "+33 4 74 08 16 76"
+street: Rue de l'Église
+housenumber: "49"
+phone: +33 4 74 08 16 76
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/savigneux/epicerie.yml b/data/cities/savigneux/epicerie.yml
index 250d9c975..4ccffe129 100644
--- a/data/cities/savigneux/epicerie.yml
+++ b/data/cities/savigneux/epicerie.yml
@@ -4,8 +4,8 @@ latitude: 46.00155
 longitude: 4.84838
 postcode: "01480"
 city: Savigneux
-street: "Rue de l'Église"
-housenumber: 87
-phone: "+33 9 54999843"
-opening_hours: "Mo off; Tu-Sa 07:00-12:30,14:30-19:30; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+street: Rue de l'Église
+housenumber: "87"
+phone: +33 9 54999843
+opening_hours: Mo off; Tu-Sa 07:00-12:30,14:30-19:30; Su 07:30-12:30
+website: ""
diff --git a/data/cities/savigneux/sarl-berger-vegetaux.yml b/data/cities/savigneux/sarl-berger-vegetaux.yml
index cb28cf896..dc6acb2d4 100644
--- a/data/cities/savigneux/sarl-berger-vegetaux.yml
+++ b/data/cities/savigneux/sarl-berger-vegetaux.yml
@@ -4,8 +4,8 @@ latitude: 45.62474
 longitude: 4.09443
 postcode: "42600"
 city: Savigneux
-street: "rue de Chantegrelet"
-housenumber: 1441
-phone: "04 77 58 25 98"
+street: rue de Chantegrelet
+housenumber: "1441"
+phone: 04 77 58 25 98
 opening_hours: ""
-website: "https://www.pepinieres-berger.com/"
\ No newline at end of file
+website: https://www.pepinieres-berger.com/
diff --git a/data/cities/savigneux/scea-pepinieres-berger.yml b/data/cities/savigneux/scea-pepinieres-berger.yml
index 1d557122c..ba8dcad3d 100644
--- a/data/cities/savigneux/scea-pepinieres-berger.yml
+++ b/data/cities/savigneux/scea-pepinieres-berger.yml
@@ -4,8 +4,8 @@ latitude: 45.62413
 longitude: 4.0941
 postcode: "42600"
 city: Savigneux
-street: "rue de Chantegrelet"
-housenumber: 1353
-phone: "04 77 58 58 04"
+street: rue de Chantegrelet
+housenumber: "1353"
+phone: 04 77 58 58 04
 opening_hours: ""
-website: "https://www.pepinieres-berger.com/"
\ No newline at end of file
+website: https://www.pepinieres-berger.com/
diff --git a/data/cities/savigneux/spiruline-du-forez.yml b/data/cities/savigneux/spiruline-du-forez.yml
index 9b425fe29..2a456488d 100644
--- a/data/cities/savigneux/spiruline-du-forez.yml
+++ b/data/cities/savigneux/spiruline-du-forez.yml
@@ -4,8 +4,8 @@ latitude: 45.60225
 longitude: 4.117
 postcode: "42600"
 city: Savigneux
-street: "La Loge"
-housenumber: 
-phone: "+33 6 08 90 25 63"
+street: La Loge
+housenumber: ""
+phone: +33 6 08 90 25 63
 opening_hours: ""
-website: "https://www.vitalspir.fr/"
\ No newline at end of file
+website: https://www.vitalspir.fr/
diff --git a/data/cities/scientrier/au-petrin-des-saveurs.yml b/data/cities/scientrier/au-petrin-des-saveurs.yml
index 5898c7b05..eb39f150b 100644
--- a/data/cities/scientrier/au-petrin-des-saveurs.yml
+++ b/data/cities/scientrier/au-petrin-des-saveurs.yml
@@ -1,11 +1,11 @@
 id: 70523208
-type: way
+type: node
 latitude: 46.1187
 longitude: 6.31622
 postcode: "74930"
 city: Scientrier
-street: "Rue des Écoles"
-housenumber: 21
+street: Rue des Écoles
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 06:15-19:30, Su 06:15-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:15-19:30, Su 06:15-13:00
+website: ""
diff --git a/data/cities/sciez-sur-leman/117factory.yml b/data/cities/sciez-sur-leman/117factory.yml
index b0c6bf512..87539da22 100644
--- a/data/cities/sciez-sur-leman/117factory.yml
+++ b/data/cities/sciez-sur-leman/117factory.yml
@@ -1,11 +1,11 @@
 id: 852656498
-type: way
+type: node
 latitude: 46.33135
 longitude: 6.38382
 postcode: "74140"
 city: Sciez-sur-Léman
-street: "Chemin de l'Aulieu"
-housenumber: 117
+street: Chemin de l'Aulieu
+housenumber: "117"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez-sur-leman/graines-de-curieux.yml b/data/cities/sciez-sur-leman/graines-de-curieux.yml
index 0144f4dca..ebf5458db 100644
--- a/data/cities/sciez-sur-leman/graines-de-curieux.yml
+++ b/data/cities/sciez-sur-leman/graines-de-curieux.yml
@@ -4,8 +4,8 @@ latitude: 46.33133
 longitude: 6.37467
 postcode: "74140"
 city: Sciez-sur-Léman
-street: "Avenue des Charmes"
-housenumber: 16
-phone: "+33 4 50 72 94 04"
-opening_hours: "Tu,Th,Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+street: Avenue des Charmes
+housenumber: "16"
+phone: +33 4 50 72 94 04
+opening_hours: Tu,Th,Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/sciez-sur-leman/lagence-automobiliere.yml b/data/cities/sciez-sur-leman/lagence-automobiliere.yml
index 6e4cdbdb1..04efab114 100644
--- a/data/cities/sciez-sur-leman/lagence-automobiliere.yml
+++ b/data/cities/sciez-sur-leman/lagence-automobiliere.yml
@@ -1,11 +1,11 @@
 id: 197283258
-type: way
+type: node
 latitude: 46.33332
 longitude: 6.38633
 postcode: "74140"
 city: Sciez-sur-Léman
-street: "Avenue de Bonnatrait"
-housenumber: 730
+street: Avenue de Bonnatrait
+housenumber: "730"
 phone: ""
-opening_hours: "Mo 14:00-18:00; Tu-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:00; Tu-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00; Su off
+website: ""
diff --git a/data/cities/sciez-sur-leman/le-salon-de-tina.yml b/data/cities/sciez-sur-leman/le-salon-de-tina.yml
index 44fea9aa1..dd8c0d82d 100644
--- a/data/cities/sciez-sur-leman/le-salon-de-tina.yml
+++ b/data/cities/sciez-sur-leman/le-salon-de-tina.yml
@@ -1,11 +1,11 @@
 id: 1128410960
-type: way
+type: node
 latitude: 46.33344
 longitude: 6.38923
 postcode: "74140"
 city: Sciez-sur-Léman
-street: "Avenue de Bonnatrait"
-housenumber: 507
+street: Avenue de Bonnatrait
+housenumber: "507"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-17:30; Mo,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-17:30; Mo,Su off
+website: ""
diff --git a/data/cities/sciez-sur-leman/maison-hofer.yml b/data/cities/sciez-sur-leman/maison-hofer.yml
index 5d68b7e16..fdb3bbbdc 100644
--- a/data/cities/sciez-sur-leman/maison-hofer.yml
+++ b/data/cities/sciez-sur-leman/maison-hofer.yml
@@ -1,11 +1,11 @@
 id: 1135898446
-type: way
+type: node
 latitude: 46.33165
 longitude: 6.37827
 postcode: "74140"
 city: Sciez-sur-Léman
-street: "Avenue de l'Église"
-housenumber: 1
+street: Avenue de l'Église
+housenumber: "1"
 phone: ""
-opening_hours: "Tu,We,Fr,Sa 08:30-12:30,15:00-19:00; Su 08:30-12:30; Mo,Th off"
-website: ""
\ No newline at end of file
+opening_hours: Tu,We,Fr,Sa 08:30-12:30,15:00-19:00; Su 08:30-12:30; Mo,Th off
+website: ""
diff --git a/data/cities/sciez-sur-leman/pecherie-danthy.yml b/data/cities/sciez-sur-leman/pecherie-danthy.yml
index d7fec4629..7b4f1f25e 100644
--- a/data/cities/sciez-sur-leman/pecherie-danthy.yml
+++ b/data/cities/sciez-sur-leman/pecherie-danthy.yml
@@ -1,11 +1,11 @@
 id: 674041424
-type: way
+type: node
 latitude: 46.32894
 longitude: 6.37983
 postcode: "74140"
 city: Sciez-sur-Léman
-street: "Route de l'Usine"
+street: Route de l'Usine
 housenumber: 306A
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.yml b/data/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.yml
index 2e8cbdf78..9921ad14e 100644
--- a/data/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.yml
+++ b/data/cities/sciez-sur-leman/vestiaire-intercommunal-saint-maurice.yml
@@ -4,8 +4,8 @@ latitude: 46.33098
 longitude: 6.37839
 postcode: "74140"
 city: Sciez-sur-Léman
-street: "Route du Crêt Beule"
-housenumber: 1
+street: Route du Crêt Beule
+housenumber: "1"
 phone: ""
-opening_hours: "Tu 13:30-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu 13:30-16:00
+website: ""
diff --git a/data/cities/sciez/auto-chablais.yml b/data/cities/sciez/auto-chablais.yml
index 356513510..131ef3d62 100644
--- a/data/cities/sciez/auto-chablais.yml
+++ b/data/cities/sciez/auto-chablais.yml
@@ -1,11 +1,11 @@
 id: 197281444
-type: way
+type: node
 latitude: 46.33059
 longitude: 6.37083
 postcode: "74140"
 city: Sciez
-street: "Chemin du Passieu"
-housenumber: 80
+street: Chemin du Passieu
+housenumber: "80"
 phone: ""
 opening_hours: ""
-website: "https://auto-chablais.com/"
\ No newline at end of file
+website: https://auto-chablais.com/
diff --git a/data/cities/sciez/carrosserie-durand.yml b/data/cities/sciez/carrosserie-durand.yml
index 0aa976950..59055d626 100644
--- a/data/cities/sciez/carrosserie-durand.yml
+++ b/data/cities/sciez/carrosserie-durand.yml
@@ -1,11 +1,11 @@
 id: 880213132
-type: way
+type: node
 latitude: 46.32903
 longitude: 6.36337
 postcode: "74140"
 city: Sciez
-street: "Avenue de Genève"
-housenumber: 468
+street: Avenue de Genève
+housenumber: "468"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez/casino-shop.yml b/data/cities/sciez/casino-shop.yml
index 5a772af31..239089905 100644
--- a/data/cities/sciez/casino-shop.yml
+++ b/data/cities/sciez/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 46.33253
 longitude: 6.37537
 postcode: "74140"
 city: Sciez
-street: "Route d'Excenevex"
-housenumber: 28
+street: Route d'Excenevex
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:30
+website: ""
diff --git a/data/cities/sciez/desmeules-automobiles.yml b/data/cities/sciez/desmeules-automobiles.yml
index d60cab26a..989b66981 100644
--- a/data/cities/sciez/desmeules-automobiles.yml
+++ b/data/cities/sciez/desmeules-automobiles.yml
@@ -1,11 +1,11 @@
 id: 197279479
-type: way
+type: node
 latitude: 46.33879
 longitude: 6.40347
 postcode: "74140"
 city: Sciez
-street: "Chemin des Voies Romaines"
-housenumber: 66
-phone: "+33 4 50 72 75 68"
+street: Chemin des Voies Romaines
+housenumber: "66"
+phone: +33 4 50 72 75 68
 opening_hours: ""
-website: "https://www.desmeules-automobiles.com/"
\ No newline at end of file
+website: https://www.desmeules-automobiles.com/
diff --git a/data/cities/sciez/diagonale-7.yml b/data/cities/sciez/diagonale-7.yml
index 7d2122992..5c8111a1d 100644
--- a/data/cities/sciez/diagonale-7.yml
+++ b/data/cities/sciez/diagonale-7.yml
@@ -4,8 +4,8 @@ latitude: 46.33084
 longitude: 6.37527
 postcode: "74140"
 city: Sciez
-street: "Avenue des Charmes"
-housenumber: 118
+street: Avenue des Charmes
+housenumber: "118"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez/ferme-du-ptit-foue.yml b/data/cities/sciez/ferme-du-ptit-foue.yml
index be3585c20..c9657ef5f 100644
--- a/data/cities/sciez/ferme-du-ptit-foue.yml
+++ b/data/cities/sciez/ferme-du-ptit-foue.yml
@@ -1,11 +1,11 @@
 id: 898519707
-type: way
+type: node
 latitude: 46.33446
 longitude: 6.41254
 postcode: "74140"
 city: Sciez
-street: "Route de Jouvernex"
-housenumber: 920
+street: Route de Jouvernex
+housenumber: "920"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez/le-crayon-bleu.yml b/data/cities/sciez/le-crayon-bleu.yml
index 681713f88..a07e9d3d2 100644
--- a/data/cities/sciez/le-crayon-bleu.yml
+++ b/data/cities/sciez/le-crayon-bleu.yml
@@ -4,8 +4,8 @@ latitude: 46.33079
 longitude: 6.37533
 postcode: "74140"
 city: Sciez
-street: "Avenue des Charmes"
-housenumber: 118
+street: Avenue des Charmes
+housenumber: "118"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez/le-potager-du-leman.yml b/data/cities/sciez/le-potager-du-leman.yml
index b70429b08..c620244ed 100644
--- a/data/cities/sciez/le-potager-du-leman.yml
+++ b/data/cities/sciez/le-potager-du-leman.yml
@@ -1,11 +1,11 @@
 id: 197286081
-type: way
+type: node
 latitude: 46.33801
 longitude: 6.4022
 postcode: "74140"
 city: Sciez
-street: "Chemin des Hutins Vieux"
-housenumber: 129
-phone: "+33 4 50 72 45 19"
+street: Chemin des Hutins Vieux
+housenumber: "129"
+phone: +33 4 50 72 45 19
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez/leman-nautic.yml b/data/cities/sciez/leman-nautic.yml
index 94ecdd99b..fd4a11e84 100644
--- a/data/cities/sciez/leman-nautic.yml
+++ b/data/cities/sciez/leman-nautic.yml
@@ -1,11 +1,11 @@
 id: 1112022964
-type: way
+type: node
 latitude: 46.33974
 longitude: 6.39325
 postcode: "74140"
 city: Sciez
-street: "Chemin de Songy"
-housenumber: 759
-phone: "+33 450 726 113"
+street: Chemin de Songy
+housenumber: "759"
+phone: +33 450 726 113
 opening_hours: ""
-website: "https://www.leman-nautic.com/"
\ No newline at end of file
+website: https://www.leman-nautic.com/
diff --git a/data/cities/sciez/les-aigles-du-leman-route-du-moulin-de-la-glaciere.yml b/data/cities/sciez/les-aigles-du-leman-route-du-moulin-de-la-glaciere.yml
index 290388979..1012b24dd 100644
--- a/data/cities/sciez/les-aigles-du-leman-route-du-moulin-de-la-glaciere.yml
+++ b/data/cities/sciez/les-aigles-du-leman-route-du-moulin-de-la-glaciere.yml
@@ -4,8 +4,8 @@ latitude: 46.33345
 longitude: 6.38001
 postcode: "74140"
 city: Sciez
-street: "Route du Moulin de la Glacière"
-housenumber: 300
+street: Route du Moulin de la Glacière
+housenumber: "300"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez/les-aigles-du-leman.yml b/data/cities/sciez/les-aigles-du-leman.yml
index f194bbf3d..8787dce58 100644
--- a/data/cities/sciez/les-aigles-du-leman.yml
+++ b/data/cities/sciez/les-aigles-du-leman.yml
@@ -4,8 +4,8 @@ latitude: 46.33344
 longitude: 6.37991
 postcode: "74140"
 city: Sciez
-street: "Route du Moulin de la Glacière"
-housenumber: 300
+street: Route du Moulin de la Glacière
+housenumber: "300"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sciez/les-fournils-du-lac.yml b/data/cities/sciez/les-fournils-du-lac.yml
index 20923e873..7b22962c3 100644
--- a/data/cities/sciez/les-fournils-du-lac.yml
+++ b/data/cities/sciez/les-fournils-du-lac.yml
@@ -4,8 +4,8 @@ latitude: 46.33399
 longitude: 6.38995
 postcode: "74140"
 city: Sciez
-street: "Avenue de Bonnatrait"
-housenumber: 428
+street: Avenue de Bonnatrait
+housenumber: "428"
 phone: ""
-opening_hours: "Mo-Su 06:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-19:30
+website: ""
diff --git a/data/cities/sciez/magretti.yml b/data/cities/sciez/magretti.yml
index 88b72ca3e..a632d65a6 100644
--- a/data/cities/sciez/magretti.yml
+++ b/data/cities/sciez/magretti.yml
@@ -1,11 +1,11 @@
 id: 197279075
-type: way
+type: node
 latitude: 46.33209
 longitude: 6.38342
 postcode: "74140"
 city: Sciez
-street: "Chemin de l'Aulieu"
-housenumber: 15
+street: Chemin de l'Aulieu
+housenumber: "15"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/scionzier/au-coin-du-four-a-bois.yml b/data/cities/scionzier/au-coin-du-four-a-bois.yml
index 8ee48b8ed..43d0da0e1 100644
--- a/data/cities/scionzier/au-coin-du-four-a-bois.yml
+++ b/data/cities/scionzier/au-coin-du-four-a-bois.yml
@@ -1,11 +1,11 @@
 id: 105837455
-type: way
+type: node
 latitude: 46.06589
 longitude: 6.55226
 postcode: "74950"
 city: Scionzier
-street: "Avenue des Lacs"
-housenumber: 250
+street: Avenue des Lacs
+housenumber: "250"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/scionzier/boulanger.yml b/data/cities/scionzier/boulanger.yml
index 5812c5047..765c236cd 100644
--- a/data/cities/scionzier/boulanger.yml
+++ b/data/cities/scionzier/boulanger.yml
@@ -4,8 +4,8 @@ latitude: 46.06955
 longitude: 6.54963
 postcode: "74950"
 city: Scionzier
-street: "Rue César Vuarchex"
-housenumber: 415
+street: Rue César Vuarchex
+housenumber: "415"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:30,14:00-19:00; Sa 09:30-19:30
+website: ""
diff --git a/data/cities/scionzier/carrefour-market.yml b/data/cities/scionzier/carrefour-market.yml
index d5eec7d59..60772b1c2 100644
--- a/data/cities/scionzier/carrefour-market.yml
+++ b/data/cities/scionzier/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 818012837
-type: way
+type: node
 latitude: 46.0656
 longitude: 6.55044
 postcode: "74950"
 city: Scionzier
-street: "Avenue des Lacs"
-housenumber: 161
+street: Avenue des Lacs
+housenumber: "161"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/scionzier/decathlon.yml b/data/cities/scionzier/decathlon.yml
index 641a61832..09e53f0bb 100644
--- a/data/cities/scionzier/decathlon.yml
+++ b/data/cities/scionzier/decathlon.yml
@@ -4,8 +4,8 @@ latitude: 46.06926
 longitude: 6.54951
 postcode: "74950"
 city: Scionzier
-street: "Rue Cesar Vuarchex"
-housenumber: 415
+street: Rue Cesar Vuarchex
+housenumber: "415"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/scionzier/gifi.yml b/data/cities/scionzier/gifi.yml
index cbae59f88..9a1966749 100644
--- a/data/cities/scionzier/gifi.yml
+++ b/data/cities/scionzier/gifi.yml
@@ -4,8 +4,8 @@ latitude: 46.0674
 longitude: 6.55023
 postcode: "74950"
 city: Scionzier
-street: "Rue des Chasseurs"
-housenumber: 8
+street: Rue des Chasseurs
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/scionzier/king-jouet.yml b/data/cities/scionzier/king-jouet.yml
index a496b6260..de6b89734 100644
--- a/data/cities/scionzier/king-jouet.yml
+++ b/data/cities/scionzier/king-jouet.yml
@@ -1,11 +1,11 @@
 id: 1008916204
-type: way
+type: node
 latitude: 46.069
 longitude: 6.55537
 postcode: "74950"
 city: Scionzier
-street: "Rue Claude Ballaloud"
-housenumber: 42
+street: Rue Claude Ballaloud
+housenumber: "42"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-12:30, 14:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-12:30, 14:00-18:30
+website: ""
diff --git a/data/cities/scionzier/la-halle-rue-des-chasseurs.yml b/data/cities/scionzier/la-halle-rue-des-chasseurs.yml
index 47f26b190..16e397939 100644
--- a/data/cities/scionzier/la-halle-rue-des-chasseurs.yml
+++ b/data/cities/scionzier/la-halle-rue-des-chasseurs.yml
@@ -4,8 +4,8 @@ latitude: 46.06707
 longitude: 6.55009
 postcode: "74950"
 city: Scionzier
-street: "Rue des Chasseurs"
-housenumber: 
+street: Rue des Chasseurs
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/scionzier/la-halle.yml b/data/cities/scionzier/la-halle.yml
index e39f652b6..b41d16f11 100644
--- a/data/cities/scionzier/la-halle.yml
+++ b/data/cities/scionzier/la-halle.yml
@@ -4,8 +4,8 @@ latitude: 46.06681
 longitude: 6.54996
 postcode: "74950"
 city: Scionzier
-street: "Rue des Chasseurs"
-housenumber: 
+street: Rue des Chasseurs
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/scionzier/orchestra.yml b/data/cities/scionzier/orchestra.yml
index ce350c225..d182caa41 100644
--- a/data/cities/scionzier/orchestra.yml
+++ b/data/cities/scionzier/orchestra.yml
@@ -4,8 +4,8 @@ latitude: 46.06655
 longitude: 6.54984
 postcode: "74950"
 city: Scionzier
-street: "Rue des Chasseurs"
-housenumber: 8
+street: Rue des Chasseurs
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/scionzier/so-bio-scionzier.yml b/data/cities/scionzier/so-bio-scionzier.yml
index d2e39ab98..eaee38939 100644
--- a/data/cities/scionzier/so-bio-scionzier.yml
+++ b/data/cities/scionzier/so-bio-scionzier.yml
@@ -4,8 +4,8 @@ latitude: 46.06947
 longitude: 6.54961
 postcode: "74950"
 city: Scionzier
-street: "Rue César Vuarchex"
-housenumber: 
-phone: "+33 4 72 19 96 44"
-opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+street: Rue César Vuarchex
+housenumber: ""
+phone: +33 4 72 19 96 44
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-19:30
+website: ""
diff --git a/data/cities/scionzier/sport-2000.yml b/data/cities/scionzier/sport-2000.yml
index 047b03138..8b6b631c0 100644
--- a/data/cities/scionzier/sport-2000.yml
+++ b/data/cities/scionzier/sport-2000.yml
@@ -1,11 +1,11 @@
 id: 629490082
-type: way
+type: node
 latitude: 46.06687
 longitude: 6.55108
 postcode: "74950"
 city: Scionzier
-street: "Rue des Chasseurs"
-housenumber: 8
+street: Rue des Chasseurs
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seez/boucherie-charcuterie-des-arcades.yml b/data/cities/seez/boucherie-charcuterie-des-arcades.yml
index 7a8a7646b..87dec31f2 100644
--- a/data/cities/seez/boucherie-charcuterie-des-arcades.yml
+++ b/data/cities/seez/boucherie-charcuterie-des-arcades.yml
@@ -4,8 +4,8 @@ latitude: 45.62352
 longitude: 6.79843
 postcode: "73700"
 city: Séez
-street: "Rue de la Libération"
-housenumber: 
+street: Rue de la Libération
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seez/fromagerie-des-arcades.yml b/data/cities/seez/fromagerie-des-arcades.yml
index 45b69dc0c..ebe302b6d 100644
--- a/data/cities/seez/fromagerie-des-arcades.yml
+++ b/data/cities/seez/fromagerie-des-arcades.yml
@@ -4,8 +4,8 @@ latitude: 45.62366
 longitude: 6.79836
 postcode: "73700"
 city: Séez
-street: "Rue de la Libération"
-housenumber: 
+street: Rue de la Libération
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seez/vival.yml b/data/cities/seez/vival.yml
index 29bdc9cd7..1e116be37 100644
--- a/data/cities/seez/vival.yml
+++ b/data/cities/seez/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.62313
 longitude: 6.79933
 postcode: "73700"
 city: Séez
-street: "Rue de la Libération"
-housenumber: 
-phone: "+33 4 79 09 27 94"
-opening_hours: "Tu-Sa 07:00-12:45,15:00-19:45; Su 08:00-12:30"
-website: "https://magasins.vival.fr/fr/vival-seez"
\ No newline at end of file
+street: Rue de la Libération
+housenumber: ""
+phone: +33 4 79 09 27 94
+opening_hours: Tu-Sa 07:00-12:45,15:00-19:45; Su 08:00-12:30
+website: https://magasins.vival.fr/fr/vival-seez
diff --git a/data/cities/segny/berties-sport.yml b/data/cities/segny/berties-sport.yml
index 883279b3e..aecf7c055 100644
--- a/data/cities/segny/berties-sport.yml
+++ b/data/cities/segny/berties-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.29468
 longitude: 6.07919
 postcode: "01170"
 city: Segny
-street: "Route Route Nationale"
-housenumber: 5
+street: Route Route Nationale
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/segny/boulangerie-patisserie-la-paniere.yml b/data/cities/segny/boulangerie-patisserie-la-paniere.yml
index 2e201b3b6..7f7baa89c 100644
--- a/data/cities/segny/boulangerie-patisserie-la-paniere.yml
+++ b/data/cities/segny/boulangerie-patisserie-la-paniere.yml
@@ -4,8 +4,8 @@ latitude: 46.29952
 longitude: 6.07004
 postcode: "01170"
 city: Ségny
-street: "Rue des Carpières"
-housenumber: 282
+street: Rue des Carpières
+housenumber: "282"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/segny/boulangerie-patisserie-segnerand.yml b/data/cities/segny/boulangerie-patisserie-segnerand.yml
index 11b02f4e5..e9aa70355 100644
--- a/data/cities/segny/boulangerie-patisserie-segnerand.yml
+++ b/data/cities/segny/boulangerie-patisserie-segnerand.yml
@@ -4,8 +4,8 @@ latitude: 46.29599
 longitude: 6.07281
 postcode: "01170"
 city: Ségny
-street: "Rue du Vieux Bourg"
-housenumber: 167
-phone: "+33 4 50 41 67 72"
+street: Rue du Vieux Bourg
+housenumber: "167"
+phone: +33 4 50 41 67 72
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/segny/esthetic-center.yml b/data/cities/segny/esthetic-center.yml
index c3a4a2692..a5faa38b5 100644
--- a/data/cities/segny/esthetic-center.yml
+++ b/data/cities/segny/esthetic-center.yml
@@ -4,8 +4,8 @@ latitude: 46.29933
 longitude: 6.07027
 postcode: "01170"
 city: Ségny
-street: "Rue des Carpières"
-housenumber: 282
+street: Rue des Carpières
+housenumber: "282"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00; Sa 08:30-18:00"
-website: "https://www.esthetic-center.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa 08:30-18:00
+website: https://www.esthetic-center.com/
diff --git a/data/cities/segny/fromagerie-michelin.yml b/data/cities/segny/fromagerie-michelin.yml
index 09d5be97a..9c04a221b 100644
--- a/data/cities/segny/fromagerie-michelin.yml
+++ b/data/cities/segny/fromagerie-michelin.yml
@@ -4,8 +4,8 @@ latitude: 46.2963
 longitude: 6.07316
 postcode: "01170"
 city: Ségny
-street: "Rue du Vieux Bourg"
-housenumber: 13
-phone: "+33 4 50 42 35 83"
+street: Rue du Vieux Bourg
+housenumber: "13"
+phone: +33 4 50 42 35 83
 opening_hours: ""
-website: "http://www.fromagerie-geneve.com"
\ No newline at end of file
+website: http://www.fromagerie-geneve.com
diff --git a/data/cities/serezin-du-rhone/la-moisson-doree.yml b/data/cities/serezin-du-rhone/la-moisson-doree.yml
index d243059de..475cf8d94 100644
--- a/data/cities/serezin-du-rhone/la-moisson-doree.yml
+++ b/data/cities/serezin-du-rhone/la-moisson-doree.yml
@@ -4,8 +4,8 @@ latitude: 45.62904
 longitude: 4.82731
 postcode: "69360"
 city: Sérézin-du-Rhône
-street: "Avenue du Dauphiné"
-housenumber: 28
+street: Avenue du Dauphiné
+housenumber: "28"
 phone: ""
-opening_hours: "Tu-Sa 06:00-13:00,15:30-19:00; Su 06:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:00-13:00,15:30-19:00; Su 06:00-13:00
+website: ""
diff --git a/data/cities/serezin-du-rhone/resotainer-lyon-sud-serezin.yml b/data/cities/serezin-du-rhone/resotainer-lyon-sud-serezin.yml
index ecd9e77f6..cebfe6ee3 100644
--- a/data/cities/serezin-du-rhone/resotainer-lyon-sud-serezin.yml
+++ b/data/cities/serezin-du-rhone/resotainer-lyon-sud-serezin.yml
@@ -4,8 +4,8 @@ latitude: 45.62566
 longitude: 4.81476
 postcode: "69360"
 city: Sérézin-du-Rhône
-street: "Zone portuaire , Avenue du Rhône"
-housenumber: 
+street: Zone portuaire , Avenue du Rhône
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sermerieu/epicerie-tabac-sermerieu.yml b/data/cities/sermerieu/epicerie-tabac-sermerieu.yml
index 9a590b281..3a17c45a5 100644
--- a/data/cities/sermerieu/epicerie-tabac-sermerieu.yml
+++ b/data/cities/sermerieu/epicerie-tabac-sermerieu.yml
@@ -4,8 +4,8 @@ latitude: 45.67178
 longitude: 5.41101
 postcode: "38510"
 city: Sermérieu
-street: "Grande Rue"
-housenumber: 245
+street: Grande Rue
+housenumber: "245"
 phone: "0474800754"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/serrieres-de-briord/boulangerie-patisserie.yml b/data/cities/serrieres-de-briord/boulangerie-patisserie.yml
index 5f61b3f7c..cbf80869d 100644
--- a/data/cities/serrieres-de-briord/boulangerie-patisserie.yml
+++ b/data/cities/serrieres-de-briord/boulangerie-patisserie.yml
@@ -4,8 +4,8 @@ latitude: 45.80765
 longitude: 5.45364
 postcode: "01470"
 city: Serrières-de-Briord
-street: "Grande Rue"
-housenumber: 17
+street: Grande Rue
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/serrieres-de-briord/vival.yml b/data/cities/serrieres-de-briord/vival.yml
index c510d3905..458a4317f 100644
--- a/data/cities/serrieres-de-briord/vival.yml
+++ b/data/cities/serrieres-de-briord/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.80765
 longitude: 5.45403
 postcode: "01470"
 city: Serrières-de-Briord
-street: "Rue du Pont"
+street: Rue du Pont
 housenumber: 17b
-phone: "+33 4 74 36 76 77"
-opening_hours: "Mo 08:30-12:30; Tu-Sa 08:00-19:00; Su 08:00-12:00"
-website: "https://magasins.vival.fr/fr/s/vival-serrieres-de-briord"
\ No newline at end of file
+phone: +33 4 74 36 76 77
+opening_hours: Mo 08:30-12:30; Tu-Sa 08:00-19:00; Su 08:00-12:00
+website: https://magasins.vival.fr/fr/s/vival-serrieres-de-briord
diff --git a/data/cities/servoz/8-a-huit.yml b/data/cities/servoz/8-a-huit.yml
index d819e0a9b..ca6f56baf 100644
--- a/data/cities/servoz/8-a-huit.yml
+++ b/data/cities/servoz/8-a-huit.yml
@@ -4,8 +4,8 @@ latitude: 45.93048
 longitude: 6.76704
 postcode: "74310"
 city: Servoz
-street: "Rue du Bouchet"
-housenumber: 54
+street: Rue du Bouchet
+housenumber: "54"
 phone: ""
-opening_hours: "Mo-Sa 07:00-12:30,17:00-19:00; Su 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-12:30,17:00-19:00; Su 07:00-12:30
+website: ""
diff --git a/data/cities/servoz/gorges-de-la-diosaz-allee-des-gorges.yml b/data/cities/servoz/gorges-de-la-diosaz-allee-des-gorges.yml
index 3f338f48b..03e6e962e 100644
--- a/data/cities/servoz/gorges-de-la-diosaz-allee-des-gorges.yml
+++ b/data/cities/servoz/gorges-de-la-diosaz-allee-des-gorges.yml
@@ -4,8 +4,8 @@ latitude: 45.93245
 longitude: 6.77005
 postcode: "74310"
 city: Servoz
-street: "Allée des Gorges"
-housenumber: 181
+street: Allée des Gorges
+housenumber: "181"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/servoz/gorges-de-la-diosaz.yml b/data/cities/servoz/gorges-de-la-diosaz.yml
index 913c9ca17..b7f65a5ec 100644
--- a/data/cities/servoz/gorges-de-la-diosaz.yml
+++ b/data/cities/servoz/gorges-de-la-diosaz.yml
@@ -4,8 +4,8 @@ latitude: 45.93239
 longitude: 6.77008
 postcode: "74310"
 city: Servoz
-street: "Allée des Gorges"
-housenumber: 181
+street: Allée des Gorges
+housenumber: "181"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sevrier/carrefour-market.yml b/data/cities/sevrier/carrefour-market.yml
index d54be329b..303750255 100644
--- a/data/cities/sevrier/carrefour-market.yml
+++ b/data/cities/sevrier/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 70565269
-type: way
+type: node
 latitude: 45.84526
 longitude: 6.14995
 postcode: "74320"
 city: Sevrier
-street: "Route des Pontets"
-housenumber: 75
+street: Route des Pontets
+housenumber: "75"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/sevrier/fraises-et-basilic.yml b/data/cities/sevrier/fraises-et-basilic.yml
index 82aa86260..7892c0724 100644
--- a/data/cities/sevrier/fraises-et-basilic.yml
+++ b/data/cities/sevrier/fraises-et-basilic.yml
@@ -1,11 +1,11 @@
 id: 70565353
-type: way
+type: node
 latitude: 45.85143
 longitude: 6.14448
 postcode: "74320"
 city: Sevrier
-street: "Route d'Albertville"
-housenumber: 3610
+street: Route d'Albertville
+housenumber: "3610"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sevrier/sport-a-tout-prix.yml b/data/cities/sevrier/sport-a-tout-prix.yml
index be901f52b..80e9fdb73 100644
--- a/data/cities/sevrier/sport-a-tout-prix.yml
+++ b/data/cities/sevrier/sport-a-tout-prix.yml
@@ -1,11 +1,11 @@
 id: 70569194
-type: way
+type: node
 latitude: 45.85109
 longitude: 6.14391
 postcode: "74320"
 city: Sevrier
-street: "Route d'Albertville"
-housenumber: 3640
+street: Route d'Albertville
+housenumber: "3640"
 phone: ""
-opening_hours: "Mo-Su 09:30-19:30"
-website: "http://www.sportatoutprix.fr"
\ No newline at end of file
+opening_hours: Mo-Su 09:30-19:30
+website: http://www.sportatoutprix.fr
diff --git a/data/cities/sevrier/vival.yml b/data/cities/sevrier/vival.yml
index 4e5d9d409..178eb1069 100644
--- a/data/cities/sevrier/vival.yml
+++ b/data/cities/sevrier/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.86709
 longitude: 6.13962
 postcode: "74320"
 city: Sevrier
-street: "Route d'Albertville"
-housenumber: 1824
+street: Route d'Albertville
+housenumber: "1824"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 17:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 17:00-20:00
+website: ""
diff --git a/data/cities/sevrier/wine-et-vin-shop.yml b/data/cities/sevrier/wine-et-vin-shop.yml
index 5e4c15b09..ad1e2189f 100644
--- a/data/cities/sevrier/wine-et-vin-shop.yml
+++ b/data/cities/sevrier/wine-et-vin-shop.yml
@@ -1,11 +1,11 @@
 id: 70569304
-type: way
+type: node
 latitude: 45.85158
 longitude: 6.14442
 postcode: "74320"
 city: Sevrier
-street: "Route d'Albertville"
-housenumber: 3610
+street: Route d'Albertville
+housenumber: "3610"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seynod/action.yml b/data/cities/seynod/action.yml
index ebd5ba970..a287e3e78 100644
--- a/data/cities/seynod/action.yml
+++ b/data/cities/seynod/action.yml
@@ -4,8 +4,8 @@ latitude: 45.87527
 longitude: 6.08735
 postcode: "74600"
 city: Seynod
-street: "Avenue d'Aix les Bains"
-housenumber: 
-phone: "01 55 56 41 52"
-opening_hours: "Mo-Su 07:30-21:00"
-website: ""
\ No newline at end of file
+street: Avenue d'Aix les Bains
+housenumber: ""
+phone: 01 55 56 41 52
+opening_hours: Mo-Su 07:30-21:00
+website: ""
diff --git a/data/cities/seynod/aravis-automobile.yml b/data/cities/seynod/aravis-automobile.yml
index 470bdd1fb..aa2fb04b0 100644
--- a/data/cities/seynod/aravis-automobile.yml
+++ b/data/cities/seynod/aravis-automobile.yml
@@ -4,8 +4,8 @@ latitude: 45.88796
 longitude: 6.10394
 postcode: ""
 city: Seynod
-street: "Avenue d'Aix les Bains"
-housenumber: 
+street: Avenue d'Aix les Bains
+housenumber: ""
 phone: "+33450335483"
-opening_hours: "Mo-FR 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: "https://www.rossi-automobile.com/"
\ No newline at end of file
+opening_hours: Mo-FR 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: https://www.rossi-automobile.com/
diff --git a/data/cities/seynod/auchan.yml b/data/cities/seynod/auchan.yml
index ae7af10c1..372164f27 100644
--- a/data/cities/seynod/auchan.yml
+++ b/data/cities/seynod/auchan.yml
@@ -4,8 +4,8 @@ latitude: 45.87537
 longitude: 6.08793
 postcode: "74600"
 city: Seynod
-street: "Avenue d'Aix les Bains"
-housenumber: 
+street: Avenue d'Aix les Bains
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.auchan.fr/magasins/hypermarche/auchan-hypermarche-annecy-seynod/s-253"
\ No newline at end of file
+website: https://www.auchan.fr/magasins/hypermarche/auchan-hypermarche-annecy-seynod/s-253
diff --git a/data/cities/seynod/bazar-sans-frontieres.yml b/data/cities/seynod/bazar-sans-frontieres.yml
index 8ed207ff8..fadfb20b4 100644
--- a/data/cities/seynod/bazar-sans-frontieres.yml
+++ b/data/cities/seynod/bazar-sans-frontieres.yml
@@ -4,8 +4,8 @@ latitude: 45.89207
 longitude: 6.11721
 postcode: "74600"
 city: Seynod
-street: "Avenue des Trois Fontaines"
-housenumber: 3
-phone: ""
-opening_hours: ""
-website: "https://www.bazarsansfrontieres.fr/"
\ No newline at end of file
+street: Avenue des Trois Fontaines
+housenumber: "3"
+phone: +33 4 50 51 83 77
+opening_hours: Tu-Sa 10:00-12:00,14:00-18:00
+website: https://www.bazarsansfrontieres.fr/
diff --git a/data/cities/seynod/carrefour-market.yml b/data/cities/seynod/carrefour-market.yml
index f310ca3bb..b5df57f78 100644
--- a/data/cities/seynod/carrefour-market.yml
+++ b/data/cities/seynod/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 822961300
-type: way
+type: node
 latitude: 45.88783
 longitude: 6.10121
 postcode: "74600"
 city: Seynod
-street: "Place Saint-Jean"
-housenumber: 10
+street: Place Saint-Jean
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/seynod/decathlon.yml b/data/cities/seynod/decathlon.yml
index cd32b7b68..6ff5292d7 100644
--- a/data/cities/seynod/decathlon.yml
+++ b/data/cities/seynod/decathlon.yml
@@ -4,8 +4,8 @@ latitude: 45.87505
 longitude: 6.08655
 postcode: "74600"
 city: Seynod
-street: "Avenue de Périaz"
-housenumber: 20
+street: Avenue de Périaz
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00; Su off
+website: ""
diff --git a/data/cities/seynod/destock-jeans.yml b/data/cities/seynod/destock-jeans.yml
index 49cffaefd..5bef21b41 100644
--- a/data/cities/seynod/destock-jeans.yml
+++ b/data/cities/seynod/destock-jeans.yml
@@ -4,8 +4,8 @@ latitude: 45.87768
 longitude: 6.09545
 postcode: "74600"
 city: Seynod
-street: "Boulevard Costa de Beauregard"
-housenumber: 69
-phone: "+33 4 50 02 70 31"
-opening_hours: "Mo-Fr 10:00-12:30,13:30-19:00; Sa 10:00-19:00"
-website: "https://www.destockjeans.fr/storelocator/store/index/shop_id/12"
\ No newline at end of file
+street: Boulevard Costa de Beauregard
+housenumber: "69"
+phone: +33 4 50 02 70 31
+opening_hours: Mo-Fr 10:00-12:30,13:30-19:00; Sa 10:00-19:00
+website: https://www.destockjeans.fr/storelocator/store/index/shop_id/12
diff --git a/data/cities/seynod/freres-lunetiers-seynod.yml b/data/cities/seynod/freres-lunetiers-seynod.yml
index 9bff75592..eeb109920 100644
--- a/data/cities/seynod/freres-lunetiers-seynod.yml
+++ b/data/cities/seynod/freres-lunetiers-seynod.yml
@@ -4,8 +4,8 @@ latitude: 45.88946
 longitude: 6.10096
 postcode: "74600"
 city: Seynod
-street: "Avenue de Champ Fleuri"
-housenumber: 14
+street: Avenue de Champ Fleuri
+housenumber: "14"
 phone: "+33450698430"
-opening_hours: "Mo 14:30-19:00; Tu-Sa 09:30-12:30,14:30-19:00"
-website: "https://frereslunetiers.fr/"
\ No newline at end of file
+opening_hours: Mo 14:30-19:00; Tu-Sa 09:30-12:30,14:30-19:00
+website: https://frereslunetiers.fr/
diff --git a/data/cities/seynod/la-loge.yml b/data/cities/seynod/la-loge.yml
index 762750bd6..77215f705 100644
--- a/data/cities/seynod/la-loge.yml
+++ b/data/cities/seynod/la-loge.yml
@@ -4,8 +4,9 @@ latitude: 45.88874
 longitude: 6.10098
 postcode: "74600"
 city: Seynod
-street: "Avenue de Champ Fleuri"
-housenumber: 31
+street: Avenue de Champ Fleuri
+housenumber: "31"
 phone: "+33450663782"
-opening_hours: "Mo 09:00-18:00; Tu 07:00-19:00; We 09:00-19:00; Th 08:00-19:00; Fr 08:00-21:00; Sa 07:00-17:00"
-website: "https://loge-coiffure.fr/"
\ No newline at end of file
+opening_hours: Mo 09:00-18:00; Tu 07:00-19:00; We 09:00-19:00; Th 08:00-19:00; Fr
+    08:00-21:00; Sa 07:00-17:00
+website: https://loge-coiffure.fr/
diff --git a/data/cities/seynod/ma-boulangerie.yml b/data/cities/seynod/ma-boulangerie.yml
index 169429d08..c7169fc3c 100644
--- a/data/cities/seynod/ma-boulangerie.yml
+++ b/data/cities/seynod/ma-boulangerie.yml
@@ -5,7 +5,7 @@ longitude: 6.10098
 postcode: "74600"
 city: Seynod
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:30; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:30; Su 06:30-13:00
+website: ""
diff --git a/data/cities/seynod/marie-blachere.yml b/data/cities/seynod/marie-blachere.yml
index ce5a8b82f..1085d9396 100644
--- a/data/cities/seynod/marie-blachere.yml
+++ b/data/cities/seynod/marie-blachere.yml
@@ -4,8 +4,8 @@ latitude: 45.89217
 longitude: 6.11379
 postcode: "74600"
 city: Seynod
-street: "Avenue Henri Zanaroli"
-housenumber: 10
+street: Avenue Henri Zanaroli
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: "https://www.marieblachere.com/"
\ No newline at end of file
+website: https://www.marieblachere.com/
diff --git a/data/cities/seynod/motopack.yml b/data/cities/seynod/motopack.yml
index ffee60b30..9aacfa4c2 100644
--- a/data/cities/seynod/motopack.yml
+++ b/data/cities/seynod/motopack.yml
@@ -4,8 +4,9 @@ latitude: 45.88178
 longitude: 6.09539
 postcode: "74600"
 city: Seynod
-street: "Avenue d'Aix les Bains"
-housenumber: 194
-phone: "+33 450521304"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Mo,Su,PH off"
-website: "http://moto-pack.fr"
\ No newline at end of file
+street: Avenue d'Aix les Bains
+housenumber: "194"
+phone: +33 450521304
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Mo,Su,PH
+    off
+website: http://moto-pack.fr
diff --git a/data/cities/seynod/opel.yml b/data/cities/seynod/opel.yml
index 3b2d70a4e..d60b32610 100644
--- a/data/cities/seynod/opel.yml
+++ b/data/cities/seynod/opel.yml
@@ -4,8 +4,8 @@ latitude: 45.88854
 longitude: 6.10518
 postcode: ""
 city: Seynod
-street: "Avenue d'Aix les Bains"
-housenumber: 
+street: Avenue d'Aix les Bains
+housenumber: ""
 phone: "+33482291534"
 opening_hours: ""
-website: "https://www.bymycar.fr/concessions/opel-annecy-bymycar"
\ No newline at end of file
+website: https://www.bymycar.fr/concessions/opel-annecy-bymycar
diff --git a/data/cities/seynod/rrun-seynod.yml b/data/cities/seynod/rrun-seynod.yml
index 94e0f5df1..792936176 100644
--- a/data/cities/seynod/rrun-seynod.yml
+++ b/data/cities/seynod/rrun-seynod.yml
@@ -4,8 +4,8 @@ latitude: 45.8762
 longitude: 6.08772
 postcode: "74600"
 city: Seynod
-street: "Chemin de Periaz"
-housenumber: 
+street: Chemin de Periaz
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.r-run-seynod.com/"
\ No newline at end of file
+website: https://www.r-run-seynod.com/
diff --git a/data/cities/seynod/scene-o-cafe.yml b/data/cities/seynod/scene-o-cafe.yml
index de8962b60..eb1996cfc 100644
--- a/data/cities/seynod/scene-o-cafe.yml
+++ b/data/cities/seynod/scene-o-cafe.yml
@@ -4,8 +4,8 @@ latitude: 45.88461
 longitude: 6.09955
 postcode: "74600"
 city: Seynod
-street: "Avenue d'Aix les Bains"
-housenumber: 150
+street: Avenue d'Aix les Bains
+housenumber: "150"
 phone: "0450520563"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seynod/val-semnoz.yml b/data/cities/seynod/val-semnoz.yml
index d520e75f7..3fa20b3b9 100644
--- a/data/cities/seynod/val-semnoz.yml
+++ b/data/cities/seynod/val-semnoz.yml
@@ -1,11 +1,11 @@
 id: 62595921
-type: way
+type: node
 latitude: 45.87587
 longitude: 6.08708
 postcode: "74600"
 city: Seynod
-street: "Avenue de Périaz"
-housenumber: 20
+street: Avenue de Périaz
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Su 07:30-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:30-21:00
+website: ""
diff --git a/data/cities/seynod/yves-rocher.yml b/data/cities/seynod/yves-rocher.yml
index d46fcd254..7de7c934c 100644
--- a/data/cities/seynod/yves-rocher.yml
+++ b/data/cities/seynod/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.87529
 longitude: 6.08671
 postcode: "74600"
 city: Seynod
-street: "Avenue Aix-Les-Bains"
-housenumber: 1
+street: Avenue Aix-Les-Bains
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/seynod/seynod/S-FRYROC767"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/seynod/seynod/S-FRYROC767
diff --git a/data/cities/seyssel/bourgeois.yml b/data/cities/seyssel/bourgeois.yml
index 414d96607..750d1ba99 100644
--- a/data/cities/seyssel/bourgeois.yml
+++ b/data/cities/seyssel/bourgeois.yml
@@ -1,11 +1,11 @@
 id: 63192826
-type: way
+type: node
 latitude: 45.95845
 longitude: 5.83187
 postcode: "01420"
 city: Seyssel
-street: "Quai Charles de Gaulle"
-housenumber: 1
+street: Quai Charles de Gaulle
+housenumber: "1"
 phone: ""
-opening_hours: "Mo, We-Su 06:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo, We-Su 06:00-20:00
+website: ""
diff --git a/data/cities/seyssel/carrefour-market.yml b/data/cities/seyssel/carrefour-market.yml
index c0f4ed79c..0343752e7 100644
--- a/data/cities/seyssel/carrefour-market.yml
+++ b/data/cities/seyssel/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 821364046
-type: way
+type: node
 latitude: 45.96468
 longitude: 5.8372
 postcode: "74910"
 city: Seyssel
-street: "Route de Genève"
-housenumber: 28
+street: Route de Genève
+housenumber: "28"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/seyssinet-pariset/audine.yml b/data/cities/seyssinet-pariset/audine.yml
index 28e25245f..d8fcb045a 100644
--- a/data/cities/seyssinet-pariset/audine.yml
+++ b/data/cities/seyssinet-pariset/audine.yml
@@ -4,8 +4,8 @@ latitude: 45.17548
 longitude: 5.69324
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Rue de la Fauconnière"
-housenumber: 64
+street: Rue de la Fauconnière
+housenumber: "64"
 phone: ""
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/auto-bernhard.yml b/data/cities/seyssinet-pariset/auto-bernhard.yml
index 5de4bfdc9..856e5a5ce 100644
--- a/data/cities/seyssinet-pariset/auto-bernhard.yml
+++ b/data/cities/seyssinet-pariset/auto-bernhard.yml
@@ -1,11 +1,11 @@
 id: 66183613
-type: way
+type: node
 latitude: 45.17744
 longitude: 5.68907
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue du Général de Gaulle"
-housenumber: 4
+street: Avenue du Général de Gaulle
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: "https://reseau.citroen.fr/grenoble-seyssinet"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: https://reseau.citroen.fr/grenoble-seyssinet
diff --git a/data/cities/seyssinet-pariset/auto-distribution-isere.yml b/data/cities/seyssinet-pariset/auto-distribution-isere.yml
index da5662547..4f7649434 100644
--- a/data/cities/seyssinet-pariset/auto-distribution-isere.yml
+++ b/data/cities/seyssinet-pariset/auto-distribution-isere.yml
@@ -1,11 +1,11 @@
 id: 66187491
-type: way
+type: node
 latitude: 45.17779
 longitude: 5.68784
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Rue de la Levade"
-housenumber: 7
-phone: "+33 4 76 70 50 96"
-opening_hours: "Mo-Fr 08:00-12:00, 13:30-18:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue de la Levade
+housenumber: "7"
+phone: +33 4 76 70 50 96
+opening_hours: Mo-Fr 08:00-12:00, 13:30-18:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/borealyss.yml b/data/cities/seyssinet-pariset/borealyss.yml
index 0c77a87fe..c2998853d 100644
--- a/data/cities/seyssinet-pariset/borealyss.yml
+++ b/data/cities/seyssinet-pariset/borealyss.yml
@@ -4,8 +4,8 @@ latitude: 45.17554
 longitude: 5.69324
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Rue de la Fauconnière"
-housenumber: 64
+street: Rue de la Fauconnière
+housenumber: "64"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-17:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/carrefour-city.yml b/data/cities/seyssinet-pariset/carrefour-city.yml
index df6a945bc..d036caec3 100644
--- a/data/cities/seyssinet-pariset/carrefour-city.yml
+++ b/data/cities/seyssinet-pariset/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.18004
 longitude: 5.69486
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Boulevard de l'Europe"
-housenumber: 29
-phone: "+33 9 52 64 24 64"
-opening_hours: "Mo-Sa 07:00-21:00; Su 09:00-20:00"
-website: "https://www.carrefour.fr/magasin/city-seyssinet-pariset"
\ No newline at end of file
+street: Boulevard de l'Europe
+housenumber: "29"
+phone: +33 9 52 64 24 64
+opening_hours: Mo-Sa 07:00-21:00; Su 09:00-20:00
+website: https://www.carrefour.fr/magasin/city-seyssinet-pariset
diff --git a/data/cities/seyssinet-pariset/chronodrive-seyssinet-pariset.yml b/data/cities/seyssinet-pariset/chronodrive-seyssinet-pariset.yml
index 44e4adb1a..9089483aa 100644
--- a/data/cities/seyssinet-pariset/chronodrive-seyssinet-pariset.yml
+++ b/data/cities/seyssinet-pariset/chronodrive-seyssinet-pariset.yml
@@ -1,11 +1,11 @@
 id: 66184801
-type: way
+type: node
 latitude: 45.17729
 longitude: 5.68765
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue du général de Gaulle"
-housenumber: 12
-phone: "+334 38 12 33 11"
-opening_hours: "Mo-Sa 08:30-20:30; Su 09:00-12:45"
-website: "https://www.chronodrive.com/magasins-chronodrive/drive-magasin-1057-seyssinet-pariset"
\ No newline at end of file
+street: Avenue du Général de Gaulle
+housenumber: "12"
+phone: +334 38 12 33 11
+opening_hours: Mo-Sa 08:30-20:30; Su 09:00-12:45
+website: https://www.chronodrive.com/magasins-chronodrive/drive-magasin-1057-seyssinet-pariset
diff --git a/data/cities/seyssinet-pariset/graine-dalice.yml b/data/cities/seyssinet-pariset/graine-dalice.yml
index f8b06f0a8..196ac51dc 100644
--- a/data/cities/seyssinet-pariset/graine-dalice.yml
+++ b/data/cities/seyssinet-pariset/graine-dalice.yml
@@ -4,8 +4,8 @@ latitude: 45.17877
 longitude: 5.69236
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de la Houille Blanche"
+street: Avenue de la Houille Blanche
 housenumber: 24B
-phone: "+33 4 76 22 61 07"
-opening_hours: "Mo-Sa 06:00-19:30"
-website: ""
\ No newline at end of file
+phone: +33 4 76 22 61 07
+opening_hours: Mo-Sa 06:00-19:30
+website: ""
diff --git a/data/cities/seyssinet-pariset/la-laverie.yml b/data/cities/seyssinet-pariset/la-laverie.yml
index 6278aca54..d7267c2a2 100644
--- a/data/cities/seyssinet-pariset/la-laverie.yml
+++ b/data/cities/seyssinet-pariset/la-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.17948
 longitude: 5.69527
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Rue Lamartine"
-housenumber: 18
-phone: "+33 6 77 54 22 77"
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+street: Rue Lamartine
+housenumber: "18"
+phone: +33 6 77 54 22 77
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/la-talemelerie.yml b/data/cities/seyssinet-pariset/la-talemelerie.yml
index a43711bf2..7121d314a 100644
--- a/data/cities/seyssinet-pariset/la-talemelerie.yml
+++ b/data/cities/seyssinet-pariset/la-talemelerie.yml
@@ -4,8 +4,8 @@ latitude: 45.17329
 longitude: 5.69702
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de la République"
-housenumber: 143
-phone: "+33 4 76 22 06 53"
-opening_hours: "Mo-Sa 06:30-19:30; Su 07:00-18:30"
-website: ""
\ No newline at end of file
+street: Avenue de la République
+housenumber: "143"
+phone: +33 4 76 22 06 53
+opening_hours: Mo-Sa 06:30-19:30; Su 07:00-18:30
+website: ""
diff --git a/data/cities/seyssinet-pariset/la-vie-claire.yml b/data/cities/seyssinet-pariset/la-vie-claire.yml
index 1700675a3..6f90be131 100644
--- a/data/cities/seyssinet-pariset/la-vie-claire.yml
+++ b/data/cities/seyssinet-pariset/la-vie-claire.yml
@@ -4,8 +4,8 @@ latitude: 45.17939
 longitude: 5.69392
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue Victor Hugo"
-housenumber: 2
-phone: "+33 4 76 21 23 86"
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-13:00"
-website: "https://magasins.lavieclaire.com/lavieclaire/fr/store/france/auvergne-rhone-alpes/isere/seyssinet-pariset/seyssinet-pariset/13813"
\ No newline at end of file
+street: Avenue Victor Hugo
+housenumber: "2"
+phone: +33 4 76 21 23 86
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-13:00
+website: https://magasins.lavieclaire.com/lavieclaire/fr/store/france/auvergne-rhone-alpes/isere/seyssinet-pariset/seyssinet-pariset/13813
diff --git a/data/cities/seyssinet-pariset/le-bleuet.yml b/data/cities/seyssinet-pariset/le-bleuet.yml
index c7da510c4..06d870f2b 100644
--- a/data/cities/seyssinet-pariset/le-bleuet.yml
+++ b/data/cities/seyssinet-pariset/le-bleuet.yml
@@ -4,8 +4,8 @@ latitude: 45.17708
 longitude: 5.69715
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de la République"
-housenumber: 123
+street: Avenue de la République
+housenumber: "123"
 phone: ""
-opening_hours: "Mo-Fr 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-20:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/le-salon-demile.yml b/data/cities/seyssinet-pariset/le-salon-demile.yml
index 3ee6653f5..cda1c474c 100644
--- a/data/cities/seyssinet-pariset/le-salon-demile.yml
+++ b/data/cities/seyssinet-pariset/le-salon-demile.yml
@@ -4,8 +4,8 @@ latitude: 45.18522
 longitude: 5.69693
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de la République"
+street: Avenue de la République
 housenumber: 18bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seyssinet-pariset/le-succes.yml b/data/cities/seyssinet-pariset/le-succes.yml
index 281c3290e..04dc02a90 100644
--- a/data/cities/seyssinet-pariset/le-succes.yml
+++ b/data/cities/seyssinet-pariset/le-succes.yml
@@ -4,8 +4,8 @@ latitude: 45.18518
 longitude: 5.69693
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de la République"
+street: Avenue de la République
 housenumber: 20bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seyssinet-pariset/les-halles-charly.yml b/data/cities/seyssinet-pariset/les-halles-charly.yml
index 782c68b84..d35a8c779 100644
--- a/data/cities/seyssinet-pariset/les-halles-charly.yml
+++ b/data/cities/seyssinet-pariset/les-halles-charly.yml
@@ -4,8 +4,8 @@ latitude: 45.17157
 longitude: 5.69576
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de Grenoble"
-housenumber: 8
-phone: "+33 4 76 96 95 22"
-opening_hours: "Tu-Sa 07:30-12:15,15:30-19:15; Su 07:30-12:15"
-website: "https://leshallescharly.fr"
\ No newline at end of file
+street: Avenue de Grenoble
+housenumber: "8"
+phone: +33 4 76 96 95 22
+opening_hours: Tu-Sa 07:30-12:15,15:30-19:15; Su 07:30-12:15
+website: https://leshallescharly.fr
diff --git a/data/cities/seyssinet-pariset/lexus-grenoble.yml b/data/cities/seyssinet-pariset/lexus-grenoble.yml
index c8638728d..b6978401d 100644
--- a/data/cities/seyssinet-pariset/lexus-grenoble.yml
+++ b/data/cities/seyssinet-pariset/lexus-grenoble.yml
@@ -1,11 +1,11 @@
 id: 66184436
-type: way
+type: node
 latitude: 45.17844
 longitude: 5.69078
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de la Houille Blanche"
-housenumber: 32
+street: Avenue de la Houille Blanche
+housenumber: "32"
 phone: "+33476221111"
 opening_hours: ""
-website: "https://mobilite.jeanlain.com/concessions/lexus-grenoble/"
\ No newline at end of file
+website: https://mobilite.jeanlain.com/concessions/lexus-grenoble/
diff --git a/data/cities/seyssinet-pariset/lidl.yml b/data/cities/seyssinet-pariset/lidl.yml
index 54d62f613..acdd9956a 100644
--- a/data/cities/seyssinet-pariset/lidl.yml
+++ b/data/cities/seyssinet-pariset/lidl.yml
@@ -4,8 +4,8 @@ latitude: 45.16874
 longitude: 5.69072
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de Grenoble"
-housenumber: 20
+street: Avenue de Grenoble
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/seyssinet-pariset/netto.yml b/data/cities/seyssinet-pariset/netto.yml
index cea963aad..1e8eaa5b8 100644
--- a/data/cities/seyssinet-pariset/netto.yml
+++ b/data/cities/seyssinet-pariset/netto.yml
@@ -4,8 +4,8 @@ latitude: 45.17633
 longitude: 5.69248
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Rue de la fauconnière"
-housenumber: 
-phone: "+33 4 76 84 02 44"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: "https://magasin.netto.fr/505-netto-seyssinet-pariset"
\ No newline at end of file
+street: Rue de la fauconnière
+housenumber: ""
+phone: +33 4 76 84 02 44
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: https://magasin.netto.fr/505-netto-seyssinet-pariset
diff --git a/data/cities/seyssinet-pariset/pates-et-pains-boulangerie-tarterie.yml b/data/cities/seyssinet-pariset/pates-et-pains-boulangerie-tarterie.yml
index e7e59489e..35b4012fa 100644
--- a/data/cities/seyssinet-pariset/pates-et-pains-boulangerie-tarterie.yml
+++ b/data/cities/seyssinet-pariset/pates-et-pains-boulangerie-tarterie.yml
@@ -1,11 +1,11 @@
 id: 302934052
-type: way
+type: node
 latitude: 45.17856
 longitude: 5.68687
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue du Vercors"
-housenumber: 46
+street: Avenue du Vercors
+housenumber: "46"
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/presse-papeterie-fauconniere.yml b/data/cities/seyssinet-pariset/presse-papeterie-fauconniere.yml
index 1d87018cf..49b4b43a4 100644
--- a/data/cities/seyssinet-pariset/presse-papeterie-fauconniere.yml
+++ b/data/cities/seyssinet-pariset/presse-papeterie-fauconniere.yml
@@ -4,8 +4,8 @@ latitude: 45.17662
 longitude: 5.6931
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Rue de la Fauconnière"
-housenumber: 8
+street: Rue de la Fauconnière
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 07:15-20:00; Su 08:15-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:15-20:00; Su 08:15-20:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/seyssinet-alpes-autos.yml b/data/cities/seyssinet-pariset/seyssinet-alpes-autos.yml
index 60c6df538..412756e14 100644
--- a/data/cities/seyssinet-pariset/seyssinet-alpes-autos.yml
+++ b/data/cities/seyssinet-pariset/seyssinet-alpes-autos.yml
@@ -1,11 +1,11 @@
 id: 66183948
-type: way
+type: node
 latitude: 45.17707
 longitude: 5.69042
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue du Général de Gaulle"
-housenumber: 9
+street: Avenue du Général de Gaulle
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: "https://www.seyssinetalpesauto.fr/"
\ No newline at end of file
+website: https://www.seyssinetalpesauto.fr/
diff --git a/data/cities/seyssinet-pariset/tiffanna.yml b/data/cities/seyssinet-pariset/tiffanna.yml
index d72b94b50..233f1691e 100644
--- a/data/cities/seyssinet-pariset/tiffanna.yml
+++ b/data/cities/seyssinet-pariset/tiffanna.yml
@@ -4,8 +4,8 @@ latitude: 45.17661
 longitude: 5.69281
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Rue de la Fauconnière"
-housenumber: 18
+street: Rue de la Fauconnière
+housenumber: "18"
 phone: ""
-opening_hours: "Tu-Fr 10:00-19:00; Sa 10:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-19:00; Sa 10:00-16:00
+website: ""
diff --git a/data/cities/seyssinet-pariset/triple-c-coiffure.yml b/data/cities/seyssinet-pariset/triple-c-coiffure.yml
index 8a60bc5a3..8e73265a8 100644
--- a/data/cities/seyssinet-pariset/triple-c-coiffure.yml
+++ b/data/cities/seyssinet-pariset/triple-c-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.18513
 longitude: 5.69693
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Avenue de la République"
+street: Avenue de la République
 housenumber: 18bis
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seyssinet-pariset/velosport.yml b/data/cities/seyssinet-pariset/velosport.yml
index 9944c9b68..2d6dd289e 100644
--- a/data/cities/seyssinet-pariset/velosport.yml
+++ b/data/cities/seyssinet-pariset/velosport.yml
@@ -4,8 +4,8 @@ latitude: 45.17996
 longitude: 5.69284
 postcode: "38170"
 city: Seyssinet-Pariset
-street: "Boulevard des Frères Desaire"
-housenumber: 26
+street: Boulevard des Frères Desaire
+housenumber: "26"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/seyssins/ama-tourisme.yml b/data/cities/seyssins/ama-tourisme.yml
index 88cf0ab41..268ddda5a 100644
--- a/data/cities/seyssins/ama-tourisme.yml
+++ b/data/cities/seyssins/ama-tourisme.yml
@@ -4,8 +4,8 @@ latitude: 45.16069
 longitude: 5.69421
 postcode: "38180"
 city: Seyssins
-street: "Rue Henri Dunan"
-housenumber: 3
-phone: "+33 4 38 12 83 53"
+street: Rue Henri Dunan
+housenumber: "3"
+phone: +33 4 38 12 83 53
 opening_hours: ""
-website: "https://www.tomorrowtravel.fr/our-agencies"
\ No newline at end of file
+website: https://www.tomorrowtravel.fr/our-agencies
diff --git a/data/cities/seyssins/boulangerie-marie-blachere.yml b/data/cities/seyssins/boulangerie-marie-blachere.yml
index 501f56149..11a153d74 100644
--- a/data/cities/seyssins/boulangerie-marie-blachere.yml
+++ b/data/cities/seyssins/boulangerie-marie-blachere.yml
@@ -1,11 +1,11 @@
 id: 66388525
-type: way
+type: node
 latitude: 45.15985
 longitude: 5.69353
 postcode: "38180"
 city: Seyssins
-street: "Avenue du Général de Gaulle"
-housenumber: 100
+street: Avenue du Général de Gaulle
+housenumber: "100"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seyssins/districycle-grenoble.yml b/data/cities/seyssins/districycle-grenoble.yml
index e21f587e1..1ff54a249 100644
--- a/data/cities/seyssins/districycle-grenoble.yml
+++ b/data/cities/seyssins/districycle-grenoble.yml
@@ -4,8 +4,8 @@ latitude: 45.16344
 longitude: 5.69951
 postcode: "38180"
 city: Seyssins
-street: "Rue des Allobroges"
-housenumber: 95
+street: Rue des Allobroges
+housenumber: "95"
 phone: ""
-opening_hours: "Tu-Sa 10:00-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/seyssins/eleven-cycling.yml b/data/cities/seyssins/eleven-cycling.yml
index 9c5121482..63b0f8e57 100644
--- a/data/cities/seyssins/eleven-cycling.yml
+++ b/data/cities/seyssins/eleven-cycling.yml
@@ -4,8 +4,8 @@ latitude: 45.16575
 longitude: 5.69775
 postcode: "38180"
 city: Seyssins
-street: "Rue Pasteur"
-housenumber: 67
+street: Rue Pasteur
+housenumber: "67"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/seyssins/intermarche.yml b/data/cities/seyssins/intermarche.yml
index 0f3512ba3..8cae7d4bf 100644
--- a/data/cities/seyssins/intermarche.yml
+++ b/data/cities/seyssins/intermarche.yml
@@ -1,11 +1,11 @@
 id: 66386417
-type: way
+type: node
 latitude: 45.16026
 longitude: 5.69528
 postcode: "38180"
 city: Seyssins
-street: "Rue de la Liberté"
-housenumber: 112
+street: Rue de la Liberté
+housenumber: "112"
 phone: ""
-opening_hours: "Mo-Th, Sa 08:30-19:30; Fr 08:30-20:00; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th, Sa 08:30-19:30; Fr 08:30-20:00; Su 09:00-12:00
+website: ""
diff --git a/data/cities/seyssins/irreelle.yml b/data/cities/seyssins/irreelle.yml
index c9595835b..6afe07b2f 100644
--- a/data/cities/seyssins/irreelle.yml
+++ b/data/cities/seyssins/irreelle.yml
@@ -4,8 +4,8 @@ latitude: 45.16063
 longitude: 5.69424
 postcode: "38180"
 city: Seyssins
-street: "Rue Henri Dunan"
-housenumber: 3
-phone: "+33 4 76 84 14 78"
+street: Rue Henri Dunan
+housenumber: "3"
+phone: +33 4 76 84 14 78
 opening_hours: ""
-website: "https://www.irreelle.fr/"
\ No newline at end of file
+website: https://www.irreelle.fr/
diff --git a/data/cities/seyssins/lart-et-gourmet.yml b/data/cities/seyssins/lart-et-gourmet.yml
index 5391069c6..53da46d63 100644
--- a/data/cities/seyssins/lart-et-gourmet.yml
+++ b/data/cities/seyssins/lart-et-gourmet.yml
@@ -1,11 +1,11 @@
 id: 1233995018
-type: way
+type: node
 latitude: 45.16984
 longitude: 5.69378
 postcode: "38180"
 city: Seyssins
-street: "Avenue Louis Armand"
-housenumber: 10
+street: Avenue Louis Armand
+housenumber: "10"
 phone: ""
-opening_hours: "Mo-Fr 06:00-19:00; Sa 06:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-19:00; Sa 06:30-19:00
+website: ""
diff --git a/data/cities/seyssins/tabac-presse-le-meloine.yml b/data/cities/seyssins/tabac-presse-le-meloine.yml
index 39a0d9bb2..16adb666d 100644
--- a/data/cities/seyssins/tabac-presse-le-meloine.yml
+++ b/data/cities/seyssins/tabac-presse-le-meloine.yml
@@ -4,8 +4,8 @@ latitude: 45.15616
 longitude: 5.68038
 postcode: "38180"
 city: Seyssins
-street: "Place du Village"
-housenumber: 6
+street: Place du Village
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Fr 06:45-12:30,15:30-19:15; Sa 08:45-12:15; Su 08:45-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:45-12:30,15:30-19:15; Sa 08:45-12:15; Su 08:45-12:00
+website: ""
diff --git a/data/cities/seyssins/vercors-lait.yml b/data/cities/seyssins/vercors-lait.yml
index c75b4c1ea..f15b66c9b 100644
--- a/data/cities/seyssins/vercors-lait.yml
+++ b/data/cities/seyssins/vercors-lait.yml
@@ -1,11 +1,11 @@
 id: 1268787207
-type: way
+type: node
 latitude: 45.15996
 longitude: 5.69347
 postcode: "38180"
 city: Seyssins
-street: "Avenue du Général de Gaulle"
-housenumber: 100
-phone: "+33 4 38 70 07 21"
-opening_hours: "Mo-Sa 08:30-18:30"
-website: "https://www.vercorslait-seyssins.fr/"
\ No newline at end of file
+street: Avenue du Général de Gaulle
+housenumber: "100"
+phone: +33 4 38 70 07 21
+opening_hours: Mo-Sa 08:30-18:30
+website: https://www.vercorslait-seyssins.fr/
diff --git a/data/cities/seyssuel/kiloutou.yml b/data/cities/seyssuel/kiloutou.yml
index 05c2fe407..9e3c00a0f 100644
--- a/data/cities/seyssuel/kiloutou.yml
+++ b/data/cities/seyssuel/kiloutou.yml
@@ -1,11 +1,11 @@
 id: 116956732
-type: way
+type: node
 latitude: 45.54982
 longitude: 4.83377
 postcode: "38200"
 city: Seyssuel
 street: ""
-housenumber: 882
-phone: "+33 4 28 29 14 68"
-opening_hours: "Mo-Fr 07:00-12:00,13:30-18:00"
-website: "https://www.kiloutou.fr/agences-ouvertes/l/seyssuel/882-route-de-chasse/2093819"
\ No newline at end of file
+housenumber: "882"
+phone: +33 4 28 29 14 68
+opening_hours: Mo-Fr 07:00-12:00,13:30-18:00
+website: https://www.kiloutou.fr/agences-ouvertes/l/seyssuel/882-route-de-chasse/2093819
diff --git a/data/cities/seyssuel/latelier-de-baptiste.yml b/data/cities/seyssuel/latelier-de-baptiste.yml
index ebc40f019..6884409ac 100644
--- a/data/cities/seyssuel/latelier-de-baptiste.yml
+++ b/data/cities/seyssuel/latelier-de-baptiste.yml
@@ -5,7 +5,7 @@ longitude: 4.8449
 postcode: "38200"
 city: Seyssuel
 street: ""
-housenumber: 32
+housenumber: "32"
 phone: ""
-opening_hours: "Tu-Su 08:00-13:00, Tu-Sa 15:00-20:00"
-website: "https://www.latelierdebaptiste.fr"
\ No newline at end of file
+opening_hours: Tu-Su 08:00-13:00, Tu-Sa 15:00-20:00
+website: https://www.latelierdebaptiste.fr
diff --git a/data/cities/seyssuel/mercedes-benz.yml b/data/cities/seyssuel/mercedes-benz.yml
index 1e06271a7..98afb9ef4 100644
--- a/data/cities/seyssuel/mercedes-benz.yml
+++ b/data/cities/seyssuel/mercedes-benz.yml
@@ -1,11 +1,11 @@
 id: 1057119079
-type: way
+type: node
 latitude: 45.55041
 longitude: 4.83278
 postcode: "38200"
 city: Seyssuel
 street: ""
-housenumber: 890
-phone: "+33 4 74 20 30 30"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: "https://www.groupechopard.com/mercedes-benz/contact/mercedes-vienne/"
\ No newline at end of file
+housenumber: "890"
+phone: +33 4 74 20 30 30
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: https://www.groupechopard.com/mercedes-benz/contact/mercedes-vienne/
diff --git a/data/cities/sillingy/alpinstore.yml b/data/cities/sillingy/alpinstore.yml
index 69a2d8e2d..53388b2d2 100644
--- a/data/cities/sillingy/alpinstore.yml
+++ b/data/cities/sillingy/alpinstore.yml
@@ -4,8 +4,8 @@ latitude: 45.94406
 longitude: 6.07146
 postcode: "74330"
 city: Sillingy
-street: "Route des Pres Rollier"
-housenumber: 180
+street: Route des Pres Rollier
+housenumber: "180"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sillingy/boulangerie-chevalier.yml b/data/cities/sillingy/boulangerie-chevalier.yml
index 272001a37..cf753e249 100644
--- a/data/cities/sillingy/boulangerie-chevalier.yml
+++ b/data/cities/sillingy/boulangerie-chevalier.yml
@@ -4,8 +4,8 @@ latitude: 45.95704
 longitude: 6.03945
 postcode: "74330"
 city: Sillingy
-street: "Route de Bellegarde"
-housenumber: 
-phone: "+33 4 50 68 80 75"
-opening_hours: "Mo-Su 06:30-20:30"
-website: "http://www.maison-chevallier.fr/boutiques/la-boutique-de-la-balme"
\ No newline at end of file
+street: Route de Bellegarde
+housenumber: ""
+phone: +33 4 50 68 80 75
+opening_hours: Mo-Su 06:30-20:30
+website: http://www.maison-chevallier.fr/boutiques/la-boutique-de-la-balme
diff --git a/data/cities/sillingy/bricorama.yml b/data/cities/sillingy/bricorama.yml
index 37d85bb3b..9000a3d3a 100644
--- a/data/cities/sillingy/bricorama.yml
+++ b/data/cities/sillingy/bricorama.yml
@@ -4,8 +4,8 @@ latitude: 45.94255
 longitude: 6.06994
 postcode: "74330"
 city: Sillingy
-street: "ZAC Bromines"
-housenumber: 
-phone: "+33 4 50 65 56 00"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.bricorama.fr/magasins/bricorama-annecy.html"
\ No newline at end of file
+street: ZAC Bromines
+housenumber: ""
+phone: +33 4 50 65 56 00
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.bricorama.fr/magasins/bricorama-annecy.html
diff --git a/data/cities/sillingy/couleur-passion.yml b/data/cities/sillingy/couleur-passion.yml
index d651aa8eb..6ffaeccca 100644
--- a/data/cities/sillingy/couleur-passion.yml
+++ b/data/cities/sillingy/couleur-passion.yml
@@ -4,8 +4,9 @@ latitude: 45.96073
 longitude: 6.00145
 postcode: "74330"
 city: Sillingy
-street: "Route de Sublessy"
-housenumber: 15
-phone: "+33 4 50 65 10 60"
-opening_hours: "Mo off; Tu 08:30-18:30; We 08:30-12:00; Th-Fr 08:30-18:30; Sa 08:30-15:30; Su off"
-website: ""
\ No newline at end of file
+street: Route de Sublessy
+housenumber: "15"
+phone: +33 4 50 65 10 60
+opening_hours: Mo off; Tu 08:30-18:30; We 08:30-12:00; Th-Fr 08:30-18:30; Sa 08:30-15:30;
+    Su off
+website: ""
diff --git a/data/cities/sillingy/ducruet-daniel.yml b/data/cities/sillingy/ducruet-daniel.yml
index a912a6918..4f631f218 100644
--- a/data/cities/sillingy/ducruet-daniel.yml
+++ b/data/cities/sillingy/ducruet-daniel.yml
@@ -4,8 +4,8 @@ latitude: 45.96034
 longitude: 6.00156
 postcode: "74330"
 city: Sillingy
-street: "Route de Clermont"
-housenumber: 5157
-phone: "+33 4 50 68 72 07"
-opening_hours: "Mo-Fr 08:00-18:00; Sa-Su off"
-website: ""
\ No newline at end of file
+street: Route de Clermont
+housenumber: "5157"
+phone: +33 4 50 68 72 07
+opening_hours: Mo-Fr 08:00-18:00; Sa-Su off
+website: ""
diff --git a/data/cities/sillingy/garage-du-marais.yml b/data/cities/sillingy/garage-du-marais.yml
index c68daf736..8c7a3d439 100644
--- a/data/cities/sillingy/garage-du-marais.yml
+++ b/data/cities/sillingy/garage-du-marais.yml
@@ -1,11 +1,11 @@
 id: 87039690
-type: way
+type: node
 latitude: 45.95653
 longitude: 6.03921
 postcode: "74330"
 city: Sillingy
-street: "Route de Bellegarde"
-housenumber: 2948
-phone: "+33 4 50 68 78 62"
-opening_hours: "Mo-Th 07:45-12:30,14:00-18:30; Fr 07:45-12:30,14:00-17:30; Sa-Su off"
-website: "https://garage-du-marais.fr"
\ No newline at end of file
+street: Route de Bellegarde
+housenumber: "2948"
+phone: +33 4 50 68 78 62
+opening_hours: Mo-Th 07:45-12:30,14:00-18:30; Fr 07:45-12:30,14:00-17:30; Sa-Su off
+website: https://garage-du-marais.fr
diff --git a/data/cities/sillingy/la-fruitiere-daugustin.yml b/data/cities/sillingy/la-fruitiere-daugustin.yml
index 5dace01ac..e97433531 100644
--- a/data/cities/sillingy/la-fruitiere-daugustin.yml
+++ b/data/cities/sillingy/la-fruitiere-daugustin.yml
@@ -4,8 +4,9 @@ latitude: 45.95693
 longitude: 6.0394
 postcode: "74330"
 city: Sillingy
-street: "Route de Bellegarde"
-housenumber: 2984
-phone: "+33 4 50 05 21 17"
-opening_hours: "Tu-Th 09:30-12:30,15:30-19:30; Fr-Sa 09:30-12:30,14:45-19:30; Su-Mo off"
-website: ""
\ No newline at end of file
+street: Route de Bellegarde
+housenumber: "2984"
+phone: +33 4 50 05 21 17
+opening_hours: Tu-Th 09:30-12:30,15:30-19:30; Fr-Sa 09:30-12:30,14:45-19:30; Su-Mo
+    off
+website: ""
diff --git a/data/cities/sillingy/le-ptiou-corti.yml b/data/cities/sillingy/le-ptiou-corti.yml
index c9cb9585e..b3603ead3 100644
--- a/data/cities/sillingy/le-ptiou-corti.yml
+++ b/data/cities/sillingy/le-ptiou-corti.yml
@@ -4,8 +4,8 @@ latitude: 45.96045
 longitude: 6.00138
 postcode: "74330"
 city: Sillingy
-street: "Route de Clermont"
-housenumber: 5159
-phone: "+33 4 50 68 78 42"
-opening_hours: "Mo-Sa 07:00-13:00,16:00-19:30; Tu off; Su 07:00-19:30"
-website: ""
\ No newline at end of file
+street: Route de Clermont
+housenumber: "5159"
+phone: +33 4 50 68 78 42
+opening_hours: Mo-Sa 07:00-13:00,16:00-19:30; Tu off; Su 07:00-19:30
+website: ""
diff --git a/data/cities/sillingy/vival.yml b/data/cities/sillingy/vival.yml
index 6ebd0a7ff..47ebbf5ee 100644
--- a/data/cities/sillingy/vival.yml
+++ b/data/cities/sillingy/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.94641
 longitude: 6.0344
 postcode: "74330"
 city: Sillingy
-street: "Route de Clermont"
-housenumber: 1200
+street: Route de Clermont
+housenumber: "1200"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30, 15:00-19:30; Su 08:00-12:00
+website: ""
diff --git a/data/cities/sixt-fer-a-cheval/caisse-de-salvagny.yml b/data/cities/sixt-fer-a-cheval/caisse-de-salvagny.yml
index cee98816a..1a2371370 100644
--- a/data/cities/sixt-fer-a-cheval/caisse-de-salvagny.yml
+++ b/data/cities/sixt-fer-a-cheval/caisse-de-salvagny.yml
@@ -1,11 +1,11 @@
 id: 1042069664
-type: way
+type: node
 latitude: 46.04552
 longitude: 6.76991
 postcode: "74740"
 city: Sixt-Fer-à-Cheval
 street: ""
-housenumber: 1267
+housenumber: "1267"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sixt-fer-a-cheval/chalet-du-cirque-du-fer-a-cheval.yml b/data/cities/sixt-fer-a-cheval/chalet-du-cirque-du-fer-a-cheval.yml
index b056096ad..fa19c85c4 100644
--- a/data/cities/sixt-fer-a-cheval/chalet-du-cirque-du-fer-a-cheval.yml
+++ b/data/cities/sixt-fer-a-cheval/chalet-du-cirque-du-fer-a-cheval.yml
@@ -5,7 +5,7 @@ longitude: 6.84013
 postcode: "74740"
 city: Sixt-Fer-à-Cheval
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sixt-fer-a-cheval/gaec-les-gorges-des-tines.yml b/data/cities/sixt-fer-a-cheval/gaec-les-gorges-des-tines.yml
index 2e1ce29d4..5adb5ee86 100644
--- a/data/cities/sixt-fer-a-cheval/gaec-les-gorges-des-tines.yml
+++ b/data/cities/sixt-fer-a-cheval/gaec-les-gorges-des-tines.yml
@@ -1,11 +1,11 @@
 id: 1118082724
-type: way
+type: node
 latitude: 46.05743
 longitude: 6.7516
 postcode: "74740"
 city: Sixt-Fer-à-Cheval
-street: "Route du Tunnel"
-housenumber: 413
+street: Route du Tunnel
+housenumber: "413"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sixt-fer-a-cheval/sherpa.yml b/data/cities/sixt-fer-a-cheval/sherpa.yml
index 744136f18..01cefa9a1 100644
--- a/data/cities/sixt-fer-a-cheval/sherpa.yml
+++ b/data/cities/sixt-fer-a-cheval/sherpa.yml
@@ -5,7 +5,7 @@ longitude: 6.77393
 postcode: "74740"
 city: Sixt-Fer-à-Cheval
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:00-12:30, 16:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-12:30, 16:30-19:30
+website: ""
diff --git a/data/cities/sixt-fer-a-cheval/skiset-chez-narcisse-sixt.yml b/data/cities/sixt-fer-a-cheval/skiset-chez-narcisse-sixt.yml
index 97bf70183..f6f7cc64d 100644
--- a/data/cities/sixt-fer-a-cheval/skiset-chez-narcisse-sixt.yml
+++ b/data/cities/sixt-fer-a-cheval/skiset-chez-narcisse-sixt.yml
@@ -4,8 +4,8 @@ latitude: 46.05413
 longitude: 6.7756
 postcode: "74740"
 city: Sixt-Fer-à-Cheval
-street: "Route de Salvagny"
-housenumber: 127
+street: Route de Salvagny
+housenumber: "127"
 phone: ""
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/sixt-fer-a-cheval/sport-2000.yml b/data/cities/sixt-fer-a-cheval/sport-2000.yml
index e1772763c..ffd6db86f 100644
--- a/data/cities/sixt-fer-a-cheval/sport-2000.yml
+++ b/data/cities/sixt-fer-a-cheval/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.05336
 longitude: 6.77437
 postcode: "74740"
 city: Sixt-Fer-à-Cheval
-street: "Place de la Gare"
-housenumber: 59
+street: Place de la Gare
+housenumber: "59"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sixt-fer-a-cheval/tiffanie.yml b/data/cities/sixt-fer-a-cheval/tiffanie.yml
index 86ec53e54..f3c551a94 100644
--- a/data/cities/sixt-fer-a-cheval/tiffanie.yml
+++ b/data/cities/sixt-fer-a-cheval/tiffanie.yml
@@ -5,7 +5,7 @@ longitude: 6.77557
 postcode: "74740"
 city: Sixt-Fer-à-Cheval
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "07:00-12:30,15:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: 07:00-12:30,15:30-19:00
+website: ""
diff --git a/data/cities/soleymieu/abs-informatique.yml b/data/cities/soleymieu/abs-informatique.yml
index db8c2d633..775d45d6c 100644
--- a/data/cities/soleymieu/abs-informatique.yml
+++ b/data/cities/soleymieu/abs-informatique.yml
@@ -1,11 +1,11 @@
 id: 143729202
-type: way
+type: node
 latitude: 45.68981
 longitude: 5.37399
 postcode: "38460"
 city: Soleymieu
-street: "Place de l'Ancienne Gare"
-housenumber: 1
+street: Place de l'Ancienne Gare
+housenumber: "1"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/soleymieu/arnaud-auto.yml b/data/cities/soleymieu/arnaud-auto.yml
index fe01dcf37..0d5a51e99 100644
--- a/data/cities/soleymieu/arnaud-auto.yml
+++ b/data/cities/soleymieu/arnaud-auto.yml
@@ -1,11 +1,11 @@
 id: 143729675
-type: way
+type: node
 latitude: 45.68767
 longitude: 5.36948
 postcode: "38460"
 city: Soleymieu
-street: "Chemin du Vieux Sablonnières"
-housenumber: 11
+street: Chemin du Vieux Sablonnières
+housenumber: "11"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soleymieu/boulangerie-patisserie-lancienne-gare.yml b/data/cities/soleymieu/boulangerie-patisserie-lancienne-gare.yml
index a4be3e1fe..31a8629a5 100644
--- a/data/cities/soleymieu/boulangerie-patisserie-lancienne-gare.yml
+++ b/data/cities/soleymieu/boulangerie-patisserie-lancienne-gare.yml
@@ -1,11 +1,11 @@
 id: 143728187
-type: way
+type: node
 latitude: 45.68975
 longitude: 5.37421
 postcode: "38460"
 city: Soleymieu
-street: "Place de l'Ancienne Gare"
-housenumber: 2
+street: Place de l'Ancienne Gare
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Sa 06:00-19:00;Su 06:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 06:00-19:00;Su 06:00-12:30
+website: ""
diff --git a/data/cities/soleymieu/elle-et-lui-coiffure-et-beaute.yml b/data/cities/soleymieu/elle-et-lui-coiffure-et-beaute.yml
index e94954c41..4eb07ef1d 100644
--- a/data/cities/soleymieu/elle-et-lui-coiffure-et-beaute.yml
+++ b/data/cities/soleymieu/elle-et-lui-coiffure-et-beaute.yml
@@ -1,11 +1,11 @@
 id: 183157485
-type: way
+type: node
 latitude: 45.68985
 longitude: 5.37536
 postcode: "38460"
 city: Soleymieu
-street: "Place de l'Ancienne Gare"
-housenumber: 6
+street: Place de l'Ancienne Gare
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soleymieu/fee-pour-elles.yml b/data/cities/soleymieu/fee-pour-elles.yml
index 7cf7215a8..0bdac86bb 100644
--- a/data/cities/soleymieu/fee-pour-elles.yml
+++ b/data/cities/soleymieu/fee-pour-elles.yml
@@ -1,11 +1,11 @@
 id: 328661635
-type: way
+type: node
 latitude: 45.68985
 longitude: 5.37541
 postcode: "38460"
 city: Soleymieu
-street: "Place de l'Ancienne Gare"
-housenumber: 7
+street: Place de l'Ancienne Gare
+housenumber: "7"
 phone: ""
-opening_hours: "Mo 9:00-18:00;Tu 09:00-18:00;We-Th 09:00-19:00;Fr 09:00-20:00;Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 9:00-18:00;Tu 09:00-18:00;We-Th 09:00-19:00;Fr 09:00-20:00;Sa 08:00-17:00
+website: ""
diff --git a/data/cities/soleymieu/fleur-des-sables.yml b/data/cities/soleymieu/fleur-des-sables.yml
index 96d510cd0..cb470a855 100644
--- a/data/cities/soleymieu/fleur-des-sables.yml
+++ b/data/cities/soleymieu/fleur-des-sables.yml
@@ -1,11 +1,11 @@
 id: 143728053
-type: way
+type: node
 latitude: 45.68984
 longitude: 5.375
 postcode: "38460"
 city: Soleymieu
-street: "Place de l'Ancienne Gare"
-housenumber: 4
+street: Place de l'Ancienne Gare
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00;Sa 09:00-19:00;Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00;Sa 09:00-19:00;Su 08:30-12:30
+website: ""
diff --git a/data/cities/soleymieu/le-coin-des-colibris.yml b/data/cities/soleymieu/le-coin-des-colibris.yml
index 2f4d899e6..1cac45a83 100644
--- a/data/cities/soleymieu/le-coin-des-colibris.yml
+++ b/data/cities/soleymieu/le-coin-des-colibris.yml
@@ -1,11 +1,11 @@
 id: 328661636
-type: way
+type: node
 latitude: 45.68985
 longitude: 5.3755
 postcode: "38460"
 city: Soleymieu
-street: "Place de l'Ancienne Gare"
-housenumber: 6
+street: Place de l'Ancienne Gare
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Su 9:00-19:30"
-website: "https://www.instagram.com/epicerie.sablonnieres/"
\ No newline at end of file
+opening_hours: Tu-Su 9:00-19:30
+website: https://www.instagram.com/epicerie.sablonnieres/
diff --git a/data/cities/soleymieu/leden-du-loisir.yml b/data/cities/soleymieu/leden-du-loisir.yml
index ea3ea85f6..fd1a578d4 100644
--- a/data/cities/soleymieu/leden-du-loisir.yml
+++ b/data/cities/soleymieu/leden-du-loisir.yml
@@ -1,11 +1,11 @@
 id: 183735215
-type: way
+type: node
 latitude: 45.68966
 longitude: 5.37518
 postcode: "38460"
 city: Soleymieu
-street: "Place de l'Ancienne Gare"
-housenumber: 5
+street: Place de l'Ancienne Gare
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Sa 08:00-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 08:00-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/soleymieux/le-soleym.yml b/data/cities/soleymieux/le-soleym.yml
index 9e4b37f2f..a5bacb08c 100644
--- a/data/cities/soleymieux/le-soleym.yml
+++ b/data/cities/soleymieux/le-soleym.yml
@@ -4,8 +4,8 @@ latitude: 45.50922
 longitude: 4.04289
 postcode: "42560"
 city: Soleymieux
-street: "Le Bourg"
-housenumber: 
+street: Le Bourg
+housenumber: ""
 phone: "+33477765236"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sollieres-sardieres/intermarche-contact.yml b/data/cities/sollieres-sardieres/intermarche-contact.yml
index 667323315..cc04899b8 100644
--- a/data/cities/sollieres-sardieres/intermarche-contact.yml
+++ b/data/cities/sollieres-sardieres/intermarche-contact.yml
@@ -1,11 +1,11 @@
 id: 108042879
-type: way
+type: node
 latitude: 45.26618
 longitude: 6.81232
 postcode: "73500"
 city: Sollières-Sardières
-street: "ZA Les Favières"
-housenumber: 
+street: ZA Les Favières
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/sonnaz/le-potager-de-sonnaz.yml b/data/cities/sonnaz/le-potager-de-sonnaz.yml
index 5de76deb7..00ded8567 100644
--- a/data/cities/sonnaz/le-potager-de-sonnaz.yml
+++ b/data/cities/sonnaz/le-potager-de-sonnaz.yml
@@ -1,11 +1,11 @@
 id: 633602589
-type: way
+type: node
 latitude: 45.61167
 longitude: 5.92292
 postcode: "73000"
 city: Sonnaz
-street: "Rue du Tillet"
-housenumber: 
+street: Rue du Tillet
+housenumber: ""
 phone: ""
-opening_hours: "Fr 12:00-19:00"
-website: "https://www.lepotagerdesonnaz.fr"
\ No newline at end of file
+opening_hours: Fr 12:00-19:00
+website: https://www.lepotagerdesonnaz.fr
diff --git a/data/cities/sorbiers/carrefour-market.yml b/data/cities/sorbiers/carrefour-market.yml
index 73709f967..731b66f61 100644
--- a/data/cities/sorbiers/carrefour-market.yml
+++ b/data/cities/sorbiers/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 79207748
-type: way
+type: node
 latitude: 45.48143
 longitude: 4.44292
 postcode: "42290"
 city: Sorbiers
-street: "Rue du Moulin Gillier"
-housenumber: 3
-phone: "+33 4 77 53 35 49"
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: "https://www.carrefour.fr/magasin/market-sorbiers"
\ No newline at end of file
+street: Rue du Moulin Gillier
+housenumber: "3"
+phone: +33 4 77 53 35 49
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: https://www.carrefour.fr/magasin/market-sorbiers
diff --git a/data/cities/sorbiers/coiffure-un-brun-dhair.yml b/data/cities/sorbiers/coiffure-un-brun-dhair.yml
index 60f1bb31a..eee57db96 100644
--- a/data/cities/sorbiers/coiffure-un-brun-dhair.yml
+++ b/data/cities/sorbiers/coiffure-un-brun-dhair.yml
@@ -4,8 +4,8 @@ latitude: 45.49431
 longitude: 4.43529
 postcode: "42290"
 city: Sorbiers
-street: "Rue de L'Onzon"
-housenumber: 4
+street: Rue de L'Onzon
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sorbiers/cycles-pilat-sports.yml b/data/cities/sorbiers/cycles-pilat-sports.yml
index eac76e989..295a261a7 100644
--- a/data/cities/sorbiers/cycles-pilat-sports.yml
+++ b/data/cities/sorbiers/cycles-pilat-sports.yml
@@ -1,11 +1,11 @@
 id: 556267111
-type: way
+type: node
 latitude: 45.48087
 longitude: 4.45133
 postcode: "42290"
 city: Sorbiers
-street: "Rue de la Vaure"
-housenumber: 61
+street: Rue de la Vaure
+housenumber: "61"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sorbiers/des-lys-de-fleurs.yml b/data/cities/sorbiers/des-lys-de-fleurs.yml
index 9cd699f7a..c5e583990 100644
--- a/data/cities/sorbiers/des-lys-de-fleurs.yml
+++ b/data/cities/sorbiers/des-lys-de-fleurs.yml
@@ -4,8 +4,8 @@ latitude: 45.48783
 longitude: 4.45042
 postcode: "42290"
 city: Sorbiers
-street: "Rue Rambert Fauré"
-housenumber: 
+street: Rue Rambert Fauré
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sorbiers/garage-de-lentente.yml b/data/cities/sorbiers/garage-de-lentente.yml
index e0413c984..bf6fd6428 100644
--- a/data/cities/sorbiers/garage-de-lentente.yml
+++ b/data/cities/sorbiers/garage-de-lentente.yml
@@ -5,7 +5,7 @@ longitude: 4.44473
 postcode: ""
 city: Sorbiers
 street: ""
-housenumber: 
-phone: "+33 4 77 53 84 68"
+housenumber: ""
+phone: +33 4 77 53 84 68
 opening_hours: ""
-website: "https://www.garage-entente.com"
\ No newline at end of file
+website: https://www.garage-entente.com
diff --git a/data/cities/sorbiers/hb-coiffure.yml b/data/cities/sorbiers/hb-coiffure.yml
index de99c2977..c03829b1a 100644
--- a/data/cities/sorbiers/hb-coiffure.yml
+++ b/data/cities/sorbiers/hb-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.48752
 longitude: 4.45028
 postcode: "42290"
 city: Sorbiers
-street: "Rue Rambert Fauré"
-housenumber: 14
+street: Rue Rambert Fauré
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/sorbiers/maria-crea-tifs.yml b/data/cities/sorbiers/maria-crea-tifs.yml
index e059963cb..7bc3cf39b 100644
--- a/data/cities/sorbiers/maria-crea-tifs.yml
+++ b/data/cities/sorbiers/maria-crea-tifs.yml
@@ -4,8 +4,8 @@ latitude: 45.4856
 longitude: 4.44932
 postcode: "42290"
 city: Sorbiers
-street: "Place de l'Europe"
-housenumber: 5
+street: Place de l'Europe
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/auriline-detente.yml b/data/cities/soucieu-en-jarrest/auriline-detente.yml
index a0b8c1b7e..9289697e9 100644
--- a/data/cities/soucieu-en-jarrest/auriline-detente.yml
+++ b/data/cities/soucieu-en-jarrest/auriline-detente.yml
@@ -4,8 +4,8 @@ latitude: 45.67825
 longitude: 4.70346
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Place du 11 Novembre 1918"
-housenumber: 14
+street: Place du 11 Novembre 1918
+housenumber: "14"
 phone: "+33478050428"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/barrandon-optique.yml b/data/cities/soucieu-en-jarrest/barrandon-optique.yml
index 0f565cb53..e559198f3 100644
--- a/data/cities/soucieu-en-jarrest/barrandon-optique.yml
+++ b/data/cities/soucieu-en-jarrest/barrandon-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.67782
 longitude: 4.70247
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Rue Charles de Gaulle"
-housenumber: 4
+street: Rue Charles de Gaulle
+housenumber: "4"
 phone: "+33472310145"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/beaute-des-sens.yml b/data/cities/soucieu-en-jarrest/beaute-des-sens.yml
index bc5bd73bb..9d3e1f90c 100644
--- a/data/cities/soucieu-en-jarrest/beaute-des-sens.yml
+++ b/data/cities/soucieu-en-jarrest/beaute-des-sens.yml
@@ -4,8 +4,8 @@ latitude: 45.67783
 longitude: 4.70272
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Place du 11 Novembre 1918"
-housenumber: 7
+street: Place du 11 Novembre 1918
+housenumber: "7"
 phone: "+33472310766"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/boucherie-lancelon.yml b/data/cities/soucieu-en-jarrest/boucherie-lancelon.yml
index c6ba330f4..c4f0d3217 100644
--- a/data/cities/soucieu-en-jarrest/boucherie-lancelon.yml
+++ b/data/cities/soucieu-en-jarrest/boucherie-lancelon.yml
@@ -4,8 +4,8 @@ latitude: 45.67862
 longitude: 4.7031
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Place François Durieux"
-housenumber: 1
+street: Place François Durieux
+housenumber: "1"
 phone: "+33472165575"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/boulangerie-gala.yml b/data/cities/soucieu-en-jarrest/boulangerie-gala.yml
index a82759184..3c8623d7d 100644
--- a/data/cities/soucieu-en-jarrest/boulangerie-gala.yml
+++ b/data/cities/soucieu-en-jarrest/boulangerie-gala.yml
@@ -4,8 +4,8 @@ latitude: 45.67819
 longitude: 4.70284
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Place du 11 Novembre 1918"
-housenumber: 3
+street: Place du 11 Novembre 1918
+housenumber: "3"
 phone: "+33478052471"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/gaec-du-coq-gaulois.yml b/data/cities/soucieu-en-jarrest/gaec-du-coq-gaulois.yml
index dfbf89976..ae0f3912a 100644
--- a/data/cities/soucieu-en-jarrest/gaec-du-coq-gaulois.yml
+++ b/data/cities/soucieu-en-jarrest/gaec-du-coq-gaulois.yml
@@ -4,8 +4,8 @@ latitude: 45.67959
 longitude: 4.71903
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Route du Coq Gaulois"
-housenumber: 
+street: Route du Coq Gaulois
+housenumber: ""
 phone: "+33478054626"
-opening_hours: "Mo-Fr 16:30-19:00; Tu,Th off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 16:30-19:00; Tu,Th off
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/garage-jarrezien-renault.yml b/data/cities/soucieu-en-jarrest/garage-jarrezien-renault.yml
index a20ed9aa4..8cc23f312 100644
--- a/data/cities/soucieu-en-jarrest/garage-jarrezien-renault.yml
+++ b/data/cities/soucieu-en-jarrest/garage-jarrezien-renault.yml
@@ -4,8 +4,8 @@ latitude: 45.67691
 longitude: 4.70512
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Route de Brignais"
-housenumber: 3
+street: Route de Brignais
+housenumber: "3"
 phone: "+33478052605"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/le-panier-jarrezien.yml b/data/cities/soucieu-en-jarrest/le-panier-jarrezien.yml
index d38cea90d..3aa489177 100644
--- a/data/cities/soucieu-en-jarrest/le-panier-jarrezien.yml
+++ b/data/cities/soucieu-en-jarrest/le-panier-jarrezien.yml
@@ -4,8 +4,8 @@ latitude: 45.67751
 longitude: 4.70212
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Rue Charles de Gaulle"
-housenumber: 14
+street: Rue Charles de Gaulle
+housenumber: "14"
 phone: "+33478052637"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/les-fleurs-direne-et-latelier.yml b/data/cities/soucieu-en-jarrest/les-fleurs-direne-et-latelier.yml
index ee6fd84de..ab56cf097 100644
--- a/data/cities/soucieu-en-jarrest/les-fleurs-direne-et-latelier.yml
+++ b/data/cities/soucieu-en-jarrest/les-fleurs-direne-et-latelier.yml
@@ -4,8 +4,8 @@ latitude: 45.67702
 longitude: 4.70196
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Rue Charles de Gaulle"
-housenumber: 17
+street: Rue Charles de Gaulle
+housenumber: "17"
 phone: "0478051988"
-opening_hours: "Tu-Th 09:00-12:30,15:00-19:00; Fr-Sa 09:00-12:30,15:00-19:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-12:30,15:00-19:00; Fr-Sa 09:00-12:30,15:00-19:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/new-hair-by-celine.yml b/data/cities/soucieu-en-jarrest/new-hair-by-celine.yml
index f0a814033..323babbc0 100644
--- a/data/cities/soucieu-en-jarrest/new-hair-by-celine.yml
+++ b/data/cities/soucieu-en-jarrest/new-hair-by-celine.yml
@@ -4,8 +4,8 @@ latitude: 45.67859
 longitude: 4.70326
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Rue de la Poste"
-housenumber: 2
+street: Rue de la Poste
+housenumber: "2"
 phone: "+33426009727"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/salon-objectif-mod.yml b/data/cities/soucieu-en-jarrest/salon-objectif-mod.yml
index 4703a2aee..22a4fd336 100644
--- a/data/cities/soucieu-en-jarrest/salon-objectif-mod.yml
+++ b/data/cities/soucieu-en-jarrest/salon-objectif-mod.yml
@@ -4,8 +4,8 @@ latitude: 45.67745
 longitude: 4.70206
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Rue Charles de Gaulle"
-housenumber: 18
+street: Rue Charles de Gaulle
+housenumber: "18"
 phone: "+33478054704"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/soleil-sud.yml b/data/cities/soucieu-en-jarrest/soleil-sud.yml
index df01636ae..334e39d9d 100644
--- a/data/cities/soucieu-en-jarrest/soleil-sud.yml
+++ b/data/cities/soucieu-en-jarrest/soleil-sud.yml
@@ -4,8 +4,8 @@ latitude: 45.67789
 longitude: 4.70346
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Place du 11 Novembre 1918"
-housenumber: 12
+street: Place du 11 Novembre 1918
+housenumber: "12"
 phone: "+33478052618"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/tabac-presse-durand-jeannette.yml b/data/cities/soucieu-en-jarrest/tabac-presse-durand-jeannette.yml
index c42bed470..c83b839c7 100644
--- a/data/cities/soucieu-en-jarrest/tabac-presse-durand-jeannette.yml
+++ b/data/cities/soucieu-en-jarrest/tabac-presse-durand-jeannette.yml
@@ -4,8 +4,8 @@ latitude: 45.67852
 longitude: 4.70321
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "Place François Durieux"
-housenumber: 8
+street: Place François Durieux
+housenumber: "8"
 phone: "+33478051816"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/soucieu-en-jarrest/thierry-morretton.yml b/data/cities/soucieu-en-jarrest/thierry-morretton.yml
index c03411abd..390a1bf34 100644
--- a/data/cities/soucieu-en-jarrest/thierry-morretton.yml
+++ b/data/cities/soucieu-en-jarrest/thierry-morretton.yml
@@ -4,8 +4,8 @@ latitude: 45.67794
 longitude: 4.66901
 postcode: "69510"
 city: Soucieu-en-Jarrest
-street: "La Goyenche"
-housenumber: 
+street: La Goyenche
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/souclin/rj-motos-sport.yml b/data/cities/souclin/rj-motos-sport.yml
index 4684c531d..f2acb44eb 100644
--- a/data/cities/souclin/rj-motos-sport.yml
+++ b/data/cities/souclin/rj-motos-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.86885
 longitude: 5.42765
 postcode: "01150"
 city: Souclin
-street: "Rue de Champiout"
-housenumber: 108
-phone: "+33 6 51 97 44 98"
-opening_hours: "Mo-Fr 09:00-18:30; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue de Champiout
+housenumber: "108"
+phone: +33 6 51 97 44 98
+opening_hours: Mo-Fr 09:00-18:30; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/sourcieux-les-mines/la-chevre-de-milo.yml b/data/cities/sourcieux-les-mines/la-chevre-de-milo.yml
index 748901ade..0fb933616 100644
--- a/data/cities/sourcieux-les-mines/la-chevre-de-milo.yml
+++ b/data/cities/sourcieux-les-mines/la-chevre-de-milo.yml
@@ -4,8 +4,8 @@ latitude: 45.80676
 longitude: 4.61485
 postcode: "69210"
 city: Sourcieux-Les-Mines
-street: "Route du Gervais"
-housenumber: 134
-phone: "+336 13 42 59 02"
-opening_hours: "We 09:00-12:00; Fr 15:30-18:30; Sa 09:00-12:00"
-website: "https://www.facebook.com/LaChevredeMiLo/"
\ No newline at end of file
+street: Route du Gervais
+housenumber: "134"
+phone: +336 13 42 59 02
+opening_hours: We 09:00-12:00; Fr 15:30-18:30; Sa 09:00-12:00
+website: https://www.facebook.com/LaChevredeMiLo/
diff --git a/data/cities/st-genis-pouilly/espace-montagne.yml b/data/cities/st-genis-pouilly/espace-montagne.yml
index b59b5800d..500faf359 100644
--- a/data/cities/st-genis-pouilly/espace-montagne.yml
+++ b/data/cities/st-genis-pouilly/espace-montagne.yml
@@ -4,8 +4,8 @@ latitude: 46.25886
 longitude: 6.03113
 postcode: "01630"
 city: St-Genis-Pouilly
-street: "Rue du Mont Blanc"
-housenumber: 500
+street: Rue du Mont Blanc
+housenumber: "500"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/st-marcellin/team-mocellin.yml b/data/cities/st-marcellin/team-mocellin.yml
index ae53b0d31..3dda96d5a 100644
--- a/data/cities/st-marcellin/team-mocellin.yml
+++ b/data/cities/st-marcellin/team-mocellin.yml
@@ -4,8 +4,8 @@ latitude: 45.15081
 longitude: 5.3223
 postcode: "38160"
 city: St Marcellin
-street: "Rue Aymard Durivail"
-housenumber: 23
+street: Rue Aymard Durivail
+housenumber: "23"
 phone: ""
 opening_hours: ""
-website: "https://www.cyclesmocellin.fr/"
\ No newline at end of file
+website: https://www.cyclesmocellin.fr/
diff --git a/data/cities/ste-foy-tarentaise/zigzags.yml b/data/cities/ste-foy-tarentaise/zigzags.yml
index cc80b773c..231c586bd 100644
--- a/data/cities/ste-foy-tarentaise/zigzags.yml
+++ b/data/cities/ste-foy-tarentaise/zigzags.yml
@@ -4,8 +4,8 @@ latitude: 45.57622
 longitude: 6.89407
 postcode: "73640"
 city: Ste-Foy-Tarentaise
-street: "Résidence LES CHARMETTES"
-housenumber: 
+street: Résidence LES CHARMETTES
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tain-lhermitage/patisserie-chalencon.yml b/data/cities/tain-lhermitage/patisserie-chalencon.yml
index 3e23c6f3f..2e650138c 100644
--- a/data/cities/tain-lhermitage/patisserie-chalencon.yml
+++ b/data/cities/tain-lhermitage/patisserie-chalencon.yml
@@ -4,8 +4,8 @@ latitude: 45.07014
 longitude: 4.83791
 postcode: "26600"
 city: Tain-l'Hermitage
-street: "Avenue Jean Jaurès"
-housenumber: 72
-phone: "+33 4 75 08 27 02"
+street: Avenue Jean Jaurès
+housenumber: "72"
+phone: +33 4 75 08 27 02
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/talloires-montmin/8-a-huit.yml b/data/cities/talloires-montmin/8-a-huit.yml
index 15bdbb777..745aed6d1 100644
--- a/data/cities/talloires-montmin/8-a-huit.yml
+++ b/data/cities/talloires-montmin/8-a-huit.yml
@@ -4,8 +4,8 @@ latitude: 45.83987
 longitude: 6.21449
 postcode: "74290"
 city: Talloires-Montmin
-street: "Place du Lavoir"
-housenumber: 1
+street: Place du Lavoir
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 08:30-12:30,15:30-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:30,15:30-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/talloires/les-grands-espaces.yml b/data/cities/talloires/les-grands-espaces.yml
index 62fb0a220..1d2191516 100644
--- a/data/cities/talloires/les-grands-espaces.yml
+++ b/data/cities/talloires/les-grands-espaces.yml
@@ -4,8 +4,8 @@ latitude: 45.84866
 longitude: 6.21279
 postcode: "74290"
 city: Talloires
-street: "Chemin de Pré Monteux"
-housenumber: 150
-phone: "+33 4 50 60 79 06"
-opening_hours: "Mo-Su 09:00-18:00"
-website: "http://grandsespaces-parapente-annecy.com/"
\ No newline at end of file
+street: Chemin de Pré Monteux
+housenumber: "150"
+phone: +33 4 50 60 79 06
+opening_hours: Mo-Su 09:00-18:00
+website: http://grandsespaces-parapente-annecy.com/
diff --git a/data/cities/talloires/tabac-presse-de-talloires.yml b/data/cities/talloires/tabac-presse-de-talloires.yml
index 828740994..4be1d5925 100644
--- a/data/cities/talloires/tabac-presse-de-talloires.yml
+++ b/data/cities/talloires/tabac-presse-de-talloires.yml
@@ -4,8 +4,8 @@ latitude: 45.84004
 longitude: 6.21461
 postcode: "74290"
 city: Talloires
-street: "Place des Vendangeurs"
-housenumber: 3
-phone: "+33 4 50 60 77 04"
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
+street: Place des Vendangeurs
+housenumber: "3"
+phone: +33 4 50 60 77 04
+opening_hours: Mo-Su 07:00-20:00
+website: ""
diff --git a/data/cities/taluyers/domaine-condamin-bernard.yml b/data/cities/taluyers/domaine-condamin-bernard.yml
index ea55d4a74..f71bb3662 100644
--- a/data/cities/taluyers/domaine-condamin-bernard.yml
+++ b/data/cities/taluyers/domaine-condamin-bernard.yml
@@ -4,8 +4,8 @@ latitude: 45.63849
 longitude: 4.72453
 postcode: "69440"
 city: Taluyers
-street: "Route du Bâtard"
-housenumber: 85
-phone: "+33 6 14 30 30 58"
-opening_hours: "Th,Fr 17:00-18:30; Sa 09:30-12:30"
-website: "https://maisoncondaminbernard.com/"
\ No newline at end of file
+street: Route du Bâtard
+housenumber: "85"
+phone: +33 6 14 30 30 58
+opening_hours: Th,Fr 17:00-18:30; Sa 09:30-12:30
+website: https://maisoncondaminbernard.com/
diff --git a/data/cities/taluyers/domaine-de-prapin.yml b/data/cities/taluyers/domaine-de-prapin.yml
index 38b2cbbef..6e7f0cbf7 100644
--- a/data/cities/taluyers/domaine-de-prapin.yml
+++ b/data/cities/taluyers/domaine-de-prapin.yml
@@ -4,8 +4,8 @@ latitude: 45.63973
 longitude: 4.70501
 postcode: "69440"
 city: Taluyers
-street: "Route de Saint-Laurent d'Agny"
-housenumber: 685
+street: Route de Saint-Laurent d'Agny
+housenumber: "685"
 phone: "+33478482484"
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00"
-website: "https://www.domainedeprapin.fr"
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00
+website: https://www.domainedeprapin.fr
diff --git a/data/cities/taluyers/lescapade.yml b/data/cities/taluyers/lescapade.yml
index 5fbc9462e..e36f7f8b3 100644
--- a/data/cities/taluyers/lescapade.yml
+++ b/data/cities/taluyers/lescapade.yml
@@ -4,8 +4,8 @@ latitude: 45.64107
 longitude: 4.72226
 postcode: "69440"
 city: Taluyers
-street: "Place de la Bascule"
-housenumber: 
+street: Place de la Bascule
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/taninges/go-sport-montagne.yml b/data/cities/taninges/go-sport-montagne.yml
index c46a8b5fb..cabbad1a2 100644
--- a/data/cities/taninges/go-sport-montagne.yml
+++ b/data/cities/taninges/go-sport-montagne.yml
@@ -4,8 +4,8 @@ latitude: 46.14907
 longitude: 6.59184
 postcode: "74440"
 city: Taninges
-street: "Route de Chevaly"
-housenumber: 1187
+street: Route de Chevaly
+housenumber: "1187"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/taninges/go-sport.yml b/data/cities/taninges/go-sport.yml
index 65e7e8684..fbb4886ca 100644
--- a/data/cities/taninges/go-sport.yml
+++ b/data/cities/taninges/go-sport.yml
@@ -4,8 +4,8 @@ latitude: 46.14119
 longitude: 6.60529
 postcode: "74440"
 city: Taninges
-street: "Route de la Savolière"
-housenumber: 113
+street: Route de la Savolière
+housenumber: "113"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/taninges/le-pain-des-pistes.yml b/data/cities/taninges/le-pain-des-pistes.yml
index 784e0e487..41a777d80 100644
--- a/data/cities/taninges/le-pain-des-pistes.yml
+++ b/data/cities/taninges/le-pain-des-pistes.yml
@@ -4,8 +4,8 @@ latitude: 46.14798
 longitude: 6.59401
 postcode: "74440"
 city: Taninges
-street: "Immeuble Chalune"
-housenumber: 
+street: Immeuble Chalune
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/taninges/mr-bricolage.yml b/data/cities/taninges/mr-bricolage.yml
index a308e4c49..f0ebd591e 100644
--- a/data/cities/taninges/mr-bricolage.yml
+++ b/data/cities/taninges/mr-bricolage.yml
@@ -1,11 +1,11 @@
 id: 224910686
-type: way
+type: node
 latitude: 46.105
 longitude: 6.59116
 postcode: "74440"
 city: Taninges
-street: "Avenue des Thézières"
-housenumber: 
+street: Avenue des Thézières
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/taninges/santoline.yml b/data/cities/taninges/santoline.yml
index 825d342c3..8af8c7989 100644
--- a/data/cities/taninges/santoline.yml
+++ b/data/cities/taninges/santoline.yml
@@ -1,11 +1,11 @@
 id: 224905386
-type: way
+type: node
 latitude: 46.10754
 longitude: 6.59254
 postcode: "74440"
 city: Taninges
-street: "Rue de la Poste"
-housenumber: 79
+street: Rue de la Poste
+housenumber: "79"
 phone: ""
 opening_hours: ""
-website: "https://belledonne.bio/fr/points-de-vente/santoline-magasin-bio-boulangerie-bio-taninges"
\ No newline at end of file
+website: https://belledonne.bio/fr/points-de-vente/santoline-magasin-bio-boulangerie-bio-taninges
diff --git a/data/cities/taninges/station-service-super-u.yml b/data/cities/taninges/station-service-super-u.yml
index ccf3dd07e..a0d03ba53 100644
--- a/data/cities/taninges/station-service-super-u.yml
+++ b/data/cities/taninges/station-service-super-u.yml
@@ -1,11 +1,11 @@
 id: 278509075
-type: way
+type: node
 latitude: 46.10876
 longitude: 6.58243
 postcode: "74440"
 city: Taninges
-street: "Route d'Annemasse"
-housenumber: 182
+street: Route d'Annemasse
+housenumber: "182"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/taninges/super-u.yml b/data/cities/taninges/super-u.yml
index 5446db0b4..b63e13353 100644
--- a/data/cities/taninges/super-u.yml
+++ b/data/cities/taninges/super-u.yml
@@ -1,11 +1,11 @@
 id: 278509597
-type: way
+type: node
 latitude: 46.10864
 longitude: 6.58435
 postcode: "74440"
 city: Taninges
-street: "Route d'Annemasse"
-housenumber: 182
+street: Route d'Annemasse
+housenumber: "182"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/tarare/alain-afflelou.yml b/data/cities/tarare/alain-afflelou.yml
index d66b4f614..d650fb203 100644
--- a/data/cities/tarare/alain-afflelou.yml
+++ b/data/cities/tarare/alain-afflelou.yml
@@ -4,8 +4,8 @@ latitude: 45.8957
 longitude: 4.43252
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 6
+street: Rue Pêcherie
+housenumber: "6"
 phone: ""
-opening_hours: "Mo 14:00-18:00; Tu-Fr 07:15-12:30,14:00-19:00; Sa 09:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:00; Tu-Fr 07:15-12:30,14:00-19:00; Sa 09:00-18:30
+website: ""
diff --git a/data/cities/tarare/artisan-bijoutier-franck-lamoureux.yml b/data/cities/tarare/artisan-bijoutier-franck-lamoureux.yml
index e56d7af87..4aa2c6e76 100644
--- a/data/cities/tarare/artisan-bijoutier-franck-lamoureux.yml
+++ b/data/cities/tarare/artisan-bijoutier-franck-lamoureux.yml
@@ -4,8 +4,8 @@ latitude: 45.89543
 longitude: 4.43328
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 51
+street: Rue de la République
+housenumber: "51"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/atol.yml b/data/cities/tarare/atol.yml
index 7bbdb135f..171cd5d37 100644
--- a/data/cities/tarare/atol.yml
+++ b/data/cities/tarare/atol.yml
@@ -4,8 +4,8 @@ latitude: 45.8961
 longitude: 4.43259
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 22
-phone: "+33 9 67 26 51 18"
-opening_hours: "Mo-Sa 14:00-19:00, Tu-Sa 09:00-12:00"
-website: "https://www.opticiens-atol.com/trouver-opticien/tarare-22-rue-pecherie"
\ No newline at end of file
+street: Rue Pêcherie
+housenumber: "22"
+phone: +33 9 67 26 51 18
+opening_hours: Mo-Sa 14:00-19:00, Tu-Sa 09:00-12:00
+website: https://www.opticiens-atol.com/trouver-opticien/tarare-22-rue-pecherie
diff --git a/data/cities/tarare/audiopros.yml b/data/cities/tarare/audiopros.yml
index 6cabcd908..4c7d49e89 100644
--- a/data/cities/tarare/audiopros.yml
+++ b/data/cities/tarare/audiopros.yml
@@ -4,8 +4,8 @@ latitude: 45.89541
 longitude: 4.43413
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 63
-phone: "+33 4 74 10 09 23"
-opening_hours: "Tu-Fr 09:00-12:00, 14:00-18:00"
-website: "https://www.audiopros-audioprothesiste.fr/plan"
\ No newline at end of file
+street: Rue de la République
+housenumber: "63"
+phone: +33 4 74 10 09 23
+opening_hours: Tu-Fr 09:00-12:00, 14:00-18:00
+website: https://www.audiopros-audioprothesiste.fr/plan
diff --git a/data/cities/tarare/audition-gineys.yml b/data/cities/tarare/audition-gineys.yml
index 6cd7a8f4d..caa747a28 100644
--- a/data/cities/tarare/audition-gineys.yml
+++ b/data/cities/tarare/audition-gineys.yml
@@ -4,8 +4,8 @@ latitude: 45.89632
 longitude: 4.43261
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 28
-phone: "+33 4 74 10 01 78"
+street: Rue Pêcherie
+housenumber: "28"
+phone: +33 4 74 10 01 78
 opening_hours: ""
-website: "https://www.auditiongineys.fr/"
\ No newline at end of file
+website: https://www.auditiongineys.fr/
diff --git a/data/cities/tarare/auto-69.yml b/data/cities/tarare/auto-69.yml
index 0d158630c..61c8c343a 100644
--- a/data/cities/tarare/auto-69.yml
+++ b/data/cities/tarare/auto-69.yml
@@ -4,8 +4,8 @@ latitude: 45.89564
 longitude: 4.43135
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 28
-phone: "+33 4 74 63 68 23"
-opening_hours: "Mo-Tu,Th-Fr 09:00-12:00, 14:00-19:00; We,Sa 09:00-12:00"
-website: "https://www.auto69.fr/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "28"
+phone: +33 4 74 63 68 23
+opening_hours: Mo-Tu,Th-Fr 09:00-12:00, 14:00-19:00; We,Sa 09:00-12:00
+website: https://www.auto69.fr/
diff --git a/data/cities/tarare/banette.yml b/data/cities/tarare/banette.yml
index ff0bd7a1b..5642df448 100644
--- a/data/cities/tarare/banette.yml
+++ b/data/cities/tarare/banette.yml
@@ -4,8 +4,8 @@ latitude: 45.89644
 longitude: 4.43381
 postcode: "69170"
 city: Tarare
-street: "Rue Anna Bibert"
-housenumber: 34
+street: Rue Anna Bibert
+housenumber: "34"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/besson.yml b/data/cities/tarare/besson.yml
index c767260f8..09a516b6b 100644
--- a/data/cities/tarare/besson.yml
+++ b/data/cities/tarare/besson.yml
@@ -4,8 +4,8 @@ latitude: 45.89581
 longitude: 4.43279
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 5
+street: Rue Pêcherie
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/bordanova.yml b/data/cities/tarare/bordanova.yml
index 533cd78d7..bf01836aa 100644
--- a/data/cities/tarare/bordanova.yml
+++ b/data/cities/tarare/bordanova.yml
@@ -4,8 +4,8 @@ latitude: 45.89571
 longitude: 4.42777
 postcode: "69170"
 city: Tarare
-street: "Rue Serroux"
-housenumber: 31
+street: Rue Serroux
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/boucherie-du-centre.yml b/data/cities/tarare/boucherie-du-centre.yml
index c11ab8ee0..4ec0d7b12 100644
--- a/data/cities/tarare/boucherie-du-centre.yml
+++ b/data/cities/tarare/boucherie-du-centre.yml
@@ -4,8 +4,8 @@ latitude: 45.89661
 longitude: 4.43285
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 35
+street: Rue Pêcherie
+housenumber: "35"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/c-garrel.yml b/data/cities/tarare/c-garrel.yml
index 10b451da8..240feaa5c 100644
--- a/data/cities/tarare/c-garrel.yml
+++ b/data/cities/tarare/c-garrel.yml
@@ -4,8 +4,8 @@ latitude: 45.8961
 longitude: 4.43281
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 17
+street: Rue Pêcherie
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/cbau-store.yml b/data/cities/tarare/cbau-store.yml
index e47930592..8a49638c9 100644
--- a/data/cities/tarare/cbau-store.yml
+++ b/data/cities/tarare/cbau-store.yml
@@ -4,8 +4,8 @@ latitude: 45.89818
 longitude: 4.43365
 postcode: "69170"
 city: Tarare
-street: "Place Victor Hugo"
-housenumber: 15
+street: Place Victor Hugo
+housenumber: "15"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 9:30-12:30,13:30-19:00; Sa 9:30-12:30, 13:30-17:00"
-website: "https://www.cbaustore.com/"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 9:30-12:30,13:30-19:00; Sa 9:30-12:30, 13:30-17:00
+website: https://www.cbaustore.com/
diff --git a/data/cities/tarare/clairbelle.yml b/data/cities/tarare/clairbelle.yml
index af943aa47..4fe6ee90e 100644
--- a/data/cities/tarare/clairbelle.yml
+++ b/data/cities/tarare/clairbelle.yml
@@ -4,8 +4,8 @@ latitude: 45.89536
 longitude: 4.43558
 postcode: "69170"
 city: Tarare
-street: "Place Madeleine"
-housenumber: 1
-phone: "+33 4 74 63 26 05"
-opening_hours: "Tu-Sa 08:30-12:15, 14:15-19:00; Su 08:30-12:15; PH 08:30-19:00"
-website: "https://fr-fr.facebook.com/pages/category/Garden-Center/Fleuriste-Clairbelle-Tarare-230332777058873/"
\ No newline at end of file
+street: Place Madeleine
+housenumber: "1"
+phone: +33 4 74 63 26 05
+opening_hours: Tu-Sa 08:30-12:15, 14:15-19:00; Su 08:30-12:15; PH 08:30-19:00
+website: https://fr-fr.facebook.com/pages/category/Garden-Center/Fleuriste-Clairbelle-Tarare-230332777058873/
diff --git a/data/cities/tarare/coiffure-m-c-verriere.yml b/data/cities/tarare/coiffure-m-c-verriere.yml
index 9408673fc..3a9bf32a2 100644
--- a/data/cities/tarare/coiffure-m-c-verriere.yml
+++ b/data/cities/tarare/coiffure-m-c-verriere.yml
@@ -4,8 +4,8 @@ latitude: 45.89636
 longitude: 4.43262
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 30
+street: Rue Pêcherie
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/cycles-andre-leduq.yml b/data/cities/tarare/cycles-andre-leduq.yml
index 94b635d91..90564c0e0 100644
--- a/data/cities/tarare/cycles-andre-leduq.yml
+++ b/data/cities/tarare/cycles-andre-leduq.yml
@@ -4,8 +4,8 @@ latitude: 45.89702
 longitude: 4.43341
 postcode: "69170"
 city: Tarare
-street: "Avenue Charles de Gaulle"
-housenumber: 4
+street: Avenue Charles de Gaulle
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/demolliere.yml b/data/cities/tarare/demolliere.yml
index 7bbbfad25..09d7d77c4 100644
--- a/data/cities/tarare/demolliere.yml
+++ b/data/cities/tarare/demolliere.yml
@@ -4,8 +4,8 @@ latitude: 45.89592
 longitude: 4.4328
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 9
+street: Rue Pêcherie
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/elizeo.yml b/data/cities/tarare/elizeo.yml
index 1b716f201..5bbe58044 100644
--- a/data/cities/tarare/elizeo.yml
+++ b/data/cities/tarare/elizeo.yml
@@ -4,8 +4,8 @@ latitude: 45.89543
 longitude: 4.43538
 postcode: "69170"
 city: Tarare
-street: "Rue Anna Bibert"
-housenumber: 1
+street: Rue Anna Bibert
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/emmaus.yml b/data/cities/tarare/emmaus.yml
index 14026b555..6c319fc68 100644
--- a/data/cities/tarare/emmaus.yml
+++ b/data/cities/tarare/emmaus.yml
@@ -4,8 +4,9 @@ latitude: 45.89242
 longitude: 4.44013
 postcode: "69170"
 city: Tarare
-street: "Rue Boucher de Perthes"
-housenumber: 29
-phone: "+33 4 74 63 30 48"
-opening_hours: "May-Oct Tu-Fr 14:00-18:00; May-Oct Sa 10:00-12:00, 14:00-18:00; Tu-Fr 14:00-17:30; Sa 10:00-12:00, 14:00-17:30"
-website: "https://emmaustarare.com/"
\ No newline at end of file
+street: Rue Boucher de Perthes
+housenumber: "29"
+phone: +33 4 74 63 30 48
+opening_hours: May-Oct Tu-Fr 14:00-18:00; May-Oct Sa 10:00-12:00, 14:00-18:00; Tu-Fr
+    14:00-17:30; Sa 10:00-12:00, 14:00-17:30
+website: https://emmaustarare.com/
diff --git a/data/cities/tarare/evocation-chocolat.yml b/data/cities/tarare/evocation-chocolat.yml
index d696dfcf8..423cd4460 100644
--- a/data/cities/tarare/evocation-chocolat.yml
+++ b/data/cities/tarare/evocation-chocolat.yml
@@ -4,8 +4,8 @@ latitude: 45.89562
 longitude: 4.43171
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 30
-phone: "+33 4 74 63 13 24;+33 6 77 70 78 20"
-opening_hours: "Tu-Sa 08:30-12:30, 14:00-18:45"
-website: "https://evocationchocolat.fr/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "30"
+phone: +33 4 74 63 13 24;+33 6 77 70 78 20
+opening_hours: Tu-Sa 08:30-12:30, 14:00-18:45
+website: https://evocationchocolat.fr/
diff --git a/data/cities/tarare/innocento.yml b/data/cities/tarare/innocento.yml
index dd1cda35a..bca90af6f 100644
--- a/data/cities/tarare/innocento.yml
+++ b/data/cities/tarare/innocento.yml
@@ -4,8 +4,8 @@ latitude: 45.8954
 longitude: 4.4343
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 67
+street: Rue de la République
+housenumber: "67"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/jack-holt-coiffure.yml b/data/cities/tarare/jack-holt-coiffure.yml
index aee1aa1ec..21b613f0f 100644
--- a/data/cities/tarare/jack-holt-coiffure.yml
+++ b/data/cities/tarare/jack-holt-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.89677
 longitude: 4.43311
 postcode: "69170"
 city: Tarare
-street: "Rue Mezelle"
-housenumber: 10
+street: Rue Mezelle
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/jonathan-desseigne.yml b/data/cities/tarare/jonathan-desseigne.yml
index b543b6faa..d43978c84 100644
--- a/data/cities/tarare/jonathan-desseigne.yml
+++ b/data/cities/tarare/jonathan-desseigne.yml
@@ -4,8 +4,8 @@ latitude: 45.89639
 longitude: 4.43283
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 27
-phone: "+33 4 74 63 09 09"
-opening_hours: "Mo 14:00-19:00; Tu-Th 09:00-19:00; Fr-Sa 09:00-19:30; Su 09:00-13:00"
-website: "https://www.desseignejonathan.fr/"
\ No newline at end of file
+street: Rue Pêcherie
+housenumber: "27"
+phone: +33 4 74 63 09 09
+opening_hours: Mo 14:00-19:00; Tu-Th 09:00-19:00; Fr-Sa 09:00-19:30; Su 09:00-13:00
+website: https://www.desseignejonathan.fr/
diff --git a/data/cities/tarare/la-charcuterie-tararienne.yml b/data/cities/tarare/la-charcuterie-tararienne.yml
index ba1db4f4b..8b3e5fc33 100644
--- a/data/cities/tarare/la-charcuterie-tararienne.yml
+++ b/data/cities/tarare/la-charcuterie-tararienne.yml
@@ -4,8 +4,8 @@ latitude: 45.89644
 longitude: 4.43654
 postcode: "69170"
 city: Tarare
-street: "Place Georges-Antoine Simonet"
-housenumber: 4
-phone: "+33 4 74 63 15 85"
-opening_hours: "Tu-We 07:30-12:00, 14:30-19:00; Th-Fr 07:30-19:00; Sa 07:00-19:00"
-website: ""
\ No newline at end of file
+street: Place Georges-Antoine Simonet
+housenumber: "4"
+phone: +33 4 74 63 15 85
+opening_hours: Tu-We 07:30-12:00, 14:30-19:00; Th-Fr 07:30-19:00; Sa 07:00-19:00
+website: ""
diff --git a/data/cities/tarare/le-comptoir-daphrodite.yml b/data/cities/tarare/le-comptoir-daphrodite.yml
index b81602c38..bf7391c9a 100644
--- a/data/cities/tarare/le-comptoir-daphrodite.yml
+++ b/data/cities/tarare/le-comptoir-daphrodite.yml
@@ -4,8 +4,8 @@ latitude: 45.89507
 longitude: 4.43456
 postcode: "69170"
 city: Tarare
-street: "Boulevard Voltaire"
-housenumber: 18
-phone: "+33 4 69 36 14 47"
-opening_hours: "Tu,Th,Fr 09:00-19:00; We 12:30-19:00; Sa 08:30-14:00"
-website: "lecomptoirdaphrodite.kalendes.com"
\ No newline at end of file
+street: Boulevard Voltaire
+housenumber: "18"
+phone: +33 4 69 36 14 47
+opening_hours: Tu,Th,Fr 09:00-19:00; We 12:30-19:00; Sa 08:30-14:00
+website: lecomptoirdaphrodite.kalendes.com
diff --git a/data/cities/tarare/les-delices-dannabe.yml b/data/cities/tarare/les-delices-dannabe.yml
index 0640545f6..98f8351ae 100644
--- a/data/cities/tarare/les-delices-dannabe.yml
+++ b/data/cities/tarare/les-delices-dannabe.yml
@@ -4,8 +4,8 @@ latitude: 45.89636
 longitude: 4.43413
 postcode: "69170"
 city: Tarare
-street: "Rue Anna Bibert"
-housenumber: 31
+street: Rue Anna Bibert
+housenumber: "31"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/les-dessous-de-mel.yml b/data/cities/tarare/les-dessous-de-mel.yml
index 68764ea3c..aa00f23ba 100644
--- a/data/cities/tarare/les-dessous-de-mel.yml
+++ b/data/cities/tarare/les-dessous-de-mel.yml
@@ -4,8 +4,8 @@ latitude: 45.89554
 longitude: 4.43334
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 52
+street: Rue de la République
+housenumber: "52"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/les-deux-font-la-paire.yml b/data/cities/tarare/les-deux-font-la-paire.yml
index 5188fd2a0..efcee549a 100644
--- a/data/cities/tarare/les-deux-font-la-paire.yml
+++ b/data/cities/tarare/les-deux-font-la-paire.yml
@@ -4,8 +4,8 @@ latitude: 45.89614
 longitude: 4.43281
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 19
+street: Rue Pêcherie
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/les-secrets-de-soi.yml b/data/cities/tarare/les-secrets-de-soi.yml
index 2ec785e6c..1036fb01a 100644
--- a/data/cities/tarare/les-secrets-de-soi.yml
+++ b/data/cities/tarare/les-secrets-de-soi.yml
@@ -4,8 +4,8 @@ latitude: 45.89541
 longitude: 4.4342
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 65
-phone: "+33 4 74 63 01 78"
-opening_hours: "Tu-Th,Sa 09:00-12:15, 14:00-19:00; Fr 09:00-19:00"
-website: "https://www.secretsdesoi-tarare.fr/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "65"
+phone: +33 4 74 63 01 78
+opening_hours: Tu-Th,Sa 09:00-12:15, 14:00-19:00; Fr 09:00-19:00
+website: https://www.secretsdesoi-tarare.fr/
diff --git a/data/cities/tarare/lidl.yml b/data/cities/tarare/lidl.yml
index fc3260790..cf0b69460 100644
--- a/data/cities/tarare/lidl.yml
+++ b/data/cities/tarare/lidl.yml
@@ -4,8 +4,8 @@ latitude: 45.89485
 longitude: 4.42833
 postcode: "69170"
 city: Tarare
-street: "Route de Feurs"
-housenumber: 1
+street: Route de Feurs
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/lunivers-du-bien-etre.yml b/data/cities/tarare/lunivers-du-bien-etre.yml
index 9c534fa01..c5dd61d3f 100644
--- a/data/cities/tarare/lunivers-du-bien-etre.yml
+++ b/data/cities/tarare/lunivers-du-bien-etre.yml
@@ -4,8 +4,8 @@ latitude: 45.89535
 longitude: 4.43469
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 73
-phone: "+33 4 74 63 17 29"
-opening_hours: "Tu 09:00-11:30; We-Sa 09:00-19:00"
-website: "https://fr-fr.facebook.com/universdubienetre/"
\ No newline at end of file
+street: Rue de la République
+housenumber: "73"
+phone: +33 4 74 63 17 29
+opening_hours: Tu 09:00-11:30; We-Sa 09:00-19:00
+website: https://fr-fr.facebook.com/universdubienetre/
diff --git a/data/cities/tarare/mado-et-les-autres.yml b/data/cities/tarare/mado-et-les-autres.yml
index 878667a42..89d0bc789 100644
--- a/data/cities/tarare/mado-et-les-autres.yml
+++ b/data/cities/tarare/mado-et-les-autres.yml
@@ -4,8 +4,8 @@ latitude: 45.89544
 longitude: 4.43302
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 45
+street: Rue de la République
+housenumber: "45"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/nataly-b.yml b/data/cities/tarare/nataly-b.yml
index 61f9c5300..90e85a0a8 100644
--- a/data/cities/tarare/nataly-b.yml
+++ b/data/cities/tarare/nataly-b.yml
@@ -4,8 +4,8 @@ latitude: 45.89664
 longitude: 4.43315
 postcode: "69170"
 city: Tarare
-street: "Rue Mezelle"
-housenumber: 5
+street: Rue Mezelle
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/or-en-cash.yml b/data/cities/tarare/or-en-cash.yml
index 74589296d..fab33e073 100644
--- a/data/cities/tarare/or-en-cash.yml
+++ b/data/cities/tarare/or-en-cash.yml
@@ -4,8 +4,8 @@ latitude: 45.89564
 longitude: 4.43247
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 4
-phone: "+33 4 74 05 60 07"
-opening_hours: "Mo 14:00-18:00; Tu-Fr 09:15-12:00, 14:00-18:00; Sa 09:15-12:00"
-website: "https://www.orencash.fr/boutiques-achat-or/tarare/"
\ No newline at end of file
+street: Rue Pêcherie
+housenumber: "4"
+phone: +33 4 74 05 60 07
+opening_hours: Mo 14:00-18:00; Tu-Fr 09:15-12:00, 14:00-18:00; Sa 09:15-12:00
+website: https://www.orencash.fr/boutiques-achat-or/tarare/
diff --git a/data/cities/tarare/orenzo.yml b/data/cities/tarare/orenzo.yml
index f66aca7c0..dd256b21e 100644
--- a/data/cities/tarare/orenzo.yml
+++ b/data/cities/tarare/orenzo.yml
@@ -4,8 +4,8 @@ latitude: 45.89556
 longitude: 4.43281
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 42
+street: Rue de la République
+housenumber: "42"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/pressing-madeleine.yml b/data/cities/tarare/pressing-madeleine.yml
index 451927c1e..bccb5a08d 100644
--- a/data/cities/tarare/pressing-madeleine.yml
+++ b/data/cities/tarare/pressing-madeleine.yml
@@ -4,8 +4,8 @@ latitude: 45.89535
 longitude: 4.43574
 postcode: "69170"
 city: Tarare
-street: "Place Madeleine"
-housenumber: 
+street: Place Madeleine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/prestance.yml b/data/cities/tarare/prestance.yml
index db998c27b..15c22c9eb 100644
--- a/data/cities/tarare/prestance.yml
+++ b/data/cities/tarare/prestance.yml
@@ -4,8 +4,9 @@ latitude: 45.89664
 longitude: 4.43302
 postcode: "69170"
 city: Tarare
-street: "Rue Mezelle"
-housenumber: 3
+street: Rue Mezelle
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Th 09:00-13:00; Tu 14:00-19:15; We-Th 14:00-19:00; Fr 09:00-19:15; Sa 09:00-13:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-13:00; Tu 14:00-19:15; We-Th 14:00-19:00; Fr 09:00-19:15;
+    Sa 09:00-13:00, 14:00-19:00
+website: ""
diff --git a/data/cities/tarare/pro-et-cie-sonimage.yml b/data/cities/tarare/pro-et-cie-sonimage.yml
index 1222b50cc..8707d5984 100644
--- a/data/cities/tarare/pro-et-cie-sonimage.yml
+++ b/data/cities/tarare/pro-et-cie-sonimage.yml
@@ -4,8 +4,8 @@ latitude: 45.89626
 longitude: 4.43261
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 26
-phone: "+33 4 74 63 04 04"
-opening_hours: "Tu-Sa 09:00-12:00; Tu-Fr 14:00-19:00; Sa 14:00-19:00"
-website: "http://www.procie-tarare.com/"
\ No newline at end of file
+street: Rue Pêcherie
+housenumber: "26"
+phone: +33 4 74 63 04 04
+opening_hours: Tu-Sa 09:00-12:00; Tu-Fr 14:00-19:00; Sa 14:00-19:00
+website: http://www.procie-tarare.com/
diff --git a/data/cities/tarare/remy-kehl.yml b/data/cities/tarare/remy-kehl.yml
index 72f464708..fd1a51e9c 100644
--- a/data/cities/tarare/remy-kehl.yml
+++ b/data/cities/tarare/remy-kehl.yml
@@ -4,8 +4,8 @@ latitude: 45.89544
 longitude: 4.43312
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 47
+street: Rue de la République
+housenumber: "47"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/robelle.yml b/data/cities/tarare/robelle.yml
index 4984a0e56..ba2530b8d 100644
--- a/data/cities/tarare/robelle.yml
+++ b/data/cities/tarare/robelle.yml
@@ -4,8 +4,8 @@ latitude: 45.8957
 longitude: 4.43494
 postcode: "69170"
 city: Tarare
-street: "Rue Anna Bibert"
-housenumber: 7
+street: Rue Anna Bibert
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: "http://rob-elle.fr/index.html"
\ No newline at end of file
+website: http://rob-elle.fr/index.html
diff --git a/data/cities/tarare/rox-et-rocky.yml b/data/cities/tarare/rox-et-rocky.yml
index 4530f2e22..6928a99a1 100644
--- a/data/cities/tarare/rox-et-rocky.yml
+++ b/data/cities/tarare/rox-et-rocky.yml
@@ -4,8 +4,8 @@ latitude: 45.89548
 longitude: 4.43449
 postcode: "69170"
 city: Tarare
-street: "Rue de la République"
-housenumber: 74
+street: Rue de la République
+housenumber: "74"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/solemur.yml b/data/cities/tarare/solemur.yml
index 89c3fbacb..3a38432fb 100644
--- a/data/cities/tarare/solemur.yml
+++ b/data/cities/tarare/solemur.yml
@@ -4,8 +4,8 @@ latitude: 45.89768
 longitude: 4.43355
 postcode: "69170"
 city: Tarare
-street: "Avenue Charles de Gaulle"
-housenumber: 26
+street: Avenue Charles de Gaulle
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/tendances.yml b/data/cities/tarare/tendances.yml
index cefb25d1c..e36518a8f 100644
--- a/data/cities/tarare/tendances.yml
+++ b/data/cities/tarare/tendances.yml
@@ -4,8 +4,8 @@ latitude: 45.89589
 longitude: 4.43451
 postcode: "69170"
 city: Tarare
-street: "Rue Anna Bibert"
-housenumber: 14
+street: Rue Anna Bibert
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/trambouze.yml b/data/cities/tarare/trambouze.yml
index 30a7fa206..1e643805f 100644
--- a/data/cities/tarare/trambouze.yml
+++ b/data/cities/tarare/trambouze.yml
@@ -4,8 +4,8 @@ latitude: 45.89554
 longitude: 4.43519
 postcode: "69170"
 city: Tarare
-street: "Rue Anna Bibert"
-housenumber: 3
+street: Rue Anna Bibert
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/unik-concept-store.yml b/data/cities/tarare/unik-concept-store.yml
index b5428295c..28f8f4e3e 100644
--- a/data/cities/tarare/unik-concept-store.yml
+++ b/data/cities/tarare/unik-concept-store.yml
@@ -4,8 +4,8 @@ latitude: 45.89642
 longitude: 4.43284
 postcode: "69170"
 city: Tarare
-street: "Rue Pêcherie"
-housenumber: 27
+street: Rue Pêcherie
+housenumber: "27"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tarare/veditex.yml b/data/cities/tarare/veditex.yml
index 30730bf71..e0d2d6ded 100644
--- a/data/cities/tarare/veditex.yml
+++ b/data/cities/tarare/veditex.yml
@@ -4,8 +4,8 @@ latitude: 45.896
 longitude: 4.43725
 postcode: "69170"
 city: Tarare
-street: "Rue de Belfort"
-housenumber: 12
-phone: "+33 4 74 63 13 18"
+street: Rue de Belfort
+housenumber: "12"
+phone: +33 4 74 63 13 18
 opening_hours: ""
-website: "https://www.veditex.com/"
\ No newline at end of file
+website: https://www.veditex.com/
diff --git a/data/cities/tartaras/domaine-les-deplaude-de-tartaras.yml b/data/cities/tartaras/domaine-les-deplaude-de-tartaras.yml
index c89a7ef35..719838a01 100644
--- a/data/cities/tartaras/domaine-les-deplaude-de-tartaras.yml
+++ b/data/cities/tartaras/domaine-les-deplaude-de-tartaras.yml
@@ -4,8 +4,8 @@ latitude: 45.55477
 longitude: 4.6693
 postcode: "42800"
 city: Tartaras
-street: "Rue du prieuré"
-housenumber: 7
+street: Rue du prieuré
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tassin-la-demi-lune/agbr-optique.yml b/data/cities/tassin-la-demi-lune/agbr-optique.yml
index 16cf2d935..0261e92e5 100644
--- a/data/cities/tassin-la-demi-lune/agbr-optique.yml
+++ b/data/cities/tassin-la-demi-lune/agbr-optique.yml
@@ -4,8 +4,8 @@ latitude: 45.7604
 longitude: 4.75784
 postcode: "69160"
 city: Tassin-la-Demi-Lune
-street: "Place Tassin"
-housenumber: 7
+street: Place Tassin
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tassin-la-demi-lune/carglass.yml b/data/cities/tassin-la-demi-lune/carglass.yml
index 1103d4d79..afbf0acb0 100644
--- a/data/cities/tassin-la-demi-lune/carglass.yml
+++ b/data/cities/tassin-la-demi-lune/carglass.yml
@@ -4,8 +4,8 @@ latitude: 45.76871
 longitude: 4.78645
 postcode: "69160"
 city: Tassin-la-Demi-Lune
-street: "Avenue Victor Hugo"
-housenumber: 14
+street: Avenue Victor Hugo
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:15,13:45-18:00; Sa 08:00-12:15,13:45-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:15,13:45-18:00; Sa 08:00-12:15,13:45-17:00
+website: ""
diff --git a/data/cities/tassin-la-demi-lune/sodicycle.yml b/data/cities/tassin-la-demi-lune/sodicycle.yml
index d227421e4..eb9524167 100644
--- a/data/cities/tassin-la-demi-lune/sodicycle.yml
+++ b/data/cities/tassin-la-demi-lune/sodicycle.yml
@@ -4,8 +4,8 @@ latitude: 45.77271
 longitude: 4.79181
 postcode: "69160"
 city: Tassin-la-Demi-Lune
-street: "Avenue Victor Hugo"
-housenumber: 9
-phone: "+33 4 37 28 04 03"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00"
-website: "https://www.sodicycle.com"
\ No newline at end of file
+street: Avenue Victor Hugo
+housenumber: "9"
+phone: +33 4 37 28 04 03
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00
+website: https://www.sodicycle.com
diff --git a/data/cities/tenay/le-herisson-gourmand.yml b/data/cities/tenay/le-herisson-gourmand.yml
index a38df7737..7065d8243 100644
--- a/data/cities/tenay/le-herisson-gourmand.yml
+++ b/data/cities/tenay/le-herisson-gourmand.yml
@@ -4,8 +4,8 @@ latitude: 45.91895
 longitude: 5.50997
 postcode: "01230"
 city: Tenay
-street: "rue du carré l’Abbé"
-housenumber: 2
-phone: "+33 4 74 36 66 83"
-opening_hours: "Tu 06:30-13:00; We-Sa 07:00-13:00"
-website: ""
\ No newline at end of file
+street: rue du carré l’Abbé
+housenumber: "2"
+phone: +33 4 74 36 66 83
+opening_hours: Tu 06:30-13:00; We-Sa 07:00-13:00
+website: ""
diff --git a/data/cities/tencin/gresy.yml b/data/cities/tencin/gresy.yml
index 3b4f3354a..4b1d6bd14 100644
--- a/data/cities/tencin/gresy.yml
+++ b/data/cities/tencin/gresy.yml
@@ -4,8 +4,8 @@ latitude: 45.30183
 longitude: 5.9526
 postcode: "38570"
 city: Tencin
-street: "Avenue du Grésivaudan"
-housenumber: 
-phone: "+33 676001888"
-opening_hours: "Tu-Sa 14:00-18:00"
-website: "https://www.gresy.fr"
\ No newline at end of file
+street: Avenue du Grésivaudan
+housenumber: ""
+phone: +33 676001888
+opening_hours: Tu-Sa 14:00-18:00
+website: https://www.gresy.fr
diff --git a/data/cities/termignon/sport-2000.yml b/data/cities/termignon/sport-2000.yml
index 738f40ee2..5baf989db 100644
--- a/data/cities/termignon/sport-2000.yml
+++ b/data/cities/termignon/sport-2000.yml
@@ -5,7 +5,7 @@ longitude: 6.8175
 postcode: "73500"
 city: Termignon
 street: ""
-housenumber: 26
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ternay/art-et-nature.yml b/data/cities/ternay/art-et-nature.yml
index 36ecb8a86..47c559360 100644
--- a/data/cities/ternay/art-et-nature.yml
+++ b/data/cities/ternay/art-et-nature.yml
@@ -4,8 +4,8 @@ latitude: 45.60531
 longitude: 4.81163
 postcode: "69360"
 city: Ternay
-street: "Route Neuve"
-housenumber: 
-phone: "+33 4 72 24 64 48"
-opening_hours: "Mo off; Tu-Sa 09:00-12:30,15:00-19:30; Su 09:00-12:30"
-website: "https://art-et-nature-florist.business.site"
\ No newline at end of file
+street: Route Neuve
+housenumber: ""
+phone: +33 4 72 24 64 48
+opening_hours: Mo off; Tu-Sa 09:00-12:30,15:00-19:30; Su 09:00-12:30
+website: https://art-et-nature-florist.business.site
diff --git a/data/cities/ternay/boulangerie-patisserie-larrat.yml b/data/cities/ternay/boulangerie-patisserie-larrat.yml
index f8f03e240..86afff74d 100644
--- a/data/cities/ternay/boulangerie-patisserie-larrat.yml
+++ b/data/cities/ternay/boulangerie-patisserie-larrat.yml
@@ -1,11 +1,11 @@
 id: 556353275
-type: way
+type: node
 latitude: 45.60806
 longitude: 4.80969
 postcode: "69360"
 city: Ternay
-street: "Place de l'Église"
-housenumber: 19
+street: Place de l'Église
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ternay/celine-r.yml b/data/cities/ternay/celine-r.yml
index b7f7ffc71..8be16ef1e 100644
--- a/data/cities/ternay/celine-r.yml
+++ b/data/cities/ternay/celine-r.yml
@@ -4,8 +4,8 @@ latitude: 45.60623
 longitude: 4.81096
 postcode: "69360"
 city: Ternay
-street: "Allée du Vieux Porche"
-housenumber: 5
-phone: "+33 4 72 24 63 12"
-opening_hours: "Mo,Su off; Tu-Th 09:00-12:00,14:00-19:00; Fr 09:00-19:00; Sa 08:00-16:00"
-website: "https://www.planity.com/celine-r-69360-ternay"
\ No newline at end of file
+street: Allée du Vieux Porche
+housenumber: "5"
+phone: +33 4 72 24 63 12
+opening_hours: Mo,Su off; Tu-Th 09:00-12:00,14:00-19:00; Fr 09:00-19:00; Sa 08:00-16:00
+website: https://www.planity.com/celine-r-69360-ternay
diff --git a/data/cities/theize/lepicerie-des-colibris.yml b/data/cities/theize/lepicerie-des-colibris.yml
index e19340887..b7110d370 100644
--- a/data/cities/theize/lepicerie-des-colibris.yml
+++ b/data/cities/theize/lepicerie-des-colibris.yml
@@ -5,7 +5,7 @@ longitude: 4.61633
 postcode: "69620"
 city: Theizé
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo 15:00-19:00; We-Fr 09:00-12:30,15:00-19:00; Sa 09:00-12:30,15:00-18:00"
-website: "https://epicerie-colibris.fr/"
\ No newline at end of file
+opening_hours: Mo 15:00-19:00; We-Fr 09:00-12:30,15:00-19:00; Sa 09:00-12:30,15:00-18:00
+website: https://epicerie-colibris.fr/
diff --git a/data/cities/thizy-les-bourgs/intermarche-super-route-de-roanne.yml b/data/cities/thizy-les-bourgs/intermarche-super-route-de-roanne.yml
index c75bf522a..a084c331e 100644
--- a/data/cities/thizy-les-bourgs/intermarche-super-route-de-roanne.yml
+++ b/data/cities/thizy-les-bourgs/intermarche-super-route-de-roanne.yml
@@ -1,11 +1,11 @@
 id: 143523473
-type: way
+type: node
 latitude: 46.03522
 longitude: 4.28992
 postcode: "69240"
 city: Thizy-les-Bourgs
-street: "Route de Roanne"
-housenumber: 
+street: Route de Roanne
+housenumber: ""
 phone: ""
-opening_hours: "Mo-We 08:30-12:15, 14:30-19:00; Tu-Sa 08:30-19:00; Su 08:30-12:30"
-website: "https://www.intermarche.com/magasins/10369/thizy-les-bourg-69240/infos-pratiques"
\ No newline at end of file
+opening_hours: Mo-We 08:30-12:15, 14:30-19:00; Tu-Sa 08:30-19:00; Su 08:30-12:30
+website: https://www.intermarche.com/magasins/10369/thizy-les-bourg-69240/infos-pratiques
diff --git a/data/cities/thizy-les-bourgs/intermarche-super.yml b/data/cities/thizy-les-bourgs/intermarche-super.yml
index 41769693f..63d243378 100644
--- a/data/cities/thizy-les-bourgs/intermarche-super.yml
+++ b/data/cities/thizy-les-bourgs/intermarche-super.yml
@@ -4,8 +4,8 @@ latitude: 46.03542
 longitude: 4.29114
 postcode: "69240"
 city: Thizy-les-Bourgs
-street: "Route de Roanne"
-housenumber: 
+street: Route de Roanne
+housenumber: ""
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/thoirette/eurorepar-prestige-garage.yml b/data/cities/thoirette/eurorepar-prestige-garage.yml
index e842e813d..7cdd4bed8 100644
--- a/data/cities/thoirette/eurorepar-prestige-garage.yml
+++ b/data/cities/thoirette/eurorepar-prestige-garage.yml
@@ -1,11 +1,11 @@
 id: 185655288
-type: way
+type: node
 latitude: 46.26686
 longitude: 5.51749
 postcode: "39240"
 city: Thoirette
-street: "Route d'Aromas"
-housenumber: 
+street: Route d'Aromas
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thoirette/peugeot.yml b/data/cities/thoirette/peugeot.yml
index e5b36227b..065bb7e22 100644
--- a/data/cities/thoirette/peugeot.yml
+++ b/data/cities/thoirette/peugeot.yml
@@ -1,11 +1,11 @@
 id: 185655263
-type: way
+type: node
 latitude: 46.26576
 longitude: 5.52087
 postcode: "39240"
 city: Thoirette
-street: "Route de Bourg"
-housenumber: 8
-phone: "+33 4 74 76 83 53"
+street: Route de Bourg
+housenumber: "8"
+phone: +33 4 74 76 83 53
 opening_hours: ""
-website: "https://concessions.peugeot.fr/thoirette/"
\ No newline at end of file
+website: https://concessions.peugeot.fr/thoirette/
diff --git a/data/cities/thoirette/thoirette-peche.yml b/data/cities/thoirette/thoirette-peche.yml
index 4b52bd8dc..e6ad6a593 100644
--- a/data/cities/thoirette/thoirette-peche.yml
+++ b/data/cities/thoirette/thoirette-peche.yml
@@ -4,8 +4,8 @@ latitude: 46.2697
 longitude: 5.52967
 postcode: "39240"
 city: Thoirette
-street: "Grande Rue"
-housenumber: 55
+street: Grande Rue
+housenumber: "55"
 phone: "+33474768599"
-opening_hours: "Mo-Sa 08:00-19:00; Su 08:00-12:00"
-website: "https://thoirette-peche.weebly.com/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:00; Su 08:00-12:00
+website: https://thoirette-peche.weebly.com/
diff --git a/data/cities/thoiry/culture-velo.yml b/data/cities/thoiry/culture-velo.yml
index 131c77191..f2388ebcb 100644
--- a/data/cities/thoiry/culture-velo.yml
+++ b/data/cities/thoiry/culture-velo.yml
@@ -4,8 +4,8 @@ latitude: 46.22582
 longitude: 5.99004
 postcode: "01710"
 city: Thoiry
-street: "Rue pre de fontaine"
-housenumber: 
+street: Rue pre de fontaine
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thoiry/decathlon.yml b/data/cities/thoiry/decathlon.yml
index 2b4538665..dad430198 100644
--- a/data/cities/thoiry/decathlon.yml
+++ b/data/cities/thoiry/decathlon.yml
@@ -1,11 +1,11 @@
 id: 1148904690
-type: way
+type: node
 latitude: 46.22836
 longitude: 5.99419
 postcode: "01710"
 city: Thoiry
-street: "Zone d'Activité Pré-Jacquet - CC Val Thoiry"
-housenumber: 
+street: Zone d'Activité Pré-Jacquet - CC Val Thoiry
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00"
-website: "https://www.decathlon.fr/store-view/magasin-de-sports-thoiry-0070160201602"
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00
+website: https://www.decathlon.fr/store-view/magasin-de-sports-thoiry-0070160201602
diff --git a/data/cities/thoiry/intersport.yml b/data/cities/thoiry/intersport.yml
index 2b7ac5b2e..87d2b862d 100644
--- a/data/cities/thoiry/intersport.yml
+++ b/data/cities/thoiry/intersport.yml
@@ -1,11 +1,11 @@
 id: 1149269331
-type: way
+type: node
 latitude: 46.22877
 longitude: 5.99336
 postcode: "01710"
 city: Thoiry
-street: "Zone du Pré Jacquet"
-housenumber: 1
+street: Zone du Pré Jacquet
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.go-sport.com/store-locator-go-sport-france-thoiry"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.go-sport.com/store-locator-go-sport-france-thoiry
diff --git a/data/cities/thoiry/motostop01.yml b/data/cities/thoiry/motostop01.yml
index a17adb996..31f9a0918 100644
--- a/data/cities/thoiry/motostop01.yml
+++ b/data/cities/thoiry/motostop01.yml
@@ -4,8 +4,8 @@ latitude: 46.22432
 longitude: 5.99129
 postcode: "01710"
 city: Thoiry
-street: "Rue de l'Artisanat"
-housenumber: 27
-phone: "+33 4 50 99 23 80"
+street: Rue de l'Artisanat
+housenumber: "27"
+phone: +33 4 50 99 23 80
 opening_hours: ""
-website: "http://motostop01.com"
\ No newline at end of file
+website: http://motostop01.com
diff --git a/data/cities/thoiry/pharmacie-val-sante.yml b/data/cities/thoiry/pharmacie-val-sante.yml
index 8a4c25afe..9a4494263 100644
--- a/data/cities/thoiry/pharmacie-val-sante.yml
+++ b/data/cities/thoiry/pharmacie-val-sante.yml
@@ -1,11 +1,11 @@
 id: 1149269333
-type: way
+type: node
 latitude: 46.22883
 longitude: 5.99601
 postcode: "01710"
 city: Thoiry
-street: "Rue de la Gare"
-housenumber: 32
-phone: "+33 4 50 20 87 57"
-opening_hours: "Mo-Fr 09:30-20:00; Sa 09:00-20:00"
-website: ""
\ No newline at end of file
+street: Rue de la Gare
+housenumber: "32"
+phone: +33 4 50 20 87 57
+opening_hours: Mo-Fr 09:30-20:00; Sa 09:00-20:00
+website: ""
diff --git a/data/cities/thoiry/satoriz-thoiry.yml b/data/cities/thoiry/satoriz-thoiry.yml
index 7c27e23b7..5d40a2424 100644
--- a/data/cities/thoiry/satoriz-thoiry.yml
+++ b/data/cities/thoiry/satoriz-thoiry.yml
@@ -5,7 +5,7 @@ longitude: 5.98964
 postcode: "01710"
 city: Thoiry
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30"
-website: "https://www.satoriz.fr/satoriz/magasin-satoriz-thoiry/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30
+website: https://www.satoriz.fr/satoriz/magasin-satoriz-thoiry/
diff --git a/data/cities/thoiry/tabac-presse-ursella.yml b/data/cities/thoiry/tabac-presse-ursella.yml
index a77ceb52f..0df015c27 100644
--- a/data/cities/thoiry/tabac-presse-ursella.yml
+++ b/data/cities/thoiry/tabac-presse-ursella.yml
@@ -4,8 +4,8 @@ latitude: 46.23608
 longitude: 5.98087
 postcode: "01710"
 city: Thoiry
-street: "Place de la Mairie"
-housenumber: 
+street: Place de la Mairie
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:00-12:30,15:00-19:00; Su 08:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-12:30,15:00-19:00; Su 08:00-13:00
+website: ""
diff --git a/data/cities/thollon-les-memises/garage-des-memises.yml b/data/cities/thollon-les-memises/garage-des-memises.yml
index bdb111364..63f12bae0 100644
--- a/data/cities/thollon-les-memises/garage-des-memises.yml
+++ b/data/cities/thollon-les-memises/garage-des-memises.yml
@@ -1,11 +1,11 @@
 id: 66884296
-type: way
+type: node
 latitude: 46.38744
 longitude: 6.69634
 postcode: "74500"
 city: Thollon-les-Mémises
-street: "Route des Plagnes"
-housenumber: 494
+street: Route des Plagnes
+housenumber: "494"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 13:30-18:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 13:30-18:30; Sa-Su off
+website: ""
diff --git a/data/cities/thollon-les-memises/sherpa-2.yml b/data/cities/thollon-les-memises/sherpa-2.yml
index 8fe5a914a..b694ea712 100644
--- a/data/cities/thollon-les-memises/sherpa-2.yml
+++ b/data/cities/thollon-les-memises/sherpa-2.yml
@@ -5,7 +5,8 @@ longitude: 6.71487
 postcode: "74500"
 city: Thollon-les-Mémises
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Dec 22-Mar 31 Mo-Su 07:00-19:30; Apr 01-Dec 21 Mo-We,Fr-Sa 07:30-12:30, 16:00-19:30, Th,Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Dec 22-Mar 31 Mo-Su 07:00-19:30; Apr 01-Dec 21 Mo-We,Fr-Sa 07:30-12:30,
+    16:00-19:30, Th,Su 07:30-12:30
+website: ""
diff --git a/data/cities/thollon-les-memises/sherpa.yml b/data/cities/thollon-les-memises/sherpa.yml
index 54c90a998..210cb5929 100644
--- a/data/cities/thollon-les-memises/sherpa.yml
+++ b/data/cities/thollon-les-memises/sherpa.yml
@@ -4,8 +4,8 @@ latitude: 46.39188
 longitude: 6.7068
 postcode: "74500"
 city: Thollon-les-Mémises
-street: "Route de Borée"
-housenumber: 499
+street: Route de Borée
+housenumber: "499"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thollon-les-memises/skiset-ecco-skis.yml b/data/cities/thollon-les-memises/skiset-ecco-skis.yml
index df37115e4..cbf7369ce 100644
--- a/data/cities/thollon-les-memises/skiset-ecco-skis.yml
+++ b/data/cities/thollon-les-memises/skiset-ecco-skis.yml
@@ -4,8 +4,8 @@ latitude: 46.39014
 longitude: 6.71526
 postcode: "74500"
 city: Thollon-les-Mémises
-street: "Route de Borée"
-housenumber: 1412
+street: Route de Borée
+housenumber: "1412"
 phone: ""
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/thones/aravis-garage.yml b/data/cities/thones/aravis-garage.yml
index fed968b15..15f478436 100644
--- a/data/cities/thones/aravis-garage.yml
+++ b/data/cities/thones/aravis-garage.yml
@@ -4,8 +4,8 @@ latitude: 45.89
 longitude: 6.31092
 postcode: "74230"
 city: Thônes
-street: "Avenue d'Annecy"
-housenumber: 47
-phone: "+33 4 50 02 85 18"
+street: Avenue d'Annecy
+housenumber: "47"
+phone: +33 4 50 02 85 18
 opening_hours: ""
-website: "https://www.garage-thones.fr/"
\ No newline at end of file
+website: https://www.garage-thones.fr/
diff --git a/data/cities/thones/boulangerie-des-aravis.yml b/data/cities/thones/boulangerie-des-aravis.yml
index 658faa2ff..79709ff51 100644
--- a/data/cities/thones/boulangerie-des-aravis.yml
+++ b/data/cities/thones/boulangerie-des-aravis.yml
@@ -4,8 +4,8 @@ latitude: 45.89376
 longitude: 6.30473
 postcode: "74230"
 city: Thônes
-street: "Rue des Vernaies"
-housenumber: 2
+street: Rue des Vernaies
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thones/boulangerie-patisserie-petit-michel.yml b/data/cities/thones/boulangerie-patisserie-petit-michel.yml
index b9825b4fa..f023f0f01 100644
--- a/data/cities/thones/boulangerie-patisserie-petit-michel.yml
+++ b/data/cities/thones/boulangerie-patisserie-petit-michel.yml
@@ -4,8 +4,8 @@ latitude: 45.88319
 longitude: 6.32654
 postcode: "74230"
 city: Thones
-street: "Rue de la Saulne"
-housenumber: 23
-phone: "+33 4 50 02 93 19"
-opening_hours: "06:00-13:00,15:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue de la Saulne
+housenumber: "23"
+phone: +33 4 50 02 93 19
+opening_hours: 06:00-13:00,15:00-19:00
+website: ""
diff --git a/data/cities/thones/carrefour-city.yml b/data/cities/thones/carrefour-city.yml
index 5df06d597..39595fe79 100644
--- a/data/cities/thones/carrefour-city.yml
+++ b/data/cities/thones/carrefour-city.yml
@@ -4,8 +4,8 @@ latitude: 45.88159
 longitude: 6.32259
 postcode: "74230"
 city: Thônes
-street: "Place Avet"
-housenumber: 31
+street: Place Avet
+housenumber: "31"
 phone: ""
-opening_hours: "Mo-Sa 07:00-22:00; Su 09:00-19:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-22:00; Su 09:00-19:45
+website: ""
diff --git a/data/cities/thones/carrefour-market.yml b/data/cities/thones/carrefour-market.yml
index a1173f790..4d75f891d 100644
--- a/data/cities/thones/carrefour-market.yml
+++ b/data/cities/thones/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 231115753
-type: way
+type: node
 latitude: 45.88487
 longitude: 6.32856
 postcode: "74230"
 city: Thônes
-street: "Rue du Bienheureux Pierre Favre"
-housenumber: 34
+street: Rue du Bienheureux Pierre Favre
+housenumber: "34"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/thones/cooperative-agricole-dachats-des-vallees-de-thones.yml b/data/cities/thones/cooperative-agricole-dachats-des-vallees-de-thones.yml
index 05f193f0d..68b814ec9 100644
--- a/data/cities/thones/cooperative-agricole-dachats-des-vallees-de-thones.yml
+++ b/data/cities/thones/cooperative-agricole-dachats-des-vallees-de-thones.yml
@@ -4,8 +4,8 @@ latitude: 45.88171
 longitude: 6.32648
 postcode: "74230"
 city: Thônes
-street: "Rue Jean-Jacques Rousseau"
-housenumber: 2
-phone: "+33 4 50 02 01 87"
-opening_hours: "8:30-12:00; 14:00-18:00"
-website: "http://coopthones.free.fr"
\ No newline at end of file
+street: Rue Jean-Jacques Rousseau
+housenumber: "2"
+phone: +33 4 50 02 01 87
+opening_hours: 8:30-12:00; 14:00-18:00
+website: http://coopthones.free.fr
diff --git a/data/cities/thones/espaces-et-jardins-des-aravis.yml b/data/cities/thones/espaces-et-jardins-des-aravis.yml
index 63c60ecc1..03c5e269e 100644
--- a/data/cities/thones/espaces-et-jardins-des-aravis.yml
+++ b/data/cities/thones/espaces-et-jardins-des-aravis.yml
@@ -4,8 +4,8 @@ latitude: 45.88176
 longitude: 6.32649
 postcode: "74230"
 city: Thônes
-street: "Rue Jean-Jacques Rousseau"
-housenumber: 2
-phone: "+33 4 50 02 01 87"
-opening_hours: "8:30-12:00; 14:00-18:00"
-website: "http://coopthones.free.fr/"
\ No newline at end of file
+street: Rue Jean-Jacques Rousseau
+housenumber: "2"
+phone: +33 4 50 02 01 87
+opening_hours: 8:30-12:00; 14:00-18:00
+website: http://coopthones.free.fr/
diff --git a/data/cities/thones/la-paniere.yml b/data/cities/thones/la-paniere.yml
index 38b0e0535..7d48ed903 100644
--- a/data/cities/thones/la-paniere.yml
+++ b/data/cities/thones/la-paniere.yml
@@ -5,7 +5,7 @@ longitude: 6.31653
 postcode: "74230"
 city: Thônes
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thones/le-farto-de-thones.yml b/data/cities/thones/le-farto-de-thones.yml
index 651291277..2d44439b1 100644
--- a/data/cities/thones/le-farto-de-thones.yml
+++ b/data/cities/thones/le-farto-de-thones.yml
@@ -4,8 +4,8 @@ latitude: 45.88758
 longitude: 6.31435
 postcode: "74230"
 city: Thônes
-street: "Avenue d'Annecy"
-housenumber: 40
-phone: "+33 4 50 02 05 60"
-opening_hours: "Mo-Sa 08:00-19:00; Su 09:30-12:30,14:30-19:00"
-website: "https://www.reblochon-thones.com/"
\ No newline at end of file
+street: Avenue d'Annecy
+housenumber: "40"
+phone: +33 4 50 02 05 60
+opening_hours: Mo-Sa 08:00-19:00; Su 09:30-12:30,14:30-19:00
+website: https://www.reblochon-thones.com/
diff --git a/data/cities/thones/magasin-la-ferme-de-lorette.yml b/data/cities/thones/magasin-la-ferme-de-lorette.yml
index e06e42b93..a426cb610 100644
--- a/data/cities/thones/magasin-la-ferme-de-lorette.yml
+++ b/data/cities/thones/magasin-la-ferme-de-lorette.yml
@@ -4,8 +4,8 @@ latitude: 45.89057
 longitude: 6.31097
 postcode: "74230"
 city: Thônes
-street: "Avenue d'Annecy"
-housenumber: 4
-phone: "+33 4 50 44 08 37"
-opening_hours: "14:00-19:00"
-website: "http://www.lafermedelorette.fr/"
\ No newline at end of file
+street: Avenue d'Annecy
+housenumber: "4"
+phone: +33 4 50 44 08 37
+opening_hours: 14:00-19:00
+website: http://www.lafermedelorette.fr/
diff --git a/data/cities/thones/villa-blanche.yml b/data/cities/thones/villa-blanche.yml
index 6a9c111f3..24d8cd3de 100644
--- a/data/cities/thones/villa-blanche.yml
+++ b/data/cities/thones/villa-blanche.yml
@@ -4,8 +4,8 @@ latitude: 45.88123
 longitude: 6.32475
 postcode: "74230"
 city: Thônes
-street: "Rue Blanche"
-housenumber: 5
-phone: "+33 4 50 02 01 53"
-opening_hours: "09:15-12:15,14:30-19:15"
-website: ""
\ No newline at end of file
+street: Rue Blanche
+housenumber: "5"
+phone: +33 4 50 02 01 53
+opening_hours: 09:15-12:15,14:30-19:15
+website: ""
diff --git a/data/cities/thonex/bens.yml b/data/cities/thonex/bens.yml
index a93365b1d..5b89ce54d 100644
--- a/data/cities/thonex/bens.yml
+++ b/data/cities/thonex/bens.yml
@@ -1,11 +1,11 @@
 id: 134696455
-type: way
+type: node
 latitude: 46.19881
 longitude: 6.22052
 postcode: ""
 city: Thônex
-street: "Route d'Ambilly"
-housenumber: 58
+street: Route d'Ambilly
+housenumber: "58"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/32-le-salon.yml b/data/cities/thonon-les-bains/32-le-salon.yml
index 21f79e704..89d282ba7 100644
--- a/data/cities/thonon-les-bains/32-le-salon.yml
+++ b/data/cities/thonon-les-bains/32-le-salon.yml
@@ -4,8 +4,8 @@ latitude: 46.37166
 longitude: 6.47841
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Square Aristide Briand"
-housenumber: 8
+street: Square Aristide Briand
+housenumber: "8"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:00-19:00; Sa 08:30-17:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:00-19:00; Sa 08:30-17:30
+website: ""
diff --git a/data/cities/thonon-les-bains/43-grande-rue.yml b/data/cities/thonon-les-bains/43-grande-rue.yml
index bfc84c453..a8af1ccb0 100644
--- a/data/cities/thonon-les-bains/43-grande-rue.yml
+++ b/data/cities/thonon-les-bains/43-grande-rue.yml
@@ -4,8 +4,8 @@ latitude: 46.37168
 longitude: 6.47939
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 43
+street: Grande Rue
+housenumber: "43"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:30-12:30, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:30-12:30, 14:00-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/ambiance-et-styles.yml b/data/cities/thonon-les-bains/ambiance-et-styles.yml
index 5844ca0eb..66c2687c6 100644
--- a/data/cities/thonon-les-bains/ambiance-et-styles.yml
+++ b/data/cities/thonon-les-bains/ambiance-et-styles.yml
@@ -4,8 +4,8 @@ latitude: 46.35278
 longitude: 6.44183
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue du Pamphiot"
-housenumber: 19
+street: Rue du Pamphiot
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/atol.yml b/data/cities/thonon-les-bains/atol.yml
index 4545da014..075d9b171 100644
--- a/data/cities/thonon-les-bains/atol.yml
+++ b/data/cities/thonon-les-bains/atol.yml
@@ -4,8 +4,8 @@ latitude: 46.37062
 longitude: 6.47888
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 6
+street: Grande Rue
+housenumber: "6"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/banette.yml b/data/cities/thonon-les-bains/banette.yml
index 846f0b657..4de4e463d 100644
--- a/data/cities/thonon-les-bains/banette.yml
+++ b/data/cities/thonon-les-bains/banette.yml
@@ -4,8 +4,8 @@ latitude: 46.37921
 longitude: 6.49733
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/beauty-success.yml b/data/cities/thonon-les-bains/beauty-success.yml
index aedb8a197..b1fe4c249 100644
--- a/data/cities/thonon-les-bains/beauty-success.yml
+++ b/data/cities/thonon-les-bains/beauty-success.yml
@@ -4,8 +4,8 @@ latitude: 46.37949
 longitude: 6.49764
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:30-10:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-10:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/blanchisserie-des-hermones.yml b/data/cities/thonon-les-bains/blanchisserie-des-hermones.yml
index a0ebbc3ae..8c789aac2 100644
--- a/data/cities/thonon-les-bains/blanchisserie-des-hermones.yml
+++ b/data/cities/thonon-les-bains/blanchisserie-des-hermones.yml
@@ -1,11 +1,11 @@
 id: 67042097
-type: way
+type: node
 latitude: 46.38094
 longitude: 6.50625
 postcode: ""
 city: Thonon-les-Bains
-street: "Route du Ranch"
-housenumber: 6
+street: Route du Ranch
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/botanic.yml b/data/cities/thonon-les-bains/botanic.yml
index 9f8d7b9fa..86818b1b1 100644
--- a/data/cities/thonon-les-bains/botanic.yml
+++ b/data/cities/thonon-les-bains/botanic.yml
@@ -1,11 +1,11 @@
 id: 899021366
-type: way
+type: node
 latitude: 46.38011
 longitude: 6.49498
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue des Prés Verts"
-housenumber: 17
+street: Avenue des Prés Verts
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/boucherie-charcuterie-traiteur-vautey.yml b/data/cities/thonon-les-bains/boucherie-charcuterie-traiteur-vautey.yml
index 68846e9aa..be3d64895 100644
--- a/data/cities/thonon-les-bains/boucherie-charcuterie-traiteur-vautey.yml
+++ b/data/cities/thonon-les-bains/boucherie-charcuterie-traiteur-vautey.yml
@@ -4,8 +4,8 @@ latitude: 46.37101
 longitude: 6.48209
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Boulevard Georges Andrier"
-housenumber: 2
+street: Boulevard Georges Andrier
+housenumber: "2"
 phone: ""
-opening_hours: "Mo,Tu,Th,Fr 08:00-12:30,15:00-19:00; We 08:00-12:30; Sa 08:00-12:30,14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Tu,Th,Fr 08:00-12:30,15:00-19:00; We 08:00-12:30; Sa 08:00-12:30,14:00-18:00
+website: ""
diff --git a/data/cities/thonon-les-bains/boucherie-de-thonon.yml b/data/cities/thonon-les-bains/boucherie-de-thonon.yml
index a159ea984..80f2dca20 100644
--- a/data/cities/thonon-les-bains/boucherie-de-thonon.yml
+++ b/data/cities/thonon-les-bains/boucherie-de-thonon.yml
@@ -4,8 +4,9 @@ latitude: 46.35861
 longitude: 6.45299
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue de Genève"
-housenumber: 70
+street: Avenue de Genève
+housenumber: "70"
 phone: ""
-opening_hours: "Mo-Th 09:00-13:00, 15:00-19:00; Fr 09:00-12:00, 15:00-19:00; Sa 09:00-20:00; Su 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 09:00-13:00, 15:00-19:00; Fr 09:00-12:00, 15:00-19:00; Sa 09:00-20:00;
+    Su 09:00-17:00
+website: ""
diff --git a/data/cities/thonon-les-bains/boucherie-de-vongy.yml b/data/cities/thonon-les-bains/boucherie-de-vongy.yml
index 699362d62..98779a857 100644
--- a/data/cities/thonon-les-bains/boucherie-de-vongy.yml
+++ b/data/cities/thonon-les-bains/boucherie-de-vongy.yml
@@ -4,8 +4,8 @@ latitude: 46.38253
 longitude: 6.50446
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Route de Vongy"
-housenumber: 6
+street: Route de Vongy
+housenumber: "6"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 07:30-12:45, 15:00-19:30; Su 07:30-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 07:30-12:45, 15:00-19:30; Su 07:30-12:45
+website: ""
diff --git a/data/cities/thonon-les-bains/boucherie-trombert.yml b/data/cities/thonon-les-bains/boucherie-trombert.yml
index bea351a07..08030c7dd 100644
--- a/data/cities/thonon-les-bains/boucherie-trombert.yml
+++ b/data/cities/thonon-les-bains/boucherie-trombert.yml
@@ -4,8 +4,8 @@ latitude: 46.37077
 longitude: 6.47844
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Boulevard Carnot"
-housenumber: 9
+street: Boulevard Carnot
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 07:00-12:30, 15:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-12:30, 15:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/boulangerie-patisserie-favre.yml b/data/cities/thonon-les-bains/boulangerie-patisserie-favre.yml
index 6c7f9d1ac..14981dd59 100644
--- a/data/cities/thonon-les-bains/boulangerie-patisserie-favre.yml
+++ b/data/cities/thonon-les-bains/boulangerie-patisserie-favre.yml
@@ -4,8 +4,8 @@ latitude: 46.37016
 longitude: 6.47967
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place des Arts"
-housenumber: 6
+street: Place des Arts
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/brechotte-rue-amedee-de-foras.yml b/data/cities/thonon-les-bains/brechotte-rue-amedee-de-foras.yml
index 0cb876842..f77904c8f 100644
--- a/data/cities/thonon-les-bains/brechotte-rue-amedee-de-foras.yml
+++ b/data/cities/thonon-les-bains/brechotte-rue-amedee-de-foras.yml
@@ -4,8 +4,8 @@ latitude: 46.37975
 longitude: 6.49736
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-14:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-18:00; Sa 09:00-14:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/brechotte.yml b/data/cities/thonon-les-bains/brechotte.yml
index a86e4a2ea..d7d3441ea 100644
--- a/data/cities/thonon-les-bains/brechotte.yml
+++ b/data/cities/thonon-les-bains/brechotte.yml
@@ -4,8 +4,8 @@ latitude: 46.37158
 longitude: 6.47936
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 39
+street: Grande Rue
+housenumber: "39"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:00-17:00
+website: ""
diff --git a/data/cities/thonon-les-bains/calzedonia.yml b/data/cities/thonon-les-bains/calzedonia.yml
index 51c8d97bf..6a6c8200a 100644
--- a/data/cities/thonon-les-bains/calzedonia.yml
+++ b/data/cities/thonon-les-bains/calzedonia.yml
@@ -4,8 +4,8 @@ latitude: 46.37052
 longitude: 6.47902
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 19
+street: Grande Rue
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Sa 09:30-18:45; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-18:45; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/carnaby.yml b/data/cities/thonon-les-bains/carnaby.yml
index 8e5e0b4e6..ed8e402b0 100644
--- a/data/cities/thonon-les-bains/carnaby.yml
+++ b/data/cities/thonon-les-bains/carnaby.yml
@@ -4,8 +4,8 @@ latitude: 46.37068
 longitude: 6.4789
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 10
+street: Grande Rue
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/carrefour-market-chemin-de-morcy.yml b/data/cities/thonon-les-bains/carrefour-market-chemin-de-morcy.yml
index 5f7fd6079..b00dfa20c 100644
--- a/data/cities/thonon-les-bains/carrefour-market-chemin-de-morcy.yml
+++ b/data/cities/thonon-les-bains/carrefour-market-chemin-de-morcy.yml
@@ -1,11 +1,11 @@
 id: 814555834
-type: way
+type: node
 latitude: 46.35859
 longitude: 6.45932
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Chemin de Morcy"
-housenumber: 16
+street: Chemin de Morcy
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/carrefour-market-laverie.yml b/data/cities/thonon-les-bains/carrefour-market-laverie.yml
index 646247428..a61d05304 100644
--- a/data/cities/thonon-les-bains/carrefour-market-laverie.yml
+++ b/data/cities/thonon-les-bains/carrefour-market-laverie.yml
@@ -1,11 +1,11 @@
 id: 67045590
-type: way
+type: node
 latitude: 46.37239
 longitude: 6.48468
 postcode: "74200"
 city: Thonon-les-Bains
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "PH,Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: PH,Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/thonon-les-bains/carrefour-market.yml b/data/cities/thonon-les-bains/carrefour-market.yml
index ff024ffbb..7b25012cf 100644
--- a/data/cities/thonon-les-bains/carrefour-market.yml
+++ b/data/cities/thonon-les-bains/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 67046082
-type: way
+type: node
 latitude: 46.37222
 longitude: 6.48435
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue Jules Ferry"
-housenumber: 13
+street: Avenue Jules Ferry
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Th,Sa 08:30-19:30; Fr 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th,Sa 08:30-19:30; Fr 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/carrosserie-du-canal.yml b/data/cities/thonon-les-bains/carrosserie-du-canal.yml
index eac93db20..91852edc3 100644
--- a/data/cities/thonon-les-bains/carrosserie-du-canal.yml
+++ b/data/cities/thonon-les-bains/carrosserie-du-canal.yml
@@ -1,11 +1,11 @@
 id: 67053144
-type: way
+type: node
 latitude: 46.35338
 longitude: 6.44579
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Route de la Visitation"
-housenumber: 
-phone: "+33 4 50 26 10 02"
-opening_hours: "Mo-Fr 08:00-12:00,13:30-19:00; Sa-Su off"
-website: ""
\ No newline at end of file
+street: Route de la Visitation
+housenumber: ""
+phone: +33 4 50 26 10 02
+opening_hours: Mo-Fr 08:00-12:00,13:30-19:00; Sa-Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/casino-shop.yml b/data/cities/thonon-les-bains/casino-shop.yml
index f3180c823..97310d6a2 100644
--- a/data/cities/thonon-les-bains/casino-shop.yml
+++ b/data/cities/thonon-les-bains/casino-shop.yml
@@ -5,7 +5,7 @@ longitude: 6.47937
 postcode: "74200"
 city: Thonon-les-Bains
 street: ""
-housenumber: 41
+housenumber: "41"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:30, Su 08:00-13:00, We 08:30-13:00,15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:30, Su 08:00-13:00, We 08:30-13:00,15:30-19:30
+website: ""
diff --git a/data/cities/thonon-les-bains/casino.yml b/data/cities/thonon-les-bains/casino.yml
index 70a6ea748..c46bd7db7 100644
--- a/data/cities/thonon-les-bains/casino.yml
+++ b/data/cities/thonon-les-bains/casino.yml
@@ -4,8 +4,8 @@ latitude: 46.37002
 longitude: 6.47755
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 27
+street: Avenue du Général de Gaulle
+housenumber: "27"
 phone: ""
-opening_hours: "Mo-Sa 08:00-19:45, Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-19:45, Su 09:00-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/chablais-telecom.yml b/data/cities/thonon-les-bains/chablais-telecom.yml
index dd41655ca..ac42189ab 100644
--- a/data/cities/thonon-les-bains/chablais-telecom.yml
+++ b/data/cities/thonon-les-bains/chablais-telecom.yml
@@ -4,8 +4,8 @@ latitude: 46.37058
 longitude: 6.47887
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 2
+street: Grande Rue
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 14:00-18:30; Tu-Fr 09:30-12:00, 14:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:30; Tu-Fr 09:30-12:00, 14:00-18:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/champion.yml b/data/cities/thonon-les-bains/champion.yml
index a5b6c749f..f164814df 100644
--- a/data/cities/thonon-les-bains/champion.yml
+++ b/data/cities/thonon-les-bains/champion.yml
@@ -1,11 +1,11 @@
 id: 67045319
-type: way
+type: node
 latitude: 46.35296
 longitude: 6.4692
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue de Senevulaz"
-housenumber: 48
+street: Avenue de Senevulaz
+housenumber: "48"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/charcuterie-des-vallees.yml b/data/cities/thonon-les-bains/charcuterie-des-vallees.yml
index 9999d6ad8..4bc3fb560 100644
--- a/data/cities/thonon-les-bains/charcuterie-des-vallees.yml
+++ b/data/cities/thonon-les-bains/charcuterie-des-vallees.yml
@@ -4,8 +4,8 @@ latitude: 46.37032
 longitude: 6.47873
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place Jules Mercier"
-housenumber: 1
+street: Place Jules Mercier
+housenumber: "1"
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30,15:00-19:00; PH,Su,Mo off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,15:00-19:00; PH,Su,Mo off
+website: ""
diff --git a/data/cities/thonon-les-bains/chaumontet-et-co.yml b/data/cities/thonon-les-bains/chaumontet-et-co.yml
index b09e9cc13..c61c1937d 100644
--- a/data/cities/thonon-les-bains/chaumontet-et-co.yml
+++ b/data/cities/thonon-les-bains/chaumontet-et-co.yml
@@ -4,8 +4,8 @@ latitude: 46.37168
 longitude: 6.47782
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Vallon"
+street: Rue Vallon
 housenumber: 20 bis
 phone: ""
-opening_hours: "Mo, Su off; Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo, Su off; Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/chaussures-salesiani.yml b/data/cities/thonon-les-bains/chaussures-salesiani.yml
index e93bfde7c..e038d19fd 100644
--- a/data/cities/thonon-les-bains/chaussures-salesiani.yml
+++ b/data/cities/thonon-les-bains/chaussures-salesiani.yml
@@ -4,8 +4,8 @@ latitude: 46.37018
 longitude: 6.47912
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue des Allobroges"
-housenumber: 5
+street: Avenue des Allobroges
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:00,14:00-19:00; Mo 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:00,14:00-19:00; Mo 14:00-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/chevallier.yml b/data/cities/thonon-les-bains/chevallier.yml
index f0d6b30cc..df6905279 100644
--- a/data/cities/thonon-les-bains/chevallier.yml
+++ b/data/cities/thonon-les-bains/chevallier.yml
@@ -1,11 +1,11 @@
 id: 67041667
-type: way
+type: node
 latitude: 46.37158
 longitude: 6.47978
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Saint-Sébastien"
-housenumber: 5
+street: Rue Saint-Sébastien
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/chez-bibi.yml b/data/cities/thonon-les-bains/chez-bibi.yml
index 7952225c9..af3043fc2 100644
--- a/data/cities/thonon-les-bains/chez-bibi.yml
+++ b/data/cities/thonon-les-bains/chez-bibi.yml
@@ -4,8 +4,8 @@ latitude: 46.36944
 longitude: 6.47593
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 14
+street: Avenue du Général de Gaulle
+housenumber: "14"
 phone: ""
-opening_hours: "We,Fr 08:30-19:00; Th 09:00-12:30,15:30-19:00; Sa 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: We,Fr 08:30-19:00; Th 09:00-12:30,15:30-19:00; Sa 09:00-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/cocci-market.yml b/data/cities/thonon-les-bains/cocci-market.yml
index 670bd50b6..6c6357a64 100644
--- a/data/cities/thonon-les-bains/cocci-market.yml
+++ b/data/cities/thonon-les-bains/cocci-market.yml
@@ -4,8 +4,8 @@ latitude: 46.36942
 longitude: 6.4811
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue des Allobroges"
-housenumber: 15
+street: Avenue des Allobroges
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Su 10:00-22:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 10:00-22:00
+website: ""
diff --git a/data/cities/thonon-les-bains/coffee-break.yml b/data/cities/thonon-les-bains/coffee-break.yml
index 0417663d0..a7aa0b8a7 100644
--- a/data/cities/thonon-les-bains/coffee-break.yml
+++ b/data/cities/thonon-les-bains/coffee-break.yml
@@ -4,8 +4,8 @@ latitude: 46.37951
 longitude: 6.4971
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/courir.yml b/data/cities/thonon-les-bains/courir.yml
index d5c06d343..5bdefd9ba 100644
--- a/data/cities/thonon-les-bains/courir.yml
+++ b/data/cities/thonon-les-bains/courir.yml
@@ -4,8 +4,8 @@ latitude: 46.37964
 longitude: 6.49766
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/culture-velo.yml b/data/cities/thonon-les-bains/culture-velo.yml
index eb0321037..31022fc18 100644
--- a/data/cities/thonon-les-bains/culture-velo.yml
+++ b/data/cities/thonon-les-bains/culture-velo.yml
@@ -4,8 +4,8 @@ latitude: 46.37038
 longitude: 6.48507
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Chemin de Ronde"
-housenumber: 21
+street: Chemin de Ronde
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-18:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/discobole.yml b/data/cities/thonon-les-bains/discobole.yml
index 0186b7ead..25fa876ba 100644
--- a/data/cities/thonon-les-bains/discobole.yml
+++ b/data/cities/thonon-les-bains/discobole.yml
@@ -4,8 +4,8 @@ latitude: 46.37158
 longitude: 6.47799
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Vallon"
-housenumber: 18
+street: Rue Vallon
+housenumber: "18"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:30-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:30-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/esprit.yml b/data/cities/thonon-les-bains/esprit.yml
index 4841cf70b..3886162d8 100644
--- a/data/cities/thonon-les-bains/esprit.yml
+++ b/data/cities/thonon-les-bains/esprit.yml
@@ -4,8 +4,8 @@ latitude: 46.37975
 longitude: 6.49753
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/esthetic-center.yml b/data/cities/thonon-les-bains/esthetic-center.yml
index 706a667bc..f9067a66b 100644
--- a/data/cities/thonon-les-bains/esthetic-center.yml
+++ b/data/cities/thonon-les-bains/esthetic-center.yml
@@ -4,8 +4,8 @@ latitude: 46.37979
 longitude: 6.49742
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/etam.yml b/data/cities/thonon-les-bains/etam.yml
index 52d06a425..e701743cb 100644
--- a/data/cities/thonon-les-bains/etam.yml
+++ b/data/cities/thonon-les-bains/etam.yml
@@ -4,8 +4,8 @@ latitude: 46.3796
 longitude: 6.49726
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/eye-view.yml b/data/cities/thonon-les-bains/eye-view.yml
index 873b17c96..33817de64 100644
--- a/data/cities/thonon-les-bains/eye-view.yml
+++ b/data/cities/thonon-les-bains/eye-view.yml
@@ -4,8 +4,9 @@ latitude: 46.36343
 longitude: 6.462
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 101
+street: Avenue du Général de Gaulle
+housenumber: "101"
 phone: ""
-opening_hours: "Mo 09:00-12:00, 14:00-18:00; Tu-Fr 09:00-19:00; Sa 09:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 09:00-12:00, 14:00-18:00; Tu-Fr 09:00-19:00; Sa 09:00-18:00; Su
+    off
+website: ""
diff --git a/data/cities/thonon-les-bains/fnac.yml b/data/cities/thonon-les-bains/fnac.yml
index 1c6419c0c..2fd908447 100644
--- a/data/cities/thonon-les-bains/fnac.yml
+++ b/data/cities/thonon-les-bains/fnac.yml
@@ -4,8 +4,8 @@ latitude: 46.37937
 longitude: 6.49705
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/franck-provost-rue-amedee-de-foras.yml b/data/cities/thonon-les-bains/franck-provost-rue-amedee-de-foras.yml
index 66224dda3..7d621cac5 100644
--- a/data/cities/thonon-les-bains/franck-provost-rue-amedee-de-foras.yml
+++ b/data/cities/thonon-les-bains/franck-provost-rue-amedee-de-foras.yml
@@ -4,8 +4,8 @@ latitude: 46.37937
 longitude: 6.49743
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Th 09:00-19:30; Fr-Sa 08:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 09:00-19:30; Fr-Sa 08:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/franck-provost.yml b/data/cities/thonon-les-bains/franck-provost.yml
index d6301df89..9e1c3b11f 100644
--- a/data/cities/thonon-les-bains/franck-provost.yml
+++ b/data/cities/thonon-les-bains/franck-provost.yml
@@ -4,8 +4,8 @@ latitude: 46.35272
 longitude: 6.44166
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue du Pamphiot"
-housenumber: 19
+street: Rue du Pamphiot
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-18:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/fromagerie-boujon.yml b/data/cities/thonon-les-bains/fromagerie-boujon.yml
index 3cd5c13ec..3b7c82674 100644
--- a/data/cities/thonon-les-bains/fromagerie-boujon.yml
+++ b/data/cities/thonon-les-bains/fromagerie-boujon.yml
@@ -4,8 +4,8 @@ latitude: 46.37169
 longitude: 6.47984
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Saint-Sébastien"
-housenumber: 7
+street: Rue Saint-Sébastien
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/fromagerie-du-noyer.yml b/data/cities/thonon-les-bains/fromagerie-du-noyer.yml
index f7064baa8..df98c0cee 100644
--- a/data/cities/thonon-les-bains/fromagerie-du-noyer.yml
+++ b/data/cities/thonon-les-bains/fromagerie-du-noyer.yml
@@ -4,8 +4,9 @@ latitude: 46.37066
 longitude: 6.47889
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 8
+street: Grande Rue
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Th 08:30-12:30, 15:00-19:30; Fr-Sa 08:30-12:30, 15:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-12:30, 15:00-19:30; Fr-Sa 08:30-12:30, 15:00-19:00; Su
+    off
+website: ""
diff --git a/data/cities/thonon-les-bains/garage-des-vallees.yml b/data/cities/thonon-les-bains/garage-des-vallees.yml
index 69d756bb9..23a1858d1 100644
--- a/data/cities/thonon-les-bains/garage-des-vallees.yml
+++ b/data/cities/thonon-les-bains/garage-des-vallees.yml
@@ -4,8 +4,8 @@ latitude: 46.37029
 longitude: 6.48857
 postcode: ""
 city: Thonon-les-Bains
-street: "Avenue des Vallées"
-housenumber: 17
-phone: "+33 4 50 71 83 83"
+street: Avenue des Vallées
+housenumber: "17"
+phone: +33 4 50 71 83 83
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/gilletfleurs.yml b/data/cities/thonon-les-bains/gilletfleurs.yml
index ce9340e5e..e1d310f2c 100644
--- a/data/cities/thonon-les-bains/gilletfleurs.yml
+++ b/data/cities/thonon-les-bains/gilletfleurs.yml
@@ -1,11 +1,11 @@
 id: 67043413
-type: way
+type: node
 latitude: 46.37678
 longitude: 6.49123
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue de Champagne"
-housenumber: 9
+street: Avenue de Champagne
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/grand-frais.yml b/data/cities/thonon-les-bains/grand-frais.yml
index a3c65c559..4f74f3afa 100644
--- a/data/cities/thonon-les-bains/grand-frais.yml
+++ b/data/cities/thonon-les-bains/grand-frais.yml
@@ -1,11 +1,11 @@
 id: 67051432
-type: way
+type: node
 latitude: 46.38062
 longitude: 6.49524
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 6
+street: Rue Amédée de Foras
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/hippolyte-vigliano-chocolatier.yml b/data/cities/thonon-les-bains/hippolyte-vigliano-chocolatier.yml
index 33c8f189c..37665d14f 100644
--- a/data/cities/thonon-les-bains/hippolyte-vigliano-chocolatier.yml
+++ b/data/cities/thonon-les-bains/hippolyte-vigliano-chocolatier.yml
@@ -4,8 +4,8 @@ latitude: 46.37069
 longitude: 6.47906
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 23
+street: Grande Rue
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-Sa 09:30-12:30, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-12:30, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/histoire-dor.yml b/data/cities/thonon-les-bains/histoire-dor.yml
index ec73ae4d4..5e2ca7a52 100644
--- a/data/cities/thonon-les-bains/histoire-dor.yml
+++ b/data/cities/thonon-les-bains/histoire-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.37968
 longitude: 6.49741
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/inter-caves.yml b/data/cities/thonon-les-bains/inter-caves.yml
index b129a189b..48001d1bb 100644
--- a/data/cities/thonon-les-bains/inter-caves.yml
+++ b/data/cities/thonon-les-bains/inter-caves.yml
@@ -1,11 +1,11 @@
 id: 995241600
-type: way
+type: node
 latitude: 46.35467
 longitude: 6.44529
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue de Genève"
-housenumber: 115
+street: Avenue de Genève
+housenumber: "115"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:30-12:30, 15:00-19:30; Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:30-12:30, 15:00-19:30; Sa 09:30-19:30
+website: ""
diff --git a/data/cities/thonon-les-bains/intermarche.yml b/data/cities/thonon-les-bains/intermarche.yml
index 121df3290..acd8770c8 100644
--- a/data/cities/thonon-les-bains/intermarche.yml
+++ b/data/cities/thonon-les-bains/intermarche.yml
@@ -4,8 +4,8 @@ latitude: 46.3792
 longitude: 6.49772
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/intersport.yml b/data/cities/thonon-les-bains/intersport.yml
index 3a4305f4b..38759ca8f 100644
--- a/data/cities/thonon-les-bains/intersport.yml
+++ b/data/cities/thonon-les-bains/intersport.yml
@@ -1,11 +1,11 @@
 id: 67054630
-type: way
+type: node
 latitude: 46.35287
 longitude: 6.44363
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue du Pamphiot"
-housenumber: 20
+street: Rue du Pamphiot
+housenumber: "20"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/jeff-de-bruges.yml b/data/cities/thonon-les-bains/jeff-de-bruges.yml
index a463faba6..30c1984bd 100644
--- a/data/cities/thonon-les-bains/jeff-de-bruges.yml
+++ b/data/cities/thonon-les-bains/jeff-de-bruges.yml
@@ -4,8 +4,8 @@ latitude: 46.37103
 longitude: 6.4803
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue des Arts"
-housenumber: 11
+street: Rue des Arts
+housenumber: "11"
 phone: ""
-opening_hours: "Mo;Su off; Mo-Sa 09:30-12:30, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo;Su off; Mo-Sa 09:30-12:30, 14:00-18:00
+website: ""
diff --git a/data/cities/thonon-les-bains/joueclub.yml b/data/cities/thonon-les-bains/joueclub.yml
index eccb32d30..d2d3d8b73 100644
--- a/data/cities/thonon-les-bains/joueclub.yml
+++ b/data/cities/thonon-les-bains/joueclub.yml
@@ -4,8 +4,8 @@ latitude: 46.3708
 longitude: 6.4791
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 23
+street: Grande Rue
+housenumber: "23"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:00-12:30,14:00-19:00; Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:00-12:30,14:00-19:00; Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/jour-de-fleuraison.yml b/data/cities/thonon-les-bains/jour-de-fleuraison.yml
index 99626b10d..f88f04832 100644
--- a/data/cities/thonon-les-bains/jour-de-fleuraison.yml
+++ b/data/cities/thonon-les-bains/jour-de-fleuraison.yml
@@ -1,11 +1,11 @@
 id: 813718557
-type: way
+type: node
 latitude: 46.36579
 longitude: 6.46668
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 69
+street: Avenue du Général de Gaulle
+housenumber: "69"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/jules-rue-amedee-de-foras.yml b/data/cities/thonon-les-bains/jules-rue-amedee-de-foras.yml
index 1beab5b09..ea2d49300 100644
--- a/data/cities/thonon-les-bains/jules-rue-amedee-de-foras.yml
+++ b/data/cities/thonon-les-bains/jules-rue-amedee-de-foras.yml
@@ -4,8 +4,8 @@ latitude: 46.37957
 longitude: 6.49774
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 10:30-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:30-18:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/jules.yml b/data/cities/thonon-les-bains/jules.yml
index dfa868a2f..4fa2d9d7a 100644
--- a/data/cities/thonon-les-bains/jules.yml
+++ b/data/cities/thonon-les-bains/jules.yml
@@ -4,8 +4,8 @@ latitude: 46.37113
 longitude: 6.48047
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue des Arts"
-housenumber: 18
+street: Rue des Arts
+housenumber: "18"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/kunz-pressing-avenue-du-general-de-gaulle.yml b/data/cities/thonon-les-bains/kunz-pressing-avenue-du-general-de-gaulle.yml
index 7286d58ae..373754006 100644
--- a/data/cities/thonon-les-bains/kunz-pressing-avenue-du-general-de-gaulle.yml
+++ b/data/cities/thonon-les-bains/kunz-pressing-avenue-du-general-de-gaulle.yml
@@ -4,8 +4,8 @@ latitude: 46.36959
 longitude: 6.47549
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 15
+street: Avenue du Général de Gaulle
+housenumber: "15"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/kunz-pressing-place-de-lhotel-de-ville.yml b/data/cities/thonon-les-bains/kunz-pressing-place-de-lhotel-de-ville.yml
index cd3b91c38..bc9169b74 100644
--- a/data/cities/thonon-les-bains/kunz-pressing-place-de-lhotel-de-ville.yml
+++ b/data/cities/thonon-les-bains/kunz-pressing-place-de-lhotel-de-ville.yml
@@ -4,8 +4,8 @@ latitude: 46.3728
 longitude: 6.47799
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place de l'Hôtel de Ville"
-housenumber: 5
+street: Place de l'Hôtel de Ville
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-We,Fr-Sa 09:00-12:00, 15:00-19:00; Th,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr-Sa 09:00-12:00, 15:00-19:00; Th,Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/kunz-pressing.yml b/data/cities/thonon-les-bains/kunz-pressing.yml
index ab2979760..9651b486c 100644
--- a/data/cities/thonon-les-bains/kunz-pressing.yml
+++ b/data/cities/thonon-les-bains/kunz-pressing.yml
@@ -4,8 +4,8 @@ latitude: 46.3795
 longitude: 6.49781
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/la-cave-adelin.yml b/data/cities/thonon-les-bains/la-cave-adelin.yml
index 97fec585d..0c35eeaf3 100644
--- a/data/cities/thonon-les-bains/la-cave-adelin.yml
+++ b/data/cities/thonon-les-bains/la-cave-adelin.yml
@@ -4,8 +4,8 @@ latitude: 46.3642
 longitude: 6.46365
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 91
+street: Avenue du Général de Gaulle
+housenumber: "91"
 phone: ""
-opening_hours: "Mo-Sa 07:30-12:30, 13:30-19:30; Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-12:30, 13:30-19:30; Su 09:00-12:00
+website: ""
diff --git a/data/cities/thonon-les-bains/la-mie-caline.yml b/data/cities/thonon-les-bains/la-mie-caline.yml
index 876660d8e..c0c98b5a4 100644
--- a/data/cities/thonon-les-bains/la-mie-caline.yml
+++ b/data/cities/thonon-les-bains/la-mie-caline.yml
@@ -4,8 +4,8 @@ latitude: 46.37093
 longitude: 6.48127
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place des Arts"
-housenumber: 9
+street: Place des Arts
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Fr 06:30-19:30; Sa 07:00-19:30; Su 07:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-19:30; Sa 07:00-19:30; Su 07:00-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/la-tabatiere.yml b/data/cities/thonon-les-bains/la-tabatiere.yml
index a0631dd03..097bdac4e 100644
--- a/data/cities/thonon-les-bains/la-tabatiere.yml
+++ b/data/cities/thonon-les-bains/la-tabatiere.yml
@@ -4,8 +4,8 @@ latitude: 46.37065
 longitude: 6.47905
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 23
+street: Grande Rue
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-We,Fr,Sa 07:00-19:00; PH,Th,Su 07:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr,Sa 07:00-19:00; PH,Th,Su 07:00-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/latelier-des-carrossiers.yml b/data/cities/thonon-les-bains/latelier-des-carrossiers.yml
index fb414d266..3d2e4e820 100644
--- a/data/cities/thonon-les-bains/latelier-des-carrossiers.yml
+++ b/data/cities/thonon-les-bains/latelier-des-carrossiers.yml
@@ -1,11 +1,11 @@
 id: 67044924
-type: way
+type: node
 latitude: 46.35102
 longitude: 6.46547
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Route de la Versoie"
-housenumber: 100
+street: Route de la Versoie
+housenumber: "100"
 phone: ""
-opening_hours: "Mo-Fr 07:00-12:00, 14:00-18:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:00, 14:00-18:30; Sa-Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/laverie-de-la-grangette.yml b/data/cities/thonon-les-bains/laverie-de-la-grangette.yml
index c6f2ec937..d79c36663 100644
--- a/data/cities/thonon-les-bains/laverie-de-la-grangette.yml
+++ b/data/cities/thonon-les-bains/laverie-de-la-grangette.yml
@@ -4,8 +4,8 @@ latitude: 46.36281
 longitude: 6.46151
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 
+street: Avenue du Général de Gaulle
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/le-colvert.yml b/data/cities/thonon-les-bains/le-colvert.yml
index c8ecc252d..f7675020b 100644
--- a/data/cities/thonon-les-bains/le-colvert.yml
+++ b/data/cities/thonon-les-bains/le-colvert.yml
@@ -4,8 +4,8 @@ latitude: 46.37201
 longitude: 6.47751
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Vallon"
-housenumber: 19
+street: Rue Vallon
+housenumber: "19"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:00-12:00, 14:00-19:00"
-website: "https://www.armurerie-colvert-thonon.fr/"
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:00-12:00, 14:00-19:00
+website: https://www.armurerie-colvert-thonon.fr/
diff --git a/data/cities/thonon-les-bains/leman-orthopedie-prothese.yml b/data/cities/thonon-les-bains/leman-orthopedie-prothese.yml
index e1da09c78..ad117f8d2 100644
--- a/data/cities/thonon-les-bains/leman-orthopedie-prothese.yml
+++ b/data/cities/thonon-les-bains/leman-orthopedie-prothese.yml
@@ -4,8 +4,8 @@ latitude: 46.36401
 longitude: 6.46267
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Vernay"
-housenumber: 3
+street: Avenue du Vernay
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/leonidas.yml b/data/cities/thonon-les-bains/leonidas.yml
index eba2bc27f..9f8115499 100644
--- a/data/cities/thonon-les-bains/leonidas.yml
+++ b/data/cities/thonon-les-bains/leonidas.yml
@@ -4,8 +4,8 @@ latitude: 46.37028
 longitude: 6.47866
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place Jules Mercier"
-housenumber: 3
-phone: "+33 4 50 70 51 25"
-opening_hours: "Mo-Sa 09:30-12:30,14:30-19:00"
-website: "https://www.leonidas.com/en/shops/thonon-les-bains/leonidas-thonon-les-bains"
\ No newline at end of file
+street: Place Jules Mercier
+housenumber: "3"
+phone: +33 4 50 70 51 25
+opening_hours: Mo-Sa 09:30-12:30,14:30-19:00
+website: https://www.leonidas.com/en/shops/thonon-les-bains/leonidas-thonon-les-bains
diff --git a/data/cities/thonon-les-bains/les-floralies.yml b/data/cities/thonon-les-bains/les-floralies.yml
index 3f5a0cf73..28bf95af8 100644
--- a/data/cities/thonon-les-bains/les-floralies.yml
+++ b/data/cities/thonon-les-bains/les-floralies.yml
@@ -4,8 +4,8 @@ latitude: 46.37038
 longitude: 6.47878
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place Jules Mercier"
-housenumber: 1
+street: Place Jules Mercier
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:30,13:30-19:00; Sa 08:30-12:30,14:00-19:00; PH,Su 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:30,13:30-19:00; Sa 08:30-12:30,14:00-19:00; PH,Su 09:00-12:00
+website: ""
diff --git a/data/cities/thonon-les-bains/librairie-climat.yml b/data/cities/thonon-les-bains/librairie-climat.yml
index 9a95626a3..586f080ed 100644
--- a/data/cities/thonon-les-bains/librairie-climat.yml
+++ b/data/cities/thonon-les-bains/librairie-climat.yml
@@ -4,8 +4,8 @@ latitude: 46.37142
 longitude: 6.47858
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Vallon"
-housenumber: 5
+street: Rue Vallon
+housenumber: "5"
 phone: ""
-opening_hours: "Tu-Sa 09:00-12:30, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:30, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/lidl.yml b/data/cities/thonon-les-bains/lidl.yml
index dc912ca8c..af3902562 100644
--- a/data/cities/thonon-les-bains/lidl.yml
+++ b/data/cities/thonon-les-bains/lidl.yml
@@ -1,11 +1,11 @@
 id: 1269065257
-type: way
+type: node
 latitude: 46.38096
 longitude: 6.4979
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue de Thuyset"
-housenumber: 5
+street: Avenue de Thuyset
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:15"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:15
+website: ""
diff --git a/data/cities/thonon-les-bains/mademoiselle-vrac.yml b/data/cities/thonon-les-bains/mademoiselle-vrac.yml
index 967634753..99a2df854 100644
--- a/data/cities/thonon-les-bains/mademoiselle-vrac.yml
+++ b/data/cities/thonon-les-bains/mademoiselle-vrac.yml
@@ -4,8 +4,8 @@ latitude: 46.36884
 longitude: 6.48125
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place de la Gare"
-housenumber: 1
+street: Place de la Gare
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/maison-123.yml b/data/cities/thonon-les-bains/maison-123.yml
index 23afeef35..d45f473d9 100644
--- a/data/cities/thonon-les-bains/maison-123.yml
+++ b/data/cities/thonon-les-bains/maison-123.yml
@@ -4,8 +4,8 @@ latitude: 46.37964
 longitude: 6.49734
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/majuscule.yml b/data/cities/thonon-les-bains/majuscule.yml
index d86bf353f..2820fb9a4 100644
--- a/data/cities/thonon-les-bains/majuscule.yml
+++ b/data/cities/thonon-les-bains/majuscule.yml
@@ -4,8 +4,9 @@ latitude: 46.37107
 longitude: 6.47995
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue des Arts"
-housenumber: 7
+street: Rue des Arts
+housenumber: "7"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:15-12:00,14:15-19:00; Sa 09:30-12:15,14:15-19:00; PH,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:15-12:00,14:15-19:00; Sa 09:30-12:15,14:15-19:00;
+    PH,Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/maroquinerie-jordan.yml b/data/cities/thonon-les-bains/maroquinerie-jordan.yml
index 1b94bbaea..3b4fb973c 100644
--- a/data/cities/thonon-les-bains/maroquinerie-jordan.yml
+++ b/data/cities/thonon-les-bains/maroquinerie-jordan.yml
@@ -4,8 +4,8 @@ latitude: 46.37085
 longitude: 6.47913
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 25
+street: Grande Rue
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/minelli.yml b/data/cities/thonon-les-bains/minelli.yml
index 73413d0e3..04681c645 100644
--- a/data/cities/thonon-les-bains/minelli.yml
+++ b/data/cities/thonon-les-bains/minelli.yml
@@ -4,8 +4,8 @@ latitude: 46.37107
 longitude: 6.47922
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 31
+street: Grande Rue
+housenumber: "31"
 phone: ""
-opening_hours: "Mo 11:00-19:00; Tu-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 11:00-19:00; Tu-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/moa.yml b/data/cities/thonon-les-bains/moa.yml
index 7506b896a..a5060980c 100644
--- a/data/cities/thonon-les-bains/moa.yml
+++ b/data/cities/thonon-les-bains/moa.yml
@@ -4,8 +4,8 @@ latitude: 46.37932
 longitude: 6.49733
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/monoprix.yml b/data/cities/thonon-les-bains/monoprix.yml
index 4040d58d5..cee321581 100644
--- a/data/cities/thonon-les-bains/monoprix.yml
+++ b/data/cities/thonon-les-bains/monoprix.yml
@@ -4,8 +4,8 @@ latitude: 46.37111
 longitude: 6.47963
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue des Arts"
-housenumber: 3
+street: Rue des Arts
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: "https://www.monoprix.fr/193.html"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: https://www.monoprix.fr/193.html
diff --git a/data/cities/thonon-les-bains/naf-naf.yml b/data/cities/thonon-les-bains/naf-naf.yml
index 5c43f9c3f..c9efd6e35 100644
--- a/data/cities/thonon-les-bains/naf-naf.yml
+++ b/data/cities/thonon-les-bains/naf-naf.yml
@@ -4,8 +4,8 @@ latitude: 46.37959
 longitude: 6.49752
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/namaste.yml b/data/cities/thonon-les-bains/namaste.yml
index 2ea6e891d..55823d03e 100644
--- a/data/cities/thonon-les-bains/namaste.yml
+++ b/data/cities/thonon-les-bains/namaste.yml
@@ -4,8 +4,8 @@ latitude: 46.3728
 longitude: 6.4804
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue des Granges"
-housenumber: 24
+street: Rue des Granges
+housenumber: "24"
 phone: "+33611865351"
-opening_hours: "Mo-Sa 14:00-19:00"
-website: "https://www.namaste-thonon.fr"
\ No newline at end of file
+opening_hours: Mo-Sa 14:00-19:00
+website: https://www.namaste-thonon.fr
diff --git a/data/cities/thonon-les-bains/needles-side-tattoo.yml b/data/cities/thonon-les-bains/needles-side-tattoo.yml
index a42497c79..e246aedcb 100644
--- a/data/cities/thonon-les-bains/needles-side-tattoo.yml
+++ b/data/cities/thonon-les-bains/needles-side-tattoo.yml
@@ -4,8 +4,8 @@ latitude: 46.36949
 longitude: 6.48095
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue des Allobroges"
-housenumber: 13
+street: Avenue des Allobroges
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Sa 13:30-18:00;We off || on appointment"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 13:30-18:00;We off || "on appointment"
+website: ""
diff --git a/data/cities/thonon-les-bains/oia.yml b/data/cities/thonon-les-bains/oia.yml
index d71614bc9..2fc28ffd1 100644
--- a/data/cities/thonon-les-bains/oia.yml
+++ b/data/cities/thonon-les-bains/oia.yml
@@ -4,8 +4,8 @@ latitude: 46.37115
 longitude: 6.47924
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 31
+street: Grande Rue
+housenumber: "31"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/orange.yml b/data/cities/thonon-les-bains/orange.yml
index aefa3ec2a..0c682f2ac 100644
--- a/data/cities/thonon-les-bains/orange.yml
+++ b/data/cities/thonon-les-bains/orange.yml
@@ -4,8 +4,8 @@ latitude: 46.37084
 longitude: 6.47894
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 12
+street: Grande Rue
+housenumber: "12"
 phone: ""
-opening_hours: "Mo 14:00-18:30; Tu-Sa 09:30-12:00, 13:15-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-18:30; Tu-Sa 09:30-12:00, 13:15-18:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/parapharmacie-tanguy.yml b/data/cities/thonon-les-bains/parapharmacie-tanguy.yml
index 6eb7f96a7..a94da1ece 100644
--- a/data/cities/thonon-les-bains/parapharmacie-tanguy.yml
+++ b/data/cities/thonon-les-bains/parapharmacie-tanguy.yml
@@ -4,8 +4,8 @@ latitude: 46.37927
 longitude: 6.49725
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/parashop.yml b/data/cities/thonon-les-bains/parashop.yml
index 24072134b..3876da4a6 100644
--- a/data/cities/thonon-les-bains/parashop.yml
+++ b/data/cities/thonon-les-bains/parashop.yml
@@ -4,8 +4,8 @@ latitude: 46.37208
 longitude: 6.47944
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 53
+street: Grande Rue
+housenumber: "53"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/philae.yml b/data/cities/thonon-les-bains/philae.yml
index 66f004217..410e3523d 100644
--- a/data/cities/thonon-les-bains/philae.yml
+++ b/data/cities/thonon-les-bains/philae.yml
@@ -4,8 +4,8 @@ latitude: 46.37143
 longitude: 6.47825
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Vallon"
-housenumber: 16
+street: Rue Vallon
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 13:30-17:30; Sa Sur rendez-vous; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 13:30-17:30; Sa "Sur rendez-vous"; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/picard.yml b/data/cities/thonon-les-bains/picard.yml
index 382c93f54..118bc317e 100644
--- a/data/cities/thonon-les-bains/picard.yml
+++ b/data/cities/thonon-les-bains/picard.yml
@@ -1,11 +1,11 @@
 id: 67042926
-type: way
+type: node
 latitude: 46.37784
 longitude: 6.48961
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue d'Evian"
-housenumber: 51
+street: Avenue d'Evian
+housenumber: "51"
 phone: ""
-opening_hours: "Mo-Th 09:00-13:00, 14:30-19:30; Fr-Sa 09:00-19:30; Su 09:00-12:45"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 09:00-13:00, 14:30-19:30; Fr-Sa 09:00-19:30; Su 09:00-12:45
+website: ""
diff --git a/data/cities/thonon-les-bains/rmode-coiffure.yml b/data/cities/thonon-les-bains/rmode-coiffure.yml
index fdef053ac..d3391466d 100644
--- a/data/cities/thonon-les-bains/rmode-coiffure.yml
+++ b/data/cities/thonon-les-bains/rmode-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.37205
 longitude: 6.47721
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Vallon"
-housenumber: 32
+street: Rue Vallon
+housenumber: "32"
 phone: ""
-opening_hours: "Mo 09:00-19:00; Tu-Fr 08:00-19:00; Sa 08:00-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 09:00-19:00; Tu-Fr 08:00-19:00; Sa 08:00-17:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/roche-bobois-avenue-du-general-de-gaulle.yml b/data/cities/thonon-les-bains/roche-bobois-avenue-du-general-de-gaulle.yml
index 8694ac213..92ed34341 100644
--- a/data/cities/thonon-les-bains/roche-bobois-avenue-du-general-de-gaulle.yml
+++ b/data/cities/thonon-les-bains/roche-bobois-avenue-du-general-de-gaulle.yml
@@ -4,8 +4,8 @@ latitude: 46.36843
 longitude: 6.47342
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 28
+street: Avenue du Général de Gaulle
+housenumber: "28"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-12:00,13:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-12:00,13:30-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/roche-bobois.yml b/data/cities/thonon-les-bains/roche-bobois.yml
index 6e471f385..437bd4edf 100644
--- a/data/cities/thonon-les-bains/roche-bobois.yml
+++ b/data/cities/thonon-les-bains/roche-bobois.yml
@@ -4,8 +4,8 @@ latitude: 46.37034
 longitude: 6.4792
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue des Allobroges"
-housenumber: 4
+street: Avenue des Allobroges
+housenumber: "4"
 phone: ""
-opening_hours: "Mo off; Tu-Sa 10:00-12:00,14:30-19:00; PH,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Sa 10:00-12:00,14:30-19:00; PH,Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/rondot.yml b/data/cities/thonon-les-bains/rondot.yml
index 51d9d43ab..e95919b84 100644
--- a/data/cities/thonon-les-bains/rondot.yml
+++ b/data/cities/thonon-les-bains/rondot.yml
@@ -4,8 +4,8 @@ latitude: 46.37204
 longitude: 6.47924
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 
+street: Grande Rue
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/sarah-beaute.yml b/data/cities/thonon-les-bains/sarah-beaute.yml
index a50751ee2..bb7cfbdee 100644
--- a/data/cities/thonon-les-bains/sarah-beaute.yml
+++ b/data/cities/thonon-les-bains/sarah-beaute.yml
@@ -4,8 +4,8 @@ latitude: 46.37337
 longitude: 6.47861
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Michaud"
-housenumber: 3
+street: Rue Michaud
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thonon-les-bains/sergent-major.yml b/data/cities/thonon-les-bains/sergent-major.yml
index 6fe96f306..d2d3fd08c 100644
--- a/data/cities/thonon-les-bains/sergent-major.yml
+++ b/data/cities/thonon-les-bains/sergent-major.yml
@@ -4,8 +4,8 @@ latitude: 46.37941
 longitude: 6.49723
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:30; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/sfr.yml b/data/cities/thonon-les-bains/sfr.yml
index 812a756d1..e0d169144 100644
--- a/data/cities/thonon-les-bains/sfr.yml
+++ b/data/cities/thonon-les-bains/sfr.yml
@@ -4,8 +4,8 @@ latitude: 46.37045
 longitude: 6.47902
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 17
+street: Grande Rue
+housenumber: "17"
 phone: ""
-opening_hours: "Su off; Mo,Tu,Th-Sa 09:30-19:00; We 09:30-12:15,13:45-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Su off; Mo,Tu,Th-Sa 09:30-19:00; We 09:30-12:15,13:45-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/shop-coiffure-rue-du-pamphiot.yml b/data/cities/thonon-les-bains/shop-coiffure-rue-du-pamphiot.yml
index 5947e8ef4..632c34a48 100644
--- a/data/cities/thonon-les-bains/shop-coiffure-rue-du-pamphiot.yml
+++ b/data/cities/thonon-les-bains/shop-coiffure-rue-du-pamphiot.yml
@@ -4,8 +4,8 @@ latitude: 46.35275
 longitude: 6.44172
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue du Pamphiot"
-housenumber: 19
+street: Rue du Pamphiot
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/shop-coiffure.yml b/data/cities/thonon-les-bains/shop-coiffure.yml
index 1f9510612..cd4ec01ff 100644
--- a/data/cities/thonon-les-bains/shop-coiffure.yml
+++ b/data/cities/thonon-les-bains/shop-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.37943
 longitude: 6.49753
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/shopping-leman.yml b/data/cities/thonon-les-bains/shopping-leman.yml
index 32c3ba5c6..a0b408ba6 100644
--- a/data/cities/thonon-les-bains/shopping-leman.yml
+++ b/data/cities/thonon-les-bains/shopping-leman.yml
@@ -1,11 +1,11 @@
 id: 444730262
-type: way
+type: node
 latitude: 46.37899
 longitude: 6.49717
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue Amédée de Foras"
-housenumber: 7
+street: Rue Amédée de Foras
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/si-selection-inspiree.yml b/data/cities/thonon-les-bains/si-selection-inspiree.yml
index 388f19c3b..6d0e0cbc5 100644
--- a/data/cities/thonon-les-bains/si-selection-inspiree.yml
+++ b/data/cities/thonon-les-bains/si-selection-inspiree.yml
@@ -4,8 +4,8 @@ latitude: 46.37197
 longitude: 6.47833
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Square Aristide Briand"
-housenumber: 10
-phone: "+33 6 37 63 87 65"
+street: Square Aristide Briand
+housenumber: "10"
+phone: +33 6 37 63 87 65
 opening_hours: ""
-website: "https://www.si-boutique.fr"
\ No newline at end of file
+website: https://www.si-boutique.fr
diff --git a/data/cities/thonon-les-bains/spar.yml b/data/cities/thonon-les-bains/spar.yml
index 220a26eb7..5e91e98bc 100644
--- a/data/cities/thonon-les-bains/spar.yml
+++ b/data/cities/thonon-les-bains/spar.yml
@@ -1,11 +1,11 @@
 id: 67044227
-type: way
+type: node
 latitude: 46.36243
 longitude: 6.47841
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue des Allinges"
-housenumber: 36
+street: Avenue des Allinges
+housenumber: "36"
 phone: ""
-opening_hours: "Mo-Sa 07:00-13:00, 15:00-20:00; Su 08:00-13:00, 15:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-13:00, 15:00-20:00; Su 08:00-13:00, 15:00-19:00
+website: ""
diff --git a/data/cities/thonon-les-bains/start.yml b/data/cities/thonon-les-bains/start.yml
index de53d88d0..69729288d 100644
--- a/data/cities/thonon-les-bains/start.yml
+++ b/data/cities/thonon-les-bains/start.yml
@@ -4,8 +4,8 @@ latitude: 46.36924
 longitude: 6.48182
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Place de la Gare"
-housenumber: 
+street: Place de la Gare
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:00-18:00; Sa 10:00-12:30, 14:30-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-18:00; Sa 10:00-12:30, 14:30-17:00; Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/tabac-bouvier.yml b/data/cities/thonon-les-bains/tabac-bouvier.yml
index 567a6abee..d8a86c18e 100644
--- a/data/cities/thonon-les-bains/tabac-bouvier.yml
+++ b/data/cities/thonon-les-bains/tabac-bouvier.yml
@@ -4,8 +4,8 @@ latitude: 46.36417
 longitude: 6.46358
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue du Général de Gaulle"
-housenumber: 91
+street: Avenue du Général de Gaulle
+housenumber: "91"
 phone: ""
-opening_hours: "Mo-Sa 07:30-12:30, 13:30-19:30; Su 08:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-12:30, 13:30-19:30; Su 08:30-12:00
+website: ""
diff --git a/data/cities/thonon-les-bains/thiriet.yml b/data/cities/thonon-les-bains/thiriet.yml
index 9e45539df..db276e998 100644
--- a/data/cities/thonon-les-bains/thiriet.yml
+++ b/data/cities/thonon-les-bains/thiriet.yml
@@ -1,11 +1,11 @@
 id: 67055847
-type: way
+type: node
 latitude: 46.36162
 longitude: 6.4578
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue de Genève"
-housenumber: 19
+street: Avenue de Genève
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su 09:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-19:30; Sa 09:00-19:30; Su 09:30-12:30
+website: ""
diff --git a/data/cities/thonon-les-bains/thonon-gourmand.yml b/data/cities/thonon-les-bains/thonon-gourmand.yml
index 1dbe94473..a2f60a253 100644
--- a/data/cities/thonon-les-bains/thonon-gourmand.yml
+++ b/data/cities/thonon-les-bains/thonon-gourmand.yml
@@ -4,8 +4,8 @@ latitude: 46.39124
 longitude: 6.5055
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue des Chevesnes"
-housenumber: 2
+street: Rue des Chevesnes
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00; Mo,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:00-12:00,14:00-18:00; Sa 08:00-12:00; Mo,Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/vini-cimes.yml b/data/cities/thonon-les-bains/vini-cimes.yml
index 3cffe7146..1075f9ee1 100644
--- a/data/cities/thonon-les-bains/vini-cimes.yml
+++ b/data/cities/thonon-les-bains/vini-cimes.yml
@@ -4,8 +4,8 @@ latitude: 46.3912
 longitude: 6.50577
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Rue des Chevesnes"
-housenumber: 4
+street: Rue des Chevesnes
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00,14:00-17:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00,14:00-17:30; Sa-Su off
+website: ""
diff --git a/data/cities/thonon-les-bains/vival.yml b/data/cities/thonon-les-bains/vival.yml
index 006c562d7..dd20eb2f1 100644
--- a/data/cities/thonon-les-bains/vival.yml
+++ b/data/cities/thonon-les-bains/vival.yml
@@ -1,11 +1,11 @@
 id: 67042085
-type: way
+type: node
 latitude: 46.39916
 longitude: 6.50418
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Avenue de Saint-Disdille"
-housenumber: 102
+street: Avenue de Saint-Disdille
+housenumber: "102"
 phone: ""
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/thonon-les-bains/yves-rocher.yml b/data/cities/thonon-les-bains/yves-rocher.yml
index 6cee6f77c..58dcc8ac7 100644
--- a/data/cities/thonon-les-bains/yves-rocher.yml
+++ b/data/cities/thonon-les-bains/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 46.37102
 longitude: 6.47901
 postcode: "74200"
 city: Thonon-les-Bains
-street: "Grande Rue"
-housenumber: 16
+street: Grande Rue
+housenumber: "16"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/thorens-glieres/fournil-des-glieres.yml b/data/cities/thorens-glieres/fournil-des-glieres.yml
index 5b5a7af65..ce8aa9265 100644
--- a/data/cities/thorens-glieres/fournil-des-glieres.yml
+++ b/data/cities/thorens-glieres/fournil-des-glieres.yml
@@ -4,8 +4,8 @@ latitude: 45.9965
 longitude: 6.24524
 postcode: "74570"
 city: Thorens-Glières
-street: "Rue Saint-François de Sales"
-housenumber: 33
-phone: "+33 4 50 22 42 48"
-opening_hours: "Mo-Su 06:00-19:30"
-website: ""
\ No newline at end of file
+street: Rue Saint-François de Sales
+housenumber: "33"
+phone: +33 4 50 22 42 48
+opening_hours: Mo-Su 06:00-19:30
+website: ""
diff --git a/data/cities/thurins/christian-vindry-producteur.yml b/data/cities/thurins/christian-vindry-producteur.yml
index de4630830..f0188df59 100644
--- a/data/cities/thurins/christian-vindry-producteur.yml
+++ b/data/cities/thurins/christian-vindry-producteur.yml
@@ -4,8 +4,8 @@ latitude: 45.68004
 longitude: 4.65823
 postcode: "69510"
 city: Thurins
-street: "La Valotte"
-housenumber: 160
+street: La Valotte
+housenumber: "160"
 phone: "+33426181717"
-opening_hours: "We,Fr 13:30-19:00"
-website: "http://www.drive-vindryproducteur.com"
\ No newline at end of file
+opening_hours: We,Fr 13:30-19:00
+website: http://www.drive-vindryproducteur.com
diff --git a/data/cities/thurins/garage-de-la-colline-citroen.yml b/data/cities/thurins/garage-de-la-colline-citroen.yml
index 53b87504a..d07ab4fa5 100644
--- a/data/cities/thurins/garage-de-la-colline-citroen.yml
+++ b/data/cities/thurins/garage-de-la-colline-citroen.yml
@@ -4,8 +4,8 @@ latitude: 45.67953
 longitude: 4.64688
 postcode: "69510"
 city: Thurins
-street: "Route de la Vallée du Garon"
-housenumber: 13
+street: Route de la Vallée du Garon
+housenumber: "13"
 phone: "+33478489639"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00"
-website: "https://www.garage-colline-thurins.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00
+website: https://www.garage-colline-thurins.fr/
diff --git a/data/cities/thurins/garage-joannard.yml b/data/cities/thurins/garage-joannard.yml
index 73f29d489..a73a46970 100644
--- a/data/cities/thurins/garage-joannard.yml
+++ b/data/cities/thurins/garage-joannard.yml
@@ -4,8 +4,8 @@ latitude: 45.67929
 longitude: 4.64854
 postcode: "69510"
 city: Thurins
-street: "Route de la Vallée du Garon"
-housenumber: 31
+street: Route de la Vallée du Garon
+housenumber: "31"
 phone: "+33478489416"
-opening_hours: "Mo-Th 08:00-12:00,14:00-19:00; Fr 08:00-12:00,14:00-17:00"
-website: "https://garagejoannard.multimarque.fr"
\ No newline at end of file
+opening_hours: Mo-Th 08:00-12:00,14:00-19:00; Fr 08:00-12:00,14:00-17:00
+website: https://garagejoannard.multimarque.fr
diff --git a/data/cities/thurins/jasserand-boulangerie-patisserie.yml b/data/cities/thurins/jasserand-boulangerie-patisserie.yml
index 5bfb4395e..be50209f9 100644
--- a/data/cities/thurins/jasserand-boulangerie-patisserie.yml
+++ b/data/cities/thurins/jasserand-boulangerie-patisserie.yml
@@ -4,8 +4,8 @@ latitude: 45.68178
 longitude: 4.6412
 postcode: "69510"
 city: Thurins
-street: "Rue du 8 Mai 1945"
-housenumber: 7
+street: Rue du 8 Mai 1945
+housenumber: "7"
 phone: ""
-opening_hours: "Tu-Fr 06:30-13:00,15:30-19:15; Sa 06:30-13:00,15:30-19:00; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 06:30-13:00,15:30-19:15; Sa 06:30-13:00,15:30-19:00; Su 06:30-13:00
+website: ""
diff --git a/data/cities/thurins/salon-sculptif.yml b/data/cities/thurins/salon-sculptif.yml
index fd46256e5..b55698429 100644
--- a/data/cities/thurins/salon-sculptif.yml
+++ b/data/cities/thurins/salon-sculptif.yml
@@ -4,8 +4,8 @@ latitude: 45.67939
 longitude: 4.65369
 postcode: "69510"
 city: Thurins
-street: "Route de la Vallée du Garon"
-housenumber: 69
+street: Route de la Vallée du Garon
+housenumber: "69"
 phone: "+33478819026"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thurins/un-dimanche-a-la-campagne.yml b/data/cities/thurins/un-dimanche-a-la-campagne.yml
index acbe2874d..100ffd515 100644
--- a/data/cities/thurins/un-dimanche-a-la-campagne.yml
+++ b/data/cities/thurins/un-dimanche-a-la-campagne.yml
@@ -4,8 +4,8 @@ latitude: 45.67305
 longitude: 4.60796
 postcode: "69850"
 city: Thurins
-street: "La Durantière"
-housenumber: 
-phone: "+33 4 78 81 94 38"
-opening_hours: "We-Su 09:00-12:30, 15:00-19:00"
-website: "https://un-dimanche-a-la-campagne.jimdofree.com/"
\ No newline at end of file
+street: La Durantière
+housenumber: ""
+phone: +33 4 78 81 94 38
+opening_hours: We-Su 09:00-12:30, 15:00-19:00
+website: https://un-dimanche-a-la-campagne.jimdofree.com/
diff --git a/data/cities/thurins/vival.yml b/data/cities/thurins/vival.yml
index 5b4815dd1..7cb3c650d 100644
--- a/data/cities/thurins/vival.yml
+++ b/data/cities/thurins/vival.yml
@@ -5,7 +5,7 @@ longitude: 4.63982
 postcode: ""
 city: Thurins
 street: ""
-housenumber: 
-phone: "+33 9 53 96 55 40"
-opening_hours: "Tu-Fr 07:30-12:30,15:30-19:30; Sa 07:30-12:30,15:30-19:00; Su 07:30-12:30"
-website: "https://magasins.vival.fr/fr/s/vival-thurins"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 53 96 55 40
+opening_hours: Tu-Fr 07:30-12:30,15:30-19:30; Sa 07:30-12:30,15:30-19:00; Su 07:30-12:30
+website: https://magasins.vival.fr/fr/s/vival-thurins
diff --git a/data/cities/thyez/intermarche.yml b/data/cities/thyez/intermarche.yml
index c7d3f4795..064d5c1e3 100644
--- a/data/cities/thyez/intermarche.yml
+++ b/data/cities/thyez/intermarche.yml
@@ -1,11 +1,11 @@
 id: 106100019
-type: way
+type: node
 latitude: 46.08594
 longitude: 6.52391
 postcode: "74300"
 city: Thyez
-street: "Avenue des Vallées"
-housenumber: 2525
+street: Avenue des Vallées
+housenumber: "2525"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/thyez/lentrepot-du-bricolage.yml b/data/cities/thyez/lentrepot-du-bricolage.yml
index af0bebd6f..fd49bdd7a 100644
--- a/data/cities/thyez/lentrepot-du-bricolage.yml
+++ b/data/cities/thyez/lentrepot-du-bricolage.yml
@@ -1,11 +1,11 @@
 id: 502177689
-type: way
+type: node
 latitude: 46.08183
 longitude: 6.52253
 postcode: "74300"
 city: Thyez
-street: "Allée de Glaisy"
-housenumber: 45
+street: Allée de Glaisy
+housenumber: "45"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes-le-lac/intersport.yml b/data/cities/tignes-le-lac/intersport.yml
index fccc41be9..2a77f3d6c 100644
--- a/data/cities/tignes-le-lac/intersport.yml
+++ b/data/cities/tignes-le-lac/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.90775
 postcode: "73320"
 city: Tignes le Lac
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes-le-lac/ski-republic.yml b/data/cities/tignes-le-lac/ski-republic.yml
index dd9064084..6f91f6c07 100644
--- a/data/cities/tignes-le-lac/ski-republic.yml
+++ b/data/cities/tignes-le-lac/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 45.47204
 longitude: 6.91455
 postcode: "73320"
 city: Tignes le Lac
-street: "Route du Lavachet"
-housenumber: 
+street: Route du Lavachet
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes-val-claret/intersport-2.yml b/data/cities/tignes-val-claret/intersport-2.yml
index e19dc9e08..f59872573 100644
--- a/data/cities/tignes-val-claret/intersport-2.yml
+++ b/data/cities/tignes-val-claret/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.90143
 postcode: "73320"
 city: Tignes Val-Claret
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes-val-claret/intersport-3.yml b/data/cities/tignes-val-claret/intersport-3.yml
index 1411932f9..4166eb3cf 100644
--- a/data/cities/tignes-val-claret/intersport-3.yml
+++ b/data/cities/tignes-val-claret/intersport-3.yml
@@ -5,7 +5,7 @@ longitude: 6.8998
 postcode: "73320"
 city: Tignes Val-Claret
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "08:30-19:30"
-website: "https://intersport-rent.fr"
\ No newline at end of file
+opening_hours: 08:30-19:30
+website: https://intersport-rent.fr
diff --git a/data/cities/tignes-val-claret/intersport.yml b/data/cities/tignes-val-claret/intersport.yml
index 2567c5226..146dbd18f 100644
--- a/data/cities/tignes-val-claret/intersport.yml
+++ b/data/cities/tignes-val-claret/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.45527
 longitude: 6.89852
 postcode: "73320"
 city: Tignes Val-Claret
-street: "Avenue de la Grande Motte"
-housenumber: 365
-phone: "+334 79 40 21 15"
-opening_hours: "08:30-19:30"
-website: ""
\ No newline at end of file
+street: ""
+housenumber: "365"
+phone: +334 79 40 21 15
+opening_hours: 08:30-19:30
+website: ""
diff --git a/data/cities/tignes-val-claret/la-gourmandise.yml b/data/cities/tignes-val-claret/la-gourmandise.yml
index 566b8e95d..704ad79f3 100644
--- a/data/cities/tignes-val-claret/la-gourmandise.yml
+++ b/data/cities/tignes-val-claret/la-gourmandise.yml
@@ -4,8 +4,8 @@ latitude: 45.45389
 longitude: 6.9016
 postcode: "73320"
 city: Tignes Val Claret
-street: "Rue du Val Claret"
-housenumber: 4
-phone: "+33 479064595"
-opening_hours: "Jan-Dec Mo-Su 07:15-19:00"
-website: ""
\ No newline at end of file
+street: ""
+housenumber: "4"
+phone: +33 479064595
+opening_hours: Jan-Dec Mo-Su 07:15-19:00
+website: ""
diff --git a/data/cities/tignes-val-claret/precision-ski.yml b/data/cities/tignes-val-claret/precision-ski.yml
index 2f85326d6..a65433383 100644
--- a/data/cities/tignes-val-claret/precision-ski.yml
+++ b/data/cities/tignes-val-claret/precision-ski.yml
@@ -4,8 +4,8 @@ latitude: 45.4543
 longitude: 6.89849
 postcode: "73320"
 city: Tignes Val-Claret
-street: "Avenue de la Grande Motte"
-housenumber: 
+street: Avenue de la Grande Motte
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes-val-claret/ski-republic-borsat.yml b/data/cities/tignes-val-claret/ski-republic-borsat.yml
index 356e67034..9a4d58245 100644
--- a/data/cities/tignes-val-claret/ski-republic-borsat.yml
+++ b/data/cities/tignes-val-claret/ski-republic-borsat.yml
@@ -4,8 +4,8 @@ latitude: 45.45387
 longitude: 6.90133
 postcode: "73320"
 city: Tignes Val-Claret
-street: "Rue du Val Claret"
-housenumber: 
-phone: "+33 4 79 06 49 31"
-opening_hours: "Jan-Dec PH,Mo-Su 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue du Val Claret
+housenumber: ""
+phone: +33 4 79 06 49 31
+opening_hours: Jan-Dec PH,Mo-Su 10:00-19:00
+website: ""
diff --git a/data/cities/tignes/arctik.yml b/data/cities/tignes/arctik.yml
index 18f5fa4f6..cace00d16 100644
--- a/data/cities/tignes/arctik.yml
+++ b/data/cities/tignes/arctik.yml
@@ -4,8 +4,8 @@ latitude: 45.457
 longitude: 6.90097
 postcode: "73220"
 city: Tignes
-street: "Rue du Val Claret"
-housenumber: 
+street: Rue du Val Claret
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes/labo-shop.yml b/data/cities/tignes/labo-shop.yml
index 0db25a528..c24361da7 100644
--- a/data/cities/tignes/labo-shop.yml
+++ b/data/cities/tignes/labo-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.46916
 longitude: 6.9052
 postcode: "73320"
 city: Tignes
-street: "Rue de la Poste"
-housenumber: 
-phone: "+33 4 58 24 00 69"
+street: Rue de la Poste
+housenumber: ""
+phone: +33 4 58 24 00 69
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes/lardechoise.yml b/data/cities/tignes/lardechoise.yml
index 6bc364de4..3e2e45012 100644
--- a/data/cities/tignes/lardechoise.yml
+++ b/data/cities/tignes/lardechoise.yml
@@ -4,8 +4,8 @@ latitude: 45.45588
 longitude: 6.90105
 postcode: "73220"
 city: Tignes
-street: "CHALET ORION LE LAVACHET"
-housenumber: 
+street: CHALET ORION LE LAVACHET
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes/ski-one.yml b/data/cities/tignes/ski-one.yml
index c2b05fa17..2bb816870 100644
--- a/data/cities/tignes/ski-one.yml
+++ b/data/cities/tignes/ski-one.yml
@@ -4,8 +4,8 @@ latitude: 45.45568
 longitude: 6.90009
 postcode: "73320"
 city: Tignes
-street: "Rue du Val Claret"
-housenumber: 
-phone: "+33 4 79 06 37 12"
-opening_hours: "Mo-Su 08:30-19:00"
-website: "https://www.skione-tignes.com/"
\ No newline at end of file
+street: Rue du Val Claret
+housenumber: ""
+phone: +33 4 79 06 37 12
+opening_hours: Mo-Su 08:30-19:00
+website: https://www.skione-tignes.com/
diff --git a/data/cities/tignes/skimium-le-lodge-location-de-ski-tignes-val-claret.yml b/data/cities/tignes/skimium-le-lodge-location-de-ski-tignes-val-claret.yml
index 6d390c45a..fe2fddb60 100644
--- a/data/cities/tignes/skimium-le-lodge-location-de-ski-tignes-val-claret.yml
+++ b/data/cities/tignes/skimium-le-lodge-location-de-ski-tignes-val-claret.yml
@@ -4,8 +4,8 @@ latitude: 45.45604
 longitude: 6.90044
 postcode: "73320"
 city: Tignes
-street: "Rue du Val Claret"
-housenumber: 
+street: Rue du Val Claret
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes/skimium.yml b/data/cities/tignes/skimium.yml
index ee85a0d1b..dfb6de515 100644
--- a/data/cities/tignes/skimium.yml
+++ b/data/cities/tignes/skimium.yml
@@ -4,8 +4,8 @@ latitude: 45.46917
 longitude: 6.90541
 postcode: "73320"
 city: Tignes
-street: "Rue de la Poste"
-housenumber: 
+street: Rue de la Poste
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignes/skiset.yml b/data/cities/tignes/skiset.yml
index 1ae4d2271..408393ebd 100644
--- a/data/cities/tignes/skiset.yml
+++ b/data/cities/tignes/skiset.yml
@@ -4,8 +4,8 @@ latitude: 45.46888
 longitude: 6.90613
 postcode: ""
 city: Tignes
-street: "Immeuble Le Palafour"
-housenumber: 
-phone: "+33 4 79 06 33 79"
-opening_hours: "mo-su 09:00-19:00"
-website: "https://mountainstory.fr/"
\ No newline at end of file
+street: Immeuble Le Palafour
+housenumber: ""
+phone: +33 4 79 06 33 79
+opening_hours: mo-su 09:00-19:00
+website: https://mountainstory.fr/
diff --git a/data/cities/tignes/sport-2000-alpes-glisses.yml b/data/cities/tignes/sport-2000-alpes-glisses.yml
index aee876673..28cf052f4 100644
--- a/data/cities/tignes/sport-2000-alpes-glisses.yml
+++ b/data/cities/tignes/sport-2000-alpes-glisses.yml
@@ -4,8 +4,8 @@ latitude: 45.49614
 longitude: 6.92749
 postcode: "73320"
 city: Tignes
-street: "Chalet de Bazel"
-housenumber: 
-phone: "+33 4 79063157"
-opening_hours: "Mo-Su 08:30-19:00"
-website: ""
\ No newline at end of file
+street: Chalet de Bazel
+housenumber: ""
+phone: +33 4 79063157
+opening_hours: Mo-Su 08:30-19:00
+website: ""
diff --git a/data/cities/tignieu-jameyzieu/bodyhouse.yml b/data/cities/tignieu-jameyzieu/bodyhouse.yml
index f9577d380..9972a6e6a 100644
--- a/data/cities/tignieu-jameyzieu/bodyhouse.yml
+++ b/data/cities/tignieu-jameyzieu/bodyhouse.yml
@@ -4,8 +4,8 @@ latitude: 45.74611
 longitude: 5.18647
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Rue de la Léchère"
-housenumber: 24
-phone: "+33 4 81 09 26 00"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://bh-boutiques.fr/tignieu-jameyzieu/"
\ No newline at end of file
+street: Rue de la Léchère
+housenumber: "24"
+phone: +33 4 81 09 26 00
+opening_hours: Mo-Sa 10:00-19:00
+website: https://bh-boutiques.fr/tignieu-jameyzieu/
diff --git a/data/cities/tignieu-jameyzieu/boulangierie-dimieux.yml b/data/cities/tignieu-jameyzieu/boulangierie-dimieux.yml
index 1bce68445..2e8347e44 100644
--- a/data/cities/tignieu-jameyzieu/boulangierie-dimieux.yml
+++ b/data/cities/tignieu-jameyzieu/boulangierie-dimieux.yml
@@ -4,8 +4,8 @@ latitude: 45.74988
 longitude: 5.18719
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Route de Crémieu"
-housenumber: 26
+street: Route de Crémieu
+housenumber: "26"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignieu-jameyzieu/ccc-sarl.yml b/data/cities/tignieu-jameyzieu/ccc-sarl.yml
index be0786425..664a913aa 100644
--- a/data/cities/tignieu-jameyzieu/ccc-sarl.yml
+++ b/data/cities/tignieu-jameyzieu/ccc-sarl.yml
@@ -1,11 +1,11 @@
 id: 1151440061
-type: way
+type: node
 latitude: 45.7564
 longitude: 5.1939
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Chemin de Pan Perdu"
-housenumber: 90
-phone: "+33 4 74 80 78 46"
+street: Chemin de Pan Perdu
+housenumber: "90"
+phone: +33 4 74 80 78 46
 opening_hours: ""
-website: "https://www.sarlccc.com"
\ No newline at end of file
+website: https://www.sarlccc.com
diff --git a/data/cities/tignieu-jameyzieu/citroen.yml b/data/cities/tignieu-jameyzieu/citroen.yml
index 450bea334..81b124bc9 100644
--- a/data/cities/tignieu-jameyzieu/citroen.yml
+++ b/data/cities/tignieu-jameyzieu/citroen.yml
@@ -4,8 +4,8 @@ latitude: 45.75202
 longitude: 5.19464
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Route de Crémieu"
-housenumber: 73
+street: Route de Crémieu
+housenumber: "73"
 phone: "+33478321146"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tignieu-jameyzieu/epicerie-sociale-gali.yml b/data/cities/tignieu-jameyzieu/epicerie-sociale-gali.yml
index 0082ed607..a748480e3 100644
--- a/data/cities/tignieu-jameyzieu/epicerie-sociale-gali.yml
+++ b/data/cities/tignieu-jameyzieu/epicerie-sociale-gali.yml
@@ -4,8 +4,8 @@ latitude: 45.74857
 longitude: 5.18076
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Boulevard de Verna"
-housenumber: 28
-phone: "+33 4 78 32 50 81"
+street: Boulevard de Verna
+housenumber: "28"
+phone: +33 4 78 32 50 81
 opening_hours: ""
-website: "https://galicca38.wixsite.com/gali"
\ No newline at end of file
+website: https://galicca38.wixsite.com/gali
diff --git a/data/cities/tignieu-jameyzieu/france-pare-brise.yml b/data/cities/tignieu-jameyzieu/france-pare-brise.yml
index d1f208974..86f2a8368 100644
--- a/data/cities/tignieu-jameyzieu/france-pare-brise.yml
+++ b/data/cities/tignieu-jameyzieu/france-pare-brise.yml
@@ -4,8 +4,8 @@ latitude: 45.75585
 longitude: 5.19534
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Boulevard Ampère"
-housenumber: 31
+street: Boulevard Ampère
+housenumber: "31"
 phone: ""
-opening_hours: "Mo-Fr 08:30-18:30; Sa 09:00-12:00"
-website: "https://www.franceparebrise.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-18:30; Sa 09:00-12:00
+website: https://www.franceparebrise.fr/
diff --git a/data/cities/tignieu-jameyzieu/iriti-supermercato.yml b/data/cities/tignieu-jameyzieu/iriti-supermercato.yml
index 926a8b238..78888b29b 100644
--- a/data/cities/tignieu-jameyzieu/iriti-supermercato.yml
+++ b/data/cities/tignieu-jameyzieu/iriti-supermercato.yml
@@ -4,8 +4,8 @@ latitude: 45.75593
 longitude: 5.19601
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Boulevard Ampère"
-housenumber: 31
+street: Boulevard Ampère
+housenumber: "31"
 phone: ""
-opening_hours: "Tu-Fr 10:00-12:30,14:30-19:00; Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 10:00-12:30,14:30-19:00; Sa 09:00-19:00
+website: ""
diff --git a/data/cities/tignieu-jameyzieu/lami-du-vigneron.yml b/data/cities/tignieu-jameyzieu/lami-du-vigneron.yml
index cc8ed35af..53ce3afac 100644
--- a/data/cities/tignieu-jameyzieu/lami-du-vigneron.yml
+++ b/data/cities/tignieu-jameyzieu/lami-du-vigneron.yml
@@ -4,8 +4,8 @@ latitude: 45.75328
 longitude: 5.1962
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Route de Crémieu"
-housenumber: 109
-phone: "+33 4 78 20 32 17"
-opening_hours: "Tu-Th 10:00-12:30,14:15-19:15; Fr-Sa 10:00-12:30,13:30-19:15"
-website: "https://www.lamiduvigneron.com/"
\ No newline at end of file
+street: Route de Crémieu
+housenumber: "109"
+phone: +33 4 78 20 32 17
+opening_hours: Tu-Th 10:00-12:30,14:15-19:15; Fr-Sa 10:00-12:30,13:30-19:15
+website: https://www.lamiduvigneron.com/
diff --git a/data/cities/tignieu-jameyzieu/le-village-des-brocanteurs.yml b/data/cities/tignieu-jameyzieu/le-village-des-brocanteurs.yml
index c9d802d74..983b458c6 100644
--- a/data/cities/tignieu-jameyzieu/le-village-des-brocanteurs.yml
+++ b/data/cities/tignieu-jameyzieu/le-village-des-brocanteurs.yml
@@ -4,8 +4,8 @@ latitude: 45.74873
 longitude: 5.20798
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Route de Crémieu"
-housenumber: 180
+street: Route de Crémieu
+housenumber: "180"
 phone: "+33678518441"
 opening_hours: ""
-website: "https://fr-fr.facebook.com/pages/category/Collectibles-Store/Le-village-des-brocanteurs38-1541869319457104/"
\ No newline at end of file
+website: https://fr-fr.facebook.com/pages/category/Collectibles-Store/Le-village-des-brocanteurs38-1541869319457104/
diff --git a/data/cities/tignieu-jameyzieu/lidl.yml b/data/cities/tignieu-jameyzieu/lidl.yml
index a844e9a09..bd63cfbf1 100644
--- a/data/cities/tignieu-jameyzieu/lidl.yml
+++ b/data/cities/tignieu-jameyzieu/lidl.yml
@@ -1,11 +1,11 @@
 id: 142879140
-type: way
+type: node
 latitude: 45.75217
 longitude: 5.19899
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Route de Crémieu"
-housenumber: 111
+street: Route de Crémieu
+housenumber: "111"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:15"
-website: "https://www.lidl.fr/s/fr-FR/supermarch%C3%A9s/tignieu-jamezieu/111-route-de-cremieu/"
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:15
+website: https://www.lidl.fr/s/fr-FR/supermarch%C3%A9s/tignieu-jamezieu/111-route-de-cremieu/
diff --git a/data/cities/tignieu-jameyzieu/noz.yml b/data/cities/tignieu-jameyzieu/noz.yml
index 414e41f07..59db913a6 100644
--- a/data/cities/tignieu-jameyzieu/noz.yml
+++ b/data/cities/tignieu-jameyzieu/noz.yml
@@ -1,11 +1,11 @@
 id: 653039024
-type: way
+type: node
 latitude: 45.75402
 longitude: 5.19418
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Route de Crémieu"
-housenumber: 95
+street: Route de Crémieu
+housenumber: "95"
 phone: ""
 opening_hours: ""
-website: "https://www.nozarrivages.com/magasin/tignieu-jameyzieu/"
\ No newline at end of file
+website: https://www.nozarrivages.com/magasin/tignieu-jameyzieu/
diff --git a/data/cities/tignieu-jameyzieu/pause-beaute.yml b/data/cities/tignieu-jameyzieu/pause-beaute.yml
index a67563d70..88a0efee9 100644
--- a/data/cities/tignieu-jameyzieu/pause-beaute.yml
+++ b/data/cities/tignieu-jameyzieu/pause-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.71553
 longitude: 5.16159
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Route de Lyon"
-housenumber: 57
-phone: "+33 9 70 21 15 11"
+street: Route de Lyon
+housenumber: "57"
+phone: +33 9 70 21 15 11
 opening_hours: ""
-website: "https://www.planity.com/pause-beaute-38230-tignieu-jameyzieu"
\ No newline at end of file
+website: https://www.planity.com/pause-beaute-38230-tignieu-jameyzieu
diff --git a/data/cities/tignieu-jameyzieu/tereva.yml b/data/cities/tignieu-jameyzieu/tereva.yml
index fae65c3ca..1ddb0002b 100644
--- a/data/cities/tignieu-jameyzieu/tereva.yml
+++ b/data/cities/tignieu-jameyzieu/tereva.yml
@@ -4,8 +4,8 @@ latitude: 45.75624
 longitude: 5.19627
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Boulevard Ampère"
-housenumber: 31
-phone: "+33 4 81 65 80 00"
-opening_hours: "Mo-Th 07:00-12:00,13:30-17:00; We 07:00-12:00,13:30-16:00;"
-website: "https://www.tereva-direct.fr/document/A-593519-tereva-agence-tereva-tignieu-jameyzieu"
\ No newline at end of file
+street: Boulevard Ampère
+housenumber: "31"
+phone: +33 4 81 65 80 00
+opening_hours: Mo-Th 07:00-12:00,13:30-17:00; We 07:00-12:00,13:30-16:00;
+website: https://www.tereva-direct.fr/document/A-593519-tereva-agence-tereva-tignieu-jameyzieu
diff --git a/data/cities/tignieu-jameyzieu/was-we-are-select.yml b/data/cities/tignieu-jameyzieu/was-we-are-select.yml
index 711b673de..ff334637d 100644
--- a/data/cities/tignieu-jameyzieu/was-we-are-select.yml
+++ b/data/cities/tignieu-jameyzieu/was-we-are-select.yml
@@ -4,8 +4,8 @@ latitude: 45.74694
 longitude: 5.18452
 postcode: "38230"
 city: Tignieu-Jameyzieu
-street: "Rue du Dauphiné"
-housenumber: 10
-phone: "04 78 39 81 82"
-opening_hours: "Mo-Sa 09:30-19:30"
-website: ""
\ No newline at end of file
+street: Rue du Dauphiné
+housenumber: "10"
+phone: 04 78 39 81 82
+opening_hours: Mo-Sa 09:30-19:30
+website: ""
diff --git a/data/cities/tournon-sur-rhone/noz.yml b/data/cities/tournon-sur-rhone/noz.yml
index 2c74a0d81..d937da4b1 100644
--- a/data/cities/tournon-sur-rhone/noz.yml
+++ b/data/cities/tournon-sur-rhone/noz.yml
@@ -1,11 +1,11 @@
 id: 1241465926
-type: way
+type: node
 latitude: 45.05036
 longitude: 4.83721
 postcode: "07300"
 city: Tournon-sur-Rhône
-street: "ZA de Champagne"
-housenumber: 
+street: ZA de Champagne
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.nozarrivages.com/magasin/tournon-sur-rhone/"
\ No newline at end of file
+website: https://www.nozarrivages.com/magasin/tournon-sur-rhone/
diff --git a/data/cities/tournon-sur-rhone/ressourcerie-tremplin-horizon.yml b/data/cities/tournon-sur-rhone/ressourcerie-tremplin-horizon.yml
index 48c1cfd60..0695005f0 100644
--- a/data/cities/tournon-sur-rhone/ressourcerie-tremplin-horizon.yml
+++ b/data/cities/tournon-sur-rhone/ressourcerie-tremplin-horizon.yml
@@ -1,11 +1,11 @@
 id: 532538841
-type: way
+type: node
 latitude: 45.06019
 longitude: 4.83253
 postcode: "07300"
 city: Tournon-sur-Rhône
-street: "Rue du Repos"
-housenumber: 20
-phone: "+33 7 87 68 59 34"
-opening_hours: "Th 14:00-18:00, Fr 10:00-12:30,14:00-18:00, Sa 10:00-17:00"
-website: "https://www.groupe-tremplin.org/pg/boutique-tournon"
\ No newline at end of file
+street: Rue du Repos
+housenumber: "20"
+phone: +33 7 87 68 59 34
+opening_hours: Th 14:00-18:00, Fr 10:00-12:30,14:00-18:00, Sa 10:00-17:00
+website: https://www.groupe-tremplin.org/pg/boutique-tournon
diff --git a/data/cities/tournon/la-ferme-du-coteau.yml b/data/cities/tournon/la-ferme-du-coteau.yml
index 91b93aa58..b35cb9dbc 100644
--- a/data/cities/tournon/la-ferme-du-coteau.yml
+++ b/data/cities/tournon/la-ferme-du-coteau.yml
@@ -4,8 +4,8 @@ latitude: 45.64312
 longitude: 6.32303
 postcode: "73460"
 city: Tournon
-street: "Route des vignes"
-housenumber: 96
+street: Route des vignes
+housenumber: "96"
 phone: "+33666641305"
 opening_hours: ""
-website: "lafermeducoteau.fr"
\ No newline at end of file
+website: lafermeducoteau.fr
diff --git a/data/cities/toussieu/ac-auto.yml b/data/cities/toussieu/ac-auto.yml
index 3523fd284..bcb01926e 100644
--- a/data/cities/toussieu/ac-auto.yml
+++ b/data/cities/toussieu/ac-auto.yml
@@ -1,11 +1,11 @@
 id: 78458457
-type: way
+type: node
 latitude: 45.66996
 longitude: 4.98254
 postcode: "69780"
 city: Toussieu
-street: "Route d'Heyrieux"
-housenumber: 1
+street: Route d'Heyrieux
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tramoyes/proxy-market.yml b/data/cities/tramoyes/proxy-market.yml
index 13f9acbab..e787a8888 100644
--- a/data/cities/tramoyes/proxy-market.yml
+++ b/data/cities/tramoyes/proxy-market.yml
@@ -4,8 +4,8 @@ latitude: 45.87467
 longitude: 4.9659
 postcode: "01390"
 city: Tramoyes
-street: "Route de la Boisse"
-housenumber: 105
-phone: "+33 4 78 91 05 33"
+street: Route de la Boisse
+housenumber: "105"
+phone: +33 4 78 91 05 33
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/trelins/parlons-cycles.yml b/data/cities/trelins/parlons-cycles.yml
index 2aed69652..fbcc82eb2 100644
--- a/data/cities/trelins/parlons-cycles.yml
+++ b/data/cities/trelins/parlons-cycles.yml
@@ -4,8 +4,8 @@ latitude: 45.73219
 longitude: 4.01018
 postcode: "42130"
 city: Trelins
-street: "Route de Montbrison"
-housenumber: 72
-phone: "+33 6 01 76 25 39"
-opening_hours: "Mo-Fr 09:30-12:00, 13:30-19:00; Sa 10:00-17:00"
-website: "https://www.parlonscycles.com/"
\ No newline at end of file
+street: Route de Montbrison
+housenumber: "72"
+phone: +33 6 01 76 25 39
+opening_hours: Mo-Fr 09:30-12:00, 13:30-19:00; Sa 10:00-17:00
+website: https://www.parlonscycles.com/
diff --git a/data/cities/trept/epitete.yml b/data/cities/trept/epitete.yml
index d2ab36a83..544e99628 100644
--- a/data/cities/trept/epitete.yml
+++ b/data/cities/trept/epitete.yml
@@ -4,8 +4,8 @@ latitude: 45.68646
 longitude: 5.3212
 postcode: "38460"
 city: Trept
-street: "Place Sébastien Boyrivent"
-housenumber: 6
+street: Place Sébastien Boyrivent
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/trevignin/boulangerie-la-patire.yml b/data/cities/trevignin/boulangerie-la-patire.yml
index f6160c170..4023a565c 100644
--- a/data/cities/trevignin/boulangerie-la-patire.yml
+++ b/data/cities/trevignin/boulangerie-la-patire.yml
@@ -4,8 +4,8 @@ latitude: 45.7085
 longitude: 5.95585
 postcode: ""
 city: Trévignin
-street: "Route du Revard"
-housenumber: 1134
+street: Route du Revard
+housenumber: "1134"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/trevignin/fromagerie-de-trevignin-produits-locaux.yml b/data/cities/trevignin/fromagerie-de-trevignin-produits-locaux.yml
index a8ca7d0f9..3950872ff 100644
--- a/data/cities/trevignin/fromagerie-de-trevignin-produits-locaux.yml
+++ b/data/cities/trevignin/fromagerie-de-trevignin-produits-locaux.yml
@@ -4,8 +4,8 @@ latitude: 45.70678
 longitude: 5.96251
 postcode: "73100"
 city: Trévignin
-street: "La Maladière"
-housenumber: 
-phone: "+33 4 79 35 27 62"
-opening_hours: "Mo-Sa 09:00-12:15, 14:00-19:00; Su 09:00-12:15, 15:00-18:00"
-website: "http://www.fromageries-bauges.fr"
\ No newline at end of file
+street: La Maladière
+housenumber: ""
+phone: +33 4 79 35 27 62
+opening_hours: Mo-Sa 09:00-12:15, 14:00-19:00; Su 09:00-12:15, 15:00-18:00
+website: http://www.fromageries-bauges.fr
diff --git a/data/cities/trevoux/cave-du-palais.yml b/data/cities/trevoux/cave-du-palais.yml
index feb1630c0..212544fbe 100644
--- a/data/cities/trevoux/cave-du-palais.yml
+++ b/data/cities/trevoux/cave-du-palais.yml
@@ -4,8 +4,8 @@ latitude: 45.94077
 longitude: 4.77506
 postcode: "01600"
 city: Trévoux
-street: "Grande Rue"
-housenumber: 28
+street: Grande Rue
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/trevoux/renault.yml b/data/cities/trevoux/renault.yml
index 0b1f8a093..d4f0c853c 100644
--- a/data/cities/trevoux/renault.yml
+++ b/data/cities/trevoux/renault.yml
@@ -4,8 +4,8 @@ latitude: 45.95246
 longitude: 4.75623
 postcode: "01600"
 city: Trévoux
-street: "Avenue du Formans"
-housenumber: 
+street: Avenue du Formans
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/bureau-de-tabac.yml b/data/cities/tulette/bureau-de-tabac.yml
index ac191f6ff..e1410af0a 100644
--- a/data/cities/tulette/bureau-de-tabac.yml
+++ b/data/cities/tulette/bureau-de-tabac.yml
@@ -4,8 +4,8 @@ latitude: 44.28617
 longitude: 4.92969
 postcode: "26790"
 city: Tulette
-street: "Le Cours"
-housenumber: 64
+street: Le Cours
+housenumber: "64"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/cave-costebelle.yml b/data/cities/tulette/cave-costebelle.yml
index 76691cd05..4a53bb484 100644
--- a/data/cities/tulette/cave-costebelle.yml
+++ b/data/cities/tulette/cave-costebelle.yml
@@ -1,11 +1,11 @@
 id: 136715288
-type: way
+type: node
 latitude: 44.28324
 longitude: 4.92941
 postcode: "26790"
 city: Tulette
-street: "Avenue de Provence"
-housenumber: 386
+street: Avenue de Provence
+housenumber: "386"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/chloe-beaute.yml b/data/cities/tulette/chloe-beaute.yml
index 322e96c6e..c93916eeb 100644
--- a/data/cities/tulette/chloe-beaute.yml
+++ b/data/cities/tulette/chloe-beaute.yml
@@ -4,8 +4,8 @@ latitude: 44.28582
 longitude: 4.92951
 postcode: "26790"
 city: Tulette
-street: "Le Cours"
-housenumber: 73
+street: Le Cours
+housenumber: "73"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/domaine-corinne-depeyre.yml b/data/cities/tulette/domaine-corinne-depeyre.yml
index c4bcb9fa0..8248a075d 100644
--- a/data/cities/tulette/domaine-corinne-depeyre.yml
+++ b/data/cities/tulette/domaine-corinne-depeyre.yml
@@ -4,8 +4,8 @@ latitude: 44.27577
 longitude: 4.93839
 postcode: "26790"
 city: Tulette
-street: "Chemin du Marquis de Cabassole"
-housenumber: 872
+street: Chemin du Marquis de Cabassole
+housenumber: "872"
 phone: ""
 opening_hours: ""
-website: "https://corinnedepeyre.fr/"
\ No newline at end of file
+website: https://corinnedepeyre.fr/
diff --git a/data/cities/tulette/domaine-coste-chabrier.yml b/data/cities/tulette/domaine-coste-chabrier.yml
index cde14d8df..eff8f70f7 100644
--- a/data/cities/tulette/domaine-coste-chabrier.yml
+++ b/data/cities/tulette/domaine-coste-chabrier.yml
@@ -4,8 +4,8 @@ latitude: 44.27919
 longitude: 4.94379
 postcode: "26790"
 city: Tulette
-street: "Route de Saint-Roman de Malegarde"
-housenumber: 1268
+street: Route de Saint-Roman de Malegarde
+housenumber: "1268"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/la-ronde-paysanne.yml b/data/cities/tulette/la-ronde-paysanne.yml
index 9c74e2dd7..29b9e4e2c 100644
--- a/data/cities/tulette/la-ronde-paysanne.yml
+++ b/data/cities/tulette/la-ronde-paysanne.yml
@@ -4,8 +4,8 @@ latitude: 44.28583
 longitude: 4.9302
 postcode: "26790"
 city: Tulette
-street: "Le Cours"
-housenumber: 13
+street: Le Cours
+housenumber: "13"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/le-boudoir-de-julie.yml b/data/cities/tulette/le-boudoir-de-julie.yml
index 7ccdec854..afbe0e2fd 100644
--- a/data/cities/tulette/le-boudoir-de-julie.yml
+++ b/data/cities/tulette/le-boudoir-de-julie.yml
@@ -4,8 +4,8 @@ latitude: 44.28629
 longitude: 4.93128
 postcode: "26790"
 city: Tulette
-street: "Avenue des Alpes"
-housenumber: 50
+street: Avenue des Alpes
+housenumber: "50"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/le-salon-de-nelly.yml b/data/cities/tulette/le-salon-de-nelly.yml
index fcd2bdc80..73738d8c1 100644
--- a/data/cities/tulette/le-salon-de-nelly.yml
+++ b/data/cities/tulette/le-salon-de-nelly.yml
@@ -4,8 +4,8 @@ latitude: 44.28618
 longitude: 4.92998
 postcode: "26790"
 city: Tulette
-street: "Le Cours"
-housenumber: 40
+street: Le Cours
+housenumber: "40"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/log-in.yml b/data/cities/tulette/log-in.yml
index a6ec7c52f..0ea7648c9 100644
--- a/data/cities/tulette/log-in.yml
+++ b/data/cities/tulette/log-in.yml
@@ -4,8 +4,8 @@ latitude: 44.2862
 longitude: 4.92936
 postcode: "26790"
 city: Tulette
-street: "Le Cours"
-housenumber: 94
+street: Le Cours
+housenumber: "94"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tulette/sublimetvous.yml b/data/cities/tulette/sublimetvous.yml
index 957aa23bb..1b084dee3 100644
--- a/data/cities/tulette/sublimetvous.yml
+++ b/data/cities/tulette/sublimetvous.yml
@@ -4,8 +4,8 @@ latitude: 44.28664
 longitude: 4.93122
 postcode: "26790"
 city: Tulette
-street: "Avenue des Alpes"
-housenumber: 73
+street: Avenue des Alpes
+housenumber: "73"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tullins/maison-de-la-presse-tabac.yml b/data/cities/tullins/maison-de-la-presse-tabac.yml
index aa3994d08..13b51c50b 100644
--- a/data/cities/tullins/maison-de-la-presse-tabac.yml
+++ b/data/cities/tullins/maison-de-la-presse-tabac.yml
@@ -4,8 +4,8 @@ latitude: 45.29813
 longitude: 5.48376
 postcode: "38210"
 city: Tullins
-street: "Place du Docteur Valois"
-housenumber: 4
+street: Place du Docteur Valois
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tullins/passiflore.yml b/data/cities/tullins/passiflore.yml
index bbba63293..7fb252468 100644
--- a/data/cities/tullins/passiflore.yml
+++ b/data/cities/tullins/passiflore.yml
@@ -1,11 +1,11 @@
 id: 101692873
-type: way
+type: node
 latitude: 45.29803
 longitude: 5.50324
 postcode: "38210"
 city: Tullins
-street: "Avenue du Peuras"
-housenumber: 666
+street: Avenue du Peuras
+housenumber: "666"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tullins/rose-poudree.yml b/data/cities/tullins/rose-poudree.yml
index 96c7f7303..307a1f45c 100644
--- a/data/cities/tullins/rose-poudree.yml
+++ b/data/cities/tullins/rose-poudree.yml
@@ -5,7 +5,7 @@ longitude: 5.49185
 postcode: "38210"
 city: Tullins
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/tupin-et-semons/domaine-de-corps-de-loup.yml b/data/cities/tupin-et-semons/domaine-de-corps-de-loup.yml
index 1be70ade0..38b1c02b4 100644
--- a/data/cities/tupin-et-semons/domaine-de-corps-de-loup.yml
+++ b/data/cities/tupin-et-semons/domaine-de-corps-de-loup.yml
@@ -1,11 +1,11 @@
 id: 134833532
-type: way
+type: node
 latitude: 45.47554
 longitude: 4.77886
 postcode: "69420"
 city: Tupin-et-Semons
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: "https://corpsdeloup.com/"
\ No newline at end of file
+website: https://corpsdeloup.com/
diff --git a/data/cities/ugine/cooperative-laitiere-de-moutiers-magasin-dugine.yml b/data/cities/ugine/cooperative-laitiere-de-moutiers-magasin-dugine.yml
index fafe5cff5..b136b9ea9 100644
--- a/data/cities/ugine/cooperative-laitiere-de-moutiers-magasin-dugine.yml
+++ b/data/cities/ugine/cooperative-laitiere-de-moutiers-magasin-dugine.yml
@@ -4,8 +4,8 @@ latitude: 45.748
 longitude: 6.41547
 postcode: "73400"
 city: Ugine
-street: "Avenue André Pringolliet"
-housenumber: 1302
-phone: "09 66 90 20 23"
-opening_hours: "Tu-Sa 09:00-12:30,14:30-19:00; Su 9:45-12:00; PH off"
-website: "https://www.beaufortdesmontagnes.com/"
\ No newline at end of file
+street: Avenue André Pringolliet
+housenumber: "1302"
+phone: 09 66 90 20 23
+opening_hours: Tu-Sa 09:00-12:30,14:30-19:00; Su 9:45-12:00; PH off
+website: https://www.beaufortdesmontagnes.com/
diff --git a/data/cities/ugine/vival.yml b/data/cities/ugine/vival.yml
index 97fb015d6..92f5bb2c0 100644
--- a/data/cities/ugine/vival.yml
+++ b/data/cities/ugine/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.75295
 longitude: 6.42104
 postcode: "73400"
 city: Ugine
-street: "Rue Félix Chautemps"
-housenumber: 14
+street: Rue Félix Chautemps
+housenumber: "14"
 phone: ""
-opening_hours: "Mo,Su 07:00-12:30; Tu-Sa 07:00-12:30, 14:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su 07:00-12:30; Tu-Sa 07:00-12:30, 14:30-19:30
+website: ""
diff --git a/data/cities/unieux/aldi.yml b/data/cities/unieux/aldi.yml
index 40f22329a..44a0271a1 100644
--- a/data/cities/unieux/aldi.yml
+++ b/data/cities/unieux/aldi.yml
@@ -4,8 +4,8 @@ latitude: 45.39255
 longitude: 4.26746
 postcode: "42240"
 city: Unieux
-street: "Rue Charles de Gaulle"
-housenumber: 17
-phone: "+33 1 81 09 78 25"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+street: Rue Charles de Gaulle
+housenumber: "17"
+phone: +33 1 81 09 78 25
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/uriage-les-bains/spa-thermal-duriage.yml b/data/cities/uriage-les-bains/spa-thermal-duriage.yml
index 84b8c128b..13a951241 100644
--- a/data/cities/uriage-les-bains/spa-thermal-duriage.yml
+++ b/data/cities/uriage-les-bains/spa-thermal-duriage.yml
@@ -4,8 +4,8 @@ latitude: 45.14257
 longitude: 5.83027
 postcode: "38410"
 city: Uriage Les Bains
-street: "Place Hygie"
-housenumber: 60
-phone: "+33 4 76 89 29 00"
-opening_hours: "mo-sa 08:00-19:00"
-website: "https://centre-thermal.uriage.com/spa"
\ No newline at end of file
+street: Place Hygie
+housenumber: "60"
+phone: +33 4 76 89 29 00
+opening_hours: mo-sa 08:00-19:00
+website: https://centre-thermal.uriage.com/spa
diff --git a/data/cities/usson-en-forez/boulangerie-patisserie-l-et-p-fougerouse.yml b/data/cities/usson-en-forez/boulangerie-patisserie-l-et-p-fougerouse.yml
index 53d3e9b42..b36caffd1 100644
--- a/data/cities/usson-en-forez/boulangerie-patisserie-l-et-p-fougerouse.yml
+++ b/data/cities/usson-en-forez/boulangerie-patisserie-l-et-p-fougerouse.yml
@@ -4,8 +4,8 @@ latitude: 45.38959
 longitude: 3.94255
 postcode: "42550"
 city: Usson-en-Forez
-street: "Avenue de la Gare"
-housenumber: 2
-phone: "+33 4 77 50 60 66"
-opening_hours: "Tu-Sa 06:00-19:00; Su 06:00-12:30"
-website: ""
\ No newline at end of file
+street: Avenue de la Gare
+housenumber: "2"
+phone: +33 4 77 50 60 66
+opening_hours: Tu-Sa 06:00-19:00; Su 06:00-12:30
+website: ""
diff --git a/data/cities/usson-en-forez/intermarche-contact.yml b/data/cities/usson-en-forez/intermarche-contact.yml
index 85f394c55..85e4fe63a 100644
--- a/data/cities/usson-en-forez/intermarche-contact.yml
+++ b/data/cities/usson-en-forez/intermarche-contact.yml
@@ -1,11 +1,11 @@
 id: 319589157
-type: way
+type: node
 latitude: 45.38978
 longitude: 3.94682
 postcode: "42550"
 city: Usson-en-Forez
-street: "Avenue de la Gare"
-housenumber: 
-phone: "+33 4 77 01 01 59"
+street: Avenue de la Gare
+housenumber: ""
+phone: +33 4 77 01 01 59
 opening_hours: ""
-website: "https://www.intermarche.com/"
\ No newline at end of file
+website: https://www.intermarche.com/
diff --git a/data/cities/usson-en-forez/patissier-chocolatier-r-pons.yml b/data/cities/usson-en-forez/patissier-chocolatier-r-pons.yml
index 3f263b64f..13085795b 100644
--- a/data/cities/usson-en-forez/patissier-chocolatier-r-pons.yml
+++ b/data/cities/usson-en-forez/patissier-chocolatier-r-pons.yml
@@ -4,8 +4,8 @@ latitude: 45.39031
 longitude: 3.94088
 postcode: "42550"
 city: Usson-en-Forez
-street: "Rue Centrale"
-housenumber: 16
-phone: "+33 4 77 50 61 18"
+street: Rue Centrale
+housenumber: "16"
+phone: +33 4 77 50 61 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/usson-en-forez/salade-de-fruits.yml b/data/cities/usson-en-forez/salade-de-fruits.yml
index b1d35318d..3d13f2b8d 100644
--- a/data/cities/usson-en-forez/salade-de-fruits.yml
+++ b/data/cities/usson-en-forez/salade-de-fruits.yml
@@ -4,8 +4,8 @@ latitude: 45.39093
 longitude: 3.94018
 postcode: "42550"
 city: Usson-en-Forez
-street: "Route Nationale"
-housenumber: 56
-phone: "+33 4 77 37 91 54"
+street: Route Nationale
+housenumber: "56"
+phone: +33 4 77 37 91 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-cenis-bramans/le-bois-samuse.yml b/data/cities/val-cenis-bramans/le-bois-samuse.yml
index 9b799158c..e65a1e3c8 100644
--- a/data/cities/val-cenis-bramans/le-bois-samuse.yml
+++ b/data/cities/val-cenis-bramans/le-bois-samuse.yml
@@ -4,8 +4,8 @@ latitude: 45.22838
 longitude: 6.77803
 postcode: "73500"
 city: Val-Cenis (Bramans)
-street: "Route Napoléon Bonaparte"
-housenumber: 600
-phone: "+336 41 67 97 00"
+street: Route Napoléon Bonaparte
+housenumber: "600"
+phone: +336 41 67 97 00
 opening_hours: ""
-website: "https://www.leboissamuse.fr/"
\ No newline at end of file
+website: https://www.leboissamuse.fr/
diff --git a/data/cities/val-cenis-bramans/proxi.yml b/data/cities/val-cenis-bramans/proxi.yml
index fc11ecdc3..f5c66ddf6 100644
--- a/data/cities/val-cenis-bramans/proxi.yml
+++ b/data/cities/val-cenis-bramans/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.22399
 longitude: 6.77561
 postcode: "73500"
 city: Val-Cenis (Bramans)
-street: "Place Saint-Colomban"
-housenumber: 
+street: Place Saint-Colomban
+housenumber: ""
 phone: "+33479051047"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-cenis/jeannot-sports.yml b/data/cities/val-cenis/jeannot-sports.yml
index feb0f770d..b1ac5aa96 100644
--- a/data/cities/val-cenis/jeannot-sports.yml
+++ b/data/cities/val-cenis/jeannot-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.91125
 postcode: "73480"
 city: Val-Cenis
 street: ""
-housenumber: 49
+housenumber: "49"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-cenis/skiset-saint-charles.yml b/data/cities/val-cenis/skiset-saint-charles.yml
index 90c0e8e3b..3738b7c35 100644
--- a/data/cities/val-cenis/skiset-saint-charles.yml
+++ b/data/cities/val-cenis/skiset-saint-charles.yml
@@ -4,8 +4,8 @@ latitude: 45.28493
 longitude: 6.88502
 postcode: "73480"
 city: Val Cenis
-street: "Chemin des Crueux"
-housenumber: 
+street: Chemin des Crueux
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-cenis/skiset-sports-pro.yml b/data/cities/val-cenis/skiset-sports-pro.yml
index 7e9030387..a79ab9178 100644
--- a/data/cities/val-cenis/skiset-sports-pro.yml
+++ b/data/cities/val-cenis/skiset-sports-pro.yml
@@ -5,7 +5,7 @@ longitude: 6.92068
 postcode: "73480"
 city: Val Cenis
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-cenis/sport-2000.yml b/data/cities/val-cenis/sport-2000.yml
index d72067d6f..ee6ef98b9 100644
--- a/data/cities/val-cenis/sport-2000.yml
+++ b/data/cities/val-cenis/sport-2000.yml
@@ -1,11 +1,11 @@
 id: 131216985
-type: way
+type: node
 latitude: 45.28529
 longitude: 6.88193
 postcode: "73480"
 city: Val-Cenis
 street: ""
-housenumber: 110
+housenumber: "110"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-darc/intermarche-contact.yml b/data/cities/val-darc/intermarche-contact.yml
index da8fa8df8..3532aa10a 100644
--- a/data/cities/val-darc/intermarche-contact.yml
+++ b/data/cities/val-darc/intermarche-contact.yml
@@ -1,11 +1,11 @@
 id: 150138029
-type: way
+type: node
 latitude: 45.54238
 longitude: 6.30449
 postcode: "73220"
 city: Val d'Arc
 street: ""
-housenumber: 46
-phone: "04 79 68 20 10"
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:15"
-website: ""
\ No newline at end of file
+housenumber: "46"
+phone: 04 79 68 20 10
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:15
+website: ""
diff --git a/data/cities/val-darc/latelier-73.yml b/data/cities/val-darc/latelier-73.yml
index 79060d07d..c6a10c99a 100644
--- a/data/cities/val-darc/latelier-73.yml
+++ b/data/cities/val-darc/latelier-73.yml
@@ -5,7 +5,7 @@ longitude: 6.3008
 postcode: "73220"
 city: Val d'Arc
 street: ""
-housenumber: 90
-phone: "+334 57 08 47 03"
+housenumber: "90"
+phone: +334 57 08 47 03
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-darc/naturelaura.yml b/data/cities/val-darc/naturelaura.yml
index fab641162..303eb9d3a 100644
--- a/data/cities/val-darc/naturelaura.yml
+++ b/data/cities/val-darc/naturelaura.yml
@@ -5,7 +5,7 @@ longitude: 6.30504
 postcode: "73220"
 city: Val d'Arc
 street: ""
-housenumber: 41
+housenumber: "41"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-de-virieu/hf-autos.yml b/data/cities/val-de-virieu/hf-autos.yml
index e02539673..d79bc8154 100644
--- a/data/cities/val-de-virieu/hf-autos.yml
+++ b/data/cities/val-de-virieu/hf-autos.yml
@@ -1,11 +1,11 @@
 id: 178946594
-type: way
+type: node
 latitude: 45.49022
 longitude: 5.46923
 postcode: "38730"
 city: Val-de-Virieu
-street: "Impasse des Plantées"
-housenumber: 
+street: Impasse des Plantées
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/chevallot.yml b/data/cities/val-disere/chevallot.yml
index c56f39ec2..c9c2a6928 100644
--- a/data/cities/val-disere/chevallot.yml
+++ b/data/cities/val-disere/chevallot.yml
@@ -4,8 +4,8 @@ latitude: 45.4483
 longitude: 6.98032
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 
-phone: "+33 4 79 06 02 42"
-opening_hours: "Mo-Su 06:30-19:00"
-website: ""
\ No newline at end of file
+street: Avenue Olympique
+housenumber: ""
+phone: +33 4 79 06 02 42
+opening_hours: Mo-Su 06:30-19:00
+website: ""
diff --git a/data/cities/val-disere/intersport-avenue-olympique-3.yml b/data/cities/val-disere/intersport-2.yml
similarity index 70%
rename from data/cities/val-disere/intersport-avenue-olympique-3.yml
rename to data/cities/val-disere/intersport-2.yml
index c8f8cac1f..8ca148308 100644
--- a/data/cities/val-disere/intersport-avenue-olympique-3.yml
+++ b/data/cities/val-disere/intersport-2.yml
@@ -4,8 +4,8 @@ latitude: 45.45058
 longitude: 6.97728
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 173
+street: ""
+housenumber: "173"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/intersport-avenue-olympique-2.yml b/data/cities/val-disere/intersport-avenue-olympique-2.yml
index 309b108c8..c7e95ea0c 100644
--- a/data/cities/val-disere/intersport-avenue-olympique-2.yml
+++ b/data/cities/val-disere/intersport-avenue-olympique-2.yml
@@ -4,8 +4,8 @@ latitude: 45.44919
 longitude: 6.9799
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 
+street: Avenue Olympique
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/intersport-avenue-olympique.yml b/data/cities/val-disere/intersport-avenue-olympique.yml
index 0d40c2783..3ac90ef1e 100644
--- a/data/cities/val-disere/intersport-avenue-olympique.yml
+++ b/data/cities/val-disere/intersport-avenue-olympique.yml
@@ -4,8 +4,8 @@ latitude: 45.44898
 longitude: 6.97946
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 
+street: Avenue Olympique
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/intersport-rue-des-telepheriques.yml b/data/cities/val-disere/intersport-rue-des-telepheriques.yml
index 87b1fe42b..9e17e911b 100644
--- a/data/cities/val-disere/intersport-rue-des-telepheriques.yml
+++ b/data/cities/val-disere/intersport-rue-des-telepheriques.yml
@@ -4,8 +4,8 @@ latitude: 45.44768
 longitude: 6.97926
 postcode: "73150"
 city: Val-d'Isère
-street: "Rue des Téléphériques"
-housenumber: 
+street: Rue des Téléphériques
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/intersport.yml b/data/cities/val-disere/intersport.yml
index db9015640..5c0fdf44b 100644
--- a/data/cities/val-disere/intersport.yml
+++ b/data/cities/val-disere/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.98054
 postcode: "73150"
 city: Val-d'Isère
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/le-bouquetiniste.yml b/data/cities/val-disere/le-bouquetiniste.yml
index 546174325..ed208d036 100644
--- a/data/cities/val-disere/le-bouquetiniste.yml
+++ b/data/cities/val-disere/le-bouquetiniste.yml
@@ -4,8 +4,8 @@ latitude: 45.44878
 longitude: 6.9809
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue du Prariond"
-housenumber: 
+street: Avenue du Prariond
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/mattis-sport-intersport.yml b/data/cities/val-disere/mattis-sport-intersport.yml
index 8ee39a037..6d4d1ad07 100644
--- a/data/cities/val-disere/mattis-sport-intersport.yml
+++ b/data/cities/val-disere/mattis-sport-intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.4476
 longitude: 6.97921
 postcode: "73150"
 city: Val-d'Isère
-street: "Rue des Téléphériques"
-housenumber: 
+street: Rue des Téléphériques
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/millet.yml b/data/cities/val-disere/millet.yml
index 84a23ba1e..9923d027d 100644
--- a/data/cities/val-disere/millet.yml
+++ b/data/cities/val-disere/millet.yml
@@ -4,8 +4,8 @@ latitude: 45.44923
 longitude: 6.97981
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 
+street: Avenue Olympique
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/mountain-pro-shop.yml b/data/cities/val-disere/mountain-pro-shop.yml
index 1510bf680..3b22fec69 100644
--- a/data/cities/val-disere/mountain-pro-shop.yml
+++ b/data/cities/val-disere/mountain-pro-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.45082
 longitude: 6.97666
 postcode: "73150"
 city: Val-d'Isère
-street: "Les cimes"
-housenumber: 
+street: Les cimes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/poivre-blanc.yml b/data/cities/val-disere/poivre-blanc.yml
index d65876388..d675343f9 100644
--- a/data/cities/val-disere/poivre-blanc.yml
+++ b/data/cities/val-disere/poivre-blanc.yml
@@ -4,8 +4,8 @@ latitude: 45.44872
 longitude: 6.98016
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue du Prariond"
-housenumber: 
+street: Avenue du Prariond
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/precision-ski.yml b/data/cities/val-disere/precision-ski.yml
index d85cbaca0..9a5a13264 100644
--- a/data/cities/val-disere/precision-ski.yml
+++ b/data/cities/val-disere/precision-ski.yml
@@ -5,7 +5,7 @@ longitude: 6.98083
 postcode: ""
 city: Val-d'Isère
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/skimium-2.yml b/data/cities/val-disere/skimium-2.yml
index 4ba2edc3b..3e66b069d 100644
--- a/data/cities/val-disere/skimium-2.yml
+++ b/data/cities/val-disere/skimium-2.yml
@@ -5,7 +5,7 @@ longitude: 6.97989
 postcode: "73150"
 city: Val-d'Isère
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/skimium-avenue-olympique.yml b/data/cities/val-disere/skimium-avenue-olympique.yml
index e44d94106..42593e420 100644
--- a/data/cities/val-disere/skimium-avenue-olympique.yml
+++ b/data/cities/val-disere/skimium-avenue-olympique.yml
@@ -4,8 +4,8 @@ latitude: 45.45153
 longitude: 6.97636
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 
+street: Avenue Olympique
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/skimium-rue-de-leglise.yml b/data/cities/val-disere/skimium-rue-de-leglise.yml
index 30d788921..4eab9b8ad 100644
--- a/data/cities/val-disere/skimium-rue-de-leglise.yml
+++ b/data/cities/val-disere/skimium-rue-de-leglise.yml
@@ -4,8 +4,8 @@ latitude: 45.44745
 longitude: 6.98108
 postcode: "73150"
 city: Val-d'Isère
-street: "Rue de l'Église"
-housenumber: 
+street: Rue de l'Église
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/skimium.yml b/data/cities/val-disere/skimium.yml
index 0b78baf84..eaba06b33 100644
--- a/data/cities/val-disere/skimium.yml
+++ b/data/cities/val-disere/skimium.yml
@@ -5,7 +5,7 @@ longitude: 6.97855
 postcode: "73150"
 city: Val-d'Isère
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/snowberry.yml b/data/cities/val-disere/snowberry.yml
index 6832e2331..f53c2c490 100644
--- a/data/cities/val-disere/snowberry.yml
+++ b/data/cities/val-disere/snowberry.yml
@@ -4,8 +4,8 @@ latitude: 45.44533
 longitude: 6.97756
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue olympique"
-housenumber: 
+street: Avenue olympique
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/spar.yml b/data/cities/val-disere/spar.yml
index 029c83b48..58780c0e8 100644
--- a/data/cities/val-disere/spar.yml
+++ b/data/cities/val-disere/spar.yml
@@ -4,8 +4,8 @@ latitude: 45.44959
 longitude: 6.97737
 postcode: "73150"
 city: Val-d'Isère
-street: "Les Hameaux du Val"
-housenumber: 
-phone: "+33 4 79 06 12 24"
-opening_hours: "Mo-Sa 07:30-13:00,15:30-20:00"
-website: ""
\ No newline at end of file
+street: Les Hameaux du Val
+housenumber: ""
+phone: +33 4 79 06 12 24
+opening_hours: Mo-Sa 07:30-13:00,15:30-20:00
+website: ""
diff --git a/data/cities/val-disere/sport-2000-avenue-olympique.yml b/data/cities/val-disere/sport-2000-avenue-olympique.yml
index c4795dbd5..d44590b38 100644
--- a/data/cities/val-disere/sport-2000-avenue-olympique.yml
+++ b/data/cities/val-disere/sport-2000-avenue-olympique.yml
@@ -4,8 +4,8 @@ latitude: 45.45282
 longitude: 6.97378
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 
+street: Avenue Olympique
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/sport-2000.yml b/data/cities/val-disere/sport-2000.yml
index 188d32ecc..2ae20331c 100644
--- a/data/cities/val-disere/sport-2000.yml
+++ b/data/cities/val-disere/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.44801
 longitude: 6.97943
 postcode: "73150"
 city: Val-d'Isère
-street: "Résidence Grand Cocor"
-housenumber: 
+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
+website: https://boraso.sport2000.fr/fr/?utm_source=google&utm_medium=gmb&utm_content=local
diff --git a/data/cities/val-disere/sport-house.yml b/data/cities/val-disere/sport-house.yml
index b736adb58..65e9acf3b 100644
--- a/data/cities/val-disere/sport-house.yml
+++ b/data/cities/val-disere/sport-house.yml
@@ -4,8 +4,8 @@ latitude: 45.44923
 longitude: 6.97876
 postcode: "73150"
 city: Val-d'Isère
-street: "Immeuble le solaise"
-housenumber: 
+street: Immeuble le solaise
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-disere/tabac-le-chiquito.yml b/data/cities/val-disere/tabac-le-chiquito.yml
index 306502824..b26dd172e 100644
--- a/data/cities/val-disere/tabac-le-chiquito.yml
+++ b/data/cities/val-disere/tabac-le-chiquito.yml
@@ -4,8 +4,8 @@ latitude: 45.44959
 longitude: 6.97805
 postcode: "73150"
 city: Val-d'Isère
-street: "Avenue Olympique"
-housenumber: 
+street: Avenue Olympique
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 08:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-19:00
+website: ""
diff --git a/data/cities/val-thorens/intersport.yml b/data/cities/val-thorens/intersport.yml
index 64388c747..2a51f8c23 100644
--- a/data/cities/val-thorens/intersport.yml
+++ b/data/cities/val-thorens/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.57782
 postcode: "73440"
 city: Val Thorens
 street: ""
-housenumber: 483
+housenumber: "483"
 phone: ""
-opening_hours: "Mo-Su,PH 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su,PH 08:30-20:00
+website: ""
diff --git a/data/cities/val-thorens/la-belle-en-cuisse.yml b/data/cities/val-thorens/la-belle-en-cuisse.yml
index 6835b4448..09280a6e0 100644
--- a/data/cities/val-thorens/la-belle-en-cuisse.yml
+++ b/data/cities/val-thorens/la-belle-en-cuisse.yml
@@ -4,8 +4,8 @@ latitude: 45.2981
 longitude: 6.58002
 postcode: "73440"
 city: Val Thorens
-street: "Rue de Caron"
-housenumber: 
-phone: "+33 4 79000430"
-opening_hours: "Mo-Fr, Su 09:00-13:00, 15:00-20:30; Sa 09:00-20:30"
-website: "http://la-belle-en-cuisse.fr/"
\ No newline at end of file
+street: Rue de Caron
+housenumber: ""
+phone: +33 4 79000430
+opening_hours: Mo-Fr, Su 09:00-13:00, 15:00-20:30; Sa 09:00-20:30
+website: http://la-belle-en-cuisse.fr/
diff --git a/data/cities/val-thorens/ski-republic.yml b/data/cities/val-thorens/ski-republic.yml
index c265a78c4..16b21617a 100644
--- a/data/cities/val-thorens/ski-republic.yml
+++ b/data/cities/val-thorens/ski-republic.yml
@@ -5,7 +5,7 @@ longitude: 6.58537
 postcode: "73440"
 city: Val Thorens
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/val-thorens/sport-2000-rue-des-balcons.yml b/data/cities/val-thorens/sport-2000-rue-des-balcons.yml
index 882313f43..a23d1f4e0 100644
--- a/data/cities/val-thorens/sport-2000-rue-des-balcons.yml
+++ b/data/cities/val-thorens/sport-2000-rue-des-balcons.yml
@@ -4,8 +4,8 @@ latitude: 45.30008
 longitude: 6.57918
 postcode: "73440"
 city: Val Thorens
-street: "Rue des Balcons"
-housenumber: 
+street: Rue des Balcons
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://valloc2400.sport2000.fr/fr/?utm_source=google&utm_medium=gmb&utm_content=local"
\ No newline at end of file
+website: https://valloc2400.sport2000.fr/fr/?utm_source=google&utm_medium=gmb&utm_content=local
diff --git a/data/cities/val-thorens/sport-2000.yml b/data/cities/val-thorens/sport-2000.yml
index da2e88e08..8c2d44b73 100644
--- a/data/cities/val-thorens/sport-2000.yml
+++ b/data/cities/val-thorens/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.29684
 longitude: 6.57706
 postcode: "73440"
 city: Val Thorens
-street: "residnce le chaval blanc"
-housenumber: 
+street: residnce le chaval blanc
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://eskiadorvalthorens.sport2000.fr/"
\ No newline at end of file
+website: https://eskiadorvalthorens.sport2000.fr/
diff --git a/data/cities/valaurie/hair-coiffure.yml b/data/cities/valaurie/hair-coiffure.yml
index 24cbce0b4..0e4aacb8a 100644
--- a/data/cities/valaurie/hair-coiffure.yml
+++ b/data/cities/valaurie/hair-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 44.41843
 longitude: 4.80258
 postcode: "26230"
 city: Valaurie
-street: "Place Nicolas Appert"
-housenumber: 
+street: Place Nicolas Appert
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valaurie/la-boulangerie-par-aracil.yml b/data/cities/valaurie/la-boulangerie-par-aracil.yml
index 944a724ac..7d7a4c471 100644
--- a/data/cities/valaurie/la-boulangerie-par-aracil.yml
+++ b/data/cities/valaurie/la-boulangerie-par-aracil.yml
@@ -4,8 +4,8 @@ latitude: 44.41851
 longitude: 4.80303
 postcode: "26230"
 city: Valaurie
-street: "Place Nicolas Appert"
-housenumber: 
+street: Place Nicolas Appert
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 06:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-13:00
+website: ""
diff --git a/data/cities/valaurie/la-preserve.yml b/data/cities/valaurie/la-preserve.yml
index 3b6e92ce3..d3fc91236 100644
--- a/data/cities/valaurie/la-preserve.yml
+++ b/data/cities/valaurie/la-preserve.yml
@@ -4,8 +4,8 @@ latitude: 44.41844
 longitude: 4.8024
 postcode: "26230"
 city: Valaurie
-street: "Place Nicolas Appert"
-housenumber: 3
-phone: "+33 4 75 90 63 96"
-opening_hours: "Tu-Sa 09:30-13:00,15:00-19:00"
-website: "https://www.lapreserve.fr/"
\ No newline at end of file
+street: Place Nicolas Appert
+housenumber: "3"
+phone: +33 4 75 90 63 96
+opening_hours: Tu-Sa 09:30-13:00,15:00-19:00
+website: https://www.lapreserve.fr/
diff --git a/data/cities/valaurie/loulivade.yml b/data/cities/valaurie/loulivade.yml
index d50bd98ab..b15cbbfa7 100644
--- a/data/cities/valaurie/loulivade.yml
+++ b/data/cities/valaurie/loulivade.yml
@@ -4,8 +4,8 @@ latitude: 44.41845
 longitude: 4.80274
 postcode: "26230"
 city: Valaurie
-street: "Place Nicolas Appert"
-housenumber: 
-phone: "+33 4 75 98 62 69"
-opening_hours: "Mo-Fr 07:00-12:30,15:30-19:00; Sa 07:30-12:30"
-website: ""
\ No newline at end of file
+street: Place Nicolas Appert
+housenumber: ""
+phone: +33 4 75 98 62 69
+opening_hours: Mo-Fr 07:00-12:30,15:30-19:00; Sa 07:30-12:30
+website: ""
diff --git a/data/cities/valaurie/sobry-auto-sport.yml b/data/cities/valaurie/sobry-auto-sport.yml
index 401b29899..242a96eb0 100644
--- a/data/cities/valaurie/sobry-auto-sport.yml
+++ b/data/cities/valaurie/sobry-auto-sport.yml
@@ -4,8 +4,8 @@ latitude: 44.41663
 longitude: 4.80572
 postcode: "26230"
 city: Valaurie
-street: "Rue Pierre et Marie Curie"
-housenumber: 4
-phone: "+33 4 75 46 55 29"
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+street: Rue Pierre et Marie Curie
+housenumber: "4"
+phone: +33 4 75 46 55 29
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/valence/black-corner-tattoo.yml b/data/cities/valence/black-corner-tattoo.yml
index 3558ceaa2..dcb6c4a54 100644
--- a/data/cities/valence/black-corner-tattoo.yml
+++ b/data/cities/valence/black-corner-tattoo.yml
@@ -4,8 +4,8 @@ latitude: 44.92979
 longitude: 4.89207
 postcode: "26000"
 city: Valence
-street: "Cité Chabert"
-housenumber: 5
+street: Cité Chabert
+housenumber: "5"
 phone: "0670714801"
 opening_hours: ""
-website: "https://www.blackcornertattoo.com/"
\ No newline at end of file
+website: https://www.blackcornertattoo.com/
diff --git a/data/cities/valence/gifi.yml b/data/cities/valence/gifi.yml
index ab45f624f..8c01170d4 100644
--- a/data/cities/valence/gifi.yml
+++ b/data/cities/valence/gifi.yml
@@ -1,11 +1,11 @@
 id: 99541264
-type: way
+type: node
 latitude: 44.95338
 longitude: 4.93372
 postcode: "26000"
 city: Valence
 street: ""
-housenumber: 
-phone: "+33 4 75 84 76 82"
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-12:30,14:00-18:30"
-website: "https://www.gifi.fr/?store_id=11219&utm_source=GMB&utm_medium=groupe&utm_campaign=11219"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 75 84 76 82
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-12:30,14:00-18:30
+website: https://www.gifi.fr/?store_id=11219&utm_source=GMB&utm_medium=groupe&utm_campaign=11219
diff --git a/data/cities/valence/la-chazere.yml b/data/cities/valence/la-chazere.yml
index 27622aa1d..8e11f1afd 100644
--- a/data/cities/valence/la-chazere.yml
+++ b/data/cities/valence/la-chazere.yml
@@ -4,8 +4,8 @@ latitude: 44.92034
 longitude: 4.88572
 postcode: "26000"
 city: Valence
-street: "Avenue Victor Hugo"
-housenumber: 206
-phone: "+33 4 75 42 31 61"
-opening_hours: "Mo 08:30-12:30; Tu-Sa 08:30-12:30, 15:00-19:00; Su off"
-website: "https://lachazere.fr/"
\ No newline at end of file
+street: Avenue Victor Hugo
+housenumber: "206"
+phone: +33 4 75 42 31 61
+opening_hours: Mo 08:30-12:30; Tu-Sa 08:30-12:30, 15:00-19:00; Su off
+website: https://lachazere.fr/
diff --git a/data/cities/valence/lepicerie-da-cote.yml b/data/cities/valence/lepicerie-da-cote.yml
index ecf15e4fa..e2ed7b947 100644
--- a/data/cities/valence/lepicerie-da-cote.yml
+++ b/data/cities/valence/lepicerie-da-cote.yml
@@ -4,8 +4,8 @@ latitude: 44.92839
 longitude: 4.89756
 postcode: "26000"
 city: Valence
-street: "Rue des Alpes"
-housenumber: 46
-phone: "+33 4 75 63 03 75"
-opening_hours: "Tu-Sa 09:00-12:30,15:30-19:00; Mo 15:30-19:00; We off"
-website: "https://lepiceriedacote.fr/"
\ No newline at end of file
+street: Rue des Alpes
+housenumber: "46"
+phone: +33 4 75 63 03 75
+opening_hours: Tu-Sa 09:00-12:30,15:30-19:00; Mo 15:30-19:00; We off
+website: https://lepiceriedacote.fr/
diff --git a/data/cities/valencin/animjardin.yml b/data/cities/valencin/animjardin.yml
index 3284f8906..19ef0cc73 100644
--- a/data/cities/valencin/animjardin.yml
+++ b/data/cities/valencin/animjardin.yml
@@ -4,8 +4,8 @@ latitude: 45.62875
 longitude: 5.06683
 postcode: "38540"
 city: valencin
-street: "Rue du Colombier"
-housenumber: 35
+street: Rue du Colombier
+housenumber: "35"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valencin/fournil-le-point-du-jour.yml b/data/cities/valencin/fournil-le-point-du-jour.yml
index 0b3439eaf..20411f274 100644
--- a/data/cities/valencin/fournil-le-point-du-jour.yml
+++ b/data/cities/valencin/fournil-le-point-du-jour.yml
@@ -4,8 +4,8 @@ latitude: 45.61312
 longitude: 5.01667
 postcode: "38540"
 city: Valencin
-street: "Route de Lyon"
-housenumber: 1994
+street: Route de Lyon
+housenumber: "1994"
 phone: ""
-opening_hours: "Mo-Su 09:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-21:00
+website: ""
diff --git a/data/cities/valencin/hygiene-discount-heyrieux.yml b/data/cities/valencin/hygiene-discount-heyrieux.yml
index 64512f56c..175ccb7c0 100644
--- a/data/cities/valencin/hygiene-discount-heyrieux.yml
+++ b/data/cities/valencin/hygiene-discount-heyrieux.yml
@@ -4,8 +4,8 @@ latitude: 45.62659
 longitude: 5.07229
 postcode: "38540"
 city: valencin
-street: "Avenue Général Leclerc"
-housenumber: 98
+street: Avenue Général Leclerc
+housenumber: "98"
 phone: ""
 opening_hours: ""
-website: "https://www.hygiene-discount.fr/"
\ No newline at end of file
+website: https://www.hygiene-discount.fr/
diff --git a/data/cities/valencin/le-valencinois.yml b/data/cities/valencin/le-valencinois.yml
index eb9e891ee..d57b22b82 100644
--- a/data/cities/valencin/le-valencinois.yml
+++ b/data/cities/valencin/le-valencinois.yml
@@ -4,8 +4,8 @@ latitude: 45.61296
 longitude: 5.01675
 postcode: "38540"
 city: valencin
-street: "Route de Lyon"
-housenumber: 1994
+street: Route de Lyon
+housenumber: "1994"
 phone: ""
-opening_hours: "Mo-Su 09:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-21:00
+website: ""
diff --git a/data/cities/valencin/les-joly-legumes.yml b/data/cities/valencin/les-joly-legumes.yml
index e7cbb03ec..cefc371b0 100644
--- a/data/cities/valencin/les-joly-legumes.yml
+++ b/data/cities/valencin/les-joly-legumes.yml
@@ -4,8 +4,8 @@ latitude: 45.60274
 longitude: 5.0514
 postcode: "38540"
 city: Valencin
-street: "Route de Lafayette"
-housenumber: 1040
+street: Route de Lafayette
+housenumber: "1040"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valencin/vival.yml b/data/cities/valencin/vival.yml
index 4c4ecb938..f37b2f0da 100644
--- a/data/cities/valencin/vival.yml
+++ b/data/cities/valencin/vival.yml
@@ -4,8 +4,8 @@ latitude: 45.61297
 longitude: 5.01714
 postcode: "38540"
 city: Valencin
-street: "Route de Lyon"
-housenumber: 1053
+street: Route de Lyon
+housenumber: "1053"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valleiry/carrefour-market.yml b/data/cities/valleiry/carrefour-market.yml
index c817160e4..b89216afd 100644
--- a/data/cities/valleiry/carrefour-market.yml
+++ b/data/cities/valleiry/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 169083909
-type: way
+type: node
 latitude: 46.10935
 longitude: 5.97556
 postcode: "74520"
 city: Valleiry
-street: "Chemin des Artisans"
-housenumber: 37
+street: Chemin des Artisans
+housenumber: "37"
 phone: ""
-opening_hours: "Mo-Fr 08:30-20:00; Sa 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-20:00; Sa 08:30-12:30
+website: ""
diff --git a/data/cities/valleiry/vival.yml b/data/cities/valleiry/vival.yml
index 64dd09eda..31f9f9e1b 100644
--- a/data/cities/valleiry/vival.yml
+++ b/data/cities/valleiry/vival.yml
@@ -1,11 +1,11 @@
 id: 169086313
-type: way
+type: node
 latitude: 46.10815
 longitude: 5.96847
 postcode: "74520"
 city: Valleiry
-street: "Route de Saint-Julien en Genevois"
-housenumber: 23
+street: Route de Saint-Julien en Genevois
+housenumber: "23"
 phone: ""
-opening_hours: "Mo-Sa 08:30-12:45, 15:15-20:00; Su 08:30-13:00, 17:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:45, 15:15-20:00; Su 08:30-13:00, 17:00-20:00
+website: ""
diff --git a/data/cities/valloire/carrefour.yml b/data/cities/valloire/carrefour.yml
index 49697143a..7dc115ec7 100644
--- a/data/cities/valloire/carrefour.yml
+++ b/data/cities/valloire/carrefour.yml
@@ -1,11 +1,11 @@
 id: 130913977
-type: way
+type: node
 latitude: 45.16387
 longitude: 6.42517
 postcode: "73450"
 city: Valloire
-street: "Avenue de la Vallée d'Or"
-housenumber: 
+street: Avenue de la Vallée d'Or
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:15,16:30-19:30; Su 08:00-12:00; PH 08:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:15,16:30-19:30; Su 08:00-12:00; PH 08:00-12:00
+website: ""
diff --git a/data/cities/valloire/grange-sports.yml b/data/cities/valloire/grange-sports.yml
index 5bddf0029..abf2d2b92 100644
--- a/data/cities/valloire/grange-sports.yml
+++ b/data/cities/valloire/grange-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.16455
 longitude: 6.43014
 postcode: "73450"
 city: Valloire
-street: "Rue de la Sétaz"
-housenumber: 
+street: Rue de la Sétaz
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valloire/grillet-sports.yml b/data/cities/valloire/grillet-sports.yml
index 1c76a4ada..90d25e0fc 100644
--- a/data/cities/valloire/grillet-sports.yml
+++ b/data/cities/valloire/grillet-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.43017
 postcode: "73450"
 city: Valloire
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valloire/intersport.yml b/data/cities/valloire/intersport.yml
index c33c995bd..836e9ee42 100644
--- a/data/cities/valloire/intersport.yml
+++ b/data/cities/valloire/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.42076
 postcode: "73450"
 city: Valloire
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valloire/martin-sports.yml b/data/cities/valloire/martin-sports.yml
index c26c4ec92..fdda31023 100644
--- a/data/cities/valloire/martin-sports.yml
+++ b/data/cities/valloire/martin-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.42887
 postcode: "73450"
 city: Valloire
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valloire/ski-republic.yml b/data/cities/valloire/ski-republic.yml
index 714dde686..ab7cea457 100644
--- a/data/cities/valloire/ski-republic.yml
+++ b/data/cities/valloire/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 45.16587
 longitude: 6.42722
 postcode: "73450"
 city: Valloire
-street: "Rue des Grandes Alpes"
-housenumber: 
+street: Rue des Grandes Alpes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valloire/sport-2000-nagano-sport.yml b/data/cities/valloire/sport-2000-nagano-sport.yml
index 50f04ad0d..bd48484b9 100644
--- a/data/cities/valloire/sport-2000-nagano-sport.yml
+++ b/data/cities/valloire/sport-2000-nagano-sport.yml
@@ -5,7 +5,7 @@ longitude: 6.41958
 postcode: "73450"
 city: Valloire
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valloire/sport-2000.yml b/data/cities/valloire/sport-2000.yml
index ac6ba3562..66f3172ae 100644
--- a/data/cities/valloire/sport-2000.yml
+++ b/data/cities/valloire/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.16519
 longitude: 6.43218
 postcode: "73450"
 city: Valloire
-street: "Route du Télégraphe"
-housenumber: 
+street: Route du Télégraphe
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valloise/jacky-sport.yml b/data/cities/valloise/jacky-sport.yml
index c898e165c..856fd5c01 100644
--- a/data/cities/valloise/jacky-sport.yml
+++ b/data/cities/valloise/jacky-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.1743
 longitude: 6.49332
 postcode: "05290"
 city: valloise
-street: "centre village"
-housenumber: 
+street: centre village
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vallon-pont-darc/fruits-et-legumes-les-delices-du-vivarais.yml b/data/cities/vallon-pont-darc/fruits-et-legumes-les-delices-du-vivarais.yml
index dcb54aaef..540a19cfc 100644
--- a/data/cities/vallon-pont-darc/fruits-et-legumes-les-delices-du-vivarais.yml
+++ b/data/cities/vallon-pont-darc/fruits-et-legumes-les-delices-du-vivarais.yml
@@ -4,8 +4,8 @@ latitude: 44.40715
 longitude: 4.39563
 postcode: "07150"
 city: Vallon-Pont-d'Arc
-street: "Rue du Miarou"
-housenumber: 2
+street: Rue du Miarou
+housenumber: "2"
 phone: ""
-opening_hours: "Fr-We 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Fr-We 09:00-19:00
+website: ""
diff --git a/data/cities/vallon-pont-darc/nougaterie-du-pont-darc.yml b/data/cities/vallon-pont-darc/nougaterie-du-pont-darc.yml
index d68abdabb..efc609dcc 100644
--- a/data/cities/vallon-pont-darc/nougaterie-du-pont-darc.yml
+++ b/data/cities/vallon-pont-darc/nougaterie-du-pont-darc.yml
@@ -4,8 +4,8 @@ latitude: 44.39968
 longitude: 4.38729
 postcode: "07150"
 city: Vallon-Pont-d'Arc
-street: "Route de Salavas"
-housenumber: 569
+street: Route de Salavas
+housenumber: "569"
 phone: "0475384697"
-opening_hours: "lundi au samedi 9h-12h et 14h30-18h à vérifier sur le site web"
-website: "https://www.nougaterie-dupontdarc.com/"
\ No newline at end of file
+opening_hours: lundi au samedi 9h-12h et 14h30-18h à vérifier sur le site web
+website: https://www.nougaterie-dupontdarc.com/
diff --git a/data/cities/vallon-pont-darc/outdoor-et-bikes-face-sud.yml b/data/cities/vallon-pont-darc/outdoor-et-bikes-face-sud.yml
index 4d9ebb5cd..b7e8c5f03 100644
--- a/data/cities/vallon-pont-darc/outdoor-et-bikes-face-sud.yml
+++ b/data/cities/vallon-pont-darc/outdoor-et-bikes-face-sud.yml
@@ -4,8 +4,8 @@ latitude: 44.41304
 longitude: 4.36953
 postcode: "07150"
 city: Vallon Pont d'Arc
-street: "Allée des Cades"
-housenumber: 89
+street: Allée des Cades
+housenumber: "89"
 phone: "+330475872723"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valmeinier/carrefour-montagne.yml b/data/cities/valmeinier/carrefour-montagne.yml
index 7f2405a86..e012bea55 100644
--- a/data/cities/valmeinier/carrefour-montagne.yml
+++ b/data/cities/valmeinier/carrefour-montagne.yml
@@ -4,8 +4,8 @@ latitude: 45.17299
 longitude: 6.49813
 postcode: "73450"
 city: Valmeinier
-street: "Place de Roche Noire"
-housenumber: 102
+street: Place de Roche Noire
+housenumber: "102"
 phone: ""
-opening_hours: "Mo-Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 08:00-20:00
+website: ""
diff --git a/data/cities/valmeinier/intersport-2.yml b/data/cities/valmeinier/intersport-2.yml
index 62548441e..79c4830fb 100644
--- a/data/cities/valmeinier/intersport-2.yml
+++ b/data/cities/valmeinier/intersport-2.yml
@@ -5,7 +5,7 @@ longitude: 6.49336
 postcode: "73450"
 city: Valmeinier
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valmeinier/intersport.yml b/data/cities/valmeinier/intersport.yml
index a5ebd5666..1d0a951ee 100644
--- a/data/cities/valmeinier/intersport.yml
+++ b/data/cities/valmeinier/intersport.yml
@@ -5,7 +5,7 @@ longitude: 6.49398
 postcode: "73450"
 city: Valmeinier
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valmeinier/precision-ski-jackie-sports.yml b/data/cities/valmeinier/precision-ski-jackie-sports.yml
index 4d31b9e05..166996317 100644
--- a/data/cities/valmeinier/precision-ski-jackie-sports.yml
+++ b/data/cities/valmeinier/precision-ski-jackie-sports.yml
@@ -5,7 +5,7 @@ longitude: 6.49358
 postcode: "73450"
 city: Valmeinier
 street: ""
-housenumber: 421
+housenumber: "421"
 phone: ""
-opening_hours: "Mo-Fr 09:00-19:00; Sa-Su 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-19:00; Sa-Su 08:30-20:00
+website: ""
diff --git a/data/cities/valmeinier/sport-2000.yml b/data/cities/valmeinier/sport-2000.yml
index 13c50b240..ad270c869 100644
--- a/data/cities/valmeinier/sport-2000.yml
+++ b/data/cities/valmeinier/sport-2000.yml
@@ -5,7 +5,7 @@ longitude: 6.49768
 postcode: "73450"
 city: Valmeinier
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valmorel/maison-m.yml b/data/cities/valmorel/maison-m.yml
index 46af1818d..aa80396eb 100644
--- a/data/cities/valmorel/maison-m.yml
+++ b/data/cities/valmorel/maison-m.yml
@@ -4,8 +4,8 @@ latitude: 45.46162
 longitude: 6.44377
 postcode: "73260"
 city: Valmorel
-street: "Bourg Morel"
-housenumber: 9
+street: Bourg Morel
+housenumber: "9"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valmorel/ski-republic.yml b/data/cities/valmorel/ski-republic.yml
index a6f413c9c..1e89aa2f0 100644
--- a/data/cities/valmorel/ski-republic.yml
+++ b/data/cities/valmorel/ski-republic.yml
@@ -4,8 +4,8 @@ latitude: 45.46126
 longitude: 6.44273
 postcode: "73260"
 city: Valmorel
-street: "Bourg Morel"
-housenumber: 12
+street: Bourg Morel
+housenumber: "12"
 phone: "0479071456"
-opening_hours: "Mo-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-19:00
+website: ""
diff --git a/data/cities/valmorel/spa-anitea.yml b/data/cities/valmorel/spa-anitea.yml
index ee430b709..79d01530c 100644
--- a/data/cities/valmorel/spa-anitea.yml
+++ b/data/cities/valmorel/spa-anitea.yml
@@ -4,8 +4,8 @@ latitude: 45.46191
 longitude: 6.44174
 postcode: "73260"
 city: Valmorel
-street: "Lieu-dit l'Epervière"
-housenumber: 
-phone: "+33 4 79 04 05 20"
+street: Lieu-dit l'Epervière
+housenumber: ""
+phone: +33 4 79 04 05 20
 opening_hours: ""
-website: "https://www.mgm-hotels-residences.com/residence-anitea-valmorel/spa-montagne-du-monde"
\ No newline at end of file
+website: https://www.mgm-hotels-residences.com/residence-anitea-valmorel/spa-montagne-du-monde
diff --git a/data/cities/vals-les-bains/boulangerie-chazot.yml b/data/cities/vals-les-bains/boulangerie-chazot.yml
index ecd0124f9..09997146c 100644
--- a/data/cities/vals-les-bains/boulangerie-chazot.yml
+++ b/data/cities/vals-les-bains/boulangerie-chazot.yml
@@ -4,8 +4,8 @@ latitude: 44.66089
 longitude: 4.36653
 postcode: ""
 city: Vals-les-Bains
-street: "Rue Jean Jaurès"
-housenumber: 108
-phone: "+33 4 75 88 79 60"
-opening_hours: "Tu-Sa 06:30-13:00,15:00-19:00; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+street: Rue Jean Jaurès
+housenumber: "108"
+phone: +33 4 75 88 79 60
+opening_hours: Tu-Sa 06:30-13:00,15:00-19:00; Su 06:30-13:00
+website: ""
diff --git a/data/cities/vals-les-bains/d-dubois.yml b/data/cities/vals-les-bains/d-dubois.yml
index 888b622d2..904714611 100644
--- a/data/cities/vals-les-bains/d-dubois.yml
+++ b/data/cities/vals-les-bains/d-dubois.yml
@@ -5,7 +5,7 @@ longitude: 4.36616
 postcode: ""
 city: Vals-les-Bains
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vals-les-bains/didier-laurent.yml b/data/cities/vals-les-bains/didier-laurent.yml
index 215979d2b..3b6096511 100644
--- a/data/cities/vals-les-bains/didier-laurent.yml
+++ b/data/cities/vals-les-bains/didier-laurent.yml
@@ -5,7 +5,7 @@ longitude: 4.36601
 postcode: ""
 city: Vals-les-Bains
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valserhone/alliance-coiffure.yml b/data/cities/valserhone/alliance-coiffure.yml
index 2669334dd..658397273 100644
--- a/data/cities/valserhone/alliance-coiffure.yml
+++ b/data/cities/valserhone/alliance-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.11895
 longitude: 5.81463
 postcode: "01200"
 city: Valserhône
-street: "Rue Joliot-Curie"
-housenumber: 
-phone: "+33 4 50 48 26 83"
+street: Rue Joliot-Curie
+housenumber: ""
+phone: +33 4 50 48 26 83
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valserhone/arts-nature.yml b/data/cities/valserhone/arts-nature.yml
index 52c1e7bd3..4919e46d5 100644
--- a/data/cities/valserhone/arts-nature.yml
+++ b/data/cities/valserhone/arts-nature.yml
@@ -4,8 +4,8 @@ latitude: 46.10695
 longitude: 5.82439
 postcode: "01200"
 city: Valserhône
-street: "Rue de la République"
+street: Rue de la République
 housenumber: 52 t
 phone: ""
-opening_hours: "Mo-We,Fr,Sa 09:00-12:30,13:30-19:00; Th 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr,Sa 09:00-12:30,13:30-19:00; Th 09:00-12:00
+website: ""
diff --git a/data/cities/valserhone/biocoop-valserine.yml b/data/cities/valserhone/biocoop-valserine.yml
index d8a007f65..4b5d260a4 100644
--- a/data/cities/valserhone/biocoop-valserine.yml
+++ b/data/cities/valserhone/biocoop-valserine.yml
@@ -1,11 +1,11 @@
 id: 1117455529
-type: way
+type: node
 latitude: 46.12819
 longitude: 5.81265
 postcode: "01200"
 city: Valserhône
-street: "Impasse de la Valserine"
-housenumber: 106
+street: Impasse de la Valserine
+housenumber: "106"
 phone: ""
-opening_hours: "Mo 14:30-19:00; Tu-Th 09:30-12:30, 14:30-19:00; Fr-Sa 09:00-19:00"
-website: "https://www.biocoopvalserine.fr/"
\ No newline at end of file
+opening_hours: Mo 14:30-19:00; Tu-Th 09:30-12:30, 14:30-19:00; Fr-Sa 09:00-19:00
+website: https://www.biocoopvalserine.fr/
diff --git a/data/cities/valserhone/garage-thierry-lavigne.yml b/data/cities/valserhone/garage-thierry-lavigne.yml
index ee999b146..64dbf0161 100644
--- a/data/cities/valserhone/garage-thierry-lavigne.yml
+++ b/data/cities/valserhone/garage-thierry-lavigne.yml
@@ -1,11 +1,11 @@
 id: 178662170
-type: way
+type: node
 latitude: 46.12141
 longitude: 5.8108
 postcode: "01200"
 city: Valserhône
-street: "Avenue du Maréchal Leclerc"
-housenumber: 
-phone: "+33 4 50 48 81 69"
+street: Avenue du Maréchal Leclerc
+housenumber: ""
+phone: +33 4 50 48 81 69
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/valserhone/le-grenier-solidaire-valserhone.yml b/data/cities/valserhone/le-grenier-solidaire-valserhone.yml
index d64a540c2..95d442115 100644
--- a/data/cities/valserhone/le-grenier-solidaire-valserhone.yml
+++ b/data/cities/valserhone/le-grenier-solidaire-valserhone.yml
@@ -1,11 +1,11 @@
 id: 178660567
-type: way
+type: node
 latitude: 46.09618
 longitude: 5.81712
 postcode: "01200"
 city: Valserhône
-street: "Rue des Usines"
-housenumber: 7
+street: Rue des Usines
+housenumber: "7"
 phone: ""
-opening_hours: "Mo-Fr 14:00-18:00 Sat 13:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 14:00-18:00 Sat 13:00-17:00
+website: ""
diff --git a/data/cities/valserhone/le-nador-orient.yml b/data/cities/valserhone/le-nador-orient.yml
index 136765228..0ca72b8c8 100644
--- a/data/cities/valserhone/le-nador-orient.yml
+++ b/data/cities/valserhone/le-nador-orient.yml
@@ -4,8 +4,8 @@ latitude: 46.10635
 longitude: 5.8214
 postcode: "01200"
 city: Valserhône
-street: "Rue Lafayette"
-housenumber: 28
+street: Rue Lafayette
+housenumber: "28"
 phone: ""
 opening_hours: ""
-website: "https://fr-fr.facebook.com/LeNadorOrient01/"
\ No newline at end of file
+website: https://fr-fr.facebook.com/LeNadorOrient01/
diff --git a/data/cities/valserhone/le-ptit-chezery.yml b/data/cities/valserhone/le-ptit-chezery.yml
index 5b0893f56..d7841d38e 100644
--- a/data/cities/valserhone/le-ptit-chezery.yml
+++ b/data/cities/valserhone/le-ptit-chezery.yml
@@ -4,8 +4,8 @@ latitude: 46.12292
 longitude: 5.81132
 postcode: "01200"
 city: Valserhône
-street: "Avenue du Maréchal Leclerc"
-housenumber: 2
-phone: "+33 4.50.56.09.64"
-opening_hours: "Mo-Fr 6:00-19:00"
-website: "http://www.leptitchezery.fr/"
\ No newline at end of file
+street: Avenue du Maréchal Leclerc
+housenumber: "2"
+phone: +33 4.50.56.09.64
+opening_hours: Mo-Fr 6:00-19:00
+website: http://www.leptitchezery.fr/
diff --git a/data/cities/valserhone/provenchall.yml b/data/cities/valserhone/provenchall.yml
index e57e77c51..b97e299db 100644
--- a/data/cities/valserhone/provenchall.yml
+++ b/data/cities/valserhone/provenchall.yml
@@ -4,8 +4,8 @@ latitude: 46.12053
 longitude: 5.81009
 postcode: "01200"
 city: Valserhône
-street: "Avenue du Maréchal Leclerc"
-housenumber: 12
-phone: "+33 4 50 28 29 98"
-opening_hours: "Mo-Sa 8:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue du Maréchal Leclerc
+housenumber: "12"
+phone: +33 4 50 28 29 98
+opening_hours: Mo-Sa 8:00-19:00
+website: ""
diff --git a/data/cities/valserhone/recyclerie-du-pays-bellegardien.yml b/data/cities/valserhone/recyclerie-du-pays-bellegardien.yml
index 9f2a002eb..2cfe20ee5 100644
--- a/data/cities/valserhone/recyclerie-du-pays-bellegardien.yml
+++ b/data/cities/valserhone/recyclerie-du-pays-bellegardien.yml
@@ -4,8 +4,8 @@ latitude: 46.12159
 longitude: 5.80782
 postcode: "01200"
 city: Valserhône
-street: "Rue Clément Ader"
-housenumber: 1
-phone: "+33 4 81 50 02 50"
-opening_hours: "We-Fr 13:30-17:30; Sa 10:00-12:30,13:30-17:30"
-website: "https://www.ccpb01.fr/la-recyclerie-du-pays-bellegardien/"
\ No newline at end of file
+street: Rue Clément Ader
+housenumber: "1"
+phone: +33 4 81 50 02 50
+opening_hours: We-Fr 13:30-17:30; Sa 10:00-12:30,13:30-17:30
+website: https://www.ccpb01.fr/la-recyclerie-du-pays-bellegardien/
diff --git a/data/cities/valserhone/velo-valserine.yml b/data/cities/valserhone/velo-valserine.yml
index 7b4f7441f..108ed0f79 100644
--- a/data/cities/valserhone/velo-valserine.yml
+++ b/data/cities/valserhone/velo-valserine.yml
@@ -4,8 +4,8 @@ latitude: 46.12892
 longitude: 5.80892
 postcode: "01200"
 city: Valserhône
-street: "Rue Santos Dumont"
-housenumber: 406
-phone: "+33 6 81 36 04 62"
+street: Rue Santos Dumont
+housenumber: "406"
+phone: +33 6 81 36 04 62
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/varces-allieres-et-risset/boulangerie-le-pain-du-peuil.yml b/data/cities/varces-allieres-et-risset/boulangerie-le-pain-du-peuil.yml
index b9ba63149..3611cc4b2 100644
--- a/data/cities/varces-allieres-et-risset/boulangerie-le-pain-du-peuil.yml
+++ b/data/cities/varces-allieres-et-risset/boulangerie-le-pain-du-peuil.yml
@@ -4,8 +4,8 @@ latitude: 45.09173
 longitude: 5.6848
 postcode: "38760"
 city: Varces-Allières-et-Risset
-street: "Rue du Peuil"
-housenumber: 30
-phone: "+33 4 76 97 53 96"
-opening_hours: "Mo-Sa 07:00-13:00"
-website: ""
\ No newline at end of file
+street: Rue du Peuil
+housenumber: "30"
+phone: +33 4 76 97 53 96
+opening_hours: Mo-Sa 07:00-13:00
+website: ""
diff --git a/data/cities/varces-allieres-et-risset/melle-m.yml b/data/cities/varces-allieres-et-risset/melle-m.yml
index 1056d4e98..1ddd0f2f1 100644
--- a/data/cities/varces-allieres-et-risset/melle-m.yml
+++ b/data/cities/varces-allieres-et-risset/melle-m.yml
@@ -4,8 +4,8 @@ latitude: 45.0871
 longitude: 5.68165
 postcode: "38760"
 city: Varces-Allières-et-Risset
-street: "Rue Jean Jaurès"
+street: Rue Jean Jaurès
 housenumber: 17 bis
-phone: "+33 4 76 72 81 64"
+phone: +33 4 76 72 81 64
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vaugneray/latelier-des-merveilles.yml b/data/cities/vaugneray/latelier-des-merveilles.yml
index 1f5d230e2..ab908fea0 100644
--- a/data/cities/vaugneray/latelier-des-merveilles.yml
+++ b/data/cities/vaugneray/latelier-des-merveilles.yml
@@ -1,11 +1,11 @@
 id: 66721568
-type: way
+type: node
 latitude: 45.73742
 longitude: 4.65691
 postcode: "69670"
 city: Vaugneray
-street: "Boulevard des Lavandières"
-housenumber: 16
+street: Boulevard des Lavandières
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vaugneray/le-petit-casino.yml b/data/cities/vaugneray/le-petit-casino.yml
index aa1a804d2..7fc79e3c1 100644
--- a/data/cities/vaugneray/le-petit-casino.yml
+++ b/data/cities/vaugneray/le-petit-casino.yml
@@ -1,11 +1,11 @@
 id: 341728922
-type: way
+type: node
 latitude: 45.73685
 longitude: 4.65738
 postcode: "69670"
 city: Vaugneray
-street: "Place du 8 Mai 1945"
-housenumber: 
+street: Place du 8 Mai 1945
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30,15:00-19:00; Su 07:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,15:00-19:00; Su 07:30-12:30
+website: ""
diff --git a/data/cities/vaugneray/panem-et-circus.yml b/data/cities/vaugneray/panem-et-circus.yml
index 4fb3c39e6..9d2b52f67 100644
--- a/data/cities/vaugneray/panem-et-circus.yml
+++ b/data/cities/vaugneray/panem-et-circus.yml
@@ -1,11 +1,11 @@
 id: 66718963
-type: way
+type: node
 latitude: 45.73734
 longitude: 4.65688
 postcode: "69670"
 city: Vaugneray
-street: "Boulevard des Lavandières"
-housenumber: 18
+street: Boulevard des Lavandières
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vaujany/sport-2000.yml b/data/cities/vaujany/sport-2000.yml
index fb2dcad9e..940864787 100644
--- a/data/cities/vaujany/sport-2000.yml
+++ b/data/cities/vaujany/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.15782
 longitude: 6.07947
 postcode: "38114"
 city: Vaujany
-street: "Route des Combes"
-housenumber: 
+street: Route des Combes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vaulx-en-velin/audition-conseil.yml b/data/cities/vaulx-en-velin/audition-conseil.yml
index bc28f2172..f4d7271d9 100644
--- a/data/cities/vaulx-en-velin/audition-conseil.yml
+++ b/data/cities/vaulx-en-velin/audition-conseil.yml
@@ -4,8 +4,8 @@ latitude: 45.77807
 longitude: 4.91782
 postcode: "69120"
 city: Vaulx-en-Velin
-street: "Rue Émile Zola"
-housenumber: 10
+street: Rue Émile Zola
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: "https://auditionconseil-lyon.fr/centres-auditifs/audioprothesiste-vaulx-en-velin/"
\ No newline at end of file
+website: https://auditionconseil-lyon.fr/centres-auditifs/audioprothesiste-vaulx-en-velin/
diff --git a/data/cities/vaulx-en-velin/carrosserie-de-la-rize.yml b/data/cities/vaulx-en-velin/carrosserie-de-la-rize.yml
index 7312681f1..46dcb919a 100644
--- a/data/cities/vaulx-en-velin/carrosserie-de-la-rize.yml
+++ b/data/cities/vaulx-en-velin/carrosserie-de-la-rize.yml
@@ -4,8 +4,8 @@ latitude: 45.77449
 longitude: 4.93781
 postcode: "69120"
 city: Vaulx-en-Velin
-street: "Rue Louis Saillant"
-housenumber: 10
+street: Rue Louis Saillant
+housenumber: "10"
 phone: ""
 opening_hours: ""
-website: "https://www.carrosserie-de-la-rize.fr/"
\ No newline at end of file
+website: https://www.carrosserie-de-la-rize.fr/
diff --git a/data/cities/vaulx-en-velin/comptoir-de-lours.yml b/data/cities/vaulx-en-velin/comptoir-de-lours.yml
index 635719fe2..0ce20f015 100644
--- a/data/cities/vaulx-en-velin/comptoir-de-lours.yml
+++ b/data/cities/vaulx-en-velin/comptoir-de-lours.yml
@@ -4,8 +4,8 @@ latitude: 45.77627
 longitude: 4.93908
 postcode: "69120"
 city: Vaulx-en-Velin
-street: "Rue Louis Saillant"
-housenumber: 17
-phone: "+33 4 78 60 38 05"
-opening_hours: "Mo-Th 07:30-12:00,13:30-18:00; Fr 07:30-12:00,13:30-16:30"
-website: "https://www.comptoirdelours.fr/nos-magasins/vaulx-en-velin-solution-peinture-distribution"
\ No newline at end of file
+street: Rue Louis Saillant
+housenumber: "17"
+phone: +33 4 78 60 38 05
+opening_hours: Mo-Th 07:30-12:00,13:30-18:00; Fr 07:30-12:00,13:30-16:30
+website: https://www.comptoirdelours.fr/nos-magasins/vaulx-en-velin-solution-peinture-distribution
diff --git a/data/cities/vaulx-en-velin/deluxe-auto-69.yml b/data/cities/vaulx-en-velin/deluxe-auto-69.yml
index f9dabc328..f23f69f49 100644
--- a/data/cities/vaulx-en-velin/deluxe-auto-69.yml
+++ b/data/cities/vaulx-en-velin/deluxe-auto-69.yml
@@ -4,8 +4,8 @@ latitude: 45.77509
 longitude: 4.93777
 postcode: "69120"
 city: Vaulx-en-Velin
-street: "Rue Louis Saillant"
-housenumber: 7
-phone: "+33 4 82 91 65 00"
+street: Rue Louis Saillant
+housenumber: "7"
+phone: +33 4 82 91 65 00
 opening_hours: ""
-website: "https://www.achat-vente-auto69.fr/"
\ No newline at end of file
+website: https://www.achat-vente-auto69.fr/
diff --git a/data/cities/vaulx-en-velin/forum-automobiles.yml b/data/cities/vaulx-en-velin/forum-automobiles.yml
index 11421c19b..80f9b3250 100644
--- a/data/cities/vaulx-en-velin/forum-automobiles.yml
+++ b/data/cities/vaulx-en-velin/forum-automobiles.yml
@@ -4,8 +4,8 @@ latitude: 45.77426
 longitude: 4.93763
 postcode: "69120"
 city: Vaulx-en-Velin
-street: "Impasse Louis Saillant"
-housenumber: 10
-phone: "+33 9 86 32 91 56"
+street: Impasse Louis Saillant
+housenumber: "10"
+phone: +33 9 86 32 91 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vaulx-en-velin/imprimerie-graphiscann.yml b/data/cities/vaulx-en-velin/imprimerie-graphiscann.yml
index 756086a43..c26920350 100644
--- a/data/cities/vaulx-en-velin/imprimerie-graphiscann.yml
+++ b/data/cities/vaulx-en-velin/imprimerie-graphiscann.yml
@@ -4,8 +4,8 @@ latitude: 45.7794
 longitude: 4.94098
 postcode: "69120"
 city: Vaulx-en-Velin
-street: "Avenue Karl Marx"
-housenumber: 32
-phone: "+33 4 72 33 60 70"
-opening_hours: "Mo-Fr 08:00-17:00"
-website: "https://www.graphiscann.fr"
\ No newline at end of file
+street: Avenue Karl Marx
+housenumber: "32"
+phone: +33 4 72 33 60 70
+opening_hours: Mo-Fr 08:00-17:00
+website: https://www.graphiscann.fr
diff --git a/data/cities/vaulx-en-velin/patisserie-de-la-cote.yml b/data/cities/vaulx-en-velin/patisserie-de-la-cote.yml
index 28b5be6fc..5f0b012ba 100644
--- a/data/cities/vaulx-en-velin/patisserie-de-la-cote.yml
+++ b/data/cities/vaulx-en-velin/patisserie-de-la-cote.yml
@@ -4,8 +4,8 @@ latitude: 45.75775
 longitude: 4.92893
 postcode: "69120"
 city: Vaulx-en-Velin
-street: "Avenue Roger Salengro"
-housenumber: 65
+street: Avenue Roger Salengro
+housenumber: "65"
 phone: ""
-opening_hours: "6:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: 6:00-19:00
+website: ""
diff --git a/data/cities/vaulx/la-bona-forna.yml b/data/cities/vaulx/la-bona-forna.yml
index 29e6ff70d..626e0a393 100644
--- a/data/cities/vaulx/la-bona-forna.yml
+++ b/data/cities/vaulx/la-bona-forna.yml
@@ -5,7 +5,7 @@ longitude: 5.99831
 postcode: "74150"
 city: Vaulx
 street: ""
-housenumber: 
+housenumber: ""
 phone: "+33450605924"
 opening_hours: ""
-website: "http://www.labonaforna.com/"
\ No newline at end of file
+website: http://www.labonaforna.com/
diff --git a/data/cities/vaux-en-bugey/epicerie-liliane.yml b/data/cities/vaux-en-bugey/epicerie-liliane.yml
index 3bbf73931..9e2c8a1a4 100644
--- a/data/cities/vaux-en-bugey/epicerie-liliane.yml
+++ b/data/cities/vaux-en-bugey/epicerie-liliane.yml
@@ -4,8 +4,8 @@ latitude: 45.92913
 longitude: 5.35434
 postcode: "01150"
 city: Vaux-en-Bugey
-street: "Grande Rue"
-housenumber: 176
+street: Grande Rue
+housenumber: "176"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/veauche/aqui-portugal.yml b/data/cities/veauche/aqui-portugal.yml
index 0c9842533..54854b915 100644
--- a/data/cities/veauche/aqui-portugal.yml
+++ b/data/cities/veauche/aqui-portugal.yml
@@ -4,8 +4,8 @@ latitude: 45.56532
 longitude: 4.29258
 postcode: "42340"
 city: Veauche
-street: "Avenue Henri Planchet"
-housenumber: 40
+street: Avenue Henri Planchet
+housenumber: "40"
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/veauche/carrefour-market.yml b/data/cities/veauche/carrefour-market.yml
index 45762a85d..5332b383e 100644
--- a/data/cities/veauche/carrefour-market.yml
+++ b/data/cities/veauche/carrefour-market.yml
@@ -1,11 +1,11 @@
 id: 63052568
-type: way
+type: node
 latitude: 45.56301
 longitude: 4.291
 postcode: "42340"
 city: Veauche
-street: "Avenue Henri Planchet"
-housenumber: 12
-phone: "+33 4 77 06 10 03"
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:00-12:30"
-website: "https://www.carrefour.fr/magasin/market-veauche"
\ No newline at end of file
+street: Avenue Henri Planchet
+housenumber: "12"
+phone: +33 4 77 06 10 03
+opening_hours: Mo-Sa 08:30-20:00; Su 09:00-12:30
+website: https://www.carrefour.fr/magasin/market-veauche
diff --git a/data/cities/veauche/coifstyl.yml b/data/cities/veauche/coifstyl.yml
index 1756bbb99..899c4df9b 100644
--- a/data/cities/veauche/coifstyl.yml
+++ b/data/cities/veauche/coifstyl.yml
@@ -4,8 +4,8 @@ latitude: 45.5628
 longitude: 4.28952
 postcode: "42340"
 city: Veauche
-street: "Avenue Henri Planchet"
+street: Avenue Henri Planchet
 housenumber: 3 Bis
 phone: ""
-opening_hours: "Tu-Fr 08:30-19:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-19:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/veauche/escale-paysanne.yml b/data/cities/veauche/escale-paysanne.yml
index 4fb1be358..1edb636bb 100644
--- a/data/cities/veauche/escale-paysanne.yml
+++ b/data/cities/veauche/escale-paysanne.yml
@@ -4,8 +4,8 @@ latitude: 45.55027
 longitude: 4.28187
 postcode: "42340"
 city: Veauche
-street: "Avenue du 8 Mai 1945"
-housenumber: 111
-phone: "+33 4 77 54 42 76"
+street: Avenue du 8 Mai 1945
+housenumber: "111"
+phone: +33 4 77 54 42 76
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/veigy-foncenex/brechotte.yml b/data/cities/veigy-foncenex/brechotte.yml
index cdb791264..e8b629062 100644
--- a/data/cities/veigy-foncenex/brechotte.yml
+++ b/data/cities/veigy-foncenex/brechotte.yml
@@ -4,8 +4,8 @@ latitude: 46.26903
 longitude: 6.2634
 postcode: "74140"
 city: Veigy-Foncenex
-street: "Route des Voirons"
-housenumber: 453
+street: Route des Voirons
+housenumber: "453"
 phone: ""
-opening_hours: "Mo-Fr 10:00-13:00, 14:00-19:00; Sa 10:00-17:00; Mo,Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-13:00, 14:00-19:00; Sa 10:00-17:00; Mo,Su off
+website: ""
diff --git a/data/cities/veigy-foncenex/gaec-aux-legumes-de-saison.yml b/data/cities/veigy-foncenex/gaec-aux-legumes-de-saison.yml
index f05c609b2..8caa6fb4a 100644
--- a/data/cities/veigy-foncenex/gaec-aux-legumes-de-saison.yml
+++ b/data/cities/veigy-foncenex/gaec-aux-legumes-de-saison.yml
@@ -1,11 +1,11 @@
 id: 269736766
-type: way
+type: node
 latitude: 46.26693
 longitude: 6.27082
 postcode: "74140"
 city: Veigy-Foncenex
-street: "Route des Mermes"
-housenumber: 100
-phone: "+334 50 94 94 93"
-opening_hours: "Mo-Fr 08:30-12:30,15:00-19:00; Sa 08:30-18:00"
-website: ""
\ No newline at end of file
+street: Route des Mermes
+housenumber: "100"
+phone: +334 50 94 94 93
+opening_hours: Mo-Fr 08:30-12:30,15:00-19:00; Sa 08:30-18:00
+website: ""
diff --git a/data/cities/venissieux/bebel-shop.yml b/data/cities/venissieux/bebel-shop.yml
index 5e8e452a4..4f5cd7d82 100644
--- a/data/cities/venissieux/bebel-shop.yml
+++ b/data/cities/venissieux/bebel-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.7237
 longitude: 4.86465
 postcode: "69200"
 city: Vénissieux
-street: "Avenue Francis de Pressensé"
-housenumber: 118
-phone: "+33 4 78 00 62 89"
-opening_hours: "Mo-Su 08:00-20:00; Fr 08:00-12:30,14:30-20:00"
-website: ""
\ No newline at end of file
+street: Avenue Francis de Pressensé
+housenumber: "118"
+phone: +33 4 78 00 62 89
+opening_hours: Mo-Su 08:00-20:00; Fr 08:00-12:30,14:30-20:00
+website: ""
diff --git a/data/cities/venissieux/la-manufacture-des-jeux.yml b/data/cities/venissieux/la-manufacture-des-jeux.yml
index 744cc61c8..0d471391a 100644
--- a/data/cities/venissieux/la-manufacture-des-jeux.yml
+++ b/data/cities/venissieux/la-manufacture-des-jeux.yml
@@ -4,8 +4,8 @@ latitude: 45.71697
 longitude: 4.88012
 postcode: "69200"
 city: Vénissieux
-street: "Rue Simone Veil"
-housenumber: 22
-phone: "+33 4 78 09 71 17"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Simone Veil
+housenumber: "22"
+phone: +33 4 78 09 71 17
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/venissieux/ldlc.yml b/data/cities/venissieux/ldlc.yml
index 1fae0aac3..de3de4fa8 100644
--- a/data/cities/venissieux/ldlc.yml
+++ b/data/cities/venissieux/ldlc.yml
@@ -4,8 +4,8 @@ latitude: 45.71682
 longitude: 4.8799
 postcode: "69200"
 city: Vénissieux
-street: "Rue Simone Veil"
-housenumber: 18
+street: Rue Simone Veil
+housenumber: "18"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.ldlc.com/magasins-ldlc/magasin-470149/69-ldlc-lyon-grand-parilly/"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.ldlc.com/magasins-ldlc/magasin-470149/69-ldlc-lyon-grand-parilly/
diff --git a/data/cities/venissieux/mell-shop.yml b/data/cities/venissieux/mell-shop.yml
index 07d12d944..5f1c0678b 100644
--- a/data/cities/venissieux/mell-shop.yml
+++ b/data/cities/venissieux/mell-shop.yml
@@ -1,11 +1,11 @@
 id: 80389817
-type: way
+type: node
 latitude: 45.70346
 longitude: 4.8761
 postcode: "69200"
 city: Venissieux
-street: "Rue Gabriel Péri"
-housenumber: 61
-phone: "+33 0437547939"
+street: Rue Gabriel Péri
+housenumber: "61"
+phone: +33 0437547939
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/venissieux/paris-store.yml b/data/cities/venissieux/paris-store.yml
index d00d6466b..1e0a7abe5 100644
--- a/data/cities/venissieux/paris-store.yml
+++ b/data/cities/venissieux/paris-store.yml
@@ -4,8 +4,8 @@ latitude: 45.72294
 longitude: 4.8717
 postcode: "69002"
 city: Vénissieux
-street: "Boulevard Irène Joliot-Curie"
-housenumber: 8
+street: Boulevard Irène Joliot-Curie
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:20"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:20
+website: ""
diff --git a/data/cities/venissieux/snc-selva.yml b/data/cities/venissieux/snc-selva.yml
index 9eefeae98..7f3baee1e 100644
--- a/data/cities/venissieux/snc-selva.yml
+++ b/data/cities/venissieux/snc-selva.yml
@@ -4,8 +4,8 @@ latitude: 45.72387
 longitude: 4.87228
 postcode: "69200"
 city: Vénissieux
-street: "Avenue Viviani"
-housenumber: 68
+street: Avenue Viviani
+housenumber: "68"
 phone: ""
-opening_hours: "Mo-Fr 06:00-12:30,14:15-19:00; Sa 07:30-12:30,14:15-19:00; Su 07:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-12:30,14:15-19:00; Sa 07:30-12:30,14:15-19:00; Su 07:30-12:00
+website: ""
diff --git a/data/cities/veranne/la-ferme-des-bles-dor.yml b/data/cities/veranne/la-ferme-des-bles-dor.yml
index 9e0d69bdc..f66cbcfbc 100644
--- a/data/cities/veranne/la-ferme-des-bles-dor.yml
+++ b/data/cities/veranne/la-ferme-des-bles-dor.yml
@@ -1,11 +1,11 @@
 id: 277647891
-type: way
+type: node
 latitude: 45.37269
 longitude: 4.66618
 postcode: "42520"
 city: Véranne
-street: "Chemin du Combeau"
-housenumber: 785
+street: Chemin du Combeau
+housenumber: "785"
 phone: ""
-opening_hours: "Th-Sa 16:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Th-Sa 16:30-20:00
+website: ""
diff --git a/data/cities/vernaison/petit-casino.yml b/data/cities/vernaison/petit-casino.yml
index fc0f41b9d..bf69eef83 100644
--- a/data/cities/vernaison/petit-casino.yml
+++ b/data/cities/vernaison/petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.64695
 longitude: 4.81317
 postcode: "69390"
 city: Vernaison
-street: "Impasse du Centre"
-housenumber: 
+street: Impasse du Centre
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vernioz/optiregard.yml b/data/cities/vernioz/optiregard.yml
index 7c53af366..1a49d5a4a 100644
--- a/data/cities/vernioz/optiregard.yml
+++ b/data/cities/vernioz/optiregard.yml
@@ -4,8 +4,8 @@ latitude: 45.42099
 longitude: 4.90367
 postcode: "38150"
 city: Vernioz
-street: "Place de la Taillanderie"
-housenumber: 1
-phone: "+33 4 74 53 18 41"
+street: Place de la Taillanderie
+housenumber: "1"
+phone: +33 4 74 53 18 41
 opening_hours: ""
-website: "https://optiregard.business.site/?m=true"
\ No newline at end of file
+website: https://optiregard.business.site/?m=true
diff --git a/data/cities/vernoux-en-vivarais/boucherie-velit.yml b/data/cities/vernoux-en-vivarais/boucherie-velit.yml
index 330193ed1..e256cf388 100644
--- a/data/cities/vernoux-en-vivarais/boucherie-velit.yml
+++ b/data/cities/vernoux-en-vivarais/boucherie-velit.yml
@@ -4,8 +4,8 @@ latitude: 44.89568
 longitude: 4.64469
 postcode: "07240"
 city: Vernoux-en-Vivarais
-street: "Rue Simon Vialet"
-housenumber: 36
-phone: "04 75 58 10 89"
-opening_hours: "Tu-Sa 08:00-12:30,15:00-19:00; Su 08:00-12:00"
-website: ""
\ No newline at end of file
+street: Rue Simon Vialet
+housenumber: "36"
+phone: 04 75 58 10 89
+opening_hours: Tu-Sa 08:00-12:30,15:00-19:00; Su 08:00-12:00
+website: ""
diff --git a/data/cities/vernoux-en-vivarais/latelier-du-delice.yml b/data/cities/vernoux-en-vivarais/latelier-du-delice.yml
index da2c517e5..c73b5b590 100644
--- a/data/cities/vernoux-en-vivarais/latelier-du-delice.yml
+++ b/data/cities/vernoux-en-vivarais/latelier-du-delice.yml
@@ -5,7 +5,7 @@ longitude: 4.64461
 postcode: ""
 city: Vernoux-en-Vivarais
 street: ""
-housenumber: 
-phone: "04 75 58 14 80"
-opening_hours: "Tu-Sa 06:30-13:00,15:00-19:00; Su 06:30-12:30"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: 04 75 58 14 80
+opening_hours: Tu-Sa 06:30-13:00,15:00-19:00; Su 06:30-12:30
+website: ""
diff --git a/data/cities/vernoux-en-vivarais/tabac-den-haut.yml b/data/cities/vernoux-en-vivarais/tabac-den-haut.yml
index 7dc988db6..2f9af184b 100644
--- a/data/cities/vernoux-en-vivarais/tabac-den-haut.yml
+++ b/data/cities/vernoux-en-vivarais/tabac-den-haut.yml
@@ -1,11 +1,11 @@
 id: 181150640
-type: way
+type: node
 latitude: 44.89512
 longitude: 4.64439
 postcode: "07240"
 city: Vernoux-en-Vivarais
-street: "Rue Simon Vialet"
-housenumber: 3
+street: Rue Simon Vialet
+housenumber: "3"
 phone: "0475581372"
-opening_hours: "Tu-Sa 09:00-12:30, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-12:30, 14:00-19:00
+website: ""
diff --git a/data/cities/versoix/la-ferme-courtois.yml b/data/cities/versoix/la-ferme-courtois.yml
index bf41c522b..444021043 100644
--- a/data/cities/versoix/la-ferme-courtois.yml
+++ b/data/cities/versoix/la-ferme-courtois.yml
@@ -1,11 +1,11 @@
 id: 173376479
-type: way
+type: node
 latitude: 46.31073
 longitude: 6.1286
 postcode: ""
 city: Versoix
-street: "Route de la Branvaude"
-housenumber: 10
+street: Route de la Branvaude
+housenumber: "10"
 phone: ""
-opening_hours: "Tu-Tu 09:00-12:00, 14:00-18:30; Fr 09:00-18:30; Sa 09:00-17:00"
-website: "https://www.fermecourtois.ch"
\ No newline at end of file
+opening_hours: Tu-Tu 09:00-12:00, 14:00-18:30; Fr 09:00-18:30; Sa 09:00-17:00
+website: https://www.fermecourtois.ch
diff --git a/data/cities/versonnex/la-flute-dor.yml b/data/cities/versonnex/la-flute-dor.yml
index 633b44dbd..fe9b3cd50 100644
--- a/data/cities/versonnex/la-flute-dor.yml
+++ b/data/cities/versonnex/la-flute-dor.yml
@@ -4,8 +4,8 @@ latitude: 46.3007
 longitude: 6.09564
 postcode: "01210"
 city: Versonnex
-street: "Route de Maconnex"
-housenumber: 21
+street: Route de Maconnex
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 06:00-13:00,15:15-19:30; Sa 06:00-13:00, 15:30-18:00; Su 06:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-13:00,15:15-19:30; Sa 06:00-13:00, 15:30-18:00; Su 06:00-12:00
+website: ""
diff --git a/data/cities/vetraz-monthoux/alves-stores.yml b/data/cities/vetraz-monthoux/alves-stores.yml
index e12ee3784..f6481df57 100644
--- a/data/cities/vetraz-monthoux/alves-stores.yml
+++ b/data/cities/vetraz-monthoux/alves-stores.yml
@@ -1,11 +1,11 @@
 id: 166776375
-type: way
+type: node
 latitude: 46.18359
 longitude: 6.27604
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Rue des Artisans"
-housenumber: 
+street: Rue des Artisans
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/art-motos-benelli.yml b/data/cities/vetraz-monthoux/art-motos-benelli.yml
index 0f87c426a..fd502c974 100644
--- a/data/cities/vetraz-monthoux/art-motos-benelli.yml
+++ b/data/cities/vetraz-monthoux/art-motos-benelli.yml
@@ -4,8 +4,8 @@ latitude: 46.18745
 longitude: 6.27527
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Chemin des Fontaines"
-housenumber: 16
+street: Chemin des Fontaines
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/au-petrin-des-saveurs-route-de-taninges.yml b/data/cities/vetraz-monthoux/au-petrin-des-saveurs-route-de-taninges.yml
index 5dabc4a55..7bbf580a9 100644
--- a/data/cities/vetraz-monthoux/au-petrin-des-saveurs-route-de-taninges.yml
+++ b/data/cities/vetraz-monthoux/au-petrin-des-saveurs-route-de-taninges.yml
@@ -1,11 +1,11 @@
 id: 166776260
-type: way
+type: node
 latitude: 46.18532
 longitude: 6.27632
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 134
+street: Route de Taninges
+housenumber: "134"
 phone: ""
-opening_hours: "Mo-Sa 05:45-19:30; Su 06:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 05:45-19:30; Su 06:00-12:30
+website: ""
diff --git a/data/cities/vetraz-monthoux/au-petrin-des-saveurs.yml b/data/cities/vetraz-monthoux/au-petrin-des-saveurs.yml
index 0b704e5b1..f722805f1 100644
--- a/data/cities/vetraz-monthoux/au-petrin-des-saveurs.yml
+++ b/data/cities/vetraz-monthoux/au-petrin-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 46.17275
 longitude: 6.26169
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Les Places"
-housenumber: 3
+street: Les Places
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Fr 06:30-12:30, 14:30-19:00; Sa-Su 06:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:30-12:30, 14:30-19:00; Sa-Su 06:30-12:30
+website: ""
diff --git a/data/cities/vetraz-monthoux/auto-la-vallee-annemasse.yml b/data/cities/vetraz-monthoux/auto-la-vallee-annemasse.yml
index 73df40fcc..fa6551e97 100644
--- a/data/cities/vetraz-monthoux/auto-la-vallee-annemasse.yml
+++ b/data/cities/vetraz-monthoux/auto-la-vallee-annemasse.yml
@@ -1,11 +1,11 @@
 id: 648381033
-type: way
+type: node
 latitude: 46.18475
 longitude: 6.27306
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Allée des Chênes"
-housenumber: 8
+street: Allée des Chênes
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/box-en-loc.yml b/data/cities/vetraz-monthoux/box-en-loc.yml
index 3d3adb866..1fbf137b5 100644
--- a/data/cities/vetraz-monthoux/box-en-loc.yml
+++ b/data/cities/vetraz-monthoux/box-en-loc.yml
@@ -1,11 +1,11 @@
 id: 877543380
-type: way
+type: node
 latitude: 46.18576
 longitude: 6.27712
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 
-phone: "+33 4 50 54 29 87"
-opening_hours: "24/7"
-website: "https://www.boxenloc.com/"
\ No newline at end of file
+street: Route de Taninges
+housenumber: ""
+phone: +33 4 50 54 29 87
+opening_hours: 24/7
+website: https://www.boxenloc.com/
diff --git a/data/cities/vetraz-monthoux/brico-depot.yml b/data/cities/vetraz-monthoux/brico-depot.yml
index 1a241d9df..904945245 100644
--- a/data/cities/vetraz-monthoux/brico-depot.yml
+++ b/data/cities/vetraz-monthoux/brico-depot.yml
@@ -1,11 +1,11 @@
 id: 166776368
-type: way
+type: node
 latitude: 46.18607
 longitude: 6.27423
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 124
+street: Route de Taninges
+housenumber: "124"
 phone: ""
-opening_hours: "Mo-Sa 07:00-19:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-19:30; Su off
+website: ""
diff --git a/data/cities/vetraz-monthoux/carrosserie-j-p-deleaval.yml b/data/cities/vetraz-monthoux/carrosserie-j-p-deleaval.yml
index 8c88806a2..dc6679129 100644
--- a/data/cities/vetraz-monthoux/carrosserie-j-p-deleaval.yml
+++ b/data/cities/vetraz-monthoux/carrosserie-j-p-deleaval.yml
@@ -1,11 +1,11 @@
 id: 166776256
-type: way
+type: node
 latitude: 46.18238
 longitude: 6.27691
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Chemin des Érables"
-housenumber: 
+street: Chemin des Érables
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/cir-france.yml b/data/cities/vetraz-monthoux/cir-france.yml
index 3eec07895..0353ca9d3 100644
--- a/data/cities/vetraz-monthoux/cir-france.yml
+++ b/data/cities/vetraz-monthoux/cir-france.yml
@@ -1,11 +1,11 @@
 id: 987109373
-type: way
+type: node
 latitude: 46.18563
 longitude: 6.27776
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 117
+street: Route de Taninges
+housenumber: "117"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/citroen-annemasse.yml b/data/cities/vetraz-monthoux/citroen-annemasse.yml
index 97c1f1fe2..aeebb499d 100644
--- a/data/cities/vetraz-monthoux/citroen-annemasse.yml
+++ b/data/cities/vetraz-monthoux/citroen-annemasse.yml
@@ -4,8 +4,8 @@ latitude: 46.18648
 longitude: 6.27259
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 118
+street: Route de Taninges
+housenumber: "118"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/vetraz-monthoux/climbing-technology.yml b/data/cities/vetraz-monthoux/climbing-technology.yml
index 3331304c1..c43736761 100644
--- a/data/cities/vetraz-monthoux/climbing-technology.yml
+++ b/data/cities/vetraz-monthoux/climbing-technology.yml
@@ -1,11 +1,11 @@
 id: 166776373
-type: way
+type: node
 latitude: 46.18309
 longitude: 6.2763
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Rue des Artisans"
-housenumber: 6
+street: Rue des Artisans
+housenumber: "6"
 phone: "+33450493741"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/ds-store-annemasse.yml b/data/cities/vetraz-monthoux/ds-store-annemasse.yml
index 3c503dab4..62fab9e0e 100644
--- a/data/cities/vetraz-monthoux/ds-store-annemasse.yml
+++ b/data/cities/vetraz-monthoux/ds-store-annemasse.yml
@@ -4,8 +4,8 @@ latitude: 46.18641
 longitude: 6.27287
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 118
+street: Route de Taninges
+housenumber: "118"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/vetraz-monthoux/ezel-automobile.yml b/data/cities/vetraz-monthoux/ezel-automobile.yml
index 680192c74..797b9f22f 100644
--- a/data/cities/vetraz-monthoux/ezel-automobile.yml
+++ b/data/cities/vetraz-monthoux/ezel-automobile.yml
@@ -4,8 +4,8 @@ latitude: 46.18478
 longitude: 6.27409
 postcode: ""
 city: Vétraz-Monthoux
-street: "Allée des Chênes"
-housenumber: 
+street: Allée des Chênes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/gamm-vert.yml b/data/cities/vetraz-monthoux/gamm-vert.yml
index 4b3ef3f65..f827d0b5c 100644
--- a/data/cities/vetraz-monthoux/gamm-vert.yml
+++ b/data/cities/vetraz-monthoux/gamm-vert.yml
@@ -1,11 +1,11 @@
 id: 168365066
-type: way
+type: node
 latitude: 46.18085
 longitude: 6.24411
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Chemin des Trois Noyers"
-housenumber: 33
+street: Chemin des Trois Noyers
+housenumber: "33"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-19:00; Su 09:00-12:30, 14:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-19:00; Su 09:00-12:30, 14:30-18:00
+website: ""
diff --git a/data/cities/vetraz-monthoux/intermarche-drive.yml b/data/cities/vetraz-monthoux/intermarche-drive.yml
index b309eb161..f92a09d5a 100644
--- a/data/cities/vetraz-monthoux/intermarche-drive.yml
+++ b/data/cities/vetraz-monthoux/intermarche-drive.yml
@@ -5,7 +5,7 @@ longitude: 6.27518
 postcode: ""
 city: Vétraz-Monthoux
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/intermarche-zac-chemin-des-erables.yml b/data/cities/vetraz-monthoux/intermarche-zac-chemin-des-erables.yml
index 15ea3f50b..db51c8023 100644
--- a/data/cities/vetraz-monthoux/intermarche-zac-chemin-des-erables.yml
+++ b/data/cities/vetraz-monthoux/intermarche-zac-chemin-des-erables.yml
@@ -1,11 +1,11 @@
 id: 201987057
-type: way
+type: node
 latitude: 46.18489
 longitude: 6.27674
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Zac chemin des Erables"
-housenumber: 
+street: Zac chemin des Erables
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/intermarche.yml b/data/cities/vetraz-monthoux/intermarche.yml
index 14dcc7b7d..954208207 100644
--- a/data/cities/vetraz-monthoux/intermarche.yml
+++ b/data/cities/vetraz-monthoux/intermarche.yml
@@ -1,11 +1,11 @@
 id: 61214503
-type: way
+type: node
 latitude: 46.18422
 longitude: 6.27525
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Rue des Teppes"
-housenumber: 17
+street: Rue des Teppes
+housenumber: "17"
 phone: ""
-opening_hours: "Mo-Sa 08:30-19:30; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-19:30; Su 08:30-12:30
+website: ""
diff --git a/data/cities/vetraz-monthoux/j-vaudaux.yml b/data/cities/vetraz-monthoux/j-vaudaux.yml
index 54a0dcfaf..f8fc892d8 100644
--- a/data/cities/vetraz-monthoux/j-vaudaux.yml
+++ b/data/cities/vetraz-monthoux/j-vaudaux.yml
@@ -1,11 +1,11 @@
 id: 158463883
-type: way
+type: node
 latitude: 46.18406
 longitude: 6.27765
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 138
+street: Route de Taninges
+housenumber: "138"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-17:00; Su off
+website: ""
diff --git a/data/cities/vetraz-monthoux/kalicea.yml b/data/cities/vetraz-monthoux/kalicea.yml
index e681469da..986abe20e 100644
--- a/data/cities/vetraz-monthoux/kalicea.yml
+++ b/data/cities/vetraz-monthoux/kalicea.yml
@@ -4,8 +4,8 @@ latitude: 46.18489
 longitude: 6.27476
 postcode: ""
 city: Vétraz-Monthoux
-street: "Allée des Chênes"
-housenumber: 
+street: Allée des Chênes
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/karine-b-coiffure.yml b/data/cities/vetraz-monthoux/karine-b-coiffure.yml
index 5df3c530a..cf3c7ce7e 100644
--- a/data/cities/vetraz-monthoux/karine-b-coiffure.yml
+++ b/data/cities/vetraz-monthoux/karine-b-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 46.17266
 longitude: 6.26161
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Les Places"
-housenumber: 4
+street: Les Places
+housenumber: "4"
 phone: "+33450048062"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/la-cave-de-borly.yml b/data/cities/vetraz-monthoux/la-cave-de-borly.yml
index 13eb3caa0..878c5368a 100644
--- a/data/cities/vetraz-monthoux/la-cave-de-borly.yml
+++ b/data/cities/vetraz-monthoux/la-cave-de-borly.yml
@@ -1,11 +1,11 @@
 id: 166776265
-type: way
+type: node
 latitude: 46.18527
 longitude: 6.27646
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 134
+street: Route de Taninges
+housenumber: "134"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:00-12:30, 14:30-19:30; Sa 09:00-12:30, 14:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:00-12:30, 14:30-19:30; Sa 09:00-12:30, 14:00-19:30
+website: ""
diff --git a/data/cities/vetraz-monthoux/la-chocolline.yml b/data/cities/vetraz-monthoux/la-chocolline.yml
index da2cff24f..657d96179 100644
--- a/data/cities/vetraz-monthoux/la-chocolline.yml
+++ b/data/cities/vetraz-monthoux/la-chocolline.yml
@@ -1,11 +1,11 @@
 id: 168153003
-type: way
+type: node
 latitude: 46.19087
 longitude: 6.25171
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route du Livron"
-housenumber: 3
+street: Route du Livron
+housenumber: "3"
 phone: "+33609981519"
 opening_hours: ""
-website: "https://lachocolline.fr"
\ No newline at end of file
+website: https://lachocolline.fr
diff --git a/data/cities/vetraz-monthoux/la-ferme-de-corly.yml b/data/cities/vetraz-monthoux/la-ferme-de-corly.yml
index 8cc8051fd..c82e9e0b1 100644
--- a/data/cities/vetraz-monthoux/la-ferme-de-corly.yml
+++ b/data/cities/vetraz-monthoux/la-ferme-de-corly.yml
@@ -4,8 +4,8 @@ latitude: 46.17785
 longitude: 6.26871
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Corly"
-housenumber: 4
+street: Route de Corly
+housenumber: "4"
 phone: ""
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/vetraz-monthoux/leffet-vrac.yml b/data/cities/vetraz-monthoux/leffet-vrac.yml
index 96f8de7e4..d8508fc52 100644
--- a/data/cities/vetraz-monthoux/leffet-vrac.yml
+++ b/data/cities/vetraz-monthoux/leffet-vrac.yml
@@ -4,8 +4,8 @@ latitude: 46.17279
 longitude: 6.26135
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Les Places"
-housenumber: 2
+street: Les Places
+housenumber: "2"
 phone: "+33977919429"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/mazda.yml b/data/cities/vetraz-monthoux/mazda.yml
index 080864942..3d9b9d637 100644
--- a/data/cities/vetraz-monthoux/mazda.yml
+++ b/data/cities/vetraz-monthoux/mazda.yml
@@ -1,11 +1,11 @@
 id: 515524185
-type: way
+type: node
 latitude: 46.18744
 longitude: 6.27259
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 99
+street: Route de Taninges
+housenumber: "99"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/medical-sante-bernard-boccard.yml b/data/cities/vetraz-monthoux/medical-sante-bernard-boccard.yml
index c55597f12..1663dc22f 100644
--- a/data/cities/vetraz-monthoux/medical-sante-bernard-boccard.yml
+++ b/data/cities/vetraz-monthoux/medical-sante-bernard-boccard.yml
@@ -1,11 +1,11 @@
 id: 158620759
-type: way
+type: node
 latitude: 46.18551
 longitude: 6.27804
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 117
+street: Route de Taninges
+housenumber: "117"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/mitsubishi.yml b/data/cities/vetraz-monthoux/mitsubishi.yml
index ed6e7f6f0..5bfdc346a 100644
--- a/data/cities/vetraz-monthoux/mitsubishi.yml
+++ b/data/cities/vetraz-monthoux/mitsubishi.yml
@@ -1,11 +1,11 @@
 id: 515524191
-type: way
+type: node
 latitude: 46.18737
 longitude: 6.27302
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 99
+street: Route de Taninges
+housenumber: "99"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/mont-blanc-depannage.yml b/data/cities/vetraz-monthoux/mont-blanc-depannage.yml
index 80fe89a49..465370cf4 100644
--- a/data/cities/vetraz-monthoux/mont-blanc-depannage.yml
+++ b/data/cities/vetraz-monthoux/mont-blanc-depannage.yml
@@ -1,11 +1,11 @@
 id: 158463884
-type: way
+type: node
 latitude: 46.1886
 longitude: 6.2765
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Chemin des Fontaines"
-housenumber: 
+street: Chemin des Fontaines
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/opel-annemasse-jean-lain-mobilites.yml b/data/cities/vetraz-monthoux/opel-annemasse-jean-lain-mobilites.yml
index 4adb8a955..ce6cb8df1 100644
--- a/data/cities/vetraz-monthoux/opel-annemasse-jean-lain-mobilites.yml
+++ b/data/cities/vetraz-monthoux/opel-annemasse-jean-lain-mobilites.yml
@@ -4,8 +4,8 @@ latitude: 46.18655
 longitude: 6.27229
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 118
+street: Route de Taninges
+housenumber: "118"
 phone: ""
 opening_hours: ""
-website: "https://mobilite.jeanlain.com/opel"
\ No newline at end of file
+website: https://mobilite.jeanlain.com/opel
diff --git a/data/cities/vetraz-monthoux/raison-home-stephane-muller.yml b/data/cities/vetraz-monthoux/raison-home-stephane-muller.yml
index a94ef32b0..892903dde 100644
--- a/data/cities/vetraz-monthoux/raison-home-stephane-muller.yml
+++ b/data/cities/vetraz-monthoux/raison-home-stephane-muller.yml
@@ -4,8 +4,8 @@ latitude: 46.18729
 longitude: 6.25383
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Chemin des Patinières"
-housenumber: 
+street: Chemin des Patinières
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-13:00"
-website: "https://www.raisonhome.com/fr/cuisinistes-concepteurs/stephane-muller-vetraz-monthoux"
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-18:00; Sa 09:00-13:00
+website: https://www.raisonhome.com/fr/cuisinistes-concepteurs/stephane-muller-vetraz-monthoux
diff --git a/data/cities/vetraz-monthoux/rectification-moteurs-peltier.yml b/data/cities/vetraz-monthoux/rectification-moteurs-peltier.yml
index df065d3e9..e1e625ee3 100644
--- a/data/cities/vetraz-monthoux/rectification-moteurs-peltier.yml
+++ b/data/cities/vetraz-monthoux/rectification-moteurs-peltier.yml
@@ -4,8 +4,8 @@ latitude: 46.18749
 longitude: 6.275
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Chemin des Fontaines"
-housenumber: 16
+street: Chemin des Fontaines
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vetraz-monthoux/transcarauto.yml b/data/cities/vetraz-monthoux/transcarauto.yml
index b4b1cad3e..f37be5958 100644
--- a/data/cities/vetraz-monthoux/transcarauto.yml
+++ b/data/cities/vetraz-monthoux/transcarauto.yml
@@ -1,11 +1,11 @@
 id: 170289577
-type: way
+type: node
 latitude: 46.19104
 longitude: 6.25176
 postcode: "74100"
 city: Vétraz-Monthoux
-street: "Route de Taninges"
-housenumber: 4
+street: Route de Taninges
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/veyrier-du-lac/le-petit-casino.yml b/data/cities/veyrier-du-lac/le-petit-casino.yml
index aac22f342..ccca56ca0 100644
--- a/data/cities/veyrier-du-lac/le-petit-casino.yml
+++ b/data/cities/veyrier-du-lac/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.88387
 longitude: 6.1775
 postcode: "74290"
 city: Veyrier-du-Lac
-street: "Rue de la Tournette"
-housenumber: 34
+street: Rue de la Tournette
+housenumber: "34"
 phone: ""
-opening_hours: "Mo-Sa 08:00-12:30, 15:00-20:00; Su 08:00-12:30, 16:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-12:30, 15:00-20:00; Su 08:00-12:30, 16:00-19:00
+website: ""
diff --git a/data/cities/vienne/8th-avenue.yml b/data/cities/vienne/8th-avenue.yml
index bce99ba57..0a5423ed1 100644
--- a/data/cities/vienne/8th-avenue.yml
+++ b/data/cities/vienne/8th-avenue.yml
@@ -5,7 +5,7 @@ longitude: 4.87497
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: "+33983979397"
-opening_hours: "Tu-Sa 10:00-12:00,14:00-19:00"
-website: "https://www.facebook.com/8th-Avenue-919763424873779/?__xts__[0]&__xts__[1]&__xts__[2]=68.ARDSy7en..."
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-12:00,14:00-19:00
+website: https://www.facebook.com/8th-Avenue-919763424873779/?__xts__[0]&__xts__[1]&__xts__[2]=68.ARDSy7en...
diff --git a/data/cities/vienne/9eme-mois.yml b/data/cities/vienne/9eme-mois.yml
index 96847b61c..7af5087ee 100644
--- a/data/cities/vienne/9eme-mois.yml
+++ b/data/cities/vienne/9eme-mois.yml
@@ -5,7 +5,7 @@ longitude: 4.87391
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 17 69 34 65"
-opening_hours: "Tu-Sa 09:00-18:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 6 17 69 34 65
+opening_hours: Tu-Sa 09:00-18:00
+website: ""
diff --git a/data/cities/vienne/abeos.yml b/data/cities/vienne/abeos.yml
index 145c19050..b671aad18 100644
--- a/data/cities/vienne/abeos.yml
+++ b/data/cities/vienne/abeos.yml
@@ -5,7 +5,7 @@ longitude: 4.86873
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 97 17"
-opening_hours: "Mo-Th 08:00-12:00,14:00-18:00; Fr 08:00-12:00,14:00-17:00"
-website: "http://www.abeos.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 97 17
+opening_hours: Mo-Th 08:00-12:00,14:00-18:00; Fr 08:00-12:00,14:00-17:00
+website: http://www.abeos.fr/
diff --git a/data/cities/vienne/aco-coiffure.yml b/data/cities/vienne/aco-coiffure.yml
index 0868a2541..1cde429db 100644
--- a/data/cities/vienne/aco-coiffure.yml
+++ b/data/cities/vienne/aco-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.87631
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/adopt.yml b/data/cities/vienne/adopt.yml
index 27f97d2e8..d66d00fd1 100644
--- a/data/cities/vienne/adopt.yml
+++ b/data/cities/vienne/adopt.yml
@@ -4,8 +4,8 @@ latitude: 45.52468
 longitude: 4.87509
 postcode: "38200"
 city: Vienne
-street: "Rue Ponsard"
-housenumber: 12
+street: Rue Ponsard
+housenumber: "12"
 phone: ""
-opening_hours: ""
-website: "https://www.adopt.com/fr/store-locator/adopt-parfums-vienne"
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-19:00; Mo 14:00-19:00
+website: https://www.adopt.com/fr/store-locator/adopt-parfums-vienne
diff --git a/data/cities/vienne/advivo.yml b/data/cities/vienne/advivo.yml
index ef9af59a7..086b5070a 100644
--- a/data/cities/vienne/advivo.yml
+++ b/data/cities/vienne/advivo.yml
@@ -4,8 +4,8 @@ latitude: 45.52023
 longitude: 4.87203
 postcode: "38200"
 city: Vienne
-street: "Square de la Résistance et de la Déportation"
-housenumber: 1
-phone: "+33 4 74 78 39 00"
-opening_hours: "Mo-Fr 08:00-12:00,13:00-16:30"
-website: "https://www.advivo.fr/"
\ No newline at end of file
+street: Square de la Résistance et de la Déportation
+housenumber: "1"
+phone: +33 4 74 78 39 00
+opening_hours: Mo-Fr 08:00-12:00,13:00-16:30
+website: https://www.advivo.fr/
diff --git a/data/cities/vienne/aldi.yml b/data/cities/vienne/aldi.yml
index cb9d01698..44f1f6b67 100644
--- a/data/cities/vienne/aldi.yml
+++ b/data/cities/vienne/aldi.yml
@@ -1,11 +1,11 @@
 id: 135881600
-type: way
+type: node
 latitude: 45.50972
 longitude: 4.85573
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 2
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/vienne/alfonso-bayon.yml b/data/cities/vienne/alfonso-bayon.yml
index 09870d62c..d470173cf 100644
--- a/data/cities/vienne/alfonso-bayon.yml
+++ b/data/cities/vienne/alfonso-bayon.yml
@@ -5,7 +5,7 @@ longitude: 4.87497
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/alias-le-poete.yml b/data/cities/vienne/alias-le-poete.yml
index 8398d38c2..3b3ff3442 100644
--- a/data/cities/vienne/alias-le-poete.yml
+++ b/data/cities/vienne/alias-le-poete.yml
@@ -5,7 +5,7 @@ longitude: 4.87188
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 83 57 51 74"
-opening_hours: "Tu-Sa 07:00-22:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 9 83 57 51 74
+opening_hours: Tu-Sa 07:00-22:00
+website: ""
diff --git a/data/cities/vienne/alticelli.yml b/data/cities/vienne/alticelli.yml
index 055153de9..68cc126a0 100644
--- a/data/cities/vienne/alticelli.yml
+++ b/data/cities/vienne/alticelli.yml
@@ -4,8 +4,8 @@ latitude: 45.5268
 longitude: 4.8751
 postcode: "38200"
 city: Vienne
-street: "Rue Teste du Bailler"
-housenumber: 11
-phone: "+33 4 74 85 52 37"
-opening_hours: "Mo,Th,Su off; Tu-We,Fr 10:00-12:00,14:00-18:00; Sa 10:00-12:00,14:00-17:00"
-website: "https://www.alticelli.fr/"
\ No newline at end of file
+street: Rue Teste du Bailler
+housenumber: "11"
+phone: +33 4 74 85 52 37
+opening_hours: Mo,Th,Su off; Tu-We,Fr 10:00-12:00,14:00-18:00; Sa 10:00-12:00,14:00-17:00
+website: https://www.alticelli.fr/
diff --git a/data/cities/vienne/anastasia-nails-bar.yml b/data/cities/vienne/anastasia-nails-bar.yml
index a5c3ec985..32f0603c3 100644
--- a/data/cities/vienne/anastasia-nails-bar.yml
+++ b/data/cities/vienne/anastasia-nails-bar.yml
@@ -5,7 +5,7 @@ longitude: 4.87186
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 86 43 26 36"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://www.anastasia-nails.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 86 43 26 36
+opening_hours: Mo-Sa 09:30-19:00
+website: https://www.anastasia-nails.fr/
diff --git a/data/cities/vienne/anastazia-beauty-cosmetique.yml b/data/cities/vienne/anastazia-beauty-cosmetique.yml
index 710222853..7351c601c 100644
--- a/data/cities/vienne/anastazia-beauty-cosmetique.yml
+++ b/data/cities/vienne/anastazia-beauty-cosmetique.yml
@@ -5,7 +5,7 @@ longitude: 4.87529
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/artcolore.yml b/data/cities/vienne/artcolore.yml
index 65226c0e7..2a6c88722 100644
--- a/data/cities/vienne/artcolore.yml
+++ b/data/cities/vienne/artcolore.yml
@@ -5,7 +5,7 @@ longitude: 4.87319
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 15 56"
-opening_hours: "Tu-Sa 09:30-12:00,14:00-18:30"
-website: "https://www.artcolore.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 15 56
+opening_hours: Tu-Sa 09:30-12:00,14:00-18:30
+website: https://www.artcolore.com/
diff --git a/data/cities/vienne/artline-institut.yml b/data/cities/vienne/artline-institut.yml
index d8324d52a..20ca4e592 100644
--- a/data/cities/vienne/artline-institut.yml
+++ b/data/cities/vienne/artline-institut.yml
@@ -4,8 +4,8 @@ latitude: 45.51644
 longitude: 4.86862
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 9 83 51 39 34"
-opening_hours: "Mo,Tu,Th,Fr 08:30-19:00; Sa 08:30-13:00"
-website: ""
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 9 83 51 39 34
+opening_hours: Mo,Tu,Th,Fr 08:30-19:00; Sa 08:30-13:00
+website: ""
diff --git a/data/cities/vienne/au-gre-du-temps.yml b/data/cities/vienne/au-gre-du-temps.yml
index ff257674e..2117e40ff 100644
--- a/data/cities/vienne/au-gre-du-temps.yml
+++ b/data/cities/vienne/au-gre-du-temps.yml
@@ -5,7 +5,7 @@ longitude: 4.87499
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: "+33474587519"
-opening_hours: "Tu-Sa 09:00-19:30; Su 09:00-12:30"
-website: "https://www.augredutemps38.com/"
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:30; Su 09:00-12:30
+website: https://www.augredutemps38.com/
diff --git a/data/cities/vienne/au-temple-du-pain.yml b/data/cities/vienne/au-temple-du-pain.yml
index f072d3a32..f25194b1e 100644
--- a/data/cities/vienne/au-temple-du-pain.yml
+++ b/data/cities/vienne/au-temple-du-pain.yml
@@ -5,7 +5,7 @@ longitude: 4.87476
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 20 36"
+housenumber: ""
+phone: +33 4 74 53 20 36
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/aurum-omnes.yml b/data/cities/vienne/aurum-omnes.yml
index 15f651c10..6dfe7fb94 100644
--- a/data/cities/vienne/aurum-omnes.yml
+++ b/data/cities/vienne/aurum-omnes.yml
@@ -5,7 +5,7 @@ longitude: 4.87562
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 26 05 88 88"
+housenumber: ""
+phone: +33 4 26 05 88 88
 opening_hours: ""
-website: "https://aurumomnes.fr/"
\ No newline at end of file
+website: https://aurumomnes.fr/
diff --git a/data/cities/vienne/axellehair.yml b/data/cities/vienne/axellehair.yml
index 30a50bfe6..b2e26423a 100644
--- a/data/cities/vienne/axellehair.yml
+++ b/data/cities/vienne/axellehair.yml
@@ -5,7 +5,7 @@ longitude: 4.86965
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 02 58"
-opening_hours: "Tu,Th-Fr 08:00-18:00; We,Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 02 58
+opening_hours: Tu,Th-Fr 08:00-18:00; We,Sa 08:00-17:00
+website: ""
diff --git a/data/cities/vienne/bambine-et-co.yml b/data/cities/vienne/bambine-et-co.yml
index 4217111f6..4a88066fa 100644
--- a/data/cities/vienne/bambine-et-co.yml
+++ b/data/cities/vienne/bambine-et-co.yml
@@ -5,7 +5,7 @@ longitude: 4.87557
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 59 85 81"
-opening_hours: "Tu-Fr 10:00-12:30,13:30-19:00; Sa 10:00-12:30,14:30-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 59 85 81
+opening_hours: Tu-Fr 10:00-12:30,13:30-19:00; Sa 10:00-12:30,14:30-19:00
+website: ""
diff --git a/data/cities/vienne/bijouterie-de-la-roche.yml b/data/cities/vienne/bijouterie-de-la-roche.yml
index 98a643d36..6f4a0a65a 100644
--- a/data/cities/vienne/bijouterie-de-la-roche.yml
+++ b/data/cities/vienne/bijouterie-de-la-roche.yml
@@ -5,7 +5,7 @@ longitude: 4.87537
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 06 34"
+housenumber: ""
+phone: +33 4 74 85 06 34
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/blason-chaussures.yml b/data/cities/vienne/blason-chaussures.yml
index 6c91e5482..ebcb77795 100644
--- a/data/cities/vienne/blason-chaussures.yml
+++ b/data/cities/vienne/blason-chaussures.yml
@@ -5,7 +5,7 @@ longitude: 4.87191
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 04 08"
-opening_hours: "Tu-Sa 09:30-12:30,14:30-19:00"
-website: "https://enbasdemarue.fr/blason-chaussures.html"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 04 08
+opening_hours: Tu-Sa 09:30-12:30,14:30-19:00
+website: https://enbasdemarue.fr/blason-chaussures.html
diff --git a/data/cities/vienne/blason-couture.yml b/data/cities/vienne/blason-couture.yml
index 0411b7d65..eb8d360e4 100644
--- a/data/cities/vienne/blason-couture.yml
+++ b/data/cities/vienne/blason-couture.yml
@@ -5,7 +5,7 @@ longitude: 4.87179
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 29 26"
-opening_hours: "Tu-Sa 09:30-12:30,14:30-19:00"
-website: "https://enbasdemarue.fr/blason-couture.html"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 29 26
+opening_hours: Tu-Sa 09:30-12:30,14:30-19:00
+website: https://enbasdemarue.fr/blason-couture.html
diff --git a/data/cities/vienne/boucherie-blache.yml b/data/cities/vienne/boucherie-blache.yml
index 9c41579df..874439135 100644
--- a/data/cities/vienne/boucherie-blache.yml
+++ b/data/cities/vienne/boucherie-blache.yml
@@ -5,7 +5,7 @@ longitude: 4.87184
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 19 15"
+housenumber: ""
+phone: +33 4 74 85 19 15
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/boucherie-du-champs-de-mars.yml b/data/cities/vienne/boucherie-du-champs-de-mars.yml
index 0f63c7f11..1158d3564 100644
--- a/data/cities/vienne/boucherie-du-champs-de-mars.yml
+++ b/data/cities/vienne/boucherie-du-champs-de-mars.yml
@@ -5,7 +5,7 @@ longitude: 4.87169
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 01 72"
-opening_hours: "Tu-Sa 07:30-12:30,15:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 01 72
+opening_hours: Tu-Sa 07:30-12:30,15:00-19:00
+website: ""
diff --git a/data/cities/vienne/boulangerie-du-theatre.yml b/data/cities/vienne/boulangerie-du-theatre.yml
index 3bd85ccf0..68b66dc25 100644
--- a/data/cities/vienne/boulangerie-du-theatre.yml
+++ b/data/cities/vienne/boulangerie-du-theatre.yml
@@ -5,7 +5,7 @@ longitude: 4.87802
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 6
-phone: "+33 4 74 31 60 59"
+housenumber: "6"
+phone: +33 4 74 31 60 59
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/boutique-ephemere.yml b/data/cities/vienne/boutique-ephemere.yml
index 1737c8106..ccce180a5 100644
--- a/data/cities/vienne/boutique-ephemere.yml
+++ b/data/cities/vienne/boutique-ephemere.yml
@@ -5,7 +5,7 @@ longitude: 4.87519
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/by-jean-charles.yml b/data/cities/vienne/by-jean-charles.yml
index 6dc76b26e..9dfa99cda 100644
--- a/data/cities/vienne/by-jean-charles.yml
+++ b/data/cities/vienne/by-jean-charles.yml
@@ -5,7 +5,7 @@ longitude: 4.87485
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 77 23"
-opening_hours: "Tu-Sa 10:00-12:30,14:00-19:00"
-website: "https://byjeancharles.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 77 23
+opening_hours: Tu-Sa 10:00-12:30,14:00-19:00
+website: https://byjeancharles.fr/
diff --git a/data/cities/vienne/c-dans-lhair.yml b/data/cities/vienne/c-dans-lhair.yml
index 7c7c344c4..c1a6abce0 100644
--- a/data/cities/vienne/c-dans-lhair.yml
+++ b/data/cities/vienne/c-dans-lhair.yml
@@ -4,8 +4,8 @@ latitude: 45.51686
 longitude: 4.86916
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 53 34 05"
-opening_hours: "We-Fr 08:30-18:30; Sa 08:30-17:30"
-website: ""
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 53 34 05
+opening_hours: We-Fr 08:30-18:30; Sa 08:30-17:30
+website: ""
diff --git a/data/cities/vienne/caire-creations.yml b/data/cities/vienne/caire-creations.yml
index fa39d13e4..fd134644a 100644
--- a/data/cities/vienne/caire-creations.yml
+++ b/data/cities/vienne/caire-creations.yml
@@ -5,7 +5,7 @@ longitude: 4.8724
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 20 72"
-opening_hours: "Mo,Th,Su off; Tu-We,Fr 09:00-12:00,14:00-18:30; Sa 10:00-12:00,14:00-18:00"
-website: "http://www.yvescaire.com"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 20 72
+opening_hours: Mo,Th,Su off; Tu-We,Fr 09:00-12:00,14:00-18:30; Sa 10:00-12:00,14:00-18:00
+website: http://www.yvescaire.com
diff --git a/data/cities/vienne/calin-toilettage.yml b/data/cities/vienne/calin-toilettage.yml
index e770874bf..fb1c7bc0c 100644
--- a/data/cities/vienne/calin-toilettage.yml
+++ b/data/cities/vienne/calin-toilettage.yml
@@ -5,7 +5,7 @@ longitude: 4.87548
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 78 04 49"
-opening_hours: "Tu-Fr 08:30-12:00,14:00-17:30; Sa 08:30-12:30"
-website: "http://www.pastor-toilettage.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 78 04 49
+opening_hours: Tu-Fr 08:30-12:00,14:00-17:30; Sa 08:30-12:30
+website: http://www.pastor-toilettage.com/
diff --git a/data/cities/vienne/carre-blanc.yml b/data/cities/vienne/carre-blanc.yml
index 29ea2a02f..459f4749f 100644
--- a/data/cities/vienne/carre-blanc.yml
+++ b/data/cities/vienne/carre-blanc.yml
@@ -5,7 +5,7 @@ longitude: 4.87398
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 31 70 98"
-opening_hours: "Tu-We,Fr 10:00-19:00; Th,Sa 09:30-12:30,14:00-19:00"
-website: "https://boutiques.carreblanc.com/linge-de-maison/vienne/VIE"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 31 70 98
+opening_hours: Tu-We,Fr 10:00-19:00; Th,Sa 09:30-12:30,14:00-19:00
+website: https://boutiques.carreblanc.com/linge-de-maison/vienne/VIE
diff --git a/data/cities/vienne/cash-express.yml b/data/cities/vienne/cash-express.yml
index 69b43a6ae..afcdf7c38 100644
--- a/data/cities/vienne/cash-express.yml
+++ b/data/cities/vienne/cash-express.yml
@@ -5,7 +5,7 @@ longitude: 4.87575
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 57 42 46"
-opening_hours: "Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-13:00,14:00-19:00"
-website: "https://www.cashexpress.fr/magasin-vienne,427.html"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 57 42 46
+opening_hours: Mo-Fr 10:00-12:00,14:00-19:00; Sa 10:00-13:00,14:00-19:00
+website: https://www.cashexpress.fr/magasin-vienne,427.html
diff --git a/data/cities/vienne/centre-rejudermie-vienne.yml b/data/cities/vienne/centre-rejudermie-vienne.yml
index 2b68b86ea..ddef976ed 100644
--- a/data/cities/vienne/centre-rejudermie-vienne.yml
+++ b/data/cities/vienne/centre-rejudermie-vienne.yml
@@ -5,7 +5,8 @@ longitude: 4.87351
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 86 42 29 29"
-opening_hours: "Mo 11:30-19:00; Tu-Th 09:30-19:00; Fr 09:30-18:00; Sa 09:30-17:30; Su off"
-website: "http://www.centre-rejudermie-vienne.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 86 42 29 29
+opening_hours: Mo 11:30-19:00; Tu-Th 09:30-19:00; Fr 09:30-18:00; Sa 09:30-17:30;
+    Su off
+website: http://www.centre-rejudermie-vienne.fr/
diff --git a/data/cities/vienne/cib-men.yml b/data/cities/vienne/cib-men.yml
index 2b5dc503e..8fafe127d 100644
--- a/data/cities/vienne/cib-men.yml
+++ b/data/cities/vienne/cib-men.yml
@@ -5,7 +5,7 @@ longitude: 4.87495
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 59 36 99"
-opening_hours: "Mo 10:00-19:00; Tu-Fr 09:00-19:00; Sa 08:30-18:00"
-website: "https://www.facebook.com/CIB-Men-314085098631269/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 59 36 99
+opening_hours: Mo 10:00-19:00; Tu-Fr 09:00-19:00; Sa 08:30-18:00
+website: https://www.facebook.com/CIB-Men-314085098631269/
diff --git a/data/cities/vienne/citroen-automobile-vienne-sud.yml b/data/cities/vienne/citroen-automobile-vienne-sud.yml
index 00229c199..aea89fab4 100644
--- a/data/cities/vienne/citroen-automobile-vienne-sud.yml
+++ b/data/cities/vienne/citroen-automobile-vienne-sud.yml
@@ -4,8 +4,8 @@ latitude: 45.50087
 longitude: 4.85088
 postcode: "38200"
 city: Vienne
-street: "Avenue Général Leclerc"
-housenumber: 163
-phone: "+33 4 74 31 15 80"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: "https://reseau.citroen.fr/vienne"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "163"
+phone: +33 4 74 31 15 80
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: https://reseau.citroen.fr/vienne
diff --git a/data/cities/vienne/clementine-boutique.yml b/data/cities/vienne/clementine-boutique.yml
index 001baae17..ccd99cce8 100644
--- a/data/cities/vienne/clementine-boutique.yml
+++ b/data/cities/vienne/clementine-boutique.yml
@@ -5,7 +5,7 @@ longitude: 4.87167
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/club-bouygues-telecom.yml b/data/cities/vienne/club-bouygues-telecom.yml
index eff2527c8..f1095c59b 100644
--- a/data/cities/vienne/club-bouygues-telecom.yml
+++ b/data/cities/vienne/club-bouygues-telecom.yml
@@ -5,7 +5,7 @@ longitude: 4.87565
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 37 02 22 55"
-opening_hours: "Mo-Sa 09:30-12:30,14:00-18:45"
-website: "https://www.bouyguestelecom.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 37 02 22 55
+opening_hours: Mo-Sa 09:30-12:30,14:00-18:45
+website: https://www.bouyguestelecom.fr/
diff --git a/data/cities/vienne/colifichets.yml b/data/cities/vienne/colifichets.yml
index 63a61f757..cf35963c1 100644
--- a/data/cities/vienne/colifichets.yml
+++ b/data/cities/vienne/colifichets.yml
@@ -5,7 +5,7 @@ longitude: 4.87361
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 14 18"
+housenumber: ""
+phone: +33 4 74 85 14 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/concept-optique-vienne.yml b/data/cities/vienne/concept-optique-vienne.yml
index 2b12c0145..f8ca739fc 100644
--- a/data/cities/vienne/concept-optique-vienne.yml
+++ b/data/cities/vienne/concept-optique-vienne.yml
@@ -5,7 +5,7 @@ longitude: 4.87589
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 87 38 38 40"
-opening_hours: "Tu-Sa 10:00-13:00,15:00-19:00"
-website: "https://concept-optique.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 87 38 38 40
+opening_hours: Tu-Sa 10:00-13:00,15:00-19:00
+website: https://concept-optique.com/
diff --git a/data/cities/vienne/coralie-coiffure.yml b/data/cities/vienne/coralie-coiffure.yml
index bd60c735c..430152fac 100644
--- a/data/cities/vienne/coralie-coiffure.yml
+++ b/data/cities/vienne/coralie-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.52478
 longitude: 4.87381
 postcode: "38200"
 city: Vienne
-street: "Place Saint-Paul"
-housenumber: 
-phone: "+33 4 74 85 09 91"
-opening_hours: "Tu-Fr 08:30-19:00; Sa 08:00-16:00"
-website: "https://coraliecoiffurevienne.business.site/"
\ No newline at end of file
+street: Place Saint-Paul
+housenumber: ""
+phone: +33 4 74 85 09 91
+opening_hours: Tu-Fr 08:30-19:00; Sa 08:00-16:00
+website: https://coraliecoiffurevienne.business.site/
diff --git a/data/cities/vienne/creassi.yml b/data/cities/vienne/creassi.yml
index 0a1cfd36d..d8d20d3cf 100644
--- a/data/cities/vienne/creassi.yml
+++ b/data/cities/vienne/creassi.yml
@@ -5,7 +5,7 @@ longitude: 4.86532
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+334 74 56 76 48"
-opening_hours: "Mo-Fr 08:00-15:30"
-website: "http://creassi.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +334 74 56 76 48
+opening_hours: Mo-Fr 08:00-15:30
+website: http://creassi.fr/
diff --git a/data/cities/vienne/cuisine-en-scene.yml b/data/cities/vienne/cuisine-en-scene.yml
index 66f67933d..a4169bcd7 100644
--- a/data/cities/vienne/cuisine-en-scene.yml
+++ b/data/cities/vienne/cuisine-en-scene.yml
@@ -5,7 +5,7 @@ longitude: 4.87486
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 84 26 32 66"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-12:00"
-website: "http://www.cuisineenscene.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 84 26 32 66
+opening_hours: Mo 14:00-19:00; Tu-Fr 10:00-12:00,14:00-19:00; Sa 10:00-12:00
+website: http://www.cuisineenscene.fr/
diff --git a/data/cities/vienne/dietplus.yml b/data/cities/vienne/dietplus.yml
index 31cc4d1e3..0c7928804 100644
--- a/data/cities/vienne/dietplus.yml
+++ b/data/cities/vienne/dietplus.yml
@@ -5,7 +5,7 @@ longitude: 4.87415
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 68 91 09 92"
-opening_hours: "Mo 14:30-18:30; Tu-Fr 09:30-18:30; Sa 09:00-16:00"
-website: "https://www.dietplus.fr/centres/vienne/"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 68 91 09 92
+opening_hours: Mo 14:30-18:30; Tu-Fr 09:30-18:30; Sa 09:00-16:00
+website: https://www.dietplus.fr/centres/vienne/
diff --git a/data/cities/vienne/ds-salon-vienne.yml b/data/cities/vienne/ds-salon-vienne.yml
index 2e22489f9..8fce592c9 100644
--- a/data/cities/vienne/ds-salon-vienne.yml
+++ b/data/cities/vienne/ds-salon-vienne.yml
@@ -4,8 +4,8 @@ latitude: 45.50105
 longitude: 4.85108
 postcode: "38200"
 city: Vienne
-street: "Avenue Général Leclerc"
-housenumber: 163
-phone: "+33 4 74 31 15 90"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00"
-website: "https://concessionnaire.dsautomobiles.fr/ds-salon-vienne"
\ No newline at end of file
+street: Avenue Général Leclerc
+housenumber: "163"
+phone: +33 4 74 31 15 90
+opening_hours: Mo-Fr 08:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00
+website: https://concessionnaire.dsautomobiles.fr/ds-salon-vienne
diff --git a/data/cities/vienne/ecouter-voir.yml b/data/cities/vienne/ecouter-voir.yml
index f67d137ee..80e0dd3ca 100644
--- a/data/cities/vienne/ecouter-voir.yml
+++ b/data/cities/vienne/ecouter-voir.yml
@@ -5,7 +5,7 @@ longitude: 4.87215
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 78 86 60; +33 4 74 56 21 86"
-opening_hours: "Mo-Fr 09:00-13:00,14:00-19:00; Sa 09:00-18:00; Su off"
-website: "https://www.ecoutervoir.fr/trouver-un-magasin/vienne/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 78 86 60; +33 4 74 56 21 86
+opening_hours: Mo-Fr 09:00-13:00,14:00-19:00; Sa 09:00-18:00; Su off
+website: https://www.ecoutervoir.fr/trouver-un-magasin/vienne/
diff --git a/data/cities/vienne/el-jenna-boutique.yml b/data/cities/vienne/el-jenna-boutique.yml
index eead21626..4995101c7 100644
--- a/data/cities/vienne/el-jenna-boutique.yml
+++ b/data/cities/vienne/el-jenna-boutique.yml
@@ -5,7 +5,7 @@ longitude: 4.87221
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 83 47 75 84;+33 6 69 78 06 47"
-opening_hours: "Mo,Su off; Tu,Th,Sa 10:00-12:00,14:00-19:00; We,Fr 14:00-19:00"
-website: "https://www.eljennaboutique.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 83 47 75 84;+33 6 69 78 06 47
+opening_hours: Mo,Su off; Tu,Th,Sa 10:00-12:00,14:00-19:00; We,Fr 14:00-19:00
+website: https://www.eljennaboutique.com/
diff --git a/data/cities/vienne/elysee-institut.yml b/data/cities/vienne/elysee-institut.yml
index f70620336..747f46b81 100644
--- a/data/cities/vienne/elysee-institut.yml
+++ b/data/cities/vienne/elysee-institut.yml
@@ -5,7 +5,7 @@ longitude: 4.87067
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 27 22"
+housenumber: ""
+phone: +33 4 74 85 27 22
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/evidemment.yml b/data/cities/vienne/evidemment.yml
index 6e6f97ccf..45fb2b693 100644
--- a/data/cities/vienne/evidemment.yml
+++ b/data/cities/vienne/evidemment.yml
@@ -5,7 +5,7 @@ longitude: 4.87325
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 7 89 95 37 86"
+housenumber: ""
+phone: +33 7 89 95 37 86
 opening_hours: ""
-website: "https://evidemmentconceptstore.wordpress.com/"
\ No newline at end of file
+website: https://evidemmentconceptstore.wordpress.com/
diff --git a/data/cities/vienne/figaro-chien.yml b/data/cities/vienne/figaro-chien.yml
index b734cc606..31109883e 100644
--- a/data/cities/vienne/figaro-chien.yml
+++ b/data/cities/vienne/figaro-chien.yml
@@ -5,7 +5,7 @@ longitude: 4.87626
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 38 31"
+housenumber: ""
+phone: +33 4 74 85 38 31
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/fleurs-de-cafe.yml b/data/cities/vienne/fleurs-de-cafe.yml
index a07859ceb..dfb3d7996 100644
--- a/data/cities/vienne/fleurs-de-cafe.yml
+++ b/data/cities/vienne/fleurs-de-cafe.yml
@@ -4,8 +4,8 @@ latitude: 45.51753
 longitude: 4.86931
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 37 04 08 52"
-opening_hours: "Tu-Sa 08:00-17:00"
-website: "https://www.fleurs-de-cafe.fr/"
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 37 04 08 52
+opening_hours: Tu-Sa 08:00-17:00
+website: https://www.fleurs-de-cafe.fr/
diff --git a/data/cities/vienne/for-t-interieur.yml b/data/cities/vienne/for-t-interieur.yml
index 711db6f80..57600433d 100644
--- a/data/cities/vienne/for-t-interieur.yml
+++ b/data/cities/vienne/for-t-interieur.yml
@@ -5,7 +5,7 @@ longitude: 4.87319
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 54 63 45; +33 6 35 53 57 43"
+housenumber: ""
+phone: +33 4 74 54 63 45; +33 6 35 53 57 43
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/franprix.yml b/data/cities/vienne/franprix.yml
index 39bc98fc6..308bd5d17 100644
--- a/data/cities/vienne/franprix.yml
+++ b/data/cities/vienne/franprix.yml
@@ -5,7 +5,7 @@ longitude: 4.87563
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 07:30-21:00; Su 09:00-21:00"
-website: "https://www.franprix.fr/"
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-21:00; Su 09:00-21:00
+website: https://www.franprix.fr/
diff --git a/data/cities/vienne/fume-des-gourmets.yml b/data/cities/vienne/fume-des-gourmets.yml
index 1a6abc31c..2ae87d5ed 100644
--- a/data/cities/vienne/fume-des-gourmets.yml
+++ b/data/cities/vienne/fume-des-gourmets.yml
@@ -4,8 +4,8 @@ latitude: 45.51694
 longitude: 4.86921
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 53 28 20"
-opening_hours: "Tu-Fr 09:00-19:00; Sa 09:00-12:30"
-website: "https://fume-des-gourmets.fr/"
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 53 28 20
+opening_hours: Tu-Fr 09:00-19:00; Sa 09:00-12:30
+website: https://fume-des-gourmets.fr/
diff --git a/data/cities/vienne/galerie-tanjung.yml b/data/cities/vienne/galerie-tanjung.yml
index e3496dcb3..256f5de99 100644
--- a/data/cities/vienne/galerie-tanjung.yml
+++ b/data/cities/vienne/galerie-tanjung.yml
@@ -4,8 +4,8 @@ latitude: 45.52342
 longitude: 4.87497
 postcode: "38200"
 city: Vienne
-street: "Rue du Musée"
-housenumber: 
+street: Rue du Musée
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/garage-dogan.yml b/data/cities/vienne/garage-dogan.yml
index a2f823f59..4f850cf29 100644
--- a/data/cities/vienne/garage-dogan.yml
+++ b/data/cities/vienne/garage-dogan.yml
@@ -5,7 +5,7 @@ longitude: 4.87015
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 1
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/gentleman.yml b/data/cities/vienne/gentleman.yml
index f83d892bc..ae9d3fd3f 100644
--- a/data/cities/vienne/gentleman.yml
+++ b/data/cities/vienne/gentleman.yml
@@ -5,7 +5,7 @@ longitude: 4.87562
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 32 18"
+housenumber: ""
+phone: +33 4 74 85 32 18
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/hair-like.yml b/data/cities/vienne/hair-like.yml
index ee01dac42..b620b8ab5 100644
--- a/data/cities/vienne/hair-like.yml
+++ b/data/cities/vienne/hair-like.yml
@@ -5,7 +5,7 @@ longitude: 4.87776
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/vienne/havas-voyage.yml b/data/cities/vienne/havas-voyage.yml
index 20722412b..9d863dcc0 100644
--- a/data/cities/vienne/havas-voyage.yml
+++ b/data/cities/vienne/havas-voyage.yml
@@ -5,7 +5,7 @@ longitude: 4.87352
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://agences.havas-voyages.fr/133-havas-voyages-faure-vienne"
\ No newline at end of file
+website: https://agences.havas-voyages.fr/133-havas-voyages-faure-vienne
diff --git a/data/cities/vienne/hetr.yml b/data/cities/vienne/hetr.yml
index 9349018bf..35591fa88 100644
--- a/data/cities/vienne/hetr.yml
+++ b/data/cities/vienne/hetr.yml
@@ -5,7 +5,7 @@ longitude: 4.87256
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 97
+housenumber: "97"
 phone: ""
-opening_hours: "Mo off; Tu-Su 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Su 09:00-19:00
+website: ""
diff --git a/data/cities/vienne/ikks-junior.yml b/data/cities/vienne/ikks-junior.yml
index da46334db..3c8d14632 100644
--- a/data/cities/vienne/ikks-junior.yml
+++ b/data/cities/vienne/ikks-junior.yml
@@ -5,7 +5,7 @@ longitude: 4.8747
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 15 29"
-opening_hours: "Tu-Sa 10:00-12:30,14:00-19:00"
-website: "https://stores.ikks.com/fr-fr/boutique/vienne/ikks-junior-vienne/4855"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 15 29
+opening_hours: Tu-Sa 10:00-12:30,14:00-19:00
+website: https://stores.ikks.com/fr-fr/boutique/vienne/ikks-junior-vienne/4855
diff --git a/data/cities/vienne/institut-capillaire-norgil.yml b/data/cities/vienne/institut-capillaire-norgil.yml
index 151e89337..7ae23138b 100644
--- a/data/cities/vienne/institut-capillaire-norgil.yml
+++ b/data/cities/vienne/institut-capillaire-norgil.yml
@@ -5,7 +5,7 @@ longitude: 4.87322
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 78 00 53"
-opening_hours: "Mo-Tu,Th-Fr 08:30-18:00; We,Sa open by appointment"
-website: "https://institut.norgil.com/institut-capillaire-vienne"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 78 00 53
+opening_hours: Mo-Tu,Th-Fr 08:30-18:00; We,Sa open "by appointment"
+website: https://institut.norgil.com/institut-capillaire-vienne
diff --git a/data/cities/vienne/institut-maria-towa.yml b/data/cities/vienne/institut-maria-towa.yml
index 5a9bf8dba..cf62a413b 100644
--- a/data/cities/vienne/institut-maria-towa.yml
+++ b/data/cities/vienne/institut-maria-towa.yml
@@ -5,7 +5,7 @@ longitude: 4.87189
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 14 67"
-opening_hours: "Mo 09:00-15:00; Tu-Fr 09:00-19:00; Sa 08:30-19:00; Su off"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 14 67
+opening_hours: Mo 09:00-15:00; Tu-Fr 09:00-19:00; Sa 08:30-19:00; Su off
+website: ""
diff --git a/data/cities/vienne/intersport.yml b/data/cities/vienne/intersport.yml
index ddae1acc0..afaee2b9c 100644
--- a/data/cities/vienne/intersport.yml
+++ b/data/cities/vienne/intersport.yml
@@ -1,11 +1,11 @@
 id: 135879489
-type: way
+type: node
 latitude: 45.50424
 longitude: 4.85058
 postcode: "38200"
 city: Vienne
-street: "Rue Édouard Girerd"
-housenumber: 
-phone: "+33 474784855"
+street: Rue Édouard Girerd
+housenumber: ""
+phone: +33 474784855
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/jardin-detoiles.yml b/data/cities/vienne/jardin-detoiles.yml
index c8a8cd28c..1625ffaa3 100644
--- a/data/cities/vienne/jardin-detoiles.yml
+++ b/data/cities/vienne/jardin-detoiles.yml
@@ -5,7 +5,7 @@ longitude: 4.87321
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 95 62 98 38"
+housenumber: ""
+phone: +33 6 95 62 98 38
 opening_hours: ""
-website: "https://jardindetoiles38.wixsite.com/bienetre"
\ No newline at end of file
+website: https://jardindetoiles38.wixsite.com/bienetre
diff --git a/data/cities/vienne/jean-jacques-vachon.yml b/data/cities/vienne/jean-jacques-vachon.yml
index e5182f977..ba82624e8 100644
--- a/data/cities/vienne/jean-jacques-vachon.yml
+++ b/data/cities/vienne/jean-jacques-vachon.yml
@@ -5,7 +5,7 @@ longitude: 4.87347
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 07 71"
-opening_hours: "Mo,Su off; Tu-Fr 08:00-18:30; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 07 71
+opening_hours: Mo,Su off; Tu-Fr 08:00-18:30; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/vienne/joelle-mode-couture.yml b/data/cities/vienne/joelle-mode-couture.yml
index 222164304..c4d591f24 100644
--- a/data/cities/vienne/joelle-mode-couture.yml
+++ b/data/cities/vienne/joelle-mode-couture.yml
@@ -5,7 +5,7 @@ longitude: 4.8738
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 54 12 35"
-opening_hours: "Tu-Fr 09:00-12:30,13:30-18:00; Sa 09:00-12:30,13:30-16:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 54 12 35
+opening_hours: Tu-Fr 09:00-12:30,13:30-18:00; Sa 09:00-12:30,13:30-16:00
+website: ""
diff --git a/data/cities/vienne/juliette-et-charly.yml b/data/cities/vienne/juliette-et-charly.yml
index 68765a69d..63f2a2bb1 100644
--- a/data/cities/vienne/juliette-et-charly.yml
+++ b/data/cities/vienne/juliette-et-charly.yml
@@ -5,7 +5,7 @@ longitude: 4.87466
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 79 63 80 10"
-opening_hours: "Tu-Sa 10:00-12:30,14:00-19:00"
-website: "https://www.vienne-online.com/juliette-et-charly"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 79 63 80 10
+opening_hours: Tu-Sa 10:00-12:30,14:00-19:00
+website: https://www.vienne-online.com/juliette-et-charly
diff --git a/data/cities/vienne/kiff-ca.yml b/data/cities/vienne/kiff-ca.yml
index 181e950e4..f25d4d1f6 100644
--- a/data/cities/vienne/kiff-ca.yml
+++ b/data/cities/vienne/kiff-ca.yml
@@ -5,7 +5,7 @@ longitude: 4.87559
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 24 25 00 57"
-opening_hours: "Tu-Fr 10:00-12:00,14:00-18:30; Sa 10:00-12:00,14:00-19:00"
-website: "https://boutiquekiffca.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 24 25 00 57
+opening_hours: Tu-Fr 10:00-12:00,14:00-18:30; Sa 10:00-12:00,14:00-19:00
+website: https://boutiquekiffca.com/
diff --git a/data/cities/vienne/la-boutique-charlotte.yml b/data/cities/vienne/la-boutique-charlotte.yml
index a19f344eb..e0934f2a8 100644
--- a/data/cities/vienne/la-boutique-charlotte.yml
+++ b/data/cities/vienne/la-boutique-charlotte.yml
@@ -5,7 +5,8 @@ longitude: 4.87457
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 67 94 44 26"
-opening_hours: "Tu-Th 10:00-12:00,14:30-18:30; Fr 10:00-12:00,14:00-19:00; Sa 10:30-18:30; PH closed"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 6 67 94 44 26
+opening_hours: Tu-Th 10:00-12:00,14:30-18:30; Fr 10:00-12:00,14:00-19:00; Sa 10:30-18:30;
+    PH closed
+website: ""
diff --git a/data/cities/vienne/la-maison-de-la-brioche.yml b/data/cities/vienne/la-maison-de-la-brioche.yml
index 3c3c975cc..7df73ddc3 100644
--- a/data/cities/vienne/la-maison-de-la-brioche.yml
+++ b/data/cities/vienne/la-maison-de-la-brioche.yml
@@ -5,7 +5,7 @@ longitude: 4.87574
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/la-maison-des-pains.yml b/data/cities/vienne/la-maison-des-pains.yml
index 2b593f961..71a2946dc 100644
--- a/data/cities/vienne/la-maison-des-pains.yml
+++ b/data/cities/vienne/la-maison-des-pains.yml
@@ -4,8 +4,8 @@ latitude: 45.51961
 longitude: 4.87014
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 53 20 90"
-opening_hours: "06:00-19:00"
-website: ""
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 53 20 90
+opening_hours: 06:00-19:00
+website: ""
diff --git a/data/cities/vienne/la-suite.yml b/data/cities/vienne/la-suite.yml
index e624432d2..a93ee6a7a 100644
--- a/data/cities/vienne/la-suite.yml
+++ b/data/cities/vienne/la-suite.yml
@@ -5,7 +5,7 @@ longitude: 4.87454
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 67 94 44 26"
+housenumber: ""
+phone: +33 6 67 94 44 26
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/lamoire-aux-coquelicots.yml b/data/cities/vienne/lamoire-aux-coquelicots.yml
index ce6535e1a..6b07af91d 100644
--- a/data/cities/vienne/lamoire-aux-coquelicots.yml
+++ b/data/cities/vienne/lamoire-aux-coquelicots.yml
@@ -5,7 +5,7 @@ longitude: 4.87234
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 83 54 22 48"
-opening_hours: "Tu-Sa 13:00-19:00"
-website: "https://www.larmoire-aux-coquelicots.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 83 54 22 48
+opening_hours: Tu-Sa 13:00-19:00
+website: https://www.larmoire-aux-coquelicots.com/
diff --git a/data/cities/vienne/lanza.yml b/data/cities/vienne/lanza.yml
index 8614c72f8..06bf2d1d5 100644
--- a/data/cities/vienne/lanza.yml
+++ b/data/cities/vienne/lanza.yml
@@ -5,7 +5,7 @@ longitude: 4.87176
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 26 05 27 11"
+housenumber: ""
+phone: +33 4 26 05 27 11
 opening_hours: ""
-website: "https://www.lanza-boutique.com/"
\ No newline at end of file
+website: https://www.lanza-boutique.com/
diff --git a/data/cities/vienne/latelier-du-sourcil.yml b/data/cities/vienne/latelier-du-sourcil.yml
index 50c07aefa..f86bc33b1 100644
--- a/data/cities/vienne/latelier-du-sourcil.yml
+++ b/data/cities/vienne/latelier-du-sourcil.yml
@@ -5,7 +5,7 @@ longitude: 4.87184
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 82 62 98 95"
-opening_hours: "Tu,Th 09:30-18:00; We,Fr 09:30-18:30; Sa 09:00-17:00"
-website: "https://booking.atelierdusourcil.com/ads382-vienne"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 82 62 98 95
+opening_hours: Tu,Th 09:30-18:00; We,Fr 09:30-18:30; Sa 09:00-17:00
+website: https://booking.atelierdusourcil.com/ads382-vienne
diff --git a/data/cities/vienne/lc-coiffure.yml b/data/cities/vienne/lc-coiffure.yml
index bdcf61ed7..79eb4981c 100644
--- a/data/cities/vienne/lc-coiffure.yml
+++ b/data/cities/vienne/lc-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.87405
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 16 00 57"
-opening_hours: "Tu-Fr 08:00-18:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 16 00 57
+opening_hours: Tu-Fr 08:00-18:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/vienne/ldlc.yml b/data/cities/vienne/ldlc.yml
index 4e8fedff4..438e37da5 100644
--- a/data/cities/vienne/ldlc.yml
+++ b/data/cities/vienne/ldlc.yml
@@ -6,6 +6,7 @@ postcode: "38200"
 city: Vienne
 street: ""
 housenumber: 10-14
-phone: "+33 4 81 43 11 11"
-opening_hours: "Tu-We 10:00-19:00; Th 10:00-12:30, 13:30-19:00; Fr 10:00-19:00; Sa 10:00-12:00, 14:00-19:00"
-website: "https://www.ldlc.com/magasins-ldlc/magasin-470055/38-ldlc-vienne/"
\ No newline at end of file
+phone: +33 4 81 43 11 11
+opening_hours: Tu-We 10:00-19:00; Th 10:00-12:30, 13:30-19:00; Fr 10:00-19:00; Sa
+    10:00-12:00, 14:00-19:00
+website: https://www.ldlc.com/magasins-ldlc/magasin-470055/38-ldlc-vienne/
diff --git a/data/cities/vienne/le-boudoir-daddictr.yml b/data/cities/vienne/le-boudoir-daddictr.yml
index abf6c401f..a93ee93e9 100644
--- a/data/cities/vienne/le-boudoir-daddictr.yml
+++ b/data/cities/vienne/le-boudoir-daddictr.yml
@@ -5,7 +5,7 @@ longitude: 4.87159
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 85 66"
-opening_hours: "Tu,Fr 09:00-19:00; We-Th,Sa 09:00-18:00"
-website: "https://www.leboudoirdaddictr.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 85 66
+opening_hours: Tu,Fr 09:00-19:00; We-Th,Sa 09:00-18:00
+website: https://www.leboudoirdaddictr.fr/
diff --git a/data/cities/vienne/le-brazza.yml b/data/cities/vienne/le-brazza.yml
index d59c0537c..4ae9fed41 100644
--- a/data/cities/vienne/le-brazza.yml
+++ b/data/cities/vienne/le-brazza.yml
@@ -5,7 +5,7 @@ longitude: 4.87512
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 66 86"
+housenumber: ""
+phone: +33 4 74 85 66 86
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/le-centre-de-soi-elodie-forel.yml b/data/cities/vienne/le-centre-de-soi-elodie-forel.yml
index 59a5c17e7..4eb20b4bb 100644
--- a/data/cities/vienne/le-centre-de-soi-elodie-forel.yml
+++ b/data/cities/vienne/le-centre-de-soi-elodie-forel.yml
@@ -5,7 +5,7 @@ longitude: 4.87277
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 67 89 34 98"
+housenumber: ""
+phone: +33 6 67 89 34 98
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/le-gourmand.yml b/data/cities/vienne/le-gourmand.yml
index da83acc73..5a5bc8487 100644
--- a/data/cities/vienne/le-gourmand.yml
+++ b/data/cities/vienne/le-gourmand.yml
@@ -4,8 +4,8 @@ latitude: 45.51658
 longitude: 4.86898
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 31 63 03"
-opening_hours: "Tu-Fr 08:45-12:30,15:00-19:30; Sa 08:45-13:00,15:00-19:30"
-website: ""
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 31 63 03
+opening_hours: Tu-Fr 08:45-12:30,15:00-19:30; Sa 08:45-13:00,15:00-19:30
+website: ""
diff --git a/data/cities/vienne/le-havane.yml b/data/cities/vienne/le-havane.yml
index 22f1734aa..6f6eec30f 100644
--- a/data/cities/vienne/le-havane.yml
+++ b/data/cities/vienne/le-havane.yml
@@ -5,7 +5,7 @@ longitude: 4.87236
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 13 72"
-opening_hours: "Mo-Fr 06:30-20:00; Sa 07:30-20:00; Su 08:00-14:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 13 72
+opening_hours: Mo-Fr 06:30-20:00; Sa 07:30-20:00; Su 08:00-14:00
+website: ""
diff --git a/data/cities/vienne/le-nicocotine.yml b/data/cities/vienne/le-nicocotine.yml
index 02021036b..5aa1dd34f 100644
--- a/data/cities/vienne/le-nicocotine.yml
+++ b/data/cities/vienne/le-nicocotine.yml
@@ -5,7 +5,7 @@ longitude: 4.86938
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 05 74"
-opening_hours: "Mo-Fr 06:00-13:00,16:00-19:00; Sa 07:00-13:00,16:00-19:00; PH closed"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 05 74
+opening_hours: Mo-Fr 06:00-13:00,16:00-19:00; Sa 07:00-13:00,16:00-19:00; PH closed
+website: ""
diff --git a/data/cities/vienne/lepicerie-de-jeanne.yml b/data/cities/vienne/lepicerie-de-jeanne.yml
index e3afb1a56..997d247b2 100644
--- a/data/cities/vienne/lepicerie-de-jeanne.yml
+++ b/data/cities/vienne/lepicerie-de-jeanne.yml
@@ -4,8 +4,9 @@ latitude: 45.51683
 longitude: 4.86887
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 85 60 80"
-opening_hours: "Tu-We 07:30-12:30,15:00-19:00; Th 07:30-12:30; Fr-Sa 07:30-19:00; Su 07:30-12:00; 24/7 closed Fermé pour raison de santé"
-website: "http://commerces.viennagglo.fr/epicerie-de-jeanne-vienne.html"
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 85 60 80
+opening_hours: Tu-We 07:30-12:30,15:00-19:00; Th 07:30-12:30; Fr-Sa 07:30-19:00; Su
+    07:30-12:00; 24/7 closed "Fermé pour raison de santé"
+website: http://commerces.viennagglo.fr/epicerie-de-jeanne-vienne.html
diff --git a/data/cities/vienne/les-bulles-de-vienne.yml b/data/cities/vienne/les-bulles-de-vienne.yml
index 2509ca975..27184ddcf 100644
--- a/data/cities/vienne/les-bulles-de-vienne.yml
+++ b/data/cities/vienne/les-bulles-de-vienne.yml
@@ -5,7 +5,7 @@ longitude: 4.87578
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 07 14"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-12:30, 14:00-19:00"
-website: "https://www.canalbd.net/les-bulles-de-vienne"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 07 14
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-12:30, 14:00-19:00
+website: https://www.canalbd.net/les-bulles-de-vienne
diff --git a/data/cities/vienne/les-carnets-de-sophia.yml b/data/cities/vienne/les-carnets-de-sophia.yml
index 900d2e23b..eac26fc28 100644
--- a/data/cities/vienne/les-carnets-de-sophia.yml
+++ b/data/cities/vienne/les-carnets-de-sophia.yml
@@ -5,7 +5,7 @@ longitude: 4.87362
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 87 05 46"
+housenumber: ""
+phone: +33 4 74 87 05 46
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/les-coupines.yml b/data/cities/vienne/les-coupines.yml
index e1842cae0..329609a7c 100644
--- a/data/cities/vienne/les-coupines.yml
+++ b/data/cities/vienne/les-coupines.yml
@@ -5,7 +5,7 @@ longitude: 4.87242
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 86 15 30 34"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.boutique-lescoupines.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 86 15 30 34
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00
+website: https://www.boutique-lescoupines.com/
diff --git a/data/cities/vienne/les-pokotos.yml b/data/cities/vienne/les-pokotos.yml
index 67d0f90e1..c5abd4810 100644
--- a/data/cities/vienne/les-pokotos.yml
+++ b/data/cities/vienne/les-pokotos.yml
@@ -5,7 +5,7 @@ longitude: 4.87634
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 86 97 64 86"
-opening_hours: "We-Sa 10:30-12:00,14:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 6 86 97 64 86
+opening_hours: We-Sa 10:30-12:00,14:00-19:00
+website: ""
diff --git a/data/cities/vienne/lesprit-damelie.yml b/data/cities/vienne/lesprit-damelie.yml
index 0a8d7f29f..0ac0e7689 100644
--- a/data/cities/vienne/lesprit-damelie.yml
+++ b/data/cities/vienne/lesprit-damelie.yml
@@ -5,7 +5,7 @@ longitude: 4.87502
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 59 80 27"
-opening_hours: "Tu-Fr 10:00-12:30,14:30-19:00; Sa 10:00-12:00,14:30-19:00"
-website: "https://www.lespritdamelie.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 59 80 27
+opening_hours: Tu-Fr 10:00-12:30,14:30-19:00; Sa 10:00-12:00,14:30-19:00
+website: https://www.lespritdamelie.fr/
diff --git a/data/cities/vienne/lilie.yml b/data/cities/vienne/lilie.yml
index c50d7a808..d679eada3 100644
--- a/data/cities/vienne/lilie.yml
+++ b/data/cities/vienne/lilie.yml
@@ -5,7 +5,7 @@ longitude: 4.87486
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 27 87 15 60"
+housenumber: ""
+phone: +33 4 27 87 15 60
 opening_hours: ""
-website: "https://www.vienneatoutcommerce.fr/adherent/lilie-boutique/"
\ No newline at end of file
+website: https://www.vienneatoutcommerce.fr/adherent/lilie-boutique/
diff --git a/data/cities/vienne/lola-by.yml b/data/cities/vienne/lola-by.yml
index 2a6607268..1b3869dc9 100644
--- a/data/cities/vienne/lola-by.yml
+++ b/data/cities/vienne/lola-by.yml
@@ -5,7 +5,7 @@ longitude: 4.87496
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 48 63 26"
-opening_hours: "Mo-Su 09:30-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 48 63 26
+opening_hours: Mo-Su 09:30-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/vienne/lynx-optique.yml b/data/cities/vienne/lynx-optique.yml
index 4a21a2546..08a8aa0ff 100644
--- a/data/cities/vienne/lynx-optique.yml
+++ b/data/cities/vienne/lynx-optique.yml
@@ -5,7 +5,7 @@ longitude: 4.8737
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 31 62 51"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:00-12:00,14:00-19:00; Su off"
-website: "https://www.lynx-optique.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 31 62 51
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:00-12:00,14:00-19:00; Su off
+website: https://www.lynx-optique.com/
diff --git a/data/cities/vienne/maison-de-la-mobilite.yml b/data/cities/vienne/maison-de-la-mobilite.yml
index af8455d70..7ed598916 100644
--- a/data/cities/vienne/maison-de-la-mobilite.yml
+++ b/data/cities/vienne/maison-de-la-mobilite.yml
@@ -1,11 +1,11 @@
 id: 116996248
-type: way
+type: node
 latitude: 45.52137
 longitude: 4.87455
 postcode: "38200"
 city: Vienne
-street: "Place Pierre Semard"
-housenumber: 
-phone: "+33 4 74 85 18 51"
-opening_hours: "Mo-Fr 08:30-12:30,14:00-19:00; Sa 08:30-12:30,14:00-16:30; PH closed"
-website: "https://www.lvabus.com/maison-de-la-mobilite"
\ No newline at end of file
+street: Place Pierre Semard
+housenumber: ""
+phone: +33 4 74 85 18 51
+opening_hours: Mo-Fr 08:30-12:30,14:00-19:00; Sa 08:30-12:30,14:00-16:30; PH closed
+website: https://www.lvabus.com/maison-de-la-mobilite
diff --git a/data/cities/vienne/maison-funeraire-de-vienne.yml b/data/cities/vienne/maison-funeraire-de-vienne.yml
index 6f93e1deb..68c15e67a 100644
--- a/data/cities/vienne/maison-funeraire-de-vienne.yml
+++ b/data/cities/vienne/maison-funeraire-de-vienne.yml
@@ -5,7 +5,7 @@ longitude: 4.86821
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 59 99 04"
-opening_hours: "Mo-Su 07:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 59 99 04
+opening_hours: Mo-Su 07:00-19:00
+website: ""
diff --git a/data/cities/vienne/maison-gabilor.yml b/data/cities/vienne/maison-gabilor.yml
index a641fb238..ecedcd611 100644
--- a/data/cities/vienne/maison-gabilor.yml
+++ b/data/cities/vienne/maison-gabilor.yml
@@ -5,7 +5,7 @@ longitude: 4.87334
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 15 01 45"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 15 01 45
+opening_hours: Mo 14:00-19:00; Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/vienne/marie-jo-boutique.yml b/data/cities/vienne/marie-jo-boutique.yml
index bc859dd7e..62f50faef 100644
--- a/data/cities/vienne/marie-jo-boutique.yml
+++ b/data/cities/vienne/marie-jo-boutique.yml
@@ -5,7 +5,7 @@ longitude: 4.87462
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 72 58"
+housenumber: ""
+phone: +33 4 74 85 72 58
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/marine-men.yml b/data/cities/vienne/marine-men.yml
index 23df9abc4..8d692d9eb 100644
--- a/data/cities/vienne/marine-men.yml
+++ b/data/cities/vienne/marine-men.yml
@@ -5,7 +5,7 @@ longitude: 4.87484
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 38 95"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-12:30,14:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 38 95
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-12:30,14:00-19:00
+website: ""
diff --git a/data/cities/vienne/marionnaud-parfumerie-2.yml b/data/cities/vienne/marionnaud-parfumerie-2.yml
index bcd7b1be0..5a5ba88b6 100644
--- a/data/cities/vienne/marionnaud-parfumerie-2.yml
+++ b/data/cities/vienne/marionnaud-parfumerie-2.yml
@@ -5,7 +5,7 @@ longitude: 4.87564
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 34 51"
-opening_hours: "Mo-Sa 09:00-19:00; Su off"
-website: "https://www.marionnaud.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 34 51
+opening_hours: Mo-Sa 09:00-19:00; Su off
+website: https://www.marionnaud.fr/
diff --git a/data/cities/vienne/marionnaud-parfumerie.yml b/data/cities/vienne/marionnaud-parfumerie.yml
index 5a401cc52..9808a857d 100644
--- a/data/cities/vienne/marionnaud-parfumerie.yml
+++ b/data/cities/vienne/marionnaud-parfumerie.yml
@@ -4,8 +4,8 @@ latitude: 45.52447
 longitude: 4.87544
 postcode: "38200"
 city: Vienne
-street: "Rue Ponsard"
-housenumber: 
+street: Rue Ponsard
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.marionnaud.fr/"
\ No newline at end of file
+website: https://www.marionnaud.fr/
diff --git a/data/cities/vienne/maxi-planete.yml b/data/cities/vienne/maxi-planete.yml
index f56ce4faf..81c2497b2 100644
--- a/data/cities/vienne/maxi-planete.yml
+++ b/data/cities/vienne/maxi-planete.yml
@@ -4,8 +4,8 @@ latitude: 45.51669
 longitude: 4.86878
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
+street: Cours de Verdun
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/vienne/mine-nails.yml b/data/cities/vienne/mine-nails.yml
index f2efd402d..69de1037a 100644
--- a/data/cities/vienne/mine-nails.yml
+++ b/data/cities/vienne/mine-nails.yml
@@ -5,7 +5,7 @@ longitude: 4.87385
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 32 32 35 83"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: "https://minenails.kalendes.com"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 32 32 35 83
+opening_hours: Mo-Sa 09:30-19:00
+website: https://minenails.kalendes.com
diff --git a/data/cities/vienne/motta-cucine.yml b/data/cities/vienne/motta-cucine.yml
index 704ca8822..cc63ccf01 100644
--- a/data/cities/vienne/motta-cucine.yml
+++ b/data/cities/vienne/motta-cucine.yml
@@ -5,7 +5,7 @@ longitude: 4.8777
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 11
-phone: "+33 6 64 41 06 23;+33 9 82 32 18 66"
+housenumber: "11"
+phone: +33 6 64 41 06 23;+33 9 82 32 18 66
 opening_hours: ""
-website: "https://www.mottacucine.fr/"
\ No newline at end of file
+website: https://www.mottacucine.fr/
diff --git a/data/cities/vienne/moustache-et-bigoudis.yml b/data/cities/vienne/moustache-et-bigoudis.yml
index 90795f3f0..ff9509686 100644
--- a/data/cities/vienne/moustache-et-bigoudis.yml
+++ b/data/cities/vienne/moustache-et-bigoudis.yml
@@ -5,7 +5,7 @@ longitude: 4.8758
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 51 13 77 63"
-opening_hours: "Tu-Th 09:00-19:00; Fr 09:00-12:00,14:00-21:30"
-website: "https://www.kalendes.com/moustache-et-bigoudis/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 51 13 77 63
+opening_hours: Tu-Th 09:00-19:00; Fr 09:00-12:00,14:00-21:30
+website: https://www.kalendes.com/moustache-et-bigoudis/
diff --git a/data/cities/vienne/mr-coco.yml b/data/cities/vienne/mr-coco.yml
index 6e953f325..3102460a1 100644
--- a/data/cities/vienne/mr-coco.yml
+++ b/data/cities/vienne/mr-coco.yml
@@ -5,7 +5,7 @@ longitude: 4.87239
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 68
+housenumber: "68"
 phone: ""
-opening_hours: "We-Sa 09:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: We-Sa 09:00-18:30
+website: ""
diff --git a/data/cities/vienne/naturhouse.yml b/data/cities/vienne/naturhouse.yml
index efac48285..ee80f0fa5 100644
--- a/data/cities/vienne/naturhouse.yml
+++ b/data/cities/vienne/naturhouse.yml
@@ -4,8 +4,9 @@ latitude: 45.51624
 longitude: 4.86876
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 20 16 88"
-opening_hours: "Mo 10:00-13:00,14:00-18:00; Tu 10:00-13:00,14:00-18:30; We 09:00-13:00,14:00-19:00; Th 09:00-13:00,14:00-17:30; Fr 09:00-13:00"
-website: "https://www.naturhouse.fr/"
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 20 16 88
+opening_hours: Mo 10:00-13:00,14:00-18:00; Tu 10:00-13:00,14:00-18:30; We 09:00-13:00,14:00-19:00;
+    Th 09:00-13:00,14:00-17:30; Fr 09:00-13:00
+website: https://www.naturhouse.fr/
diff --git a/data/cities/vienne/opalin.yml b/data/cities/vienne/opalin.yml
index 4a5ad9b44..0377ddb16 100644
--- a/data/cities/vienne/opalin.yml
+++ b/data/cities/vienne/opalin.yml
@@ -5,7 +5,7 @@ longitude: 4.87572
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 59 91 58"
+housenumber: ""
+phone: +33 4 74 59 91 58
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/orange.yml b/data/cities/vienne/orange.yml
index b34346e61..9a8afdb58 100644
--- a/data/cities/vienne/orange.yml
+++ b/data/cities/vienne/orange.yml
@@ -5,7 +5,7 @@ longitude: 4.87334
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:30-12:30,14:00-19:00"
-website: "https://agence.orange.fr/5648-boutique-orange-vienne"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-12:30,14:00-19:00
+website: https://agence.orange.fr/5648-boutique-orange-vienne
diff --git a/data/cities/vienne/orienthal-erciyes.yml b/data/cities/vienne/orienthal-erciyes.yml
index d5130e46e..beb8948ca 100644
--- a/data/cities/vienne/orienthal-erciyes.yml
+++ b/data/cities/vienne/orienthal-erciyes.yml
@@ -4,8 +4,8 @@ latitude: 45.54016
 longitude: 4.86034
 postcode: "38200"
 city: Vienne
-street: "Place du 19 Mars"
-housenumber: 19
+street: Place du 19 Mars
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/paradis-du-geek.yml b/data/cities/vienne/paradis-du-geek.yml
index 71bd9f9f3..49238ce18 100644
--- a/data/cities/vienne/paradis-du-geek.yml
+++ b/data/cities/vienne/paradis-du-geek.yml
@@ -5,7 +5,7 @@ longitude: 4.87544
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 27 69 18 37"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://paradisdugeek.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 27 69 18 37
+opening_hours: Mo-Sa 10:00-19:00
+website: https://paradisdugeek.com/
diff --git a/data/cities/vienne/paradis.yml b/data/cities/vienne/paradis.yml
index 02825a646..dc2626549 100644
--- a/data/cities/vienne/paradis.yml
+++ b/data/cities/vienne/paradis.yml
@@ -5,7 +5,7 @@ longitude: 4.87182
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 10:00-19:30; Sa 08:00-18:00; Su 10:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-19:30; Sa 08:00-18:00; Su 10:00-17:00
+website: ""
diff --git a/data/cities/vienne/parapharmacie-lafayette.yml b/data/cities/vienne/parapharmacie-lafayette.yml
index ea8b5702d..6bc6f6a0d 100644
--- a/data/cities/vienne/parapharmacie-lafayette.yml
+++ b/data/cities/vienne/parapharmacie-lafayette.yml
@@ -5,7 +5,7 @@ longitude: 4.87123
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/vienne/passerelles.yml b/data/cities/vienne/passerelles.yml
index 6a8f7d93f..0dc290a77 100644
--- a/data/cities/vienne/passerelles.yml
+++ b/data/cities/vienne/passerelles.yml
@@ -5,7 +5,7 @@ longitude: 4.87251
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 09 50"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-19:00"
-website: "https://www.librairie-passerelles.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 09 50
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-19:00
+website: https://www.librairie-passerelles.fr/
diff --git a/data/cities/vienne/pfg.yml b/data/cities/vienne/pfg.yml
index cefce2add..ddabce698 100644
--- a/data/cities/vienne/pfg.yml
+++ b/data/cities/vienne/pfg.yml
@@ -5,7 +5,7 @@ longitude: 4.8755
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 03 88"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00"
-website: "https://www.pfg.fr/nos-agences/isere/vienne/agence-pompes-funebres-pfg-vienne"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 03 88
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:00; Sa 09:00-12:00
+website: https://www.pfg.fr/nos-agences/isere/vienne/agence-pompes-funebres-pfg-vienne
diff --git a/data/cities/vienne/phox-viennimage.yml b/data/cities/vienne/phox-viennimage.yml
index 775e2447a..8a779cf8a 100644
--- a/data/cities/vienne/phox-viennimage.yml
+++ b/data/cities/vienne/phox-viennimage.yml
@@ -5,7 +5,7 @@ longitude: 4.87193
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 20 20"
-opening_hours: "Tu-Fr 09:00-18:30; Sa 09:00-12:00,14:00-18:30"
-website: "https://www.viennimage.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 20 20
+opening_hours: Tu-Fr 09:00-18:30; Sa 09:00-12:00,14:00-18:30
+website: https://www.viennimage.fr/
diff --git a/data/cities/vienne/picard.yml b/data/cities/vienne/picard.yml
index 69b8a2e3f..e6dfe772a 100644
--- a/data/cities/vienne/picard.yml
+++ b/data/cities/vienne/picard.yml
@@ -5,7 +5,7 @@ longitude: 4.87151
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 22 01 33 20"
-opening_hours: "Mo-Sa 09:00-19:30; Su 09:00-12:45"
-website: "https://magasins.picard.fr/1140-picard-vienne"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 22 01 33 20
+opening_hours: Mo-Sa 09:00-19:30; Su 09:00-12:45
+website: https://magasins.picard.fr/1140-picard-vienne
diff --git a/data/cities/vienne/pile-a-lheure.yml b/data/cities/vienne/pile-a-lheure.yml
index 68387b391..92c965670 100644
--- a/data/cities/vienne/pile-a-lheure.yml
+++ b/data/cities/vienne/pile-a-lheure.yml
@@ -5,7 +5,7 @@ longitude: 4.87449
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 59 51 62"
+housenumber: ""
+phone: +33 4 74 59 51 62
 opening_hours: ""
-website: "https://www.lequandquand.fr/vendor/pilealheure/"
\ No newline at end of file
+website: https://www.lequandquand.fr/vendor/pilealheure/
diff --git a/data/cities/vienne/pirouette.yml b/data/cities/vienne/pirouette.yml
index f438c453d..fe8488a35 100644
--- a/data/cities/vienne/pirouette.yml
+++ b/data/cities/vienne/pirouette.yml
@@ -5,7 +5,7 @@ longitude: 4.87236
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 78 05 97"
-opening_hours: "Mo-Sa 09:30-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 78 05 97
+opening_hours: Mo-Sa 09:30-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/vienne/pixsoft-informatique.yml b/data/cities/vienne/pixsoft-informatique.yml
index e93d7bd7e..9a6809e90 100644
--- a/data/cities/vienne/pixsoft-informatique.yml
+++ b/data/cities/vienne/pixsoft-informatique.yml
@@ -4,8 +4,8 @@ latitude: 45.51744
 longitude: 4.86927
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 6 31 96 91 05"
-opening_hours: "Mo-We 10:00-13:00,14:00-18:30; Th-Fr 10:00-18:00; Sa 10:30-18:30"
-website: "https://www.pixsoft.fr/"
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 6 31 96 91 05
+opening_hours: Mo-We 10:00-13:00,14:00-18:30; Th-Fr 10:00-18:00; Sa 10:30-18:30
+website: https://www.pixsoft.fr/
diff --git a/data/cities/vienne/poesie.yml b/data/cities/vienne/poesie.yml
index 167a12cef..8ed76395e 100644
--- a/data/cities/vienne/poesie.yml
+++ b/data/cities/vienne/poesie.yml
@@ -5,7 +5,7 @@ longitude: 4.87232
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 6 71 46 38 18"
-opening_hours: "Mo-Sa 09:00-12:00; Su off"
-website: "https://www.poesiepatisseriedemotions.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 6 71 46 38 18
+opening_hours: Mo-Sa 09:00-12:00; Su off
+website: https://www.poesiepatisseriedemotions.com/
diff --git a/data/cities/vienne/poisson-davril.yml b/data/cities/vienne/poisson-davril.yml
index 14f5c8385..e204aa918 100644
--- a/data/cities/vienne/poisson-davril.yml
+++ b/data/cities/vienne/poisson-davril.yml
@@ -5,7 +5,7 @@ longitude: 4.87439
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 58 17 12"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "https://poissondavril38.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 58 17 12
+opening_hours: Tu-Sa 10:00-19:00
+website: https://poissondavril38.com/
diff --git a/data/cities/vienne/pyramide-coiffure.yml b/data/cities/vienne/pyramide-coiffure.yml
index 5fb5f18b7..75f99e7f1 100644
--- a/data/cities/vienne/pyramide-coiffure.yml
+++ b/data/cities/vienne/pyramide-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.51633
 longitude: 4.86855
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 53 12 65"
-opening_hours: "Tu-Fr 09:00-18:00; Sa 09:00-16:00"
-website: ""
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 53 12 65
+opening_hours: Tu-Fr 09:00-18:00; Sa 09:00-16:00
+website: ""
diff --git a/data/cities/vienne/r-e-p-micro-informatique.yml b/data/cities/vienne/r-e-p-micro-informatique.yml
index a962e6a2c..1d0e41eec 100644
--- a/data/cities/vienne/r-e-p-micro-informatique.yml
+++ b/data/cities/vienne/r-e-p-micro-informatique.yml
@@ -5,7 +5,7 @@ longitude: 4.87294
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 63 45"
-opening_hours: "Tu-Fr 09:30-12:00,14:00-18:30"
-website: "https://www.repmicro.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 63 45
+opening_hours: Tu-Fr 09:30-12:00,14:00-18:30
+website: https://www.repmicro.com/
diff --git a/data/cities/vienne/rieker-vienne.yml b/data/cities/vienne/rieker-vienne.yml
index 7c0981b88..e3a6ab089 100644
--- a/data/cities/vienne/rieker-vienne.yml
+++ b/data/cities/vienne/rieker-vienne.yml
@@ -5,7 +5,7 @@ longitude: 4.87537
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 51 13 89 42"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:30,14:00-19:00; Sa 10:00-12:00,14:00-19:00"
-website: "https://www.roux-chaussures.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 51 13 89 42
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:30,14:00-19:00; Sa 10:00-12:00,14:00-19:00
+website: https://www.roux-chaussures.fr/
diff --git a/data/cities/vienne/rustic-pressing.yml b/data/cities/vienne/rustic-pressing.yml
index 7039a3a00..f65f56df3 100644
--- a/data/cities/vienne/rustic-pressing.yml
+++ b/data/cities/vienne/rustic-pressing.yml
@@ -5,7 +5,7 @@ longitude: 4.87377
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 46 30"
-opening_hours: "Tu-Fr 08:00-12:30,14:30-19:00; Sa 09:00-12:30,14:30-18:00"
-website: "https://www.vienneatoutcommerce.fr/adherent/rustic-pressing/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 46 30
+opening_hours: Tu-Fr 08:00-12:30,14:30-19:00; Sa 09:00-12:30,14:30-18:00
+website: https://www.vienneatoutcommerce.fr/adherent/rustic-pressing/
diff --git a/data/cities/vienne/scarla.yml b/data/cities/vienne/scarla.yml
index e3d0a6aab..11fb76b08 100644
--- a/data/cities/vienne/scarla.yml
+++ b/data/cities/vienne/scarla.yml
@@ -5,7 +5,7 @@ longitude: 4.87555
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 79 85 88"
+housenumber: ""
+phone: +33 4 74 79 85 88
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/sergent-major.yml b/data/cities/vienne/sergent-major.yml
index 8a412517c..b4fa382a2 100644
--- a/data/cities/vienne/sergent-major.yml
+++ b/data/cities/vienne/sergent-major.yml
@@ -5,7 +5,7 @@ longitude: 4.87566
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 78 18 57"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: "https://www.sergent-major.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 78 18 57
+opening_hours: Tu-Sa 10:00-19:00
+website: https://www.sergent-major.com/
diff --git a/data/cities/vienne/seven-market.yml b/data/cities/vienne/seven-market.yml
index 0b42e3ee1..db5af70bf 100644
--- a/data/cities/vienne/seven-market.yml
+++ b/data/cities/vienne/seven-market.yml
@@ -5,7 +5,7 @@ longitude: 4.87789
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 52 34"
-opening_hours: "Mo-Su 09:00-22:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 52 34
+opening_hours: Mo-Su 09:00-22:00
+website: ""
diff --git a/data/cities/vienne/shop-coiffure.yml b/data/cities/vienne/shop-coiffure.yml
index 45f8c8a2f..c4f2ea690 100644
--- a/data/cities/vienne/shop-coiffure.yml
+++ b/data/cities/vienne/shop-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.87208
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 87 53 63"
-opening_hours: "Mo 09:30-18:30; Tu-Sa 09:30-19:00; Su off"
-website: "http://www.shopcoiffure.eu/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 87 53 63
+opening_hours: Mo 09:30-18:30; Tu-Sa 09:30-19:00; Su off
+website: http://www.shopcoiffure.eu/
diff --git a/data/cities/vienne/speedy.yml b/data/cities/vienne/speedy.yml
index 609c625ff..64563559e 100644
--- a/data/cities/vienne/speedy.yml
+++ b/data/cities/vienne/speedy.yml
@@ -4,8 +4,8 @@ latitude: 45.51956
 longitude: 4.87059
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 78 24 24"
-opening_hours: "Mo-Sa 08:00-12:00, Mo-Fr 14:00-19:00"
-website: ""
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 78 24 24
+opening_hours: Mo-Sa 08:00-12:00, Mo-Fr 14:00-19:00
+website: ""
diff --git a/data/cities/vienne/spina-cafe-epicerie-patrick-henriroux.yml b/data/cities/vienne/spina-cafe-epicerie-patrick-henriroux.yml
index 1735a5e64..ef87199e8 100644
--- a/data/cities/vienne/spina-cafe-epicerie-patrick-henriroux.yml
+++ b/data/cities/vienne/spina-cafe-epicerie-patrick-henriroux.yml
@@ -5,7 +5,7 @@ longitude: 4.86763
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 81 94"
-opening_hours: "Tu,We 09:00-12:00,14:00-19:00; Th-Sa 09:00-12:00,14:00-18:30"
-website: "https://www.lapyramide.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 53 81 94
+opening_hours: Tu,We 09:00-12:00,14:00-19:00; Th-Sa 09:00-12:00,14:00-18:30
+website: https://www.lapyramide.com/
diff --git a/data/cities/vienne/sports-et-voyages.yml b/data/cities/vienne/sports-et-voyages.yml
index 4d47c5657..615672d29 100644
--- a/data/cities/vienne/sports-et-voyages.yml
+++ b/data/cities/vienne/sports-et-voyages.yml
@@ -5,7 +5,7 @@ longitude: 4.87318
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 72 77"
-opening_hours: "Mo,Su off; Tu-We,Sa 08:30-12:00,14:00-19:00; Th-Fr 08:30-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 72 77
+opening_hours: Mo,Su off; Tu-We,Sa 08:30-12:00,14:00-19:00; Th-Fr 08:30-19:00
+website: ""
diff --git a/data/cities/vienne/studio-dermo-esthetic.yml b/data/cities/vienne/studio-dermo-esthetic.yml
index cd9fcb29f..4c119821e 100644
--- a/data/cities/vienne/studio-dermo-esthetic.yml
+++ b/data/cities/vienne/studio-dermo-esthetic.yml
@@ -5,7 +5,7 @@ longitude: 4.87081
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 37 04 51 96"
-opening_hours: "Tu-We,Fr 09:00-19:00; Th 09:00-20:00; Sa 09:00-14:00"
-website: "https://www.studio-dermoesthetic.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 37 04 51 96
+opening_hours: Tu-We,Fr 09:00-19:00; Th 09:00-20:00; Sa 09:00-14:00
+website: https://www.studio-dermoesthetic.fr/
diff --git a/data/cities/vienne/superdry.yml b/data/cities/vienne/superdry.yml
index 12e3f2448..46ede1857 100644
--- a/data/cities/vienne/superdry.yml
+++ b/data/cities/vienne/superdry.yml
@@ -5,7 +5,7 @@ longitude: 4.87498
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 87 37 11 49"
-opening_hours: "Mo 14:00-18:00; Tu-Sa 09:00-19:00"
-website: "https://stores.superdry.com/fr/vienne/26-place-fran%C3%A7ois-mitterrand"
\ No newline at end of file
+housenumber: ""
+phone: +33 9 87 37 11 49
+opening_hours: Mo 14:00-18:00; Tu-Sa 09:00-19:00
+website: https://stores.superdry.com/fr/vienne/26-place-fran%C3%A7ois-mitterrand
diff --git a/data/cities/vienne/tabac-cylex.yml b/data/cities/vienne/tabac-cylex.yml
index f295814ba..a69f2512e 100644
--- a/data/cities/vienne/tabac-cylex.yml
+++ b/data/cities/vienne/tabac-cylex.yml
@@ -5,7 +5,7 @@ longitude: 4.8734
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 44 30"
+housenumber: ""
+phone: +33 4 74 85 44 30
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/tabac-presse-journaux.yml b/data/cities/vienne/tabac-presse-journaux.yml
index 93fb24c64..2357fe4a9 100644
--- a/data/cities/vienne/tabac-presse-journaux.yml
+++ b/data/cities/vienne/tabac-presse-journaux.yml
@@ -5,7 +5,7 @@ longitude: 4.87565
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 53 15 21"
+housenumber: ""
+phone: +33 4 74 53 15 21
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vienne/tapisserie-dameublement-royer.yml b/data/cities/vienne/tapisserie-dameublement-royer.yml
index 0bbf1261e..fa236cbe5 100644
--- a/data/cities/vienne/tapisserie-dameublement-royer.yml
+++ b/data/cities/vienne/tapisserie-dameublement-royer.yml
@@ -4,8 +4,8 @@ latitude: 45.51756
 longitude: 4.86934
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 84 99 68;+33 6 08 62 47 14"
-opening_hours: "Mo-Fr 10:00-12:00,14:30-18:30; Sa 10:00-12:00"
-website: ""
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 84 99 68;+33 6 08 62 47 14
+opening_hours: Mo-Fr 10:00-12:00,14:30-18:30; Sa 10:00-12:00
+website: ""
diff --git a/data/cities/vienne/terre-dart.yml b/data/cities/vienne/terre-dart.yml
index ddb3fc521..d00302f83 100644
--- a/data/cities/vienne/terre-dart.yml
+++ b/data/cities/vienne/terre-dart.yml
@@ -5,7 +5,7 @@ longitude: 4.87352
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 57 93 18"
-opening_hours: "Tu-Sa 10:00-13:00,14:00-18:00"
-website: "http://terredart.fr"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 57 93 18
+opening_hours: Tu-Sa 10:00-13:00,14:00-18:00
+website: http://terredart.fr
diff --git a/data/cities/vienne/totalenergies.yml b/data/cities/vienne/totalenergies.yml
index 987ae1bf1..56a54c1c0 100644
--- a/data/cities/vienne/totalenergies.yml
+++ b/data/cities/vienne/totalenergies.yml
@@ -4,8 +4,8 @@ latitude: 45.51937
 longitude: 4.87018
 postcode: "38200"
 city: Vienne
-street: "Cours de Verdun"
-housenumber: 
-phone: "+33 4 74 85 64 39"
-opening_hours: "24/7"
-website: "https://store.totalenergies.fr/fr_FR/NF078609"
\ No newline at end of file
+street: Cours de Verdun
+housenumber: ""
+phone: +33 4 74 85 64 39
+opening_hours: 24/7
+website: https://store.totalenergies.fr/fr_FR/NF078609
diff --git a/data/cities/vienne/tricouture.yml b/data/cities/vienne/tricouture.yml
index 9b698c061..7ec871de6 100644
--- a/data/cities/vienne/tricouture.yml
+++ b/data/cities/vienne/tricouture.yml
@@ -5,7 +5,7 @@ longitude: 4.87288
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 53 87"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 53 87
+opening_hours: Tu-Fr 09:00-12:00,14:00-18:30; Sa 09:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/vienne/tui.yml b/data/cities/vienne/tui.yml
index 69372e653..f1d985c07 100644
--- a/data/cities/vienne/tui.yml
+++ b/data/cities/vienne/tui.yml
@@ -5,7 +5,7 @@ longitude: 4.87426
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 20 96 00"
-opening_hours: "Tu-Sa 10:00-12:00,14:00-18:00"
-website: "https://agences-de-voyages.tui.fr/vienne-C38544/tui-store-VIN"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 20 96 00
+opening_hours: Tu-Sa 10:00-12:00,14:00-18:00
+website: https://agences-de-voyages.tui.fr/vienne-C38544/tui-store-VIN
diff --git a/data/cities/vienne/united-colors-of-benetton-2.yml b/data/cities/vienne/united-colors-of-benetton-2.yml
index b51545387..32165ca02 100644
--- a/data/cities/vienne/united-colors-of-benetton-2.yml
+++ b/data/cities/vienne/united-colors-of-benetton-2.yml
@@ -1,11 +1,11 @@
-id: 2732606650
+id: 2731966002
 type: node
-latitude: 45.52685
-longitude: 4.87551
+latitude: 45.52617
+longitude: 4.87592
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 67 31 35 42"
+housenumber: ""
+phone: +33 9 67 31 74 36
 opening_hours: ""
-website: "https://fr.benetton.com/"
\ No newline at end of file
+website: https://fr.benetton.com/
diff --git a/data/cities/vienne/united-colors-of-benetton.yml b/data/cities/vienne/united-colors-of-benetton.yml
index 720bb8448..7e3fc4f41 100644
--- a/data/cities/vienne/united-colors-of-benetton.yml
+++ b/data/cities/vienne/united-colors-of-benetton.yml
@@ -1,11 +1,11 @@
-id: 2731966002
+id: 2732606650
 type: node
-latitude: 45.52617
-longitude: 4.87592
+latitude: 45.52685
+longitude: 4.87551
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 9 67 31 74 36"
+housenumber: ""
+phone: +33 9 67 31 35 42
 opening_hours: ""
-website: "https://fr.benetton.com/"
\ No newline at end of file
+website: https://fr.benetton.com/
diff --git a/data/cities/vienne/ursule-en-ville.yml b/data/cities/vienne/ursule-en-ville.yml
index 06a79b414..7540d0fa7 100644
--- a/data/cities/vienne/ursule-en-ville.yml
+++ b/data/cities/vienne/ursule-en-ville.yml
@@ -5,7 +5,7 @@ longitude: 4.87227
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 87 94 65"
-opening_hours: "Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00; PH closed"
-website: "https://www.tissusdesursules.fr/content/43-vienne-ursule-en-ville"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 87 94 65
+opening_hours: Mo 14:00-19:00; Tu-Sa 09:30-12:00,14:00-19:00; PH closed
+website: https://www.tissusdesursules.fr/content/43-vienne-ursule-en-ville
diff --git a/data/cities/vienne/vapstyle.yml b/data/cities/vienne/vapstyle.yml
index cfa62c52e..abd63efb7 100644
--- a/data/cities/vienne/vapstyle.yml
+++ b/data/cities/vienne/vapstyle.yml
@@ -5,7 +5,7 @@ longitude: 4.87347
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 31 64 48"
+housenumber: ""
+phone: +33 4 74 31 64 48
 opening_hours: ""
-website: "https://www.vapstyle.fr/"
\ No newline at end of file
+website: https://www.vapstyle.fr/
diff --git a/data/cities/vienne/vetements-michel.yml b/data/cities/vienne/vetements-michel.yml
index 59506521f..69b318759 100644
--- a/data/cities/vienne/vetements-michel.yml
+++ b/data/cities/vienne/vetements-michel.yml
@@ -5,7 +5,7 @@ longitude: 4.87181
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 24 18"
+housenumber: ""
+phone: +33 4 74 85 24 18
 opening_hours: ""
-website: "https://www.vetements-michel.com/"
\ No newline at end of file
+website: https://www.vetements-michel.com/
diff --git a/data/cities/vienne/vienne-nature.yml b/data/cities/vienne/vienne-nature.yml
index d9835e955..a8c35947b 100644
--- a/data/cities/vienne/vienne-nature.yml
+++ b/data/cities/vienne/vienne-nature.yml
@@ -5,7 +5,7 @@ longitude: 4.87265
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 42 21"
-opening_hours: "Mo,Su off; Tu,Th-Fr 09:00-12:30,14:00-18:30; We 09:00-12:30; Sa 09:00-12:30,14:00-17:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 42 21
+opening_hours: Mo,Su off; Tu,Th-Fr 09:00-12:30,14:00-18:30; We 09:00-12:30; Sa 09:00-12:30,14:00-17:00
+website: ""
diff --git a/data/cities/vienne/vival.yml b/data/cities/vienne/vival.yml
index 34e2b3937..03148312e 100644
--- a/data/cities/vienne/vival.yml
+++ b/data/cities/vienne/vival.yml
@@ -5,7 +5,7 @@ longitude: 4.87483
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 27 87 68 07"
-opening_hours: "Mo-Su 07:00-22:30"
-website: "http://annuaire.casino-proximite.fr/vival/commerce-vival-vienne-franchise-vienne-groupe-casino/magasin-4553.html"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 27 87 68 07
+opening_hours: Mo-Su 07:00-22:30
+website: http://annuaire.casino-proximite.fr/vival/commerce-vival-vienne-franchise-vienne-groupe-casino/magasin-4553.html
diff --git a/data/cities/vienne/willy-et-lulu.yml b/data/cities/vienne/willy-et-lulu.yml
index 098207ee8..f909d54ea 100644
--- a/data/cities/vienne/willy-et-lulu.yml
+++ b/data/cities/vienne/willy-et-lulu.yml
@@ -5,7 +5,7 @@ longitude: 4.87555
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 85 03 86"
-opening_hours: "Tu,Th,Fr 09:30-18:00; We 13:30-18:00, Sa 09:30-17:00"
-website: "https://willyetlulu.com/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 85 03 86
+opening_hours: Tu,Th,Fr 09:30-18:00; We 13:30-18:00, Sa 09:30-17:00
+website: https://willyetlulu.com/
diff --git a/data/cities/vienne/woodpecker-tattoo.yml b/data/cities/vienne/woodpecker-tattoo.yml
index aab34202a..c7169f092 100644
--- a/data/cities/vienne/woodpecker-tattoo.yml
+++ b/data/cities/vienne/woodpecker-tattoo.yml
@@ -5,7 +5,7 @@ longitude: 4.87642
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 4 74 84 16 54"
-opening_hours: "Tu-Sa 09:00-12:00,14:00-18:00"
-website: "https://woodpeckertattoo.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 74 84 16 54
+opening_hours: Tu-Sa 09:00-12:00,14:00-18:00
+website: https://woodpeckertattoo.fr/
diff --git a/data/cities/vienne/ziben-coiffure.yml b/data/cities/vienne/ziben-coiffure.yml
index 6f83f7621..3990c6fd9 100644
--- a/data/cities/vienne/ziben-coiffure.yml
+++ b/data/cities/vienne/ziben-coiffure.yml
@@ -5,7 +5,7 @@ longitude: 4.8756
 postcode: "38200"
 city: Vienne
 street: ""
-housenumber: 
-phone: "+33 7 80 86 59 96;+33 6 23 71 66 69"
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: ""
+phone: +33 7 80 86 59 96;+33 6 23 71 66 69
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/vif/boulangerie-morin-et-fils.yml b/data/cities/vif/boulangerie-morin-et-fils.yml
index 0e23e1744..42d843153 100644
--- a/data/cities/vif/boulangerie-morin-et-fils.yml
+++ b/data/cities/vif/boulangerie-morin-et-fils.yml
@@ -4,8 +4,8 @@ latitude: 45.0558
 longitude: 5.66878
 postcode: "38450"
 city: Vif
-street: "Place de la Libération"
-housenumber: 
-phone: "+33 4 76 72 51 31"
+street: Place de la Libération
+housenumber: ""
+phone: +33 4 76 72 51 31
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vif/espace-vegetal.yml b/data/cities/vif/espace-vegetal.yml
index c30c2a7f6..e0e284cae 100644
--- a/data/cities/vif/espace-vegetal.yml
+++ b/data/cities/vif/espace-vegetal.yml
@@ -4,8 +4,8 @@ latitude: 45.05899
 longitude: 5.66771
 postcode: "38450"
 city: Vif
-street: "Boulevard Faidherbe"
-housenumber: 13
-phone: "+33 4 76906971"
+street: Boulevard Faidherbe
+housenumber: "13"
+phone: +33 4 76906971
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vif/le-petit-casino.yml b/data/cities/vif/le-petit-casino.yml
index 250653284..2946fde84 100644
--- a/data/cities/vif/le-petit-casino.yml
+++ b/data/cities/vif/le-petit-casino.yml
@@ -4,8 +4,8 @@ latitude: 45.05588
 longitude: 5.66966
 postcode: "38450"
 city: Vif
-street: "Rue de la République"
-housenumber: 
+street: Rue de la République
+housenumber: ""
 phone: ""
-opening_hours: "Tu-Sa 07:30-12:30,15:30-19:30; Su 08:00-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 07:30-12:30,15:30-19:30; Su 08:00-12:30
+website: ""
diff --git a/data/cities/vif/oupy-bike.yml b/data/cities/vif/oupy-bike.yml
index 0c1d6d8a9..5072a3c01 100644
--- a/data/cities/vif/oupy-bike.yml
+++ b/data/cities/vif/oupy-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.05757
 longitude: 5.68171
 postcode: "38450"
 city: Vif
-street: "Rue du Bruyant"
-housenumber: 4
+street: Rue du Bruyant
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vif/velisere.yml b/data/cities/vif/velisere.yml
index 166ca426d..a02f701d3 100644
--- a/data/cities/vif/velisere.yml
+++ b/data/cities/vif/velisere.yml
@@ -4,8 +4,8 @@ latitude: 45.05053
 longitude: 5.67648
 postcode: "38450"
 city: Vif
-street: "Rue Joseph Incelet"
-housenumber: 8
+street: Rue Joseph Incelet
+housenumber: "8"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-bonnot/all-bikes-38.yml b/data/cities/villard-bonnot/all-bikes-38.yml
index 4da4277dd..bae153acc 100644
--- a/data/cities/villard-bonnot/all-bikes-38.yml
+++ b/data/cities/villard-bonnot/all-bikes-38.yml
@@ -4,8 +4,8 @@ latitude: 45.25692
 longitude: 5.90688
 postcode: "38190"
 city: Villard-Bonnot
-street: "Boulevard de la Libération"
+street: Boulevard de la Libération
 housenumber: 23 b
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-bonnot/au-camelia.yml b/data/cities/villard-bonnot/au-camelia.yml
index b63917648..b49c1df1b 100644
--- a/data/cities/villard-bonnot/au-camelia.yml
+++ b/data/cities/villard-bonnot/au-camelia.yml
@@ -4,8 +4,8 @@ latitude: 45.23771
 longitude: 5.88747
 postcode: "38190"
 city: Villard-Bonnot
-street: "Boulevard de la Pologne"
-housenumber: 1
-phone: "+33 4 76 71 47 93"
+street: Boulevard de la Pologne
+housenumber: "1"
+phone: +33 4 76 71 47 93
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-bonnot/bike-wild.yml b/data/cities/villard-bonnot/bike-wild.yml
index c27cd07fd..7c40ee6a0 100644
--- a/data/cities/villard-bonnot/bike-wild.yml
+++ b/data/cities/villard-bonnot/bike-wild.yml
@@ -4,8 +4,8 @@ latitude: 45.25703
 longitude: 5.9011
 postcode: "38190"
 city: Villard-Bonnot
-street: "Allée le Verney"
-housenumber: 3
+street: Allée le Verney
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-bonnot/chez-sandrine.yml b/data/cities/villard-bonnot/chez-sandrine.yml
index a1ce48f0c..7843e40f0 100644
--- a/data/cities/villard-bonnot/chez-sandrine.yml
+++ b/data/cities/villard-bonnot/chez-sandrine.yml
@@ -4,8 +4,8 @@ latitude: 45.23645
 longitude: 5.88574
 postcode: "38190"
 city: Villard-Bonnot
-street: "Avenue Aristide Bergès"
-housenumber: 1
+street: Avenue Aristide Bergès
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-bonnot/coup-coif.yml b/data/cities/villard-bonnot/coup-coif.yml
index 71803ff37..020e64b17 100644
--- a/data/cities/villard-bonnot/coup-coif.yml
+++ b/data/cities/villard-bonnot/coup-coif.yml
@@ -4,8 +4,8 @@ latitude: 45.23631
 longitude: 5.88556
 postcode: "38190"
 city: Villard-Bonnot
-street: "Avenue Aristide Bergès"
+street: Avenue Aristide Bergès
 housenumber: 1 bis
-phone: "+33 4 76 71 44 37"
-opening_hours: "Tu-Th 08:30-12:00,14:00-18:00; Fr 08:30-18:30; Sa 08:30-15:30"
-website: ""
\ No newline at end of file
+phone: +33 4 76 71 44 37
+opening_hours: Tu-Th 08:30-12:00,14:00-18:00; Fr 08:30-18:30; Sa 08:30-15:30
+website: ""
diff --git a/data/cities/villard-bonnot/echec-et-mat.yml b/data/cities/villard-bonnot/echec-et-mat.yml
index 903f06165..e2da32a32 100644
--- a/data/cities/villard-bonnot/echec-et-mat.yml
+++ b/data/cities/villard-bonnot/echec-et-mat.yml
@@ -4,8 +4,8 @@ latitude: 45.23644
 longitude: 5.88528
 postcode: "38190"
 city: Villard-Bonnot
-street: "Avenue Aristide Bergès"
-housenumber: 4
+street: Avenue Aristide Bergès
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-bonnot/renault-auto-dauphine-lancey.yml b/data/cities/villard-bonnot/renault-auto-dauphine-lancey.yml
index 08c09e52a..d0003453d 100644
--- a/data/cities/villard-bonnot/renault-auto-dauphine-lancey.yml
+++ b/data/cities/villard-bonnot/renault-auto-dauphine-lancey.yml
@@ -4,8 +4,8 @@ latitude: 45.23779
 longitude: 5.88706
 postcode: "38190"
 city: Villard-Bonnot
-street: "Boulevard de la Pologne"
-housenumber: 2
-phone: "+33 4 76 71 42 14"
-opening_hours: "07:30-19:00"
-website: "https://renault.auto-selection.com/reseau/concession-rhone-alpes/22/renault-autoservices-lancey-agent-villard-bonnot-38-fiche-12340.php"
\ No newline at end of file
+street: Boulevard de la Pologne
+housenumber: "2"
+phone: +33 4 76 71 42 14
+opening_hours: 07:30-19:00
+website: https://renault.auto-selection.com/reseau/concession-rhone-alpes/22/renault-autoservices-lancey-agent-villard-bonnot-38-fiche-12340.php
diff --git a/data/cities/villard-de-lans/92582sport-evalsion.yml b/data/cities/villard-de-lans/92582sport-evalsion.yml
index 1a3457eb8..6c07402eb 100644
--- a/data/cities/villard-de-lans/92582sport-evalsion.yml
+++ b/data/cities/villard-de-lans/92582sport-evalsion.yml
@@ -4,8 +4,8 @@ latitude: 45.05175
 longitude: 5.56311
 postcode: "38250"
 city: VILLARD DE LANS
-street: "Route des Glovettes"
-housenumber: 
-phone: "04 76 95 09 43"
+street: Route des Glovettes
+housenumber: ""
+phone: 04 76 95 09 43
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/alltracks-ecole-de-vtt.yml b/data/cities/villard-de-lans/alltracks-ecole-de-vtt.yml
index a17726e52..0b3b6eb42 100644
--- a/data/cities/villard-de-lans/alltracks-ecole-de-vtt.yml
+++ b/data/cities/villard-de-lans/alltracks-ecole-de-vtt.yml
@@ -4,8 +4,8 @@ latitude: 45.04491
 longitude: 5.55963
 postcode: "38250"
 city: Villard-de-Lans
-street: "Allée des Mouflons"
-housenumber: 
-phone: "06 51 12 01 45"
+street: Allée des Mouflons
+housenumber: ""
+phone: 06 51 12 01 45
 opening_hours: ""
-website: "https://www.alltracks.fr/"
\ No newline at end of file
+website: https://www.alltracks.fr/
diff --git a/data/cities/villard-de-lans/au-fil-du-bois.yml b/data/cities/villard-de-lans/au-fil-du-bois.yml
index 33a0f927f..e1539b737 100644
--- a/data/cities/villard-de-lans/au-fil-du-bois.yml
+++ b/data/cities/villard-de-lans/au-fil-du-bois.yml
@@ -4,8 +4,8 @@ latitude: 45.07015
 longitude: 5.55284
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 110
-phone: "09 81 74 23 71"
+street: Rue de la République
+housenumber: "110"
+phone: 09 81 74 23 71
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/aux-gouts-du-terroir.yml b/data/cities/villard-de-lans/aux-gouts-du-terroir.yml
index 8791fac2f..0f345a192 100644
--- a/data/cities/villard-de-lans/aux-gouts-du-terroir.yml
+++ b/data/cities/villard-de-lans/aux-gouts-du-terroir.yml
@@ -4,8 +4,8 @@ latitude: 45.07023
 longitude: 5.55234
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 78
-phone: "04 56 00 98 94"
+street: Rue de la République
+housenumber: "78"
+phone: 04 56 00 98 94
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/avia.yml b/data/cities/villard-de-lans/avia.yml
index 76685967c..b201b11e0 100644
--- a/data/cities/villard-de-lans/avia.yml
+++ b/data/cities/villard-de-lans/avia.yml
@@ -4,8 +4,8 @@ latitude: 45.07463
 longitude: 5.55321
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue du Général de Gaulle"
-housenumber: 531
+street: Avenue du Général de Gaulle
+housenumber: "531"
 phone: "0476959353"
-opening_hours: "24/7"
-website: ""
\ No newline at end of file
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/villard-de-lans/beaudoingt-sport.yml b/data/cities/villard-de-lans/beaudoingt-sport.yml
index 7867cb1fe..04c4edc28 100644
--- a/data/cities/villard-de-lans/beaudoingt-sport.yml
+++ b/data/cities/villard-de-lans/beaudoingt-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.04675
 longitude: 5.559
 postcode: "38250"
 city: Villard-de-Lans
-street: "Allée des Chevreuils"
-housenumber: 
-phone: "04 76 94 05 03"
+street: Allée des Chevreuils
+housenumber: ""
+phone: 04 76 94 05 03
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/biocoop.yml b/data/cities/villard-de-lans/biocoop.yml
index e61178e14..4eea557c1 100644
--- a/data/cities/villard-de-lans/biocoop.yml
+++ b/data/cities/villard-de-lans/biocoop.yml
@@ -4,8 +4,8 @@ latitude: 45.07492
 longitude: 5.553
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue du Général de Gaulle"
-housenumber: 571
+street: Avenue du Général de Gaulle
+housenumber: "571"
 phone: ""
-opening_hours: "Mo-Sa 09:00-13:00, 14:30-19:00"
-website: "https://www.biocoopvillarddelans.fr"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-13:00, 14:30-19:00
+website: https://www.biocoopvillarddelans.fr
diff --git a/data/cities/villard-de-lans/boulangerie-valentin.yml b/data/cities/villard-de-lans/boulangerie-valentin.yml
index a2d086b87..daa4ae45b 100644
--- a/data/cities/villard-de-lans/boulangerie-valentin.yml
+++ b/data/cities/villard-de-lans/boulangerie-valentin.yml
@@ -4,8 +4,8 @@ latitude: 45.07039
 longitude: 5.55169
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 15
-phone: "+33 476951200"
+street: Rue de la République
+housenumber: "15"
+phone: +33 476951200
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/casino-shop.yml b/data/cities/villard-de-lans/casino-shop.yml
index 97a3dc4f4..a12cfc4f4 100644
--- a/data/cities/villard-de-lans/casino-shop.yml
+++ b/data/cities/villard-de-lans/casino-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.07016
 longitude: 5.55092
 postcode: "38250"
 city: Villard-de-Lans
-street: "Place de la Libération"
-housenumber: 
-phone: "04 76 95 12 02"
+street: Place de la Libération
+housenumber: ""
+phone: 04 76 95 12 02
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/cyrilou.yml b/data/cities/villard-de-lans/cyrilou.yml
index 197acaef6..ffe69c38a 100644
--- a/data/cities/villard-de-lans/cyrilou.yml
+++ b/data/cities/villard-de-lans/cyrilou.yml
@@ -4,8 +4,8 @@ latitude: 45.07038
 longitude: 5.5518
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 25
-phone: "04 76 95 56 73"
+street: Rue de la République
+housenumber: "25"
+phone: 04 76 95 56 73
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/garage-des-bains.yml b/data/cities/villard-de-lans/garage-des-bains.yml
index 8f95e2554..60cfa06bc 100644
--- a/data/cities/villard-de-lans/garage-des-bains.yml
+++ b/data/cities/villard-de-lans/garage-des-bains.yml
@@ -1,11 +1,11 @@
 id: 54730196
-type: way
+type: node
 latitude: 45.06736
 longitude: 5.55261
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue des Bains"
-housenumber: 401
-phone: "04 76 95 15 61"
+street: Avenue des Bains
+housenumber: "401"
+phone: 04 76 95 15 61
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/glovette-sports.yml b/data/cities/villard-de-lans/glovette-sports.yml
index 2b4401a21..8d7612bd1 100644
--- a/data/cities/villard-de-lans/glovette-sports.yml
+++ b/data/cities/villard-de-lans/glovette-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.0517
 longitude: 5.56332
 postcode: "38250"
 city: vILLARD DE LANS
-street: "Les Glovettes"
-housenumber: 
-phone: "04 76 95 59 38"
+street: Les Glovettes
+housenumber: ""
+phone: 04 76 95 59 38
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/guillaume-touraille.yml b/data/cities/villard-de-lans/guillaume-touraille.yml
index 7a5f95eb0..510665516 100644
--- a/data/cities/villard-de-lans/guillaume-touraille.yml
+++ b/data/cities/villard-de-lans/guillaume-touraille.yml
@@ -4,8 +4,8 @@ latitude: 45.07029
 longitude: 5.55163
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 8
-phone: "04 76 86 00 03"
+street: Rue de la République
+housenumber: "8"
+phone: 04 76 86 00 03
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/intersport.yml b/data/cities/villard-de-lans/intersport.yml
index 01ae65eef..d1f20b2b5 100644
--- a/data/cities/villard-de-lans/intersport.yml
+++ b/data/cities/villard-de-lans/intersport.yml
@@ -4,8 +4,8 @@ latitude: 45.04547
 longitude: 5.56026
 postcode: "38250"
 city: Villard-de-Lans
-street: "Allée des Mouflons"
-housenumber: 
-phone: "04 76 95 15 65"
+street: Allée des Mouflons
+housenumber: ""
+phone: 04 76 95 15 65
 opening_hours: ""
-website: "http://www.intersport-villardelans.com"
\ No newline at end of file
+website: http://www.intersport-villardelans.com
diff --git a/data/cities/villard-de-lans/joy-sports.yml b/data/cities/villard-de-lans/joy-sports.yml
index 981ed2143..1a4b11866 100644
--- a/data/cities/villard-de-lans/joy-sports.yml
+++ b/data/cities/villard-de-lans/joy-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.04681
 longitude: 5.55864
 postcode: "38250"
 city: Villard-de-Lans
-street: "Route de la Côte 2000"
-housenumber: 
-phone: "06 67 48 33 53"
+street: Route de la Côte 2000
+housenumber: ""
+phone: 06 67 48 33 53
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/la-barbe-de-jupiter.yml b/data/cities/villard-de-lans/la-barbe-de-jupiter.yml
index 9071acb62..4360fa6e3 100644
--- a/data/cities/villard-de-lans/la-barbe-de-jupiter.yml
+++ b/data/cities/villard-de-lans/la-barbe-de-jupiter.yml
@@ -4,8 +4,8 @@ latitude: 45.06985
 longitude: 5.55037
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue Gambetta"
-housenumber: 2
-phone: "06 13 60 74 38"
+street: Rue Gambetta
+housenumber: "2"
+phone: 06 13 60 74 38
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/la-biscuiterie.yml b/data/cities/villard-de-lans/la-biscuiterie.yml
index bdcf6238a..75316980d 100644
--- a/data/cities/villard-de-lans/la-biscuiterie.yml
+++ b/data/cities/villard-de-lans/la-biscuiterie.yml
@@ -4,8 +4,8 @@ latitude: 45.06984
 longitude: 5.55046
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue Gambetta"
-housenumber: 10
-phone: "09 54 60 56 71"
-opening_hours: "Tu-Sa 09:00-12:15,15:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue Gambetta
+housenumber: "10"
+phone: 09 54 60 56 71
+opening_hours: Tu-Sa 09:00-12:15,15:00-19:00
+website: ""
diff --git a/data/cities/villard-de-lans/la-boule-dantan.yml b/data/cities/villard-de-lans/la-boule-dantan.yml
index 1f557bc7e..1d79f4961 100644
--- a/data/cities/villard-de-lans/la-boule-dantan.yml
+++ b/data/cities/villard-de-lans/la-boule-dantan.yml
@@ -4,8 +4,8 @@ latitude: 45.0699
 longitude: 5.5516
 postcode: "38250"
 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"
-website: ""
\ No newline at end of file
+street: Rue Vaucanson
+housenumber: "50"
+phone: +33 4 76 94 02 58
+opening_hours: Mo-Su 07:30-12:30,15:30-19:00
+website: ""
diff --git a/data/cities/villard-de-lans/la-fabrique-du-ski.yml b/data/cities/villard-de-lans/la-fabrique-du-ski.yml
index d3c94a959..d337b0c29 100644
--- a/data/cities/villard-de-lans/la-fabrique-du-ski.yml
+++ b/data/cities/villard-de-lans/la-fabrique-du-ski.yml
@@ -4,8 +4,8 @@ latitude: 45.07187
 longitude: 5.54664
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue Jean-Séraphin Achard-Picard"
-housenumber: 135
-phone: "+33 4 76 26 41 89"
+street: Avenue Jean-Séraphin Achard-Picard
+housenumber: "135"
+phone: +33 4 76 26 41 89
 opening_hours: ""
-website: "https://www.fabriqueduski.com/"
\ No newline at end of file
+website: https://www.fabriqueduski.com/
diff --git a/data/cities/villard-de-lans/la-galerie.yml b/data/cities/villard-de-lans/la-galerie.yml
index d07728af6..c4f3a7cc2 100644
--- a/data/cities/villard-de-lans/la-galerie.yml
+++ b/data/cities/villard-de-lans/la-galerie.yml
@@ -4,8 +4,8 @@ latitude: 45.06983
 longitude: 5.55051
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue Gambetta"
-housenumber: 12
-phone: "04 56 85 43 03"
+street: Rue Gambetta
+housenumber: "12"
+phone: 04 56 85 43 03
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/la-petite-boutique.yml b/data/cities/villard-de-lans/la-petite-boutique.yml
index cebcaf50d..2e4cafcec 100644
--- a/data/cities/villard-de-lans/la-petite-boutique.yml
+++ b/data/cities/villard-de-lans/la-petite-boutique.yml
@@ -4,8 +4,8 @@ latitude: 45.07024
 longitude: 5.55232
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 68
-phone: "04 76 95 14 34"
+street: Rue de la République
+housenumber: "68"
+phone: 04 76 95 14 34
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/la-piste-verte.yml b/data/cities/villard-de-lans/la-piste-verte.yml
index 1e7cd764c..099089e8b 100644
--- a/data/cities/villard-de-lans/la-piste-verte.yml
+++ b/data/cities/villard-de-lans/la-piste-verte.yml
@@ -4,8 +4,8 @@ latitude: 45.07034
 longitude: 5.5507
 postcode: "38250"
 city: Villard-de-Lans
-street: "Place de la Libération"
-housenumber: 66
-phone: "04 76 16 85 54"
+street: Place de la Libération
+housenumber: "66"
+phone: 04 76 16 85 54
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/landry-sport.yml b/data/cities/villard-de-lans/landry-sport.yml
index 85fec6e31..1a5c903fb 100644
--- a/data/cities/villard-de-lans/landry-sport.yml
+++ b/data/cities/villard-de-lans/landry-sport.yml
@@ -4,8 +4,8 @@ latitude: 45.07182
 longitude: 5.55182
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue du Général de Gaulle"
-housenumber: 124
-phone: "04 76 95 03 04"
+street: Avenue du Général de Gaulle
+housenumber: "124"
+phone: 04 76 95 03 04
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/larbre-de-lune.yml b/data/cities/villard-de-lans/larbre-de-lune.yml
index c4bcad180..de1190a66 100644
--- a/data/cities/villard-de-lans/larbre-de-lune.yml
+++ b/data/cities/villard-de-lans/larbre-de-lune.yml
@@ -4,8 +4,8 @@ latitude: 45.07029
 longitude: 5.55172
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 18
-phone: "04 76 86 09 56"
+street: Rue de la République
+housenumber: "18"
+phone: 04 76 86 09 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/lattrape-reve.yml b/data/cities/villard-de-lans/lattrape-reve.yml
index 50a602b19..ab8625751 100644
--- a/data/cities/villard-de-lans/lattrape-reve.yml
+++ b/data/cities/villard-de-lans/lattrape-reve.yml
@@ -4,8 +4,8 @@ latitude: 45.07016
 longitude: 5.5528
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 108
-phone: "06 71 00 54 50"
+street: Rue de la République
+housenumber: "108"
+phone: 06 71 00 54 50
 opening_hours: ""
-website: "https://www.lattrapereves-boutique.fr"
\ No newline at end of file
+website: https://www.lattrapereves-boutique.fr
diff --git a/data/cities/villard-de-lans/le-comptoir-du-pere-jo.yml b/data/cities/villard-de-lans/le-comptoir-du-pere-jo.yml
index d8fef4988..7966ffca3 100644
--- a/data/cities/villard-de-lans/le-comptoir-du-pere-jo.yml
+++ b/data/cities/villard-de-lans/le-comptoir-du-pere-jo.yml
@@ -4,8 +4,8 @@ latitude: 45.07166
 longitude: 5.55169
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue du Général de Gaulle"
-housenumber: 102
-phone: "06 95 67 03 60"
-opening_hours: "Mo-Su 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Avenue du Général de Gaulle
+housenumber: "102"
+phone: 06 95 67 03 60
+opening_hours: Mo-Su 10:00-19:00
+website: ""
diff --git a/data/cities/villard-de-lans/le-mont-chocolat.yml b/data/cities/villard-de-lans/le-mont-chocolat.yml
index 9f3e52a7d..955568f80 100644
--- a/data/cities/villard-de-lans/le-mont-chocolat.yml
+++ b/data/cities/villard-de-lans/le-mont-chocolat.yml
@@ -4,8 +4,8 @@ latitude: 45.07126
 longitude: 5.55149
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue du Général de Gaulle"
-housenumber: 58
-phone: "09 53 40 15 39"
-opening_hours: "Mo-Su 09:00-13:00, Mo-Sa 16:30-19:00"
-website: ""
\ No newline at end of file
+street: Avenue du Général de Gaulle
+housenumber: "58"
+phone: 09 53 40 15 39
+opening_hours: Mo-Su 09:00-13:00, Mo-Sa 16:30-19:00
+website: ""
diff --git a/data/cities/villard-de-lans/le-petit-alpin.yml b/data/cities/villard-de-lans/le-petit-alpin.yml
index db2117319..ac3a7ec22 100644
--- a/data/cities/villard-de-lans/le-petit-alpin.yml
+++ b/data/cities/villard-de-lans/le-petit-alpin.yml
@@ -4,8 +4,8 @@ latitude: 45.07029
 longitude: 5.5526
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 127
-phone: "04 76 95 07 67"
+street: Rue de la République
+housenumber: "127"
+phone: 04 76 95 07 67
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/lhair-du-temps.yml b/data/cities/villard-de-lans/lhair-du-temps.yml
index 36b222e3d..0751927ef 100644
--- a/data/cities/villard-de-lans/lhair-du-temps.yml
+++ b/data/cities/villard-de-lans/lhair-du-temps.yml
@@ -4,8 +4,8 @@ latitude: 45.07037
 longitude: 5.55186
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 27
-phone: "04 76 95 15 13"
+street: Rue de la République
+housenumber: "27"
+phone: 04 76 95 15 13
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/life.yml b/data/cities/villard-de-lans/life.yml
index 3c8242ead..35ff4b15a 100644
--- a/data/cities/villard-de-lans/life.yml
+++ b/data/cities/villard-de-lans/life.yml
@@ -4,8 +4,8 @@ latitude: 45.07035
 longitude: 5.55218
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 57
-phone: "04 76 27 74 68"
+street: Rue de la République
+housenumber: "57"
+phone: 04 76 27 74 68
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/locaskis.yml b/data/cities/villard-de-lans/locaskis.yml
index eac3ab797..35dfb47f9 100644
--- a/data/cities/villard-de-lans/locaskis.yml
+++ b/data/cities/villard-de-lans/locaskis.yml
@@ -4,8 +4,8 @@ latitude: 45.0468
 longitude: 5.55894
 postcode: "38250"
 city: Villard-de-Lans
-street: "Allée des Chevreuils"
-housenumber: 
-phone: "04 76 95 16 17"
+street: Allée des Chevreuils
+housenumber: ""
+phone: 04 76 95 16 17
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/ma-tonka.yml b/data/cities/villard-de-lans/ma-tonka.yml
index 043675ccb..56ad5e590 100644
--- a/data/cities/villard-de-lans/ma-tonka.yml
+++ b/data/cities/villard-de-lans/ma-tonka.yml
@@ -4,8 +4,8 @@ latitude: 45.07023
 longitude: 5.55112
 postcode: "38250"
 city: Villard-de-Lans
-street: "Place de la Libération"
-housenumber: 75
-phone: "04 76 50 83 86"
-opening_hours: "Tu-Sa 08:00-18:30; Su 08:00-12:30"
-website: "https://www.matonka.fr/"
\ No newline at end of file
+street: Place de la Libération
+housenumber: "75"
+phone: 04 76 50 83 86
+opening_hours: Tu-Sa 08:00-18:30; Su 08:00-12:30
+website: https://www.matonka.fr/
diff --git a/data/cities/villard-de-lans/maison-de-la-presse-tabac.yml b/data/cities/villard-de-lans/maison-de-la-presse-tabac.yml
index d6eed2702..56ce85e23 100644
--- a/data/cities/villard-de-lans/maison-de-la-presse-tabac.yml
+++ b/data/cities/villard-de-lans/maison-de-la-presse-tabac.yml
@@ -4,8 +4,8 @@ latitude: 45.07033
 longitude: 5.55132
 postcode: "38250"
 city: Villard-de-Lans
-street: "Place de la Libération"
-housenumber: 
-phone: "09 60 05 86 53"
-opening_hours: "Mo-Sa 07:15-12:15,13:30-19:15; Su 07:15-12:15"
-website: ""
\ No newline at end of file
+street: Place de la Libération
+housenumber: ""
+phone: 09 60 05 86 53
+opening_hours: Mo-Sa 07:15-12:15,13:30-19:15; Su 07:15-12:15
+website: ""
diff --git a/data/cities/villard-de-lans/poissonnerie-du-vercors.yml b/data/cities/villard-de-lans/poissonnerie-du-vercors.yml
index f6dc1e783..c8c750d9e 100644
--- a/data/cities/villard-de-lans/poissonnerie-du-vercors.yml
+++ b/data/cities/villard-de-lans/poissonnerie-du-vercors.yml
@@ -4,8 +4,8 @@ latitude: 45.07018
 longitude: 5.55254
 postcode: "38250"
 city: Villard-de-Lans
-street: "Rue de la République"
-housenumber: 88
-phone: "04 76 43 31 38"
-opening_hours: "PH,Tu-Su 08:30-12:30, Fr,Sa 16:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue de la République
+housenumber: "88"
+phone: 04 76 43 31 38
+opening_hours: PH,Tu-Su 08:30-12:30, Fr,Sa 16:00-19:00
+website: ""
diff --git a/data/cities/villard-de-lans/proxi.yml b/data/cities/villard-de-lans/proxi.yml
index 86028268b..3e16eacad 100644
--- a/data/cities/villard-de-lans/proxi.yml
+++ b/data/cities/villard-de-lans/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.04685
 longitude: 5.55862
 postcode: "38250"
 city: Villard-de-Lans
-street: "Route de la Côte 2000"
-housenumber: 
-phone: "04 76 87 13 68"
+street: Route de la Côte 2000
+housenumber: ""
+phone: 04 76 87 13 68
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/riders-on-the-storm.yml b/data/cities/villard-de-lans/riders-on-the-storm.yml
index 7fbde1f74..a7e1d4a2a 100644
--- a/data/cities/villard-de-lans/riders-on-the-storm.yml
+++ b/data/cities/villard-de-lans/riders-on-the-storm.yml
@@ -4,8 +4,8 @@ latitude: 45.06925
 longitude: 5.54927
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue des Francs Tireurs"
-housenumber: 64
-phone: "06 88 86 95 73"
+street: Avenue des Francs Tireurs
+housenumber: "64"
+phone: 06 88 86 95 73
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/ski-evalsion.yml b/data/cities/villard-de-lans/ski-evalsion.yml
index 5f342458f..72c2ee5f2 100644
--- a/data/cities/villard-de-lans/ski-evalsion.yml
+++ b/data/cities/villard-de-lans/ski-evalsion.yml
@@ -4,8 +4,8 @@ latitude: 45.05175
 longitude: 5.56297
 postcode: "38250"
 city: VILLARD DE LANS
-street: "Route des Glovettes"
-housenumber: 
-phone: "04 76 95 01 32"
+street: Route des Glovettes
+housenumber: ""
+phone: 04 76 95 01 32
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/skiman-2000-netski.yml b/data/cities/villard-de-lans/skiman-2000-netski.yml
index 715413ee6..1afa20b73 100644
--- a/data/cities/villard-de-lans/skiman-2000-netski.yml
+++ b/data/cities/villard-de-lans/skiman-2000-netski.yml
@@ -4,8 +4,8 @@ latitude: 45.0468
 longitude: 5.55857
 postcode: "38250"
 city: Villard-de-Lans
-street: "Allée des Chevreuils"
-housenumber: 24
-phone: "04 76 95 91 23"
+street: Allée des Chevreuils
+housenumber: "24"
+phone: 04 76 95 91 23
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/skis-et-loisirs-2000-skiset.yml b/data/cities/villard-de-lans/skis-et-loisirs-2000-skiset.yml
index 3d7afabe0..30c2d9ced 100644
--- a/data/cities/villard-de-lans/skis-et-loisirs-2000-skiset.yml
+++ b/data/cities/villard-de-lans/skis-et-loisirs-2000-skiset.yml
@@ -4,8 +4,8 @@ latitude: 45.04685
 longitude: 5.55833
 postcode: "38250"
 city: Villard-de-Lans
-street: "Route de la Côte 2000"
-housenumber: 
-phone: "04 76 95 14 07"
+street: Route de la Côte 2000
+housenumber: ""
+phone: 04 76 95 14 07
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/sport-2000-sportneige.yml b/data/cities/villard-de-lans/sport-2000-sportneige.yml
index c16865477..aa25a36e8 100644
--- a/data/cities/villard-de-lans/sport-2000-sportneige.yml
+++ b/data/cities/villard-de-lans/sport-2000-sportneige.yml
@@ -4,8 +4,8 @@ latitude: 45.06979
 longitude: 5.54986
 postcode: "38250"
 city: Villard-de-Lans
-street: "Place des Martyrs"
-housenumber: 38
+street: Place des Martyrs
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/sport-2000.yml b/data/cities/villard-de-lans/sport-2000.yml
index cd275f60e..109a31142 100644
--- a/data/cities/villard-de-lans/sport-2000.yml
+++ b/data/cities/villard-de-lans/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 45.0457
 longitude: 5.56004
 postcode: "38250"
 city: Villard-de-Lans
-street: "Allée des Mouflons"
-housenumber: 
-phone: "04 76 95 12 24"
+street: Allée des Mouflons
+housenumber: ""
+phone: 04 76 95 12 24
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villard-de-lans/vercors-lait.yml b/data/cities/villard-de-lans/vercors-lait.yml
index 5a59838c7..57ae3e56f 100644
--- a/data/cities/villard-de-lans/vercors-lait.yml
+++ b/data/cities/villard-de-lans/vercors-lait.yml
@@ -4,8 +4,8 @@ latitude: 45.07908
 longitude: 5.53403
 postcode: "38250"
 city: Villard-de-Lans
-street: "Route des Jarrands"
-housenumber: 
-phone: "+33 476 95 3321"
-opening_hours: "Mo-Su 09:00-12:00,14:00-18:00; SH Mo-Su 09:00-19:00"
-website: "https://www.vercorslait.com/site/"
\ No newline at end of file
+street: Route des Jarrands
+housenumber: ""
+phone: +33 476 95 3321
+opening_hours: Mo-Su 09:00-12:00,14:00-18:00; SH Mo-Su 09:00-19:00
+website: https://www.vercorslait.com/site/
diff --git a/data/cities/villard-de-lans/villard-sports.yml b/data/cities/villard-de-lans/villard-sports.yml
index dd690fab9..5c8f39b9e 100644
--- a/data/cities/villard-de-lans/villard-sports.yml
+++ b/data/cities/villard-de-lans/villard-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.07398
 longitude: 5.5541
 postcode: "38250"
 city: Villard-de-Lans
-street: "Avenue du Général de Gaulle"
-housenumber: 408
+street: Avenue du Général de Gaulle
+housenumber: "408"
 phone: ""
-opening_hours: "Mo-Sa 09:00-12:00, 14:30-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-12:00, 14:30-18:00
+website: ""
diff --git a/data/cities/villard-sur-doron/intermarche.yml b/data/cities/villard-sur-doron/intermarche.yml
index b49b79b03..09356a01d 100644
--- a/data/cities/villard-sur-doron/intermarche.yml
+++ b/data/cities/villard-sur-doron/intermarche.yml
@@ -1,11 +1,11 @@
 id: 188900390
-type: way
+type: node
 latitude: 45.72715
 longitude: 6.53355
 postcode: "73270"
 city: Villard-sur-Doron
-street: "Route du Jardy"
-housenumber: 100
-phone: "+33 4 79 38 35 79"
-opening_hours: "Mo-Fr 08:30-12:00, 14:30-19:00; Sa 08:30-19:00; Su 08:30-11:45"
-website: "https://www.intermarche.com/magasins/10172/villard-sur-doron-73270/infos-pratiques"
\ No newline at end of file
+street: Route du Jardy
+housenumber: "100"
+phone: +33 4 79 38 35 79
+opening_hours: Mo-Fr 08:30-12:00, 14:30-19:00; Sa 08:30-19:00; Su 08:30-11:45
+website: https://www.intermarche.com/magasins/10172/villard-sur-doron-73270/infos-pratiques
diff --git a/data/cities/villard/le-refuge-des-petits-gourmands.yml b/data/cities/villard/le-refuge-des-petits-gourmands.yml
index b34b38e8e..a1fd46f6a 100644
--- a/data/cities/villard/le-refuge-des-petits-gourmands.yml
+++ b/data/cities/villard/le-refuge-des-petits-gourmands.yml
@@ -4,8 +4,8 @@ latitude: 46.21753
 longitude: 6.4396
 postcode: "74420"
 city: Villard
-street: "Route des Alpes du Léman"
-housenumber: 1675
+street: Route des Alpes du Léman
+housenumber: "1675"
 phone: ""
-opening_hours: "Mo off; Tu-Su 06:30-13:00, 15:30-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo off; Tu-Su 06:30-13:00, 15:30-19:30
+website: ""
diff --git a/data/cities/villard/lenvie-de-viande.yml b/data/cities/villard/lenvie-de-viande.yml
index 0b60817da..166192f75 100644
--- a/data/cities/villard/lenvie-de-viande.yml
+++ b/data/cities/villard/lenvie-de-viande.yml
@@ -4,8 +4,8 @@ latitude: 46.21294
 longitude: 6.43904
 postcode: "74420"
 city: Villard
-street: "Route de la Gruaz d'en Haut"
-housenumber: 112
+street: Route de la Gruaz d'en Haut
+housenumber: "112"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villarodin-bourget/ski-m-play.yml b/data/cities/villarodin-bourget/ski-m-play.yml
index 46e1df532..e50fe9402 100644
--- a/data/cities/villarodin-bourget/ski-m-play.yml
+++ b/data/cities/villarodin-bourget/ski-m-play.yml
@@ -4,8 +4,8 @@ latitude: 45.20149
 longitude: 6.69749
 postcode: "73500"
 city: Villarodin-Bourget
-street: "LE VILLAGE- LA NORMA"
-housenumber: 
+street: LE VILLAGE- LA NORMA
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villars/besson-chaussures.yml b/data/cities/villars/besson-chaussures.yml
index 582247be2..a5c1b11bd 100644
--- a/data/cities/villars/besson-chaussures.yml
+++ b/data/cities/villars/besson-chaussures.yml
@@ -4,8 +4,8 @@ latitude: 45.46842
 longitude: 4.34126
 postcode: "42390"
 city: Villars
-street: "Zac du versant de montravel"
-housenumber: 
+street: Zac du versant de montravel
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-saint-etienne-villars_villars_42390/195.html"
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.besson-chaussures.com/nos-boutiques/besson-chaussures-saint-etienne-villars_villars_42390/195.html
diff --git a/data/cities/villars/noz.yml b/data/cities/villars/noz.yml
index 4cc0d7791..c4e15cdfb 100644
--- a/data/cities/villars/noz.yml
+++ b/data/cities/villars/noz.yml
@@ -4,8 +4,8 @@ latitude: 45.46788
 longitude: 4.36908
 postcode: "42270"
 city: Villars
-street: "Rue des Canuts"
+street: Rue des Canuts
 housenumber: 7 bis
 phone: ""
 opening_hours: ""
-website: "https://nozarrivages.com/magasin/villars/"
\ No newline at end of file
+website: https://nozarrivages.com/magasin/villars/
diff --git a/data/cities/villars/velo-passion.yml b/data/cities/villars/velo-passion.yml
index 5d4009e46..09b99c1d3 100644
--- a/data/cities/villars/velo-passion.yml
+++ b/data/cities/villars/velo-passion.yml
@@ -4,8 +4,8 @@ latitude: 45.46952
 longitude: 4.36538
 postcode: "42390"
 city: Villars
-street: "Rue de l'Artisanat"
-housenumber: 5
+street: Rue de l'Artisanat
+housenumber: "5"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villaz/carrefour-express.yml b/data/cities/villaz/carrefour-express.yml
index 8f4ae2414..f1c699238 100644
--- a/data/cities/villaz/carrefour-express.yml
+++ b/data/cities/villaz/carrefour-express.yml
@@ -1,11 +1,11 @@
 id: 62448000
-type: way
+type: node
 latitude: 45.95088
 longitude: 6.19206
 postcode: "74370"
 city: Villaz
-street: "Avenue de Bonatray"
-housenumber: 154
+street: Avenue de Bonatray
+housenumber: "154"
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su 08:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:00-20:00; Su 08:00-20:00
+website: ""
diff --git a/data/cities/villaz/fruitiere-chabert.yml b/data/cities/villaz/fruitiere-chabert.yml
index d31604fab..250f40c40 100644
--- a/data/cities/villaz/fruitiere-chabert.yml
+++ b/data/cities/villaz/fruitiere-chabert.yml
@@ -4,8 +4,8 @@ latitude: 45.95209
 longitude: 6.19497
 postcode: "74370"
 city: Villaz
-street: "Avenue de Bonatray"
-housenumber: 
+street: Avenue de Bonatray
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "http://www.fruitieres-chabert.com/toutes-nos-fruitieres/la-fruitiere-du-parmelan"
\ No newline at end of file
+website: http://www.fruitieres-chabert.com/toutes-nos-fruitieres/la-fruitiere-du-parmelan
diff --git a/data/cities/villaz/le-fournil-du-parmelan.yml b/data/cities/villaz/le-fournil-du-parmelan.yml
index 030e23df6..50748d85e 100644
--- a/data/cities/villaz/le-fournil-du-parmelan.yml
+++ b/data/cities/villaz/le-fournil-du-parmelan.yml
@@ -4,8 +4,8 @@ latitude: 45.95196
 longitude: 6.19445
 postcode: "74370"
 city: Villaz
-street: "Avenue de Bonatray"
-housenumber: 355
+street: Avenue de Bonatray
+housenumber: "355"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villaz/le-jardin-du-felan.yml b/data/cities/villaz/le-jardin-du-felan.yml
index 81d78195c..ca1c4dde2 100644
--- a/data/cities/villaz/le-jardin-du-felan.yml
+++ b/data/cities/villaz/le-jardin-du-felan.yml
@@ -4,8 +4,8 @@ latitude: 45.95043
 longitude: 6.18682
 postcode: "74370"
 city: Villaz
-street: "Route des Provinces"
-housenumber: 196
+street: Route des Provinces
+housenumber: "196"
 phone: ""
-opening_hours: "Friday evening"
-website: ""
\ No newline at end of file
+opening_hours: Friday evening
+website: ""
diff --git a/data/cities/villaz/le-ptiou-cousin.yml b/data/cities/villaz/le-ptiou-cousin.yml
index f693cf26b..3ad7da0e9 100644
--- a/data/cities/villaz/le-ptiou-cousin.yml
+++ b/data/cities/villaz/le-ptiou-cousin.yml
@@ -4,8 +4,8 @@ latitude: 45.95199
 longitude: 6.19435
 postcode: "74370"
 city: Villaz
-street: "Avenue de Bonatray"
-housenumber: 355
+street: Avenue de Bonatray
+housenumber: "355"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villaz/loop-sports.yml b/data/cities/villaz/loop-sports.yml
index 09b6ff340..c07714469 100644
--- a/data/cities/villaz/loop-sports.yml
+++ b/data/cities/villaz/loop-sports.yml
@@ -4,8 +4,8 @@ latitude: 45.95754
 longitude: 6.17121
 postcode: "74370"
 city: Villaz
-street: "Route des Futaies"
-housenumber: 805
-phone: "+33 4 50 19 88 10"
-opening_hours: "Mo-Sa 10:00-18:30"
-website: "https://loop-sports.fr/"
\ No newline at end of file
+street: Route des Futaies
+housenumber: "805"
+phone: +33 4 50 19 88 10
+opening_hours: Mo-Sa 10:00-18:30
+website: https://loop-sports.fr/
diff --git a/data/cities/ville-la-grand/alcura.yml b/data/cities/ville-la-grand/alcura.yml
index 035078266..aa0de2299 100644
--- a/data/cities/ville-la-grand/alcura.yml
+++ b/data/cities/ville-la-grand/alcura.yml
@@ -4,8 +4,8 @@ latitude: 46.20412
 longitude: 6.27663
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue du Bois de la Rose"
-housenumber: 6
+street: Rue du Bois de la Rose
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/alinea.yml b/data/cities/ville-la-grand/alinea.yml
index 3834337df..dd40f4822 100644
--- a/data/cities/ville-la-grand/alinea.yml
+++ b/data/cities/ville-la-grand/alinea.yml
@@ -1,11 +1,11 @@
 id: 156890444
-type: way
+type: node
 latitude: 46.2045
 longitude: 6.28103
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Deux Montagnes (Québec)"
-housenumber: 3
+street: Rue de Deux Montagnes (Québec)
+housenumber: "3"
 phone: "+33450872740"
 opening_hours: ""
-website: "https://www.alinea.com/"
\ No newline at end of file
+website: https://www.alinea.com/
diff --git a/data/cities/ville-la-grand/alpes-batteries.yml b/data/cities/ville-la-grand/alpes-batteries.yml
index 87eee8ac5..073274c7f 100644
--- a/data/cities/ville-la-grand/alpes-batteries.yml
+++ b/data/cities/ville-la-grand/alpes-batteries.yml
@@ -4,8 +4,8 @@ latitude: 46.20435
 longitude: 6.27932
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 17
+street: Rue de Montréal
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/animalis.yml b/data/cities/ville-la-grand/animalis.yml
index 8dd2bfc65..c0f3e0e99 100644
--- a/data/cities/ville-la-grand/animalis.yml
+++ b/data/cities/ville-la-grand/animalis.yml
@@ -4,8 +4,8 @@ latitude: 46.20292
 longitude: 6.28045
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Deux Montagnes (Québec)"
-housenumber: 1
+street: Rue de Deux Montagnes (Québec)
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su 10:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su 10:00-13:00
+website: ""
diff --git a/data/cities/ville-la-grand/annemasse-pneu-vlg.yml b/data/cities/ville-la-grand/annemasse-pneu-vlg.yml
index 6a6590e32..a098969d9 100644
--- a/data/cities/ville-la-grand/annemasse-pneu-vlg.yml
+++ b/data/cities/ville-la-grand/annemasse-pneu-vlg.yml
@@ -1,11 +1,11 @@
 id: 80119403
-type: way
+type: node
 latitude: 46.20345
 longitude: 6.27274
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Artisans"
-housenumber: 1
+street: Rue des Artisans
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:30; Sa 08:00-12:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/atouts-fenetres.yml b/data/cities/ville-la-grand/atouts-fenetres.yml
index 5fdc39109..7849a5ed6 100644
--- a/data/cities/ville-la-grand/atouts-fenetres.yml
+++ b/data/cities/ville-la-grand/atouts-fenetres.yml
@@ -4,8 +4,8 @@ latitude: 46.20429
 longitude: 6.27914
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 17
+street: Rue de Montréal
+housenumber: "17"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/au-petrin-des-saveurs-rue-des-chasseurs.yml b/data/cities/ville-la-grand/au-petrin-des-saveurs-rue-des-chasseurs.yml
index 633dc49f5..ca394c27f 100644
--- a/data/cities/ville-la-grand/au-petrin-des-saveurs-rue-des-chasseurs.yml
+++ b/data/cities/ville-la-grand/au-petrin-des-saveurs-rue-des-chasseurs.yml
@@ -4,8 +4,8 @@ latitude: 46.20653
 longitude: 6.28481
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Chasseurs"
-housenumber: 2
+street: Rue des Chasseurs
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/au-petrin-des-saveurs.yml b/data/cities/ville-la-grand/au-petrin-des-saveurs.yml
index 80baf8b49..a27175059 100644
--- a/data/cities/ville-la-grand/au-petrin-des-saveurs.yml
+++ b/data/cities/ville-la-grand/au-petrin-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 46.20275
 longitude: 6.2487
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue du Commerce"
+street: Rue du Commerce
 housenumber: 6 bis
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:30; Su 06:00-14:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:30; Su 06:00-14:00
+website: ""
diff --git a/data/cities/ville-la-grand/audi.yml b/data/cities/ville-la-grand/audi.yml
index 7709a8c7c..abb694a22 100644
--- a/data/cities/ville-la-grand/audi.yml
+++ b/data/cities/ville-la-grand/audi.yml
@@ -1,11 +1,11 @@
 id: 158608795
-type: way
+type: node
 latitude: 46.20173
 longitude: 6.27188
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Buchillons"
-housenumber: 21
+street: Rue des Buchillons
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:30-12:00, 14:00-18:00"
-website: "https://www.audi-annemasse.fr/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:30-12:00, 14:00-18:00
+website: https://www.audi-annemasse.fr/
diff --git a/data/cities/ville-la-grand/biofrais.yml b/data/cities/ville-la-grand/biofrais.yml
index 53d01b2bc..2bd949f37 100644
--- a/data/cities/ville-la-grand/biofrais.yml
+++ b/data/cities/ville-la-grand/biofrais.yml
@@ -4,8 +4,8 @@ latitude: 46.20309
 longitude: 6.28089
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Deux Montagnes (Québec)"
-housenumber: 1
+street: Rue de Deux Montagnes (Québec)
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 09:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 09:30-13:00
+website: ""
diff --git a/data/cities/ville-la-grand/bmw-mini-saleve-automobiles.yml b/data/cities/ville-la-grand/bmw-mini-saleve-automobiles.yml
index da9db5049..33499263f 100644
--- a/data/cities/ville-la-grand/bmw-mini-saleve-automobiles.yml
+++ b/data/cities/ville-la-grand/bmw-mini-saleve-automobiles.yml
@@ -1,11 +1,11 @@
 id: 894397454
-type: way
+type: node
 latitude: 46.19957
 longitude: 6.26571
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Buchillons"
-housenumber: 8
+street: Rue des Buchillons
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/botanic.yml b/data/cities/ville-la-grand/botanic.yml
index 1f72a0df0..4de0411c8 100644
--- a/data/cities/ville-la-grand/botanic.yml
+++ b/data/cities/ville-la-grand/botanic.yml
@@ -1,11 +1,11 @@
 id: 80130311
-type: way
+type: node
 latitude: 46.20253
 longitude: 6.27101
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Biches"
-housenumber: 14
+street: Rue des Biches
+housenumber: "14"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su 09:30-12:30,14:00-18:00; aug 15 off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00; Su 09:30-12:30,14:00-18:00; aug 15 off
+website: ""
diff --git a/data/cities/ville-la-grand/but.yml b/data/cities/ville-la-grand/but.yml
index 360c171eb..f31cb44e9 100644
--- a/data/cities/ville-la-grand/but.yml
+++ b/data/cities/ville-la-grand/but.yml
@@ -1,11 +1,11 @@
 id: 1165469123
-type: way
+type: node
 latitude: 46.20351
 longitude: 6.27555
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 5
+street: Rue de Montréal
+housenumber: "5"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/carglass.yml b/data/cities/ville-la-grand/carglass.yml
index a20003ceb..02b70c7b7 100644
--- a/data/cities/ville-la-grand/carglass.yml
+++ b/data/cities/ville-la-grand/carglass.yml
@@ -4,8 +4,8 @@ latitude: 46.20175
 longitude: 6.26798
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 6
+street: Rue Chantemerle
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:15, 13:45-18:00; Sa 08:00-12:15, 13:45-17:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:15, 13:45-18:00; Sa 08:00-12:15, 13:45-17:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/carrosserie-millet.yml b/data/cities/ville-la-grand/carrosserie-millet.yml
index d4e7e7444..17ad0830a 100644
--- a/data/cities/ville-la-grand/carrosserie-millet.yml
+++ b/data/cities/ville-la-grand/carrosserie-millet.yml
@@ -4,8 +4,8 @@ latitude: 46.20281
 longitude: 6.26849
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 4
+street: Rue Chantemerle
+housenumber: "4"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/carrosserie-robin.yml b/data/cities/ville-la-grand/carrosserie-robin.yml
index 367f75a9f..9d7af9bc5 100644
--- a/data/cities/ville-la-grand/carrosserie-robin.yml
+++ b/data/cities/ville-la-grand/carrosserie-robin.yml
@@ -1,11 +1,11 @@
 id: 80119389
-type: way
+type: node
 latitude: 46.20357
 longitude: 6.27505
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Artisans"
-housenumber: 8
+street: Rue des Artisans
+housenumber: "8"
 phone: ""
-opening_hours: "Mo,Sa-Su off; Tu-Th 07:30-12:00, 13:00-17:00; Fr 07:30-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Sa-Su off; Tu-Th 07:30-12:00, 13:00-17:00; Fr 07:30-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/ville-la-grand/cedeo-la-salle-de-bain.yml b/data/cities/ville-la-grand/cedeo-la-salle-de-bain.yml
index b620b3cca..62f874fa7 100644
--- a/data/cities/ville-la-grand/cedeo-la-salle-de-bain.yml
+++ b/data/cities/ville-la-grand/cedeo-la-salle-de-bain.yml
@@ -1,11 +1,12 @@
 id: 80119401
-type: way
+type: node
 latitude: 46.20327
 longitude: 6.27428
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Artisans"
-housenumber: 4
+street: Rue des Artisans
+housenumber: "4"
 phone: ""
-opening_hours: "Tu-Th 09:00-12:00, 14:00-17:00; Fr 09:00-12:00, 13:30-16:30, Mo,Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Th 09:00-12:00, 14:00-17:00; Fr 09:00-12:00, 13:30-16:30, Mo,Sa-Su
+    off
+website: ""
diff --git a/data/cities/ville-la-grand/centrakor.yml b/data/cities/ville-la-grand/centrakor.yml
index ecf069f37..2a83b4d91 100644
--- a/data/cities/ville-la-grand/centrakor.yml
+++ b/data/cities/ville-la-grand/centrakor.yml
@@ -1,11 +1,11 @@
 id: 80130315
-type: way
+type: node
 latitude: 46.20264
 longitude: 6.27017
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 2
+street: Rue Chantemerle
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/centre-commercial-cap-bernard.yml b/data/cities/ville-la-grand/centre-commercial-cap-bernard.yml
index 03b5338c3..3590bdf07 100644
--- a/data/cities/ville-la-grand/centre-commercial-cap-bernard.yml
+++ b/data/cities/ville-la-grand/centre-commercial-cap-bernard.yml
@@ -1,11 +1,11 @@
 id: 260122284
-type: way
+type: node
 latitude: 46.20348
 longitude: 6.27789
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/comptoir-des-fers.yml b/data/cities/ville-la-grand/comptoir-des-fers.yml
index 6bdcc1e51..6c5ba0d39 100644
--- a/data/cities/ville-la-grand/comptoir-des-fers.yml
+++ b/data/cities/ville-la-grand/comptoir-des-fers.yml
@@ -1,11 +1,11 @@
 id: 116337710
-type: way
+type: node
 latitude: 46.20459
 longitude: 6.26542
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Biches"
-housenumber: 1
+street: Rue des Biches
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:30; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/cultura.yml b/data/cities/ville-la-grand/cultura.yml
index 2a7846a4e..935e39f92 100644
--- a/data/cities/ville-la-grand/cultura.yml
+++ b/data/cities/ville-la-grand/cultura.yml
@@ -4,8 +4,8 @@ latitude: 46.20275
 longitude: 6.27801
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/decoplus-parquets.yml b/data/cities/ville-la-grand/decoplus-parquets.yml
index 2ee068ee8..5ddcf7c21 100644
--- a/data/cities/ville-la-grand/decoplus-parquets.yml
+++ b/data/cities/ville-la-grand/decoplus-parquets.yml
@@ -1,11 +1,11 @@
 id: 80118392
-type: way
+type: node
 latitude: 46.20497
 longitude: 6.28192
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 32
+street: Rue de Montréal
+housenumber: "32"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 10:00-13:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 10:00-13:00, 14:00-19:00
+website: ""
diff --git a/data/cities/ville-la-grand/e-leclerc.yml b/data/cities/ville-la-grand/e-leclerc.yml
index c6763a0be..ae14f8d81 100644
--- a/data/cities/ville-la-grand/e-leclerc.yml
+++ b/data/cities/ville-la-grand/e-leclerc.yml
@@ -1,11 +1,11 @@
 id: 472145236
-type: way
+type: node
 latitude: 46.20433
 longitude: 6.24006
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Albert Hénon"
-housenumber: 3
+street: Rue Albert Hénon
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/easy-love.yml b/data/cities/ville-la-grand/easy-love.yml
index 8d51564fc..373c61a9d 100644
--- a/data/cities/ville-la-grand/easy-love.yml
+++ b/data/cities/ville-la-grand/easy-love.yml
@@ -4,8 +4,8 @@ latitude: 46.20218
 longitude: 6.27909
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 16
+street: Rue de Montréal
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/elan-automobile.yml b/data/cities/ville-la-grand/elan-automobile.yml
index cb6a97a79..7816e8eb4 100644
--- a/data/cities/ville-la-grand/elan-automobile.yml
+++ b/data/cities/ville-la-grand/elan-automobile.yml
@@ -1,11 +1,11 @@
 id: 116337707
-type: way
+type: node
 latitude: 46.20202
 longitude: 6.26861
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 7
+street: Rue Chantemerle
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/france-pare-brise.yml b/data/cities/ville-la-grand/france-pare-brise.yml
index b89b65472..08eaae937 100644
--- a/data/cities/ville-la-grand/france-pare-brise.yml
+++ b/data/cities/ville-la-grand/france-pare-brise.yml
@@ -4,8 +4,8 @@ latitude: 46.20289
 longitude: 6.26925
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 4
+street: Rue Chantemerle
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-18:30; Sa 08:30-12:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/fromagerie-bouchet.yml b/data/cities/ville-la-grand/fromagerie-bouchet.yml
index cf7cc7c3a..067521f40 100644
--- a/data/cities/ville-la-grand/fromagerie-bouchet.yml
+++ b/data/cities/ville-la-grand/fromagerie-bouchet.yml
@@ -4,8 +4,8 @@ latitude: 46.20293
 longitude: 6.25083
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Voirons"
-housenumber: 13
-phone: "+33 4 50 74 54 80"
+street: Rue des Voirons
+housenumber: "13"
+phone: +33 4 50 74 54 80
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/garage-du-lac.yml b/data/cities/ville-la-grand/garage-du-lac.yml
index b9d6659cc..385cb5ba1 100644
--- a/data/cities/ville-la-grand/garage-du-lac.yml
+++ b/data/cities/ville-la-grand/garage-du-lac.yml
@@ -1,11 +1,11 @@
 id: 158620758
-type: way
+type: node
 latitude: 46.20136
 longitude: 6.2649
 postcode: "74100"
 city: Ville-la-Grand
-street: "Allée des Mousserons des Prés"
-housenumber: 2
+street: Allée des Mousserons des Prés
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/gedimat-vallier.yml b/data/cities/ville-la-grand/gedimat-vallier.yml
index 5f4e3c7bd..7824ecf69 100644
--- a/data/cities/ville-la-grand/gedimat-vallier.yml
+++ b/data/cities/ville-la-grand/gedimat-vallier.yml
@@ -1,11 +1,11 @@
 id: 80131547
-type: way
+type: node
 latitude: 46.20386
 longitude: 6.26916
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Biches"
-housenumber: 8
+street: Rue des Biches
+housenumber: "8"
 phone: ""
-opening_hours: "Mo-Fr 07:00-12:00, 13:30-18:30; Sa 08:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:00, 13:30-18:30; Sa 08:00-12:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/habitat.yml b/data/cities/ville-la-grand/habitat.yml
index c161a41d8..f783406e4 100644
--- a/data/cities/ville-la-grand/habitat.yml
+++ b/data/cities/ville-la-grand/habitat.yml
@@ -4,8 +4,8 @@ latitude: 46.20261
 longitude: 6.27817
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/haldys.yml b/data/cities/ville-la-grand/haldys.yml
index 884a33181..7041b8b01 100644
--- a/data/cities/ville-la-grand/haldys.yml
+++ b/data/cities/ville-la-grand/haldys.yml
@@ -4,8 +4,8 @@ latitude: 46.19807
 longitude: 6.24233
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Tournelles"
-housenumber: 21
+street: Rue des Tournelles
+housenumber: "21"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-19:00
+website: ""
diff --git a/data/cities/ville-la-grand/heth-meuble-canape-et-deco.yml b/data/cities/ville-la-grand/heth-meuble-canape-et-deco.yml
index 549b4c90c..ef27cf709 100644
--- a/data/cities/ville-la-grand/heth-meuble-canape-et-deco.yml
+++ b/data/cities/ville-la-grand/heth-meuble-canape-et-deco.yml
@@ -4,8 +4,8 @@ latitude: 46.2022
 longitude: 6.27811
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: "+33450244432"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00"
-website: "https://heth.actueldesign.fr/magasin-heth-annemasse.html"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00
+website: https://heth.actueldesign.fr/magasin-heth-annemasse.html
diff --git a/data/cities/ville-la-grand/homesalons-annemasse.yml b/data/cities/ville-la-grand/homesalons-annemasse.yml
index e332c700b..f81637449 100644
--- a/data/cities/ville-la-grand/homesalons-annemasse.yml
+++ b/data/cities/ville-la-grand/homesalons-annemasse.yml
@@ -4,8 +4,8 @@ latitude: 46.20208
 longitude: 6.27756
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: "+33450244431"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00"
-website: "https://homesalons-annemasse.fr/"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00
+website: https://homesalons-annemasse.fr/
diff --git a/data/cities/ville-la-grand/institut-entre-elles.yml b/data/cities/ville-la-grand/institut-entre-elles.yml
index 9ebbf0d74..290a1383b 100644
--- a/data/cities/ville-la-grand/institut-entre-elles.yml
+++ b/data/cities/ville-la-grand/institut-entre-elles.yml
@@ -4,8 +4,8 @@ latitude: 46.20293
 longitude: 6.25093
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Voirons"
-housenumber: 13
-phone: "+33 6 59 56 87 69"
+street: Rue des Voirons
+housenumber: "13"
+phone: +33 6 59 56 87 69
 opening_hours: ""
-website: "https://www.planity.com/entre-elles-74100-ville-la-grand"
\ No newline at end of file
+website: https://www.planity.com/entre-elles-74100-ville-la-grand
diff --git a/data/cities/ville-la-grand/interiors.yml b/data/cities/ville-la-grand/interiors.yml
index 7b3f89463..ce7bfc60b 100644
--- a/data/cities/ville-la-grand/interiors.yml
+++ b/data/cities/ville-la-grand/interiors.yml
@@ -4,8 +4,8 @@ latitude: 46.20185
 longitude: 6.27668
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/ixina.yml b/data/cities/ville-la-grand/ixina.yml
index 97b646e09..ef75e1e30 100644
--- a/data/cities/ville-la-grand/ixina.yml
+++ b/data/cities/ville-la-grand/ixina.yml
@@ -4,8 +4,8 @@ latitude: 46.20358
 longitude: 6.27691
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 9
+street: Rue de Montréal
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00, 14:00-19:00; Sa 09:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00, 14:00-19:00; Sa 09:00-18:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/jean-lain-annemasse-carrosserie.yml b/data/cities/ville-la-grand/jean-lain-annemasse-carrosserie.yml
index f80812650..5a67beb7a 100644
--- a/data/cities/ville-la-grand/jean-lain-annemasse-carrosserie.yml
+++ b/data/cities/ville-la-grand/jean-lain-annemasse-carrosserie.yml
@@ -1,11 +1,12 @@
 id: 80133701
-type: way
+type: node
 latitude: 46.2001
 longitude: 6.26559
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de la Californie"
-housenumber: 6
+street: Rue de la Californie
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Th 07:45-12:00, 13:45-18:30; Fr 07:45-12:00, 13:45-17:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:45-12:00, 13:45-18:30; Fr 07:45-12:00, 13:45-17:30; Sa-Su
+    off
+website: ""
diff --git a/data/cities/ville-la-grand/jean-lain-hyundai-annemasse.yml b/data/cities/ville-la-grand/jean-lain-hyundai-annemasse.yml
index 39ca03350..adf914b54 100644
--- a/data/cities/ville-la-grand/jean-lain-hyundai-annemasse.yml
+++ b/data/cities/ville-la-grand/jean-lain-hyundai-annemasse.yml
@@ -1,11 +1,11 @@
 id: 158620768
-type: way
+type: node
 latitude: 46.201
 longitude: 6.26638
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de la Californie"
-housenumber: 9
+street: Rue de la Californie
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/la-boutique-savoyarde.yml b/data/cities/ville-la-grand/la-boutique-savoyarde.yml
index 055a0ec95..afa2eea57 100644
--- a/data/cities/ville-la-grand/la-boutique-savoyarde.yml
+++ b/data/cities/ville-la-grand/la-boutique-savoyarde.yml
@@ -4,8 +4,8 @@ latitude: 46.20229
 longitude: 6.2594
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Voirons"
+street: Rue des Voirons
 housenumber: 39 bis
 phone: ""
-opening_hours: "Mo-Fr 06:00-19:00; Sa 07:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-19:00; Sa 07:00-12:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/la-cave-bordelaise.yml b/data/cities/ville-la-grand/la-cave-bordelaise.yml
index 68750b346..706e05feb 100644
--- a/data/cities/ville-la-grand/la-cave-bordelaise.yml
+++ b/data/cities/ville-la-grand/la-cave-bordelaise.yml
@@ -4,8 +4,8 @@ latitude: 46.20224
 longitude: 6.25947
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Voirons"
+street: Rue des Voirons
 housenumber: 39 bis
 phone: ""
-opening_hours: "Mo-We,Fr-Sa 0:00-12:15, 15:00-19:00; Th 10:00-12:15; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-We,Fr-Sa 0:00-12:15, 15:00-19:00; Th 10:00-12:15; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/la-compagnie-du-lit.yml b/data/cities/ville-la-grand/la-compagnie-du-lit.yml
index c342c2e74..9928a520b 100644
--- a/data/cities/ville-la-grand/la-compagnie-du-lit.yml
+++ b/data/cities/ville-la-grand/la-compagnie-du-lit.yml
@@ -4,8 +4,8 @@ latitude: 46.20229
 longitude: 6.26938
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 1
+street: Rue Chantemerle
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/la-paniere.yml b/data/cities/ville-la-grand/la-paniere.yml
index 0dcef35d4..e78f590ff 100644
--- a/data/cities/ville-la-grand/la-paniere.yml
+++ b/data/cities/ville-la-grand/la-paniere.yml
@@ -1,11 +1,11 @@
 id: 452114733
-type: way
+type: node
 latitude: 46.2025
 longitude: 6.27801
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Su 07:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-19:30
+website: ""
diff --git a/data/cities/ville-la-grand/la-rose-du-desert.yml b/data/cities/ville-la-grand/la-rose-du-desert.yml
index f6dce832f..22552355e 100644
--- a/data/cities/ville-la-grand/la-rose-du-desert.yml
+++ b/data/cities/ville-la-grand/la-rose-du-desert.yml
@@ -1,11 +1,11 @@
 id: 80119393
-type: way
+type: node
 latitude: 46.20353
 longitude: 6.27427
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Artisans"
-housenumber: 6
+street: Rue des Artisans
+housenumber: "6"
 phone: ""
-opening_hours: "Mo,We-Th 10:00-19:00; Fr-Sa 10:00-20:00; Su 10:00-15:00; Tu off"
-website: ""
\ No newline at end of file
+opening_hours: Mo,We-Th 10:00-19:00; Fr-Sa 10:00-20:00; Su 10:00-15:00; Tu off
+website: ""
diff --git a/data/cities/ville-la-grand/laimant-moto.yml b/data/cities/ville-la-grand/laimant-moto.yml
index 68a333853..664a89b9c 100644
--- a/data/cities/ville-la-grand/laimant-moto.yml
+++ b/data/cities/ville-la-grand/laimant-moto.yml
@@ -1,11 +1,11 @@
 id: 158608801
-type: way
+type: node
 latitude: 46.20151
 longitude: 6.26655
 postcode: "74100"
 city: Ville-la-Grand
-street: "Allée des Mousserons des Prés"
-housenumber: 8
+street: Allée des Mousserons des Prés
+housenumber: "8"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00, 14:00-18:00
+website: ""
diff --git a/data/cities/ville-la-grand/lanches-sport.yml b/data/cities/ville-la-grand/lanches-sport.yml
index 541f5658a..05dcababc 100644
--- a/data/cities/ville-la-grand/lanches-sport.yml
+++ b/data/cities/ville-la-grand/lanches-sport.yml
@@ -1,11 +1,11 @@
 id: 949563602
-type: way
+type: node
 latitude: 46.20731
 longitude: 6.28171
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Chasseurs"
-housenumber: 9
+street: Rue des Chasseurs
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-19:00; Sa 08:30-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:00-12:00, 14:00-19:00; Sa 08:30-18:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/le-grand-comptoir.yml b/data/cities/ville-la-grand/le-grand-comptoir.yml
index 64cba2c9c..860e40c36 100644
--- a/data/cities/ville-la-grand/le-grand-comptoir.yml
+++ b/data/cities/ville-la-grand/le-grand-comptoir.yml
@@ -1,11 +1,11 @@
 id: 733841333
-type: way
+type: node
 latitude: 46.20391
 longitude: 6.27139
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Biches"
-housenumber: 14
+street: Rue des Biches
+housenumber: "14"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/le-manege-a-bijoux.yml b/data/cities/ville-la-grand/le-manege-a-bijoux.yml
index f76288a70..1a5de6487 100644
--- a/data/cities/ville-la-grand/le-manege-a-bijoux.yml
+++ b/data/cities/ville-la-grand/le-manege-a-bijoux.yml
@@ -4,8 +4,8 @@ latitude: 46.20394
 longitude: 6.23884
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Albert Hénon"
-housenumber: 3
+street: Rue Albert Hénon
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/leroy-merlin.yml b/data/cities/ville-la-grand/leroy-merlin.yml
index e9f19ab09..8228983d6 100644
--- a/data/cities/ville-la-grand/leroy-merlin.yml
+++ b/data/cities/ville-la-grand/leroy-merlin.yml
@@ -1,11 +1,11 @@
 id: 977993780
-type: way
+type: node
 latitude: 46.20563
 longitude: 6.28448
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 40
-phone: "+33 4 50 84 63 00"
-opening_hours: "Mo-Sa 09:00-20:00; Su off"
-website: "https://www.leroymerlin.fr/magasins/annemasse/magasin-de-bricolage-annemasse-lpl.html"
\ No newline at end of file
+street: Rue de Montréal
+housenumber: "40"
+phone: +33 4 50 84 63 00
+opening_hours: Mo-Sa 09:00-20:00; Su off
+website: https://www.leroymerlin.fr/magasins/annemasse/magasin-de-bricolage-annemasse-lpl.html
diff --git a/data/cities/ville-la-grand/maison-du-monde.yml b/data/cities/ville-la-grand/maison-du-monde.yml
index a3e7e60b1..750a2c960 100644
--- a/data/cities/ville-la-grand/maison-du-monde.yml
+++ b/data/cities/ville-la-grand/maison-du-monde.yml
@@ -4,8 +4,8 @@ latitude: 46.20193
 longitude: 6.27693
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/maison-janin.yml b/data/cities/ville-la-grand/maison-janin.yml
index 4f9d40e22..9f82718ce 100644
--- a/data/cities/ville-la-grand/maison-janin.yml
+++ b/data/cities/ville-la-grand/maison-janin.yml
@@ -4,8 +4,8 @@ latitude: 46.20086
 longitude: 6.24381
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de la République"
-housenumber: 13
+street: Rue de la République
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Sa 06:00-19:00; Su 06:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:00-19:00; Su 06:00-13:00
+website: ""
diff --git a/data/cities/ville-la-grand/mariali-creation.yml b/data/cities/ville-la-grand/mariali-creation.yml
index 080e55b2d..39f037151 100644
--- a/data/cities/ville-la-grand/mariali-creation.yml
+++ b/data/cities/ville-la-grand/mariali-creation.yml
@@ -4,8 +4,8 @@ latitude: 46.2027
 longitude: 6.24899
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue du Commerce"
-housenumber: 3
+street: Rue du Commerce
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/mda.yml b/data/cities/ville-la-grand/mda.yml
index a9ca0c996..5c3a62ba0 100644
--- a/data/cities/ville-la-grand/mda.yml
+++ b/data/cities/ville-la-grand/mda.yml
@@ -1,11 +1,12 @@
 id: 80119400
-type: way
+type: node
 latitude: 46.20294
 longitude: 6.27318
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Artisans"
-housenumber: 2
+street: Rue des Artisans
+housenumber: "2"
 phone: ""
-opening_hours: "Mo 10:00-12:00, 14:00-19:00; Tu-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 10:00-12:00, 14:00-19:00; Tu-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00;
+    Su off
+website: ""
diff --git a/data/cities/ville-la-grand/mercedes-benz.yml b/data/cities/ville-la-grand/mercedes-benz.yml
index 1bfed8ec4..734f6f350 100644
--- a/data/cities/ville-la-grand/mercedes-benz.yml
+++ b/data/cities/ville-la-grand/mercedes-benz.yml
@@ -1,11 +1,11 @@
 id: 1306114634
-type: way
+type: node
 latitude: 46.20146
 longitude: 6.27148
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Buchillons"
-housenumber: 19
+street: Rue des Buchillons
+housenumber: "19"
 phone: ""
-opening_hours: "Mo-Fr 07:00-12:30, 13:30-19:00, Sa 07:00-12:30, 14:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:00-12:30, 13:30-19:00, Sa 07:00-12:30, 14:00-18:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/metro.yml b/data/cities/ville-la-grand/metro.yml
index edaa1111e..dbe162ab4 100644
--- a/data/cities/ville-la-grand/metro.yml
+++ b/data/cities/ville-la-grand/metro.yml
@@ -1,11 +1,11 @@
 id: 158612354
-type: way
+type: node
 latitude: 46.20614
 longitude: 6.27608
 postcode: ""
 city: Ville-la-Grand
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Fr 06:00-19:00; Sa 06:00-13:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 06:00-19:00; Sa 06:00-13:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/meubles-gautier-annemasse.yml b/data/cities/ville-la-grand/meubles-gautier-annemasse.yml
index 6c3028243..3cad17b9c 100644
--- a/data/cities/ville-la-grand/meubles-gautier-annemasse.yml
+++ b/data/cities/ville-la-grand/meubles-gautier-annemasse.yml
@@ -1,11 +1,11 @@
 id: 1261927032
-type: way
+type: node
 latitude: 46.20357
 longitude: 6.27817
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 
+street: Rue de Montréal
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/mobalpa.yml b/data/cities/ville-la-grand/mobalpa.yml
index 234359331..d6bf3e018 100644
--- a/data/cities/ville-la-grand/mobalpa.yml
+++ b/data/cities/ville-la-grand/mobalpa.yml
@@ -1,11 +1,11 @@
 id: 80118393
-type: way
+type: node
 latitude: 46.20473
 longitude: 6.2814
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 
+street: Rue de Montréal
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/mobilier-de-france.yml b/data/cities/ville-la-grand/mobilier-de-france.yml
index 4e7bbc92c..e52216bdc 100644
--- a/data/cities/ville-la-grand/mobilier-de-france.yml
+++ b/data/cities/ville-la-grand/mobilier-de-france.yml
@@ -4,8 +4,8 @@ latitude: 46.20234
 longitude: 6.26977
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 1
+street: Rue Chantemerle
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/mondial-tissus.yml b/data/cities/ville-la-grand/mondial-tissus.yml
index c77880d9c..c8836e8b8 100644
--- a/data/cities/ville-la-grand/mondial-tissus.yml
+++ b/data/cities/ville-la-grand/mondial-tissus.yml
@@ -4,8 +4,8 @@ latitude: 46.20237
 longitude: 6.27924
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 16
+street: Rue de Montréal
+housenumber: "16"
 phone: ""
-opening_hours: "Mo-Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/monsieur-meuble-annemasse.yml b/data/cities/ville-la-grand/monsieur-meuble-annemasse.yml
index 4ac5a2ba5..331d80708 100644
--- a/data/cities/ville-la-grand/monsieur-meuble-annemasse.yml
+++ b/data/cities/ville-la-grand/monsieur-meuble-annemasse.yml
@@ -1,11 +1,11 @@
 id: 80119339
-type: way
+type: node
 latitude: 46.20076
 longitude: 6.27409
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Voirons"
-housenumber: 30
+street: Rue des Voirons
+housenumber: "30"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/ville-la-grand/mont-blanc-stockage.yml b/data/cities/ville-la-grand/mont-blanc-stockage.yml
index 2f0a748ea..95762ff43 100644
--- a/data/cities/ville-la-grand/mont-blanc-stockage.yml
+++ b/data/cities/ville-la-grand/mont-blanc-stockage.yml
@@ -1,11 +1,12 @@
 id: 158463250
-type: way
+type: node
 latitude: 46.19992
 longitude: 6.26964
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Buchillons"
-housenumber: 14
+street: Rue des Buchillons
+housenumber: "14"
 phone: ""
-opening_hours: "Mo,We,Fr 08:00-12:30, 14:00-18:00; Tu,Th 08:00-12:30; Sa 08:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo,We,Fr 08:00-12:30, 14:00-18:00; Tu,Th 08:00-12:30; Sa 08:00-19:00;
+    Su off
+website: ""
diff --git a/data/cities/ville-la-grand/natural-parket.yml b/data/cities/ville-la-grand/natural-parket.yml
index 662a88b75..0189314d7 100644
--- a/data/cities/ville-la-grand/natural-parket.yml
+++ b/data/cities/ville-la-grand/natural-parket.yml
@@ -4,8 +4,8 @@ latitude: 46.20363
 longitude: 6.27705
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 9
+street: Rue de Montréal
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-12:00, 14:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-12:00, 14:00-18:30; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/nissan.yml b/data/cities/ville-la-grand/nissan.yml
index fa89e8179..d64f25884 100644
--- a/data/cities/ville-la-grand/nissan.yml
+++ b/data/cities/ville-la-grand/nissan.yml
@@ -1,11 +1,11 @@
 id: 80119745
-type: way
+type: node
 latitude: 46.19909
 longitude: 6.26422
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Esserts"
-housenumber: 6
+street: Rue des Esserts
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00, Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-19:00; Sa 08:00-12:00, 14:00-18:00, Su off
+website: ""
diff --git a/data/cities/ville-la-grand/olyreve-annemasse.yml b/data/cities/ville-la-grand/olyreve-annemasse.yml
index 8abb229f4..0dc4ebb3d 100644
--- a/data/cities/ville-la-grand/olyreve-annemasse.yml
+++ b/data/cities/ville-la-grand/olyreve-annemasse.yml
@@ -1,11 +1,11 @@
 id: 179054536
-type: way
+type: node
 latitude: 46.20096
 longitude: 6.2743
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Buchillons"
-housenumber: 26
+street: Rue des Buchillons
+housenumber: "26"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00
+website: ""
diff --git a/data/cities/ville-la-grand/optical-center.yml b/data/cities/ville-la-grand/optical-center.yml
index aae61654e..cbc14d549 100644
--- a/data/cities/ville-la-grand/optical-center.yml
+++ b/data/cities/ville-la-grand/optical-center.yml
@@ -4,8 +4,8 @@ latitude: 46.20399
 longitude: 6.27812
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 13
+street: Rue de Montréal
+housenumber: "13"
 phone: ""
-opening_hours: "Mo-Sa 10:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/ovelo.yml b/data/cities/ville-la-grand/ovelo.yml
index c1ae51ebd..0198c0574 100644
--- a/data/cities/ville-la-grand/ovelo.yml
+++ b/data/cities/ville-la-grand/ovelo.yml
@@ -1,11 +1,11 @@
 id: 1261918393
-type: way
+type: node
 latitude: 46.2033
 longitude: 6.27911
 postcode: "74100"
 city: Ville-la-Grand
-street: "Allée de Montréal"
-housenumber: 20
+street: Allée de Montréal
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/parapharmacie-e-leclerc.yml b/data/cities/ville-la-grand/parapharmacie-e-leclerc.yml
index 111d8b2dd..acf5f5514 100644
--- a/data/cities/ville-la-grand/parapharmacie-e-leclerc.yml
+++ b/data/cities/ville-la-grand/parapharmacie-e-leclerc.yml
@@ -4,8 +4,8 @@ latitude: 46.20404
 longitude: 6.23992
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Albert Hénon"
-housenumber: 3
+street: Rue Albert Hénon
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Th 08:30-19:30; Fr-Sa 08:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-19:30; Fr-Sa 08:30-20:00
+website: ""
diff --git a/data/cities/ville-la-grand/pierre-peutet.yml b/data/cities/ville-la-grand/pierre-peutet.yml
index a81843995..c7943b58a 100644
--- a/data/cities/ville-la-grand/pierre-peutet.yml
+++ b/data/cities/ville-la-grand/pierre-peutet.yml
@@ -4,8 +4,9 @@ latitude: 46.20273
 longitude: 6.25027
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue des Voirons"
-housenumber: 2
+street: Rue des Voirons
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Tu,Th-Fr 08:00-12:30, 15:00-19:00; We 08:00-12:30; Sa 08:00-18:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu,Th-Fr 08:00-12:30, 15:00-19:00; We 08:00-12:30; Sa 08:00-18:00;
+    Su off
+website: ""
diff --git a/data/cities/ville-la-grand/renault-trucks.yml b/data/cities/ville-la-grand/renault-trucks.yml
index 131968c54..b5e75f235 100644
--- a/data/cities/ville-la-grand/renault-trucks.yml
+++ b/data/cities/ville-la-grand/renault-trucks.yml
@@ -1,11 +1,11 @@
 id: 80118394
-type: way
+type: node
 latitude: 46.20513
 longitude: 6.28298
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 34
+street: Rue de Montréal
+housenumber: "34"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/retif.yml b/data/cities/ville-la-grand/retif.yml
index 94d194e80..a90fdff6f 100644
--- a/data/cities/ville-la-grand/retif.yml
+++ b/data/cities/ville-la-grand/retif.yml
@@ -1,11 +1,11 @@
 id: 80116261
-type: way
+type: node
 latitude: 46.20391
 longitude: 6.27908
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 22
+street: Rue de Montréal
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Fr 08:30-18:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-18:30
+website: ""
diff --git a/data/cities/ville-la-grand/rey-automobiles.yml b/data/cities/ville-la-grand/rey-automobiles.yml
index e1d309a56..544dc59c4 100644
--- a/data/cities/ville-la-grand/rey-automobiles.yml
+++ b/data/cities/ville-la-grand/rey-automobiles.yml
@@ -1,11 +1,11 @@
 id: 158620757
-type: way
+type: node
 latitude: 46.20123
 longitude: 6.26713
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de la Californie"
-housenumber: 11
+street: Rue de la Californie
+housenumber: "11"
 phone: ""
-opening_hours: "Mo-Sa 07:30-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 07:30-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/ripn-wud-handmade-skis.yml b/data/cities/ville-la-grand/ripn-wud-handmade-skis.yml
index 33fd47dc1..76c29d302 100644
--- a/data/cities/ville-la-grand/ripn-wud-handmade-skis.yml
+++ b/data/cities/ville-la-grand/ripn-wud-handmade-skis.yml
@@ -1,11 +1,11 @@
 id: 158604373
-type: way
+type: node
 latitude: 46.20559
 longitude: 6.28365
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 38
+street: Rue de Montréal
+housenumber: "38"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/samse.yml b/data/cities/ville-la-grand/samse.yml
index 279690519..822980ca7 100644
--- a/data/cities/ville-la-grand/samse.yml
+++ b/data/cities/ville-la-grand/samse.yml
@@ -1,11 +1,11 @@
 id: 116337716
-type: way
+type: node
 latitude: 46.20317
 longitude: 6.26527
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de la Corne d'Abondance"
-housenumber: 2
+street: Rue de la Corne d'Abondance
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Fr 07:30-11:45, 13:30-17:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-11:45, 13:30-17:30; Sa-Su off
+website: ""
diff --git a/data/cities/ville-la-grand/sat.yml b/data/cities/ville-la-grand/sat.yml
index a19c5a2d4..cf2858ed7 100644
--- a/data/cities/ville-la-grand/sat.yml
+++ b/data/cities/ville-la-grand/sat.yml
@@ -1,11 +1,11 @@
 id: 158712460
-type: way
+type: node
 latitude: 46.20763
 longitude: 6.27876
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Deux Montagnes (Québec)"
-housenumber: 19
+street: Rue de Deux Montagnes (Québec)
+housenumber: "19"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/schmidt.yml b/data/cities/ville-la-grand/schmidt.yml
index a250bc887..200636201 100644
--- a/data/cities/ville-la-grand/schmidt.yml
+++ b/data/cities/ville-la-grand/schmidt.yml
@@ -1,11 +1,11 @@
 id: 80117916
-type: way
+type: node
 latitude: 46.20588
 longitude: 6.28262
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 25
+street: Rue de Montréal
+housenumber: "25"
 phone: ""
-opening_hours: "Mo-Fr 10:00-12:00, 14:00-19:00; Sa 09:00-18:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 10:00-12:00, 14:00-19:00; Sa 09:00-18:30; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/shop-airsoft-74.yml b/data/cities/ville-la-grand/shop-airsoft-74.yml
index 48ef4279a..65e12aceb 100644
--- a/data/cities/ville-la-grand/shop-airsoft-74.yml
+++ b/data/cities/ville-la-grand/shop-airsoft-74.yml
@@ -4,8 +4,8 @@ latitude: 46.20479
 longitude: 6.28216
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 32
-phone: "+334 50 37 34 67"
+street: Rue de Montréal
+housenumber: "32"
+phone: +334 50 37 34 67
 opening_hours: ""
-website: "https://www.shop-airsoft-74.com/"
\ No newline at end of file
+website: https://www.shop-airsoft-74.com/
diff --git a/data/cities/ville-la-grand/sikkens.yml b/data/cities/ville-la-grand/sikkens.yml
index 51b669f84..bd62eaa26 100644
--- a/data/cities/ville-la-grand/sikkens.yml
+++ b/data/cities/ville-la-grand/sikkens.yml
@@ -4,8 +4,9 @@ latitude: 46.20433
 longitude: 6.2765
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue du Bois de la Rose"
-housenumber: 6
+street: Rue du Bois de la Rose
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Th 07:30-12:00, 13:30-17:30; Fr 07:30-12:00, 13:30-16:30; Sa-Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 07:30-12:00, 13:30-17:30; Fr 07:30-12:00, 13:30-16:30; Sa-Su
+    off
+website: ""
diff --git a/data/cities/ville-la-grand/starcom-auto-pieces.yml b/data/cities/ville-la-grand/starcom-auto-pieces.yml
index fd9d52f9a..5f1a8234b 100644
--- a/data/cities/ville-la-grand/starcom-auto-pieces.yml
+++ b/data/cities/ville-la-grand/starcom-auto-pieces.yml
@@ -4,8 +4,8 @@ latitude: 46.20317
 longitude: 6.26913
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Chantemerle"
-housenumber: 4
+street: Rue Chantemerle
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00, 14:00-18:00; Sa 09:00-12:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 08:00-12:00, 14:00-18:00; Sa 09:00-12:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/suzuki-savoie-motors.yml b/data/cities/ville-la-grand/suzuki-savoie-motors.yml
index a41c5924a..1b01dc1fe 100644
--- a/data/cities/ville-la-grand/suzuki-savoie-motors.yml
+++ b/data/cities/ville-la-grand/suzuki-savoie-motors.yml
@@ -1,11 +1,11 @@
 id: 585935890
-type: way
+type: node
 latitude: 46.20141
 longitude: 6.26529
 postcode: "74100"
 city: Ville-la-Grand
-street: "Allée des Mousserons des Prés"
-housenumber: 2
+street: Allée des Mousserons des Prés
+housenumber: "2"
 phone: ""
-opening_hours: "Mo-Sa 08:30-12:00, 14:00-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-12:00, 14:00-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/terre-de-montagne.yml b/data/cities/ville-la-grand/terre-de-montagne.yml
index 73dd0a8dc..7708dce61 100644
--- a/data/cities/ville-la-grand/terre-de-montagne.yml
+++ b/data/cities/ville-la-grand/terre-de-montagne.yml
@@ -4,8 +4,8 @@ latitude: 46.20238
 longitude: 6.27829
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: ""
-opening_hours: "Mo-Fr 09:30-13:00, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 09:30-13:00, 14:00-19:00; Sa 09:30-19:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/tesla.yml b/data/cities/ville-la-grand/tesla.yml
index fad8730bd..885c2c096 100644
--- a/data/cities/ville-la-grand/tesla.yml
+++ b/data/cities/ville-la-grand/tesla.yml
@@ -1,11 +1,11 @@
 id: 158608798
-type: way
+type: node
 latitude: 46.20168
 longitude: 6.26342
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue du Coprin Chevelu"
-housenumber: 1
+street: Rue du Coprin Chevelu
+housenumber: "1"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/tollens.yml b/data/cities/ville-la-grand/tollens.yml
index 60cfbd969..d527afab6 100644
--- a/data/cities/ville-la-grand/tollens.yml
+++ b/data/cities/ville-la-grand/tollens.yml
@@ -1,11 +1,11 @@
 id: 116337711
-type: way
+type: node
 latitude: 46.2018
 longitude: 6.266
 postcode: "74100"
 city: Ville-la-Grand
-street: "Allée des Mousserons des Prés"
-housenumber: 4
+street: Allée des Mousserons des Prés
+housenumber: "4"
 phone: ""
-opening_hours: "Mo-Fr 07:30-12:00, 13:30-18:00; Sa 09:00-12:30; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 07:30-12:00, 13:30-18:00; Sa 09:00-12:30; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/troc-com.yml b/data/cities/ville-la-grand/troc-com.yml
index 406f64675..58d1ed4f6 100644
--- a/data/cities/ville-la-grand/troc-com.yml
+++ b/data/cities/ville-la-grand/troc-com.yml
@@ -1,11 +1,11 @@
 id: 158604358
-type: way
+type: node
 latitude: 46.20544
 longitude: 6.28314
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 36
+street: Rue de Montréal
+housenumber: "36"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/une-heure-pour-soi.yml b/data/cities/ville-la-grand/une-heure-pour-soi.yml
index 50ede8c2c..71dce0b32 100644
--- a/data/cities/ville-la-grand/une-heure-pour-soi.yml
+++ b/data/cities/ville-la-grand/une-heure-pour-soi.yml
@@ -4,8 +4,8 @@ latitude: 46.20414
 longitude: 6.24
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue Albert Hénon"
-housenumber: 3
+street: Rue Albert Hénon
+housenumber: "3"
 phone: ""
-opening_hours: "Mo-Th 08:30-19:30; Fr-Sa 08:30-20:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Th 08:30-19:30; Fr-Sa 08:30-20:00; Su off
+website: ""
diff --git a/data/cities/ville-la-grand/utile.yml b/data/cities/ville-la-grand/utile.yml
index f87119778..375be225e 100644
--- a/data/cities/ville-la-grand/utile.yml
+++ b/data/cities/ville-la-grand/utile.yml
@@ -1,11 +1,11 @@
 id: 185719473
-type: way
+type: node
 latitude: 46.20348
 longitude: 6.24928
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue du Révérend Père Favre"
-housenumber: 19
-phone: "+33 4 50 38 36 32"
+street: Rue du Révérend Père Favre
+housenumber: "19"
+phone: +33 4 50 38 36 32
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/ville-la-grand/velomania.yml b/data/cities/ville-la-grand/velomania.yml
index 7505d17e2..1b4f9fa6e 100644
--- a/data/cities/ville-la-grand/velomania.yml
+++ b/data/cities/ville-la-grand/velomania.yml
@@ -1,11 +1,12 @@
 id: 80119399
-type: way
+type: node
 latitude: 46.20252
 longitude: 6.27412
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 3
+street: Rue de Montréal
+housenumber: "3"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:30, 14:00-19:00; Sa 09:30-19:00; Su
+    off
+website: ""
diff --git a/data/cities/ville-la-grand/wieder.yml b/data/cities/ville-la-grand/wieder.yml
index f6c9e3250..d6deb206d 100644
--- a/data/cities/ville-la-grand/wieder.yml
+++ b/data/cities/ville-la-grand/wieder.yml
@@ -1,11 +1,12 @@
 id: 156890447
-type: way
+type: node
 latitude: 46.20331
 longitude: 6.2809
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Deux Montagnes (Québec)"
-housenumber: 1
+street: Rue de Deux Montagnes (Québec)
+housenumber: "1"
 phone: ""
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off"
-website: ""
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su
+    off
+website: ""
diff --git a/data/cities/ville-la-grand/xxl-maison-meuble-et-decoration.yml b/data/cities/ville-la-grand/xxl-maison-meuble-et-decoration.yml
index c961f14bc..7a418b62d 100644
--- a/data/cities/ville-la-grand/xxl-maison-meuble-et-decoration.yml
+++ b/data/cities/ville-la-grand/xxl-maison-meuble-et-decoration.yml
@@ -4,8 +4,8 @@ latitude: 46.202
 longitude: 6.27722
 postcode: "74100"
 city: Ville-la-Grand
-street: "Rue de Montréal"
-housenumber: 6
+street: Rue de Montréal
+housenumber: "6"
 phone: "+33450244435"
-opening_hours: "Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00"
-website: "https://xxl.actueldesign.fr/magasin-xxl-annemasse.html"
\ No newline at end of file
+opening_hours: Mo 14:00-19:00; Tu-Fr 09:30-12:00,14:00-19:00; Sa 09:30-19:00
+website: https://xxl.actueldesign.fr/magasin-xxl-annemasse.html
diff --git a/data/cities/villecheneve/champimonts-du-lyonnais.yml b/data/cities/villecheneve/champimonts-du-lyonnais.yml
index e3c0d5eed..52b71c4bf 100644
--- a/data/cities/villecheneve/champimonts-du-lyonnais.yml
+++ b/data/cities/villecheneve/champimonts-du-lyonnais.yml
@@ -4,8 +4,8 @@ latitude: 45.81103
 longitude: 4.43097
 postcode: "69770"
 city: Villechenève
-street: "chemin du Rozier"
-housenumber: 404
-phone: "+336 63 25 64 48"
+street: chemin du Rozier
+housenumber: "404"
+phone: +336 63 25 64 48
 opening_hours: ""
-website: "https://champimonts.fr"
\ No newline at end of file
+website: https://champimonts.fr
diff --git a/data/cities/villecheneve/garage-second.yml b/data/cities/villecheneve/garage-second.yml
index 2211157eb..411ff5dc9 100644
--- a/data/cities/villecheneve/garage-second.yml
+++ b/data/cities/villecheneve/garage-second.yml
@@ -4,8 +4,8 @@ latitude: 45.8003
 longitude: 4.39483
 postcode: "69770"
 city: Villechenève
-street: "Chemin du Zaléry Haut"
-housenumber: 159
-phone: "+33 4 74 70 19 77"
+street: Chemin du Zaléry Haut
+housenumber: "159"
+phone: +33 4 74 70 19 77
 opening_hours: ""
-website: "https://garagesecond.com/"
\ No newline at end of file
+website: https://garagesecond.com/
diff --git a/data/cities/villefontaine/atelier-osez-lvelo-de-lapie.yml b/data/cities/villefontaine/atelier-osez-lvelo-de-lapie.yml
index e13f1999d..73856f070 100644
--- a/data/cities/villefontaine/atelier-osez-lvelo-de-lapie.yml
+++ b/data/cities/villefontaine/atelier-osez-lvelo-de-lapie.yml
@@ -4,8 +4,8 @@ latitude: 45.60651
 longitude: 5.1487
 postcode: "38090"
 city: VILLEFONTAINE
-street: "Place de l'Échiquier"
-housenumber: 27
+street: Place de l'Échiquier
+housenumber: "27"
 phone: ""
-opening_hours: "saturday 14:00-18:00"
-website: "https://apie-asso.net/accueil"
\ No newline at end of file
+opening_hours: saturday 14:00-18:00
+website: https://apie-asso.net/accueil
diff --git a/data/cities/villefontaine/the-village.yml b/data/cities/villefontaine/the-village.yml
index 3c4d093c4..0edc75f53 100644
--- a/data/cities/villefontaine/the-village.yml
+++ b/data/cities/villefontaine/the-village.yml
@@ -1,11 +1,11 @@
 id: 485505391
-type: way
+type: node
 latitude: 45.62754
 longitude: 5.16044
 postcode: "38290"
 city: Villefontaine
-street: "Parc du couvent"
-housenumber: 
-phone: "+33 4 74 95 37 01"
-opening_hours: "Mo-Sa 10:00-20:00"
-website: "https://www.thevillageoutlet.com"
\ No newline at end of file
+street: Parc du couvent
+housenumber: ""
+phone: +33 4 74 95 37 01
+opening_hours: Mo-Sa 10:00-20:00
+website: https://www.thevillageoutlet.com
diff --git a/data/cities/villefranche-sur-saone/action.yml b/data/cities/villefranche-sur-saone/action.yml
index 570186298..44ce67927 100644
--- a/data/cities/villefranche-sur-saone/action.yml
+++ b/data/cities/villefranche-sur-saone/action.yml
@@ -4,8 +4,9 @@ latitude: 45.99608
 longitude: 4.7348
 postcode: "69400"
 city: Villefranche sur Saone
-street: "Rue François Meunier"
-housenumber: 240
+street: Rue François Meunier
+housenumber: "240"
 phone: ""
-opening_hours: "Mo 09:00-19:00; Tu 09:00-19:00; We 09:00-19:00; Th 09:00-19:00; Fr 09:00-19:00; Sa 09:00-19:00; Su closed"
-website: "https://www.action.com/fr-fr/points-de-vente/villefranche-sur-saone-240-rue-francois-meunier/"
\ No newline at end of file
+opening_hours: Mo 09:00-19:00; Tu 09:00-19:00; We 09:00-19:00; Th 09:00-19:00; Fr
+    09:00-19:00; Sa 09:00-19:00; Su closed
+website: https://www.action.com/fr-fr/points-de-vente/villefranche-sur-saone-240-rue-francois-meunier/
diff --git a/data/cities/villefranche-sur-saone/carrefour-market.yml b/data/cities/villefranche-sur-saone/carrefour-market.yml
index 701185a7e..8d1802014 100644
--- a/data/cities/villefranche-sur-saone/carrefour-market.yml
+++ b/data/cities/villefranche-sur-saone/carrefour-market.yml
@@ -4,8 +4,8 @@ latitude: 45.99538
 longitude: 4.71739
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue de Roncevaux"
-housenumber: 124
+street: Rue de Roncevaux
+housenumber: "124"
 phone: ""
-opening_hours: "Mo-Su 07:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 07:00-21:00
+website: ""
diff --git a/data/cities/villefranche-sur-saone/carrefour.yml b/data/cities/villefranche-sur-saone/carrefour.yml
index 94afc37d4..ebf16df01 100644
--- a/data/cities/villefranche-sur-saone/carrefour.yml
+++ b/data/cities/villefranche-sur-saone/carrefour.yml
@@ -4,8 +4,8 @@ latitude: 45.99545
 longitude: 4.73284
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Boulevard Burdeau"
-housenumber: 1110
+street: Boulevard Burdeau
+housenumber: "1110"
 phone: ""
-opening_hours: "Mo-Sa 08:30-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-21:00
+website: ""
diff --git a/data/cities/villefranche-sur-saone/centre-commercial-du-garet.yml b/data/cities/villefranche-sur-saone/centre-commercial-du-garet.yml
index a6e6f78fe..ba67246f2 100644
--- a/data/cities/villefranche-sur-saone/centre-commercial-du-garet.yml
+++ b/data/cities/villefranche-sur-saone/centre-commercial-du-garet.yml
@@ -1,11 +1,11 @@
 id: 136802691
-type: way
+type: node
 latitude: 45.99619
 longitude: 4.73139
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Boulevard Burdeau"
-housenumber: 1110
+street: Boulevard Burdeau
+housenumber: "1110"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villefranche-sur-saone/decathlon-villefranche-sur-saone.yml b/data/cities/villefranche-sur-saone/decathlon-villefranche-sur-saone.yml
index 8cc86f847..e4d7c6b72 100644
--- a/data/cities/villefranche-sur-saone/decathlon-villefranche-sur-saone.yml
+++ b/data/cities/villefranche-sur-saone/decathlon-villefranche-sur-saone.yml
@@ -4,8 +4,8 @@ latitude: 45.98231
 longitude: 4.74405
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Route de Frans"
-housenumber: 1840
-phone: "+33 4 69 47 28 20"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+street: Route de Frans
+housenumber: "1840"
+phone: +33 4 69 47 28 20
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/villefranche-sur-saone/henri-desmoulins.yml b/data/cities/villefranche-sur-saone/henri-desmoulins.yml
index bcfb987a2..27d0b0ecc 100644
--- a/data/cities/villefranche-sur-saone/henri-desmoulins.yml
+++ b/data/cities/villefranche-sur-saone/henri-desmoulins.yml
@@ -5,7 +5,7 @@ longitude: 4.719
 postcode: ""
 city: Villefranche-sur-Saône
 street: ""
-housenumber: 
-phone: "+33 4 27 30 02 16"
-opening_hours: "Th-Sa 08:00-19:00"
-website: "https://henridesmoulins.fr/"
\ No newline at end of file
+housenumber: ""
+phone: +33 4 27 30 02 16
+opening_hours: Th-Sa 08:00-19:00
+website: https://henridesmoulins.fr/
diff --git a/data/cities/villefranche-sur-saone/instinct-gourmand.yml b/data/cities/villefranche-sur-saone/instinct-gourmand.yml
index 6e013797a..b0780f961 100644
--- a/data/cities/villefranche-sur-saone/instinct-gourmand.yml
+++ b/data/cities/villefranche-sur-saone/instinct-gourmand.yml
@@ -4,8 +4,8 @@ latitude: 45.9953
 longitude: 4.71923
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue Nationale"
-housenumber: 1
+street: Rue Nationale
+housenumber: "1"
 phone: "0474651378"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villefranche-sur-saone/joueclub.yml b/data/cities/villefranche-sur-saone/joueclub.yml
index 8ff305e8c..0c640e214 100644
--- a/data/cities/villefranche-sur-saone/joueclub.yml
+++ b/data/cities/villefranche-sur-saone/joueclub.yml
@@ -1,11 +1,11 @@
 id: 136802837
-type: way
+type: node
 latitude: 45.98944
 longitude: 4.74276
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue des Frères Bonnet"
-housenumber: 34
-phone: "04 74 09 95 78"
+street: Rue des Frères Bonnet
+housenumber: "34"
+phone: 04 74 09 95 78
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villefranche-sur-saone/king-jouet.yml b/data/cities/villefranche-sur-saone/king-jouet.yml
index 7c913d28f..656c1d06b 100644
--- a/data/cities/villefranche-sur-saone/king-jouet.yml
+++ b/data/cities/villefranche-sur-saone/king-jouet.yml
@@ -4,8 +4,8 @@ latitude: 45.99017
 longitude: 4.74233
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Avenue de l'Europe"
-housenumber: 745
-phone: "04 74 09 42 53"
+street: Avenue de l'Europe
+housenumber: "745"
+phone: 04 74 09 42 53
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villefranche-sur-saone/la-boussole.yml b/data/cities/villefranche-sur-saone/la-boussole.yml
index 73d75a6e4..6d3f34022 100644
--- a/data/cities/villefranche-sur-saone/la-boussole.yml
+++ b/data/cities/villefranche-sur-saone/la-boussole.yml
@@ -4,8 +4,8 @@ latitude: 45.99769
 longitude: 4.71946
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue de Belleville"
-housenumber: 240
+street: Rue de Belleville
+housenumber: "240"
 phone: "0474606423"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/villefranche-sur-saone/lencadreur-du-beaujolais.yml b/data/cities/villefranche-sur-saone/lencadreur-du-beaujolais.yml
index 021687c34..c311507f3 100644
--- a/data/cities/villefranche-sur-saone/lencadreur-du-beaujolais.yml
+++ b/data/cities/villefranche-sur-saone/lencadreur-du-beaujolais.yml
@@ -4,8 +4,8 @@ latitude: 45.98611
 longitude: 4.71683
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue de Thizy"
-housenumber: 95
+street: Rue de Thizy
+housenumber: "95"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villefranche-sur-saone/maison-encislai.yml b/data/cities/villefranche-sur-saone/maison-encislai.yml
index b3d83b64a..f20765bd3 100644
--- a/data/cities/villefranche-sur-saone/maison-encislai.yml
+++ b/data/cities/villefranche-sur-saone/maison-encislai.yml
@@ -4,8 +4,8 @@ latitude: 45.98682
 longitude: 4.71837
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue Nationale"
-housenumber: 949
+street: Rue Nationale
+housenumber: "949"
 phone: "+33474654172"
-opening_hours: "Tu-Fr 07:00-12:30,15:00-19:00; Sa 07:00-19:00"
-website: "https://maisonencislai.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 07:00-12:30,15:00-19:00; Sa 07:00-19:00
+website: https://maisonencislai.fr/
diff --git a/data/cities/villefranche-sur-saone/marche-aux-affaires.yml b/data/cities/villefranche-sur-saone/marche-aux-affaires.yml
index a45553c82..cef5e50dc 100644
--- a/data/cities/villefranche-sur-saone/marche-aux-affaires.yml
+++ b/data/cities/villefranche-sur-saone/marche-aux-affaires.yml
@@ -1,11 +1,11 @@
 id: 136804463
-type: way
+type: node
 latitude: 45.99141
 longitude: 4.72133
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue Grenette"
-housenumber: 177
+street: Rue Grenette
+housenumber: "177"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villefranche-sur-saone/medelices.yml b/data/cities/villefranche-sur-saone/medelices.yml
index 2edd60ba6..d4d21ce8c 100644
--- a/data/cities/villefranche-sur-saone/medelices.yml
+++ b/data/cities/villefranche-sur-saone/medelices.yml
@@ -4,8 +4,8 @@ latitude: 45.99604
 longitude: 4.7192
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Rue de Belleville"
-housenumber: 66
+street: Rue de Belleville
+housenumber: "66"
 phone: ""
-opening_hours: "Mo-Fr 05:30-19:00; Sa 05:30-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Fr 05:30-19:00; Sa 05:30-16:00
+website: ""
diff --git a/data/cities/villefranche-sur-saone/stocker-seul.yml b/data/cities/villefranche-sur-saone/stocker-seul.yml
index 2b046a210..253f3328e 100644
--- a/data/cities/villefranche-sur-saone/stocker-seul.yml
+++ b/data/cities/villefranche-sur-saone/stocker-seul.yml
@@ -1,11 +1,11 @@
 id: 136806102
-type: way
+type: node
 latitude: 45.98156
 longitude: 4.73106
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Chemin des Sables"
-housenumber: 188
-phone: "+33 4 74 09 92 33"
+street: Chemin des Sables
+housenumber: "188"
+phone: +33 4 74 09 92 33
 opening_hours: ""
-website: "https://www.stockerseul.com/"
\ No newline at end of file
+website: https://www.stockerseul.com/
diff --git a/data/cities/villefranche-sur-saone/yves-rocher.yml b/data/cities/villefranche-sur-saone/yves-rocher.yml
index be460d765..d4a38045a 100644
--- a/data/cities/villefranche-sur-saone/yves-rocher.yml
+++ b/data/cities/villefranche-sur-saone/yves-rocher.yml
@@ -4,8 +4,8 @@ latitude: 45.99602
 longitude: 4.73258
 postcode: "69400"
 city: Villefranche-sur-Saône
-street: "Boulevard Burdeau"
-housenumber: 1100
+street: Boulevard Burdeau
+housenumber: "1100"
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:00"
-website: "https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/villefranche-sur-saone/villefranche-sur-saone-c-co/S-FRYROC938"
\ No newline at end of file
+opening_hours: Mo-Sa 09:30-20:00
+website: https://www.yves-rocher.fr/tout-sur-les-magasins/auvergne-rhone-alpes/villefranche-sur-saone/villefranche-sur-saone-c-co/S-FRYROC938
diff --git a/data/cities/villerest/illuzion-coiffure.yml b/data/cities/villerest/illuzion-coiffure.yml
index 5a26d214c..fe2d2000b 100644
--- a/data/cities/villerest/illuzion-coiffure.yml
+++ b/data/cities/villerest/illuzion-coiffure.yml
@@ -4,8 +4,9 @@ latitude: 46.01783
 longitude: 4.041
 postcode: "42300"
 city: Villerest
-street: "Allée Bernard Palissy"
-housenumber: 1
-phone: "+33 4 77 69 59 42"
-opening_hours: "Tu 09:00-12:00,14:00-19:00; We 09:00-18:00; Th 09:00-12:00,14:00-19:00; Fr 09:00-19:00; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+street: Allée Bernard Palissy
+housenumber: "1"
+phone: +33 4 77 69 59 42
+opening_hours: Tu 09:00-12:00,14:00-19:00; We 09:00-18:00; Th 09:00-12:00,14:00-19:00;
+    Fr 09:00-19:00; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/villerest/le-petit-mecano.yml b/data/cities/villerest/le-petit-mecano.yml
index f16191793..f21c79cfe 100644
--- a/data/cities/villerest/le-petit-mecano.yml
+++ b/data/cities/villerest/le-petit-mecano.yml
@@ -4,8 +4,8 @@ latitude: 46.01761
 longitude: 4.04075
 postcode: "42300"
 city: Villerest
-street: "Route de Villemontais"
-housenumber: 168
-phone: "+33 4 77 44 95 70"
-opening_hours: "Mo-Sa 08:00-12:00,13:00-19:00"
-website: ""
\ No newline at end of file
+street: Route de Villemontais
+housenumber: "168"
+phone: +33 4 77 44 95 70
+opening_hours: Mo-Sa 08:00-12:00,13:00-19:00
+website: ""
diff --git a/data/cities/villerest/pierre-brunelin-sarl.yml b/data/cities/villerest/pierre-brunelin-sarl.yml
index 7baece1a0..fd8189e5c 100644
--- a/data/cities/villerest/pierre-brunelin-sarl.yml
+++ b/data/cities/villerest/pierre-brunelin-sarl.yml
@@ -4,8 +4,8 @@ latitude: 46.01561
 longitude: 4.03957
 postcode: "42300"
 city: Villerest
-street: "Chemin DE LA TUILERIE ROND POINT de LA MIRANDOLE"
-housenumber: 792
+street: Chemin DE LA TUILERIE ROND POINT de LA MIRANDOLE
+housenumber: "792"
 phone: ""
-opening_hours: "Mo-Fr 08:30-12:00, 14:00-19:00; Sa 08:30-12:00, 14:00-18:00"
-website: "https://www.brunelin.com/"
\ No newline at end of file
+opening_hours: Mo-Fr 08:30-12:00, 14:00-19:00; Sa 08:30-12:00, 14:00-18:00
+website: https://www.brunelin.com/
diff --git a/data/cities/villette-danthon/proxi.yml b/data/cities/villette-danthon/proxi.yml
index 6871df432..d394b25ea 100644
--- a/data/cities/villette-danthon/proxi.yml
+++ b/data/cities/villette-danthon/proxi.yml
@@ -4,8 +4,8 @@ latitude: 45.79551
 longitude: 5.11632
 postcode: "38280"
 city: Villette d'Anthon
-street: "Avenue des Cèdres"
-housenumber: 108
-phone: "+33 4 78 31 25 09"
+street: Avenue des Cèdres
+housenumber: "108"
+phone: +33 4 78 31 25 09
 opening_hours: ""
-website: "https://villette-d-anthon.monproxi.fr/"
\ No newline at end of file
+website: https://villette-d-anthon.monproxi.fr/
diff --git a/data/cities/villeurbanne/a-fond-gaston.yml b/data/cities/villeurbanne/a-fond-gaston.yml
index 8380b52c7..c1d968e12 100644
--- a/data/cities/villeurbanne/a-fond-gaston.yml
+++ b/data/cities/villeurbanne/a-fond-gaston.yml
@@ -4,8 +4,8 @@ latitude: 45.76108
 longitude: 4.91634
 postcode: "69100"
 city: Villeurbanne
-street: "Rue Decomberousse"
-housenumber: 40
-phone: "+33 6 13 19 24 11"
+street: Rue Decomberousse
+housenumber: "40"
+phone: +33 6 13 19 24 11
 opening_hours: ""
-website: "https://afondgaston.fr/"
\ No newline at end of file
+website: https://afondgaston.fr/
diff --git a/data/cities/villeurbanne/artisans-du-monde.yml b/data/cities/villeurbanne/artisans-du-monde.yml
index 03dd0aadd..edd40c75d 100644
--- a/data/cities/villeurbanne/artisans-du-monde.yml
+++ b/data/cities/villeurbanne/artisans-du-monde.yml
@@ -4,8 +4,8 @@ latitude: 45.77456
 longitude: 4.86852
 postcode: "69100"
 city: Villeurbanne
-street: "Avenue Roger Salengro"
-housenumber: 5
-phone: "+33 4 78 94 08 65"
-opening_hours: "Tu-Sa 10:00-12:30, 15:00-19:00"
-website: "https://admlyonvilleurbanne.fr/vie-associative/villeurbanne/"
\ No newline at end of file
+street: Avenue Roger Salengro
+housenumber: "5"
+phone: +33 4 78 94 08 65
+opening_hours: Tu-Sa 10:00-12:30, 15:00-19:00
+website: https://admlyonvilleurbanne.fr/vie-associative/villeurbanne/
diff --git a/data/cities/villeurbanne/biscuiterie-martinez.yml b/data/cities/villeurbanne/biscuiterie-martinez.yml
index b72aa8637..2bb9e57aa 100644
--- a/data/cities/villeurbanne/biscuiterie-martinez.yml
+++ b/data/cities/villeurbanne/biscuiterie-martinez.yml
@@ -4,8 +4,8 @@ latitude: 45.77638
 longitude: 4.89242
 postcode: "69100"
 city: Villeurbanne
-street: "Rue du 8 Mai 1945"
-housenumber: 82
+street: Rue du 8 Mai 1945
+housenumber: "82"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villeurbanne/blc-coiffure.yml b/data/cities/villeurbanne/blc-coiffure.yml
index 9b063cfdc..106cba3e4 100644
--- a/data/cities/villeurbanne/blc-coiffure.yml
+++ b/data/cities/villeurbanne/blc-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.77442
 longitude: 4.86804
 postcode: "69100"
 city: Villeurbanne
-street: "Avenue Condorcet"
-housenumber: 59
+street: Avenue Condorcet
+housenumber: "59"
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: ""
diff --git a/data/cities/villeurbanne/bomolet-les-bureaux.yml b/data/cities/villeurbanne/bomolet-les-bureaux.yml
index 0b943645f..8e6594c69 100644
--- a/data/cities/villeurbanne/bomolet-les-bureaux.yml
+++ b/data/cities/villeurbanne/bomolet-les-bureaux.yml
@@ -4,8 +4,8 @@ latitude: 45.7648
 longitude: 4.89642
 postcode: "69100"
 city: Villeurbanne
-street: "Rue Charles Robin"
-housenumber: 3
+street: Rue Charles Robin
+housenumber: "3"
 phone: ""
-opening_hours: "Tu-Fr 15:00-18:00"
-website: "https://bomolet.com/"
\ No newline at end of file
+opening_hours: Tu-Fr 15:00-18:00
+website: https://bomolet.com/
diff --git a/data/cities/villeurbanne/boucherie-slimani.yml b/data/cities/villeurbanne/boucherie-slimani.yml
index 5f6b4b0fe..01b39e970 100644
--- a/data/cities/villeurbanne/boucherie-slimani.yml
+++ b/data/cities/villeurbanne/boucherie-slimani.yml
@@ -4,8 +4,8 @@ latitude: 45.77437
 longitude: 4.8681
 postcode: "69100"
 city: Villeurbanne
-street: "Avenue Condorcet"
-housenumber: 61
-phone: "+33 4 78 93 62 23"
-opening_hours: "Tu-Sa 07:30-13:00; Su 07:00-13:00; Tu-Sa 15:30-19:30"
-website: ""
\ No newline at end of file
+street: Avenue Condorcet
+housenumber: "61"
+phone: +33 4 78 93 62 23
+opening_hours: Tu-Sa 07:30-13:00; Su 07:00-13:00; Tu-Sa 15:30-19:30
+website: ""
diff --git a/data/cities/villeurbanne/boulangerie-mariette.yml b/data/cities/villeurbanne/boulangerie-mariette.yml
index 9ba973212..48c880e44 100644
--- a/data/cities/villeurbanne/boulangerie-mariette.yml
+++ b/data/cities/villeurbanne/boulangerie-mariette.yml
@@ -4,8 +4,8 @@ latitude: 45.7693
 longitude: 4.88129
 postcode: "69100"
 city: Villeurbanne
-street: "Cours Émile Zola"
-housenumber: 182
+street: Cours Émile Zola
+housenumber: "182"
 phone: ""
-opening_hours: "Mo-Su 06:30-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 06:30-20:00
+website: ""
diff --git a/data/cities/villeurbanne/capturons-vos-moments-com.yml b/data/cities/villeurbanne/capturons-vos-moments-com.yml
index f39a41f7e..d09207bab 100644
--- a/data/cities/villeurbanne/capturons-vos-moments-com.yml
+++ b/data/cities/villeurbanne/capturons-vos-moments-com.yml
@@ -4,8 +4,8 @@ latitude: 45.76222
 longitude: 4.89438
 postcode: "69100"
 city: Villeurbanne
-street: "Rue du Progrès"
-housenumber: 50
+street: Rue du Progrès
+housenumber: "50"
 phone: ""
-opening_hours: "Mo-Su 09:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 09:00-21:00
+website: ""
diff --git a/data/cities/villeurbanne/cofi.yml b/data/cities/villeurbanne/cofi.yml
index e16729149..f364d5869 100644
--- a/data/cities/villeurbanne/cofi.yml
+++ b/data/cities/villeurbanne/cofi.yml
@@ -4,8 +4,8 @@ latitude: 45.77426
 longitude: 4.86853
 postcode: "69100"
 city: Villeurbanne
-street: "Avenue Roger Salengro"
-housenumber: 2
-phone: "+33 4 72 43 97 09"
-opening_hours: "Tu-Sa 09:00-19:00; Su 09:00-13:00"
-website: "https://www.comptoir-produits-italiens.fr/"
\ No newline at end of file
+street: Avenue Roger Salengro
+housenumber: "2"
+phone: +33 4 72 43 97 09
+opening_hours: Tu-Sa 09:00-19:00; Su 09:00-13:00
+website: https://www.comptoir-produits-italiens.fr/
diff --git a/data/cities/villeurbanne/cyclociel.yml b/data/cities/villeurbanne/cyclociel.yml
index 43812f1d9..b43f4f43b 100644
--- a/data/cities/villeurbanne/cyclociel.yml
+++ b/data/cities/villeurbanne/cyclociel.yml
@@ -4,8 +4,8 @@ latitude: 45.77411
 longitude: 4.8838
 postcode: "69100"
 city: Villeurbanne
-street: "Rue de Fontanières"
-housenumber: 57
-phone: "+33 4 78545144"
-opening_hours: "sur rendez-vous uniquement"
-website: "https://www.cyclociel.com/"
\ No newline at end of file
+street: Rue de Fontanières
+housenumber: "57"
+phone: +33 4 78545144
+opening_hours: '"sur rendez-vous uniquement"'
+website: https://www.cyclociel.com/
diff --git a/data/cities/villeurbanne/franprix.yml b/data/cities/villeurbanne/franprix.yml
index 95133154b..6d7b97a6e 100644
--- a/data/cities/villeurbanne/franprix.yml
+++ b/data/cities/villeurbanne/franprix.yml
@@ -4,8 +4,8 @@ latitude: 45.75666
 longitude: 4.88015
 postcode: "69100"
 city: Villeurbanne
-street: "Rue Jean Jaurès"
-housenumber: 30
+street: Rue Jean Jaurès
+housenumber: "30"
 phone: ""
-opening_hours: "24/7"
-website: "https://www.franprix.fr/magasins/1543"
\ No newline at end of file
+opening_hours: 24/7
+website: https://www.franprix.fr/magasins/1543
diff --git a/data/cities/villeurbanne/gaesis.yml b/data/cities/villeurbanne/gaesis.yml
index fe375cb97..6c40ca4da 100644
--- a/data/cities/villeurbanne/gaesis.yml
+++ b/data/cities/villeurbanne/gaesis.yml
@@ -4,8 +4,8 @@ latitude: 45.76486
 longitude: 4.89777
 postcode: "69100"
 city: Villeurbanne
-street: "Rue Bergonier"
-housenumber: 8
-phone: "+33 2 02 14 23 74"
+street: Rue Bergonier
+housenumber: "8"
+phone: +33 2 02 14 23 74
 opening_hours: ""
-website: "https://gaesis.fr/contact/"
\ No newline at end of file
+website: https://gaesis.fr/contact/
diff --git a/data/cities/villeurbanne/h-market.yml b/data/cities/villeurbanne/h-market.yml
index cc53c408c..1848c3569 100644
--- a/data/cities/villeurbanne/h-market.yml
+++ b/data/cities/villeurbanne/h-market.yml
@@ -4,8 +4,8 @@ latitude: 45.76483
 longitude: 4.89851
 postcode: "69100"
 city: Villeurbanne
-street: "Rue Bergonier"
-housenumber: 22
+street: Rue Bergonier
+housenumber: "22"
 phone: ""
-opening_hours: "Mo-Su 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 10:00-20:00
+website: ""
diff --git a/data/cities/villeurbanne/hair-look.yml b/data/cities/villeurbanne/hair-look.yml
index 6af59e590..6b92c24cf 100644
--- a/data/cities/villeurbanne/hair-look.yml
+++ b/data/cities/villeurbanne/hair-look.yml
@@ -4,8 +4,8 @@ latitude: 45.75985
 longitude: 4.88946
 postcode: "69100"
 city: VILLEURBANNE
-street: "Cours Tolstoï"
-housenumber: 169
+street: Cours Tolstoï
+housenumber: "169"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villeurbanne/ishop-69.yml b/data/cities/villeurbanne/ishop-69.yml
index 7cd478c5a..1ca0e3981 100644
--- a/data/cities/villeurbanne/ishop-69.yml
+++ b/data/cities/villeurbanne/ishop-69.yml
@@ -4,8 +4,8 @@ latitude: 45.78229
 longitude: 4.88911
 postcode: "69100"
 city: Villeurbanne
-street: "Avenue Roger Salengro"
-housenumber: 206
-phone: "+33 9 77 37 58 23"
-opening_hours: "Mo,Tu,We,Th,Sa 09:00-19:00; Fr 09:00-12:00,14:00-19:00"
-website: "https://ishop69.fr/"
\ No newline at end of file
+street: Avenue Roger Salengro
+housenumber: "206"
+phone: +33 9 77 37 58 23
+opening_hours: Mo,Tu,We,Th,Sa 09:00-19:00; Fr 09:00-12:00,14:00-19:00
+website: https://ishop69.fr/
diff --git a/data/cities/villeurbanne/latelier-salengro.yml b/data/cities/villeurbanne/latelier-salengro.yml
index 758171d06..dbf59f425 100644
--- a/data/cities/villeurbanne/latelier-salengro.yml
+++ b/data/cities/villeurbanne/latelier-salengro.yml
@@ -4,8 +4,8 @@ latitude: 45.776
 longitude: 4.87062
 postcode: "69100"
 city: Villeurbanne
-street: "Avenue Roger Salengro"
-housenumber: 31
-phone: "+33 4 72 44 22 80"
-opening_hours: "Mo-Sa 06:30-19:30"
-website: ""
\ No newline at end of file
+street: Avenue Roger Salengro
+housenumber: "31"
+phone: +33 4 72 44 22 80
+opening_hours: Mo-Sa 06:30-19:30
+website: ""
diff --git a/data/cities/villeurbanne/layali-bagdad.yml b/data/cities/villeurbanne/layali-bagdad.yml
index 28bbc5039..1aa028223 100644
--- a/data/cities/villeurbanne/layali-bagdad.yml
+++ b/data/cities/villeurbanne/layali-bagdad.yml
@@ -4,8 +4,8 @@ latitude: 45.76992
 longitude: 4.86616
 postcode: "69100"
 city: Villeurbanne
-street: "Rue des Teinturiers"
-housenumber: 3
-phone: "06 12 30 09 56"
+street: Rue des Teinturiers
+housenumber: "3"
+phone: 06 12 30 09 56
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/villeurbanne/merolla-louis.yml b/data/cities/villeurbanne/merolla-louis.yml
index e69fab184..3afbb2c6f 100644
--- a/data/cities/villeurbanne/merolla-louis.yml
+++ b/data/cities/villeurbanne/merolla-louis.yml
@@ -4,8 +4,8 @@ latitude: 45.76365
 longitude: 4.89857
 postcode: "69100"
 city: Villeurbanne
-street: "Rue Chevreul"
-housenumber: 22
-phone: "+33 4 78 84 80 31"
-opening_hours: "Mo-Th 08:00-12:00,14:00-19:00; Fr 08:00-12:00,14:00-18:30"
-website: ""
\ No newline at end of file
+street: Rue Chevreul
+housenumber: "22"
+phone: +33 4 78 84 80 31
+opening_hours: Mo-Th 08:00-12:00,14:00-19:00; Fr 08:00-12:00,14:00-18:30
+website: ""
diff --git a/data/cities/vinay/dherbey-motos.yml b/data/cities/vinay/dherbey-motos.yml
index 271d601f1..67d930701 100644
--- a/data/cities/vinay/dherbey-motos.yml
+++ b/data/cities/vinay/dherbey-motos.yml
@@ -1,11 +1,11 @@
 id: 638750289
-type: way
+type: node
 latitude: 45.19967
 longitude: 5.4205
 postcode: "38470"
 city: Vinay
-street: "Chemin des Côtes de Trellins"
-housenumber: 300
+street: Chemin des Côtes de Trellins
+housenumber: "300"
 phone: ""
 opening_hours: ""
-website: "https://www.dherbeymoto.com/"
\ No newline at end of file
+website: https://www.dherbeymoto.com/
diff --git a/data/cities/vinay/la-halle-fermiere.yml b/data/cities/vinay/la-halle-fermiere.yml
index 713b0cdda..8fc8a0516 100644
--- a/data/cities/vinay/la-halle-fermiere.yml
+++ b/data/cities/vinay/la-halle-fermiere.yml
@@ -1,11 +1,11 @@
 id: 169863463
-type: way
+type: node
 latitude: 45.20798
 longitude: 5.41061
 postcode: "38470"
 city: Vinay
-street: "Avenue de la Gare"
-housenumber: 194
-phone: "+33 4 76 36 68 49"
-opening_hours: "Th,Fr 08:30-12:30,14:30-19:00; Sa 08:30-13:00"
-website: "https://www.la-halle-fermiere.fr/"
\ No newline at end of file
+street: Avenue de la Gare
+housenumber: "194"
+phone: +33 4 76 36 68 49
+opening_hours: Th,Fr 08:30-12:30,14:30-19:00; Sa 08:30-13:00
+website: https://www.la-halle-fermiere.fr/
diff --git a/data/cities/vinay/latelier-des-saveurs.yml b/data/cities/vinay/latelier-des-saveurs.yml
index ead37116d..48e76d0ac 100644
--- a/data/cities/vinay/latelier-des-saveurs.yml
+++ b/data/cities/vinay/latelier-des-saveurs.yml
@@ -4,8 +4,8 @@ latitude: 45.20979
 longitude: 5.4023
 postcode: "38470"
 city: Vinay
-street: "Rue Malleval"
-housenumber: 24
+street: Rue Malleval
+housenumber: "24"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vindry-sur-turdine/bikes-lair.yml b/data/cities/vindry-sur-turdine/bikes-lair.yml
index e5b6465b7..f91e94264 100644
--- a/data/cities/vindry-sur-turdine/bikes-lair.yml
+++ b/data/cities/vindry-sur-turdine/bikes-lair.yml
@@ -4,8 +4,8 @@ latitude: 45.87341
 longitude: 4.50192
 postcode: "69490"
 city: Vindry-sur-Turdine
-street: "Chemin du Moulin Roquille"
-housenumber: 468
+street: Chemin du Moulin Roquille
+housenumber: "468"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vindry-sur-turdine/les-tontons-vraqueurs.yml b/data/cities/vindry-sur-turdine/les-tontons-vraqueurs.yml
index eef421375..dae1d2bc7 100644
--- a/data/cities/vindry-sur-turdine/les-tontons-vraqueurs.yml
+++ b/data/cities/vindry-sur-turdine/les-tontons-vraqueurs.yml
@@ -4,8 +4,8 @@ latitude: 45.87493
 longitude: 4.48392
 postcode: "69490"
 city: Vindry-sur-Turdine
-street: "Rue Jean Moulin"
-housenumber: 76
+street: Rue Jean Moulin
+housenumber: "76"
 phone: "0614201406"
-opening_hours: "24/7"
-website: "https://lestontonsvraqueurs.com/"
\ No newline at end of file
+opening_hours: 24/7
+website: https://lestontonsvraqueurs.com/
diff --git a/data/cities/vinzier/brechotte.yml b/data/cities/vinzier/brechotte.yml
index 2529c6526..63e10977f 100644
--- a/data/cities/vinzier/brechotte.yml
+++ b/data/cities/vinzier/brechotte.yml
@@ -4,8 +4,8 @@ latitude: 46.35176
 longitude: 6.61649
 postcode: "74500"
 city: Vinzier
-street: "Route de Vers les Granges"
-housenumber: 267
+street: Route de Vers les Granges
+housenumber: "267"
 phone: ""
-opening_hours: "Mo,Su off; Tu-Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo,Su off; Tu-Sa 09:00-12:00
+website: ""
diff --git a/data/cities/violay/carrosserie-franck-imbert.yml b/data/cities/violay/carrosserie-franck-imbert.yml
index 4a7432ce1..678b55026 100644
--- a/data/cities/violay/carrosserie-franck-imbert.yml
+++ b/data/cities/violay/carrosserie-franck-imbert.yml
@@ -1,11 +1,11 @@
 id: 1036826700
-type: way
+type: node
 latitude: 45.8511
 longitude: 4.34433
 postcode: "42780"
 city: Violay
-street: "Zone artisanale"
-housenumber: 
-phone: "+33 474639608"
+street: Zone artisanale
+housenumber: ""
+phone: +33 474639608
 opening_hours: ""
-website: "https://www.carrosserie-franck-imbert-fivestar.fr/"
\ No newline at end of file
+website: https://www.carrosserie-franck-imbert-fivestar.fr/
diff --git a/data/cities/viriat/daze-vapor-house.yml b/data/cities/viriat/daze-vapor-house.yml
index 1e2e0a84f..9c7af7a8c 100644
--- a/data/cities/viriat/daze-vapor-house.yml
+++ b/data/cities/viriat/daze-vapor-house.yml
@@ -4,8 +4,8 @@ latitude: 46.2145
 longitude: 5.21357
 postcode: "01440"
 city: Viriat
-street: "Rue du Plateau"
-housenumber: 45
-phone: "+33 4 74 22 65 93"
-opening_hours: "Mo-Sa 09:30-19:00"
-website: ""
\ No newline at end of file
+street: Rue du Plateau
+housenumber: "45"
+phone: +33 4 74 22 65 93
+opening_hours: Mo-Sa 09:30-19:00
+website: ""
diff --git a/data/cities/viriat/decor-discount.yml b/data/cities/viriat/decor-discount.yml
index 4b073e820..5e487c835 100644
--- a/data/cities/viriat/decor-discount.yml
+++ b/data/cities/viriat/decor-discount.yml
@@ -1,11 +1,11 @@
 id: 116667461
-type: way
+type: node
 latitude: 46.22274
 longitude: 5.20339
 postcode: "01440"
 city: Viriat
-street: "Rue des Vareys"
-housenumber: 905
-phone: "+33 4 74 23 19 21"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00"
-website: "https://magasins.decor-discount.com/decordiscount/fr/store/france/auvergne-rhone-alpes/ain/viriat/bourg-en-bresse/m23"
\ No newline at end of file
+street: Rue des Vareys
+housenumber: "905"
+phone: +33 4 74 23 19 21
+opening_hours: Mo-Fr 09:00-12:00,14:00-19:00; Sa 09:00-19:00
+website: https://magasins.decor-discount.com/decordiscount/fr/store/france/auvergne-rhone-alpes/ain/viriat/bourg-en-bresse/m23
diff --git a/data/cities/viriat/sport-2000.yml b/data/cities/viriat/sport-2000.yml
index 80e2ff5e2..0e4e46508 100644
--- a/data/cities/viriat/sport-2000.yml
+++ b/data/cities/viriat/sport-2000.yml
@@ -4,8 +4,8 @@ latitude: 46.21651
 longitude: 5.2121
 postcode: "01440"
 city: Viriat
-street: "Rue du Plateau"
-housenumber: 44
-phone: "+33 4 81 51 04 75"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+street: Rue du Plateau
+housenumber: "44"
+phone: +33 4 81 51 04 75
+opening_hours: Mo-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/virieu-le-grand/maison-de-la-presse-tabac.yml b/data/cities/virieu-le-grand/maison-de-la-presse-tabac.yml
index 68ddab718..3c7ce1cd5 100644
--- a/data/cities/virieu-le-grand/maison-de-la-presse-tabac.yml
+++ b/data/cities/virieu-le-grand/maison-de-la-presse-tabac.yml
@@ -1,11 +1,11 @@
 id: 257536365
-type: way
+type: node
 latitude: 45.8478
 longitude: 5.65248
 postcode: "01510"
 city: Virieu-le-Grand
-street: "Avenue de la Gare"
-housenumber: 64
+street: Avenue de la Gare
+housenumber: "64"
 phone: ""
-opening_hours: "Mo-Sa 06:30-12:30,15:00-19:30; Su 07:30-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-12:30,15:00-19:30; Su 07:30-12:00
+website: ""
diff --git a/data/cities/viry/carrefour-contact.yml b/data/cities/viry/carrefour-contact.yml
index 106513789..cbc5ed123 100644
--- a/data/cities/viry/carrefour-contact.yml
+++ b/data/cities/viry/carrefour-contact.yml
@@ -4,8 +4,8 @@ latitude: 46.11699
 longitude: 6.03857
 postcode: "74580"
 city: Viry
-street: "Passage Grand Angle"
-housenumber: 9
+street: Passage Grand Angle
+housenumber: "9"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 09:00-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-13:00
+website: ""
diff --git a/data/cities/viry/viry-optique.yml b/data/cities/viry/viry-optique.yml
index 39fa810fa..f691af28c 100644
--- a/data/cities/viry/viry-optique.yml
+++ b/data/cities/viry/viry-optique.yml
@@ -4,8 +4,8 @@ latitude: 46.11731
 longitude: 6.03716
 postcode: "74580"
 city: Viry
-street: "Rue du Marronnier"
-housenumber: 60
-phone: "+33 4 50 79 29 57"
+street: Rue du Marronnier
+housenumber: "60"
+phone: +33 4 50 79 29 57
 opening_hours: ""
-website: "http://viryoptique-viry.monopticien.com"
\ No newline at end of file
+website: http://viryoptique-viry.monopticien.com
diff --git a/data/cities/viuz-en-sallaz/alpes-ride.yml b/data/cities/viuz-en-sallaz/alpes-ride.yml
index 57f78bed1..bd9629205 100644
--- a/data/cities/viuz-en-sallaz/alpes-ride.yml
+++ b/data/cities/viuz-en-sallaz/alpes-ride.yml
@@ -4,8 +4,8 @@ latitude: 46.14404
 longitude: 6.39847
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Route du Fer à Cheval"
-housenumber: 3202
+street: Route du Fer à Cheval
+housenumber: "3202"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/viuz-en-sallaz/aromes-et-sens.yml b/data/cities/viuz-en-sallaz/aromes-et-sens.yml
index d7fe3227f..9afcdb4a2 100644
--- a/data/cities/viuz-en-sallaz/aromes-et-sens.yml
+++ b/data/cities/viuz-en-sallaz/aromes-et-sens.yml
@@ -4,8 +4,8 @@ latitude: 46.14082
 longitude: 6.40283
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Allée de l'Atrium"
-housenumber: 32
+street: Allée de l'Atrium
+housenumber: "32"
 phone: ""
-opening_hours: "Ferme bientôt ⋅ 19:00 ⋅ Ouvre à 09:00 mar."
-website: ""
\ No newline at end of file
+opening_hours: Ferme bientôt ⋅ 19:00 ⋅ Ouvre à 09:00 mar.
+website: ""
diff --git a/data/cities/viuz-en-sallaz/auchan.yml b/data/cities/viuz-en-sallaz/auchan.yml
index db98cc62e..4836c3915 100644
--- a/data/cities/viuz-en-sallaz/auchan.yml
+++ b/data/cities/viuz-en-sallaz/auchan.yml
@@ -1,11 +1,11 @@
 id: 38568493
-type: way
+type: node
 latitude: 46.14173
 longitude: 6.4027
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Allée du Commerce"
-housenumber: 182
+street: Allée du Commerce
+housenumber: "182"
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su 08:30-12:30"
-website: "https://www.auchan.fr/magasins/supermarche/auchan-supermarche-viuz-en-sallaz/s-240"
\ No newline at end of file
+opening_hours: Mo-Sa 08:00-20:00; Su 08:30-12:30
+website: https://www.auchan.fr/magasins/supermarche/auchan-supermarche-viuz-en-sallaz/s-240
diff --git a/data/cities/viuz-en-sallaz/biomonde-santoline.yml b/data/cities/viuz-en-sallaz/biomonde-santoline.yml
index 5a8fabd0b..4d41aec22 100644
--- a/data/cities/viuz-en-sallaz/biomonde-santoline.yml
+++ b/data/cities/viuz-en-sallaz/biomonde-santoline.yml
@@ -4,8 +4,8 @@ latitude: 46.14411
 longitude: 6.39827
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Route du Fer à Cheval"
-housenumber: 3202
-phone: "+33 6 34 24 78 32"
-opening_hours: "Mo-Fr 09:00-19:30; Sa 09:00-19:00"
-website: ""
\ No newline at end of file
+street: Route du Fer à Cheval
+housenumber: "3202"
+phone: +33 6 34 24 78 32
+opening_hours: Mo-Fr 09:00-19:30; Sa 09:00-19:00
+website: ""
diff --git a/data/cities/viuz-en-sallaz/clinique-du-cheveu.yml b/data/cities/viuz-en-sallaz/clinique-du-cheveu.yml
index 20e3db8a8..7b43931e5 100644
--- a/data/cities/viuz-en-sallaz/clinique-du-cheveu.yml
+++ b/data/cities/viuz-en-sallaz/clinique-du-cheveu.yml
@@ -4,8 +4,8 @@ latitude: 46.14438
 longitude: 6.39866
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "impasse du Bois des Pontets"
-housenumber: 20
+street: impasse du Bois des Pontets
+housenumber: "20"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/viuz-en-sallaz/fromagerie-du-val-dalex.yml b/data/cities/viuz-en-sallaz/fromagerie-du-val-dalex.yml
index 252c762e7..3f3fd3e6c 100644
--- a/data/cities/viuz-en-sallaz/fromagerie-du-val-dalex.yml
+++ b/data/cities/viuz-en-sallaz/fromagerie-du-val-dalex.yml
@@ -1,11 +1,11 @@
 id: 153160722
-type: way
+type: node
 latitude: 46.14389
 longitude: 6.39857
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Route du Fer à Cheval"
-housenumber: 3234
+street: Route du Fer à Cheval
+housenumber: "3234"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/viuz-en-sallaz/janin.yml b/data/cities/viuz-en-sallaz/janin.yml
index f3cb42002..983eb6112 100644
--- a/data/cities/viuz-en-sallaz/janin.yml
+++ b/data/cities/viuz-en-sallaz/janin.yml
@@ -1,11 +1,11 @@
 id: 153160687
-type: way
+type: node
 latitude: 46.14422
 longitude: 6.39706
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Route du Fer à Cheval"
-housenumber: 3098
+street: Route du Fer à Cheval
+housenumber: "3098"
 phone: ""
-opening_hours: "Mo-Su 05:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Su 05:00-21:00
+website: ""
diff --git a/data/cities/viuz-en-sallaz/les-alpes-en-vrac.yml b/data/cities/viuz-en-sallaz/les-alpes-en-vrac.yml
index 7094a1bbb..09d231c1b 100644
--- a/data/cities/viuz-en-sallaz/les-alpes-en-vrac.yml
+++ b/data/cities/viuz-en-sallaz/les-alpes-en-vrac.yml
@@ -1,11 +1,11 @@
 id: 198495317
-type: way
+type: node
 latitude: 46.14266
 longitude: 6.40313
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Route du Fer à Cheval"
-housenumber: 3611
+street: Route du Fer à Cheval
+housenumber: "3611"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/viuz-en-sallaz/magasin-de-parquet.yml b/data/cities/viuz-en-sallaz/magasin-de-parquet.yml
index 6b0699567..59ad4c255 100644
--- a/data/cities/viuz-en-sallaz/magasin-de-parquet.yml
+++ b/data/cities/viuz-en-sallaz/magasin-de-parquet.yml
@@ -4,8 +4,8 @@ latitude: 46.14434
 longitude: 6.3988
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "impasse du Bois des Pontets"
-housenumber: 18
+street: impasse du Bois des Pontets
+housenumber: "18"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/viuz-en-sallaz/maison-janin.yml b/data/cities/viuz-en-sallaz/maison-janin.yml
index ecaa370c3..dcdbd9902 100644
--- a/data/cities/viuz-en-sallaz/maison-janin.yml
+++ b/data/cities/viuz-en-sallaz/maison-janin.yml
@@ -1,11 +1,11 @@
 id: 96186662
-type: way
+type: node
 latitude: 46.14531
 longitude: 6.40907
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Avenue de Savoie"
-housenumber: 725
+street: Avenue de Savoie
+housenumber: "725"
 phone: ""
-opening_hours: "Mo-Sa 06:30-19:00; Su 06:30-13:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 06:30-19:00; Su 06:30-13:00
+website: ""
diff --git a/data/cities/viuz-en-sallaz/vrac-altitude.yml b/data/cities/viuz-en-sallaz/vrac-altitude.yml
index 089fe1814..8d65fefa3 100644
--- a/data/cities/viuz-en-sallaz/vrac-altitude.yml
+++ b/data/cities/viuz-en-sallaz/vrac-altitude.yml
@@ -4,8 +4,8 @@ latitude: 46.14879
 longitude: 6.41044
 postcode: "74250"
 city: Viuz-en-Sallaz
-street: "Avenue de Savoie"
-housenumber: 1147
-phone: "+33 4 50 94 51 44"
+street: Avenue de Savoie
+housenumber: "1147"
+phone: +33 4 50 94 51 44
 opening_hours: ""
-website: "https://vrac-altitude.fr/"
\ No newline at end of file
+website: https://vrac-altitude.fr/
diff --git a/data/cities/viviers-du-lac/centrakor.yml b/data/cities/viviers-du-lac/centrakor.yml
index e68ec4a34..5f03ba67e 100644
--- a/data/cities/viviers-du-lac/centrakor.yml
+++ b/data/cities/viviers-du-lac/centrakor.yml
@@ -1,11 +1,11 @@
 id: 108984913
-type: way
+type: node
 latitude: 45.64648
 longitude: 5.89439
 postcode: "73420"
 city: Viviers-du-Lac
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/viviers-du-lac/france-pare-brise.yml b/data/cities/viviers-du-lac/france-pare-brise.yml
index 41a8d3ee6..26bd86d0b 100644
--- a/data/cities/viviers-du-lac/france-pare-brise.yml
+++ b/data/cities/viviers-du-lac/france-pare-brise.yml
@@ -4,8 +4,8 @@ latitude: 45.65863
 longitude: 5.90916
 postcode: "73420"
 city: Viviers-du-Lac
-street: "Route d'Aix"
-housenumber: 1162
+street: Route d'Aix
+housenumber: "1162"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/viviers-du-lac/maison-chanvillard.yml b/data/cities/viviers-du-lac/maison-chanvillard.yml
index a0773b6d2..18eb28ba7 100644
--- a/data/cities/viviers-du-lac/maison-chanvillard.yml
+++ b/data/cities/viviers-du-lac/maison-chanvillard.yml
@@ -4,8 +4,8 @@ latitude: 45.64943
 longitude: 5.90874
 postcode: "73420"
 city: Viviers-du-Lac
-street: "Route d'Aix"
-housenumber: 93
+street: Route d'Aix
+housenumber: "93"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vizille/cyclobab.yml b/data/cities/vizille/cyclobab.yml
index 6d6d99a4f..1598965cf 100644
--- a/data/cities/vizille/cyclobab.yml
+++ b/data/cities/vizille/cyclobab.yml
@@ -4,8 +4,8 @@ latitude: 45.08453
 longitude: 5.76502
 postcode: "38220"
 city: Vizille
-street: "Rue Ambroise Croizat"
-housenumber: 
+street: Rue Ambroise Croizat
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 10:00-20:00
+website: ""
diff --git a/data/cities/vizille/davidetson.yml b/data/cities/vizille/davidetson.yml
index ad304de72..f0b9d2e94 100644
--- a/data/cities/vizille/davidetson.yml
+++ b/data/cities/vizille/davidetson.yml
@@ -4,8 +4,8 @@ latitude: 45.07746
 longitude: 5.7687
 postcode: "38220"
 city: Vizille
-street: "Rue Des Forges"
-housenumber: 136
+street: Rue Des Forges
+housenumber: "136"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00; Sa 08:00-17:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00; Sa 08:00-17:00
+website: ""
diff --git a/data/cities/vizille/flashelect.yml b/data/cities/vizille/flashelect.yml
index 3f2b1e77d..1b2fc6a6a 100644
--- a/data/cities/vizille/flashelect.yml
+++ b/data/cities/vizille/flashelect.yml
@@ -4,8 +4,8 @@ latitude: 45.07776
 longitude: 5.76876
 postcode: "38220"
 city: Vizille
-street: "Rue des Forges"
-housenumber: 214
+street: Rue des Forges
+housenumber: "214"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voglans/arteis.yml b/data/cities/voglans/arteis.yml
index 786ee5711..3029c44e8 100644
--- a/data/cities/voglans/arteis.yml
+++ b/data/cities/voglans/arteis.yml
@@ -4,8 +4,8 @@ latitude: 45.61982
 longitude: 5.88703
 postcode: "73420"
 city: Voglans
-street: "Rue de la Françon"
-housenumber: 
+street: Rue de la Françon
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: "https://www.arteis-chambery.fr/"
\ No newline at end of file
+website: https://www.arteis-chambery.fr/
diff --git a/data/cities/voglans/au-jardin-des-plantes.yml b/data/cities/voglans/au-jardin-des-plantes.yml
index 4f8e5db28..87581a7f9 100644
--- a/data/cities/voglans/au-jardin-des-plantes.yml
+++ b/data/cities/voglans/au-jardin-des-plantes.yml
@@ -1,11 +1,11 @@
 id: 271960082
-type: way
+type: node
 latitude: 45.62091
 longitude: 5.88661
 postcode: "73420"
 city: Voglans
-street: "Rue des Belledonnes"
-housenumber: 670
-phone: "+33 4 79544691"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00, Su 09:30-12:30,14:30-18:30"
-website: "https://www.aujardindesplantes.com/"
\ No newline at end of file
+street: Rue des Belledonnes
+housenumber: "670"
+phone: +33 4 79544691
+opening_hours: Mo-Sa 09:00-12:00,14:00-19:00, Su 09:30-12:30,14:30-18:30
+website: https://www.aujardindesplantes.com/
diff --git a/data/cities/voglans/axe-auto.yml b/data/cities/voglans/axe-auto.yml
index e7367c8b2..cef57b57f 100644
--- a/data/cities/voglans/axe-auto.yml
+++ b/data/cities/voglans/axe-auto.yml
@@ -1,11 +1,11 @@
 id: 271961129
-type: way
+type: node
 latitude: 45.61856
 longitude: 5.88795
 postcode: "73420"
 city: Voglans
-street: "Rue de la Françon"
-housenumber: 
-phone: "+33 4 79 52 05 20"
+street: Rue de la Françon
+housenumber: ""
+phone: +33 4 79 52 05 20
 opening_hours: ""
-website: "https://www.axeauto.fr/"
\ No newline at end of file
+website: https://www.axeauto.fr/
diff --git a/data/cities/voglans/boucherie-charcuterie-zanini.yml b/data/cities/voglans/boucherie-charcuterie-zanini.yml
index e44888d80..40c79d7b9 100644
--- a/data/cities/voglans/boucherie-charcuterie-zanini.yml
+++ b/data/cities/voglans/boucherie-charcuterie-zanini.yml
@@ -4,8 +4,8 @@ latitude: 45.63192
 longitude: 5.89723
 postcode: "73420"
 city: Voglans
-street: "Chemin de Sonnaz"
-housenumber: 30
+street: Chemin de Sonnaz
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voglans/boulangerie-la-gourmandise.yml b/data/cities/voglans/boulangerie-la-gourmandise.yml
index 992c633b2..edea423d8 100644
--- a/data/cities/voglans/boulangerie-la-gourmandise.yml
+++ b/data/cities/voglans/boulangerie-la-gourmandise.yml
@@ -4,8 +4,8 @@ latitude: 45.63176
 longitude: 5.89715
 postcode: "73420"
 city: Voglans
-street: "Chemin de Sonnaz"
-housenumber: 30
+street: Chemin de Sonnaz
+housenumber: "30"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voglans/coiffure-la-fontaine.yml b/data/cities/voglans/coiffure-la-fontaine.yml
index bf9026961..826c2613d 100644
--- a/data/cities/voglans/coiffure-la-fontaine.yml
+++ b/data/cities/voglans/coiffure-la-fontaine.yml
@@ -4,8 +4,8 @@ latitude: 45.63239
 longitude: 5.89722
 postcode: "73420"
 city: Voglans
-street: "Chemin du Sous-bois"
-housenumber: 4
+street: Chemin du Sous-bois
+housenumber: "4"
 phone: "+33479544149"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voglans/garage-vasseur-renault-trucks.yml b/data/cities/voglans/garage-vasseur-renault-trucks.yml
index c1f26e365..3c89ad2bc 100644
--- a/data/cities/voglans/garage-vasseur-renault-trucks.yml
+++ b/data/cities/voglans/garage-vasseur-renault-trucks.yml
@@ -1,11 +1,11 @@
 id: 271960072
-type: way
+type: node
 latitude: 45.62377
 longitude: 5.87681
 postcode: "73420"
 city: Voglans
-street: "Rue de la Prairie"
-housenumber: 
+street: Rue de la Prairie
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voglans/la-cuisine-by-louise-verlaine-chambery.yml b/data/cities/voglans/la-cuisine-by-louise-verlaine-chambery.yml
index 3fe8c6a31..73623a071 100644
--- a/data/cities/voglans/la-cuisine-by-louise-verlaine-chambery.yml
+++ b/data/cities/voglans/la-cuisine-by-louise-verlaine-chambery.yml
@@ -1,11 +1,11 @@
 id: 271961078
-type: way
+type: node
 latitude: 45.61689
 longitude: 5.89061
 postcode: "73420"
 city: Voglans
-street: "Rue Pré Gaut"
-housenumber: 413
-phone: "06 95 13 92 25"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://louiseverlaine.fr/chambery"
\ No newline at end of file
+street: Rue Pré Gaut
+housenumber: "413"
+phone: 06 95 13 92 25
+opening_hours: Mo-Sa 10:00-19:00
+website: https://louiseverlaine.fr/chambery
diff --git a/data/cities/voglans/metro.yml b/data/cities/voglans/metro.yml
index 3168dceec..408d56a7d 100644
--- a/data/cities/voglans/metro.yml
+++ b/data/cities/voglans/metro.yml
@@ -4,8 +4,8 @@ latitude: 45.62172
 longitude: 5.88958
 postcode: "73420"
 city: Voglans
-street: "Rue de la Dent du Chat"
-housenumber: 
-phone: "+33 8 25090909"
-opening_hours: "Mo-Fr 06:00-19:00; Sa 06:00-18:00"
-website: "https://www.metro.fr/entrepot/chambery"
\ No newline at end of file
+street: Rue de la Dent du Chat
+housenumber: ""
+phone: +33 8 25090909
+opening_hours: Mo-Fr 06:00-19:00; Sa 06:00-18:00
+website: https://www.metro.fr/entrepot/chambery
diff --git a/data/cities/voglans/ovelo.yml b/data/cities/voglans/ovelo.yml
index fbeb7fb6e..32362a0c3 100644
--- a/data/cities/voglans/ovelo.yml
+++ b/data/cities/voglans/ovelo.yml
@@ -4,8 +4,8 @@ latitude: 45.61924
 longitude: 5.8876
 postcode: "73420"
 city: Voglans
-street: "Rue de la Françon"
-housenumber: 40
-phone: "+33 9 86 71 26 28"
-opening_hours: "Mo-Sa 10:00-19:00"
-website: "https://www.ovelo.fr/fr/"
\ No newline at end of file
+street: Rue de la Françon
+housenumber: "40"
+phone: +33 9 86 71 26 28
+opening_hours: Mo-Sa 10:00-19:00
+website: https://www.ovelo.fr/fr/
diff --git a/data/cities/voglans/starterre-chambery.yml b/data/cities/voglans/starterre-chambery.yml
index cc58ecff8..8dbb53ecf 100644
--- a/data/cities/voglans/starterre-chambery.yml
+++ b/data/cities/voglans/starterre-chambery.yml
@@ -4,8 +4,8 @@ latitude: 45.61677
 longitude: 5.88489
 postcode: "73420"
 city: Voglans
-street: "Rue de la Françon"
-housenumber: 297
-phone: "+33 4 79 54 30 12"
+street: Rue de la Françon
+housenumber: "297"
+phone: +33 4 79 54 30 12
 opening_hours: ""
-website: "https://www.starterre.fr/mandataire/chambery"
\ No newline at end of file
+website: https://www.starterre.fr/mandataire/chambery
diff --git a/data/cities/voiron/atelier-de-johanna.yml b/data/cities/voiron/atelier-de-johanna.yml
index 8fe2a762a..74098dd3e 100644
--- a/data/cities/voiron/atelier-de-johanna.yml
+++ b/data/cities/voiron/atelier-de-johanna.yml
@@ -4,8 +4,8 @@ latitude: 45.36701
 longitude: 5.58859
 postcode: "38500"
 city: Voiron
-street: "Avenue Jean Jaurès"
-housenumber: 19
+street: Avenue Jean Jaurès
+housenumber: "19"
 phone: ""
-opening_hours: "Tu-Fr 09:00-18:00; Sa 08:30-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-18:00; Sa 08:30-16:00
+website: ""
diff --git a/data/cities/voiron/auchan.yml b/data/cities/voiron/auchan.yml
index 48aac8ab5..b628e1250 100644
--- a/data/cities/voiron/auchan.yml
+++ b/data/cities/voiron/auchan.yml
@@ -1,11 +1,11 @@
 id: 79828027
-type: way
+type: node
 latitude: 45.35898
 longitude: 5.59946
 postcode: "38500"
 city: Voiron
-street: "Boulevard Edgar Kofler"
-housenumber: 
+street: Boulevard Edgar Kofler
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: ""
diff --git a/data/cities/voiron/bord-de-laize.yml b/data/cities/voiron/bord-de-laize.yml
index 063184cf7..727694504 100644
--- a/data/cities/voiron/bord-de-laize.yml
+++ b/data/cities/voiron/bord-de-laize.yml
@@ -4,8 +4,8 @@ latitude: 45.36574
 longitude: 5.59204
 postcode: "38500"
 city: Voiron
-street: "Rue Bourg-de-Péage"
-housenumber: 2
+street: Rue Bourg-de-Péage
+housenumber: "2"
 phone: ""
-opening_hours: "Tu-Fr 09:30-12:00"
-website: "http://bord-de-laize.fr/"
\ No newline at end of file
+opening_hours: Tu-Fr 09:30-12:00
+website: http://bord-de-laize.fr/
diff --git a/data/cities/voiron/box-de-chartreuse.yml b/data/cities/voiron/box-de-chartreuse.yml
index 677c3466d..a589f6ef0 100644
--- a/data/cities/voiron/box-de-chartreuse.yml
+++ b/data/cities/voiron/box-de-chartreuse.yml
@@ -4,8 +4,8 @@ latitude: 45.37801
 longitude: 5.56356
 postcode: "38500"
 city: Voiron
-street: "Boulevard de Charavines"
-housenumber: 1353
-phone: "+33 4 76 93 63 16"
+street: Boulevard de Charavines
+housenumber: "1353"
+phone: +33 4 76 93 63 16
 opening_hours: ""
-website: "https://www.boxdechartreuse.fr/"
\ No newline at end of file
+website: https://www.boxdechartreuse.fr/
diff --git a/data/cities/voiron/chevrerie-de-chartreuse.yml b/data/cities/voiron/chevrerie-de-chartreuse.yml
index 65dafeebd..23d3a1234 100644
--- a/data/cities/voiron/chevrerie-de-chartreuse.yml
+++ b/data/cities/voiron/chevrerie-de-chartreuse.yml
@@ -4,8 +4,8 @@ latitude: 45.38137
 longitude: 5.58475
 postcode: "38500"
 city: Voiron
-street: "Rue du Château"
-housenumber: 1
+street: Rue du Château
+housenumber: "1"
 phone: ""
-opening_hours: "We,Fr,Sa 10:00-12:00,16:00-18:30"
-website: ""
\ No newline at end of file
+opening_hours: We,Fr,Sa 10:00-12:00,16:00-18:30
+website: ""
diff --git a/data/cities/voiron/come-bike.yml b/data/cities/voiron/come-bike.yml
index a1a595f05..bec783d4b 100644
--- a/data/cities/voiron/come-bike.yml
+++ b/data/cities/voiron/come-bike.yml
@@ -4,8 +4,9 @@ latitude: 45.35157
 longitude: 5.59086
 postcode: "38500"
 city: Voiron
-street: "Avenue de Paviot"
-housenumber: 37
-phone: "+33 476054609"
-opening_hours: "Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su,Mo,PH off"
-website: "http://www.come-bike.com"
\ No newline at end of file
+street: Avenue de Paviot
+housenumber: "37"
+phone: +33 476054609
+opening_hours: Tu-Fr 09:00-12:00,14:00-19:00; Sa 09:00-12:00,14:00-18:00; Su,Mo,PH
+    off
+website: http://www.come-bike.com
diff --git a/data/cities/voiron/devred.yml b/data/cities/voiron/devred.yml
index 9b1255a94..87e191664 100644
--- a/data/cities/voiron/devred.yml
+++ b/data/cities/voiron/devred.yml
@@ -4,8 +4,8 @@ latitude: 45.36633
 longitude: 5.59089
 postcode: "38500"
 city: Voiron
-street: "Cours Sénozan"
-housenumber: 14
-phone: "+33 4 76 31 00 23"
-opening_hours: "Mo 10:00-19:00; Tu-Sa 09:30-19:00"
-website: "https://www.devred.com/boutiques/rhone-alpes/magasin-vetement-homme-voiron-393.html"
\ No newline at end of file
+street: Cours Sénozan
+housenumber: "14"
+phone: +33 4 76 31 00 23
+opening_hours: Mo 10:00-19:00; Tu-Sa 09:30-19:00
+website: https://www.devred.com/boutiques/rhone-alpes/magasin-vetement-homme-voiron-393.html
diff --git a/data/cities/voiron/distri-club-medical.yml b/data/cities/voiron/distri-club-medical.yml
index 2401e94a3..f9f1194ea 100644
--- a/data/cities/voiron/distri-club-medical.yml
+++ b/data/cities/voiron/distri-club-medical.yml
@@ -4,8 +4,8 @@ latitude: 45.38168
 longitude: 5.58117
 postcode: "38500"
 city: Voiron
-street: "Rue Joseph Marie Jacquard"
-housenumber: 10
-phone: "+33 4 76 75 72 75"
+street: Rue Joseph Marie Jacquard
+housenumber: "10"
+phone: +33 4 76 75 72 75
 opening_hours: ""
-website: "https://voiron.districlubmedical.com/"
\ No newline at end of file
+website: https://voiron.districlubmedical.com/
diff --git a/data/cities/voiron/e-go-mobilite-electrique.yml b/data/cities/voiron/e-go-mobilite-electrique.yml
index e414f2ce8..50a08d2ab 100644
--- a/data/cities/voiron/e-go-mobilite-electrique.yml
+++ b/data/cities/voiron/e-go-mobilite-electrique.yml
@@ -4,8 +4,8 @@ latitude: 45.36351
 longitude: 5.59377
 postcode: "38500"
 city: Voiron
-street: "Avenue François Mitterrand"
-housenumber: 37
+street: Avenue François Mitterrand
+housenumber: "37"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voiron/elixir-de-beaute.yml b/data/cities/voiron/elixir-de-beaute.yml
index bc02c1e3b..63cddaf4e 100644
--- a/data/cities/voiron/elixir-de-beaute.yml
+++ b/data/cities/voiron/elixir-de-beaute.yml
@@ -4,8 +4,8 @@ latitude: 45.3662
 longitude: 5.59501
 postcode: "38500"
 city: Voiron
-street: "Place Porte de la Buisse"
-housenumber: 7
+street: Place Porte de la Buisse
+housenumber: "7"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voiron/garage-de-chartreuse.yml b/data/cities/voiron/garage-de-chartreuse.yml
index acb1c794c..9d18fb5d5 100644
--- a/data/cities/voiron/garage-de-chartreuse.yml
+++ b/data/cities/voiron/garage-de-chartreuse.yml
@@ -4,8 +4,8 @@ latitude: 45.36031
 longitude: 5.59935
 postcode: "38500"
 city: Voiron
-street: "Boulevard Edgar Kofler"
-housenumber: 22
-phone: "+33 4 76 05 03 16"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00"
-website: ""
\ No newline at end of file
+street: Boulevard Edgar Kofler
+housenumber: "22"
+phone: +33 4 76 05 03 16
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00
+website: ""
diff --git a/data/cities/voiron/high-society-voiron.yml b/data/cities/voiron/high-society-voiron.yml
index 6e31a2dda..35f78c2eb 100644
--- a/data/cities/voiron/high-society-voiron.yml
+++ b/data/cities/voiron/high-society-voiron.yml
@@ -4,8 +4,8 @@ latitude: 45.36648
 longitude: 5.59305
 postcode: "38500"
 city: Voiron
-street: "Rue Rose Sage"
-housenumber: 15
-phone: "+33 983662984"
+street: Rue Rose Sage
+housenumber: "15"
+phone: +33 983662984
 opening_hours: ""
-website: "https://www.highsociety.fr/fr/magasins/150-cbd-voiron"
\ No newline at end of file
+website: https://www.highsociety.fr/fr/magasins/150-cbd-voiron
diff --git a/data/cities/voiron/la-boutique-du-baton.yml b/data/cities/voiron/la-boutique-du-baton.yml
index 627f8e9df..2fa541513 100644
--- a/data/cities/voiron/la-boutique-du-baton.yml
+++ b/data/cities/voiron/la-boutique-du-baton.yml
@@ -5,7 +5,7 @@ longitude: 5.57983
 postcode: "38500"
 city: Voiron
 street: ""
-housenumber: 180
-phone: "+33 6 20 57 00 72"
+housenumber: "180"
+phone: +33 6 20 57 00 72
 opening_hours: ""
-website: "https://www.la-boutique-du-baton.com/"
\ No newline at end of file
+website: https://www.la-boutique-du-baton.com/
diff --git a/data/cities/voiron/la-communaute-des-jeux.yml b/data/cities/voiron/la-communaute-des-jeux.yml
index 4d8328848..c6144d758 100644
--- a/data/cities/voiron/la-communaute-des-jeux.yml
+++ b/data/cities/voiron/la-communaute-des-jeux.yml
@@ -5,7 +5,7 @@ longitude: 5.58677
 postcode: "38500"
 city: Voiron
 street: ""
-housenumber: 22
-phone: "+33 4 76 65 28 94"
-opening_hours: "Tu-Sa 10:00-19:00"
-website: ""
\ No newline at end of file
+housenumber: "22"
+phone: +33 4 76 65 28 94
+opening_hours: Tu-Sa 10:00-19:00
+website: ""
diff --git a/data/cities/voiron/la-laverie.yml b/data/cities/voiron/la-laverie.yml
index fbabc6f3a..42c409585 100644
--- a/data/cities/voiron/la-laverie.yml
+++ b/data/cities/voiron/la-laverie.yml
@@ -4,8 +4,8 @@ latitude: 45.36353
 longitude: 5.59354
 postcode: "38500"
 city: Voiron
-street: "Avenue François Mitterrand"
-housenumber: 37
-phone: "+33 6 77 54 22 77"
-opening_hours: "Mo-Su 06:00-21:00"
-website: ""
\ No newline at end of file
+street: Avenue François Mitterrand
+housenumber: "37"
+phone: +33 6 77 54 22 77
+opening_hours: Mo-Su 06:00-21:00
+website: ""
diff --git a/data/cities/voiron/le-bon-chineur.yml b/data/cities/voiron/le-bon-chineur.yml
index 4507022fd..0afed3056 100644
--- a/data/cities/voiron/le-bon-chineur.yml
+++ b/data/cities/voiron/le-bon-chineur.yml
@@ -4,8 +4,8 @@ latitude: 45.36602
 longitude: 5.58895
 postcode: "38500"
 city: Voiron
-street: "Avenue Dugueyt-Jouvin"
-housenumber: 32
+street: Avenue Dugueyt-Jouvin
+housenumber: "32"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:00,14:30-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00,14:30-19:00
+website: ""
diff --git a/data/cities/voiron/le-coin-de-lest.yml b/data/cities/voiron/le-coin-de-lest.yml
index 53c9e579d..b8921f295 100644
--- a/data/cities/voiron/le-coin-de-lest.yml
+++ b/data/cities/voiron/le-coin-de-lest.yml
@@ -4,8 +4,8 @@ latitude: 45.36721
 longitude: 5.58868
 postcode: "38500"
 city: Voiron
-street: "Avenue Jean Jaurès"
-housenumber: 18
+street: Avenue Jean Jaurès
+housenumber: "18"
 phone: "+33975719312"
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/voiron/le-salon.yml b/data/cities/voiron/le-salon.yml
index 59e058c36..5f3ceb4b9 100644
--- a/data/cities/voiron/le-salon.yml
+++ b/data/cities/voiron/le-salon.yml
@@ -4,8 +4,8 @@ latitude: 45.36559
 longitude: 5.59458
 postcode: "38500"
 city: Voiron
-street: "Rue Guy Allard"
-housenumber: 6
+street: Rue Guy Allard
+housenumber: "6"
 phone: ""
-opening_hours: "Tu-Fr 09:00-19:00, Sa 08:30-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-19:00, Sa 08:30-16:00
+website: ""
diff --git a/data/cities/voiron/lentre-deux.yml b/data/cities/voiron/lentre-deux.yml
index 9cb05a338..22ca2fa79 100644
--- a/data/cities/voiron/lentre-deux.yml
+++ b/data/cities/voiron/lentre-deux.yml
@@ -4,8 +4,8 @@ latitude: 45.36734
 longitude: 5.59032
 postcode: "38500"
 city: Voiron
-street: "Avenue Raymond Tézier"
-housenumber: 13
-phone: "+33 9 81 28 41 05"
+street: Avenue Raymond Tézier
+housenumber: "13"
+phone: +33 9 81 28 41 05
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voiron/medialpes.yml b/data/cities/voiron/medialpes.yml
index ea28658e4..1e8f586b5 100644
--- a/data/cities/voiron/medialpes.yml
+++ b/data/cities/voiron/medialpes.yml
@@ -4,8 +4,8 @@ latitude: 45.3596
 longitude: 5.59249
 postcode: "38500"
 city: Voiron
-street: "Boulevard Denfert-Rochereau"
-housenumber: 26
-phone: "+33 4 76061975"
-opening_hours: "Mo-Fr 09:00-12:00,14:00-18:45; Sa 09:00-12:00"
-website: "https://www.medialpes.com/"
\ No newline at end of file
+street: Boulevard Denfert-Rochereau
+housenumber: "26"
+phone: +33 4 76061975
+opening_hours: Mo-Fr 09:00-12:00,14:00-18:45; Sa 09:00-12:00
+website: https://www.medialpes.com/
diff --git a/data/cities/voiron/midas.yml b/data/cities/voiron/midas.yml
index 65401877a..d66e094d4 100644
--- a/data/cities/voiron/midas.yml
+++ b/data/cities/voiron/midas.yml
@@ -4,8 +4,8 @@ latitude: 45.37054
 longitude: 5.58069
 postcode: "38500"
 city: Voiron
-street: "Avenue de Verdun"
-housenumber: 17
-phone: "+33 4 76 67 30 30"
-opening_hours: "Mo-Fr 08:00-19:00; Sa 08:00-17:00"
-website: "https://www.midas.fr/"
\ No newline at end of file
+street: Avenue de Verdun
+housenumber: "17"
+phone: +33 4 76 67 30 30
+opening_hours: Mo-Fr 08:00-19:00; Sa 08:00-17:00
+website: https://www.midas.fr/
diff --git a/data/cities/voiron/ressourcerie-du-pays-voironnais-la-buisse.yml b/data/cities/voiron/ressourcerie-du-pays-voironnais-la-buisse.yml
index bb7c6f7f0..0f5686c6c 100644
--- a/data/cities/voiron/ressourcerie-du-pays-voironnais-la-buisse.yml
+++ b/data/cities/voiron/ressourcerie-du-pays-voironnais-la-buisse.yml
@@ -4,8 +4,8 @@ latitude: 45.35746
 longitude: 5.59817
 postcode: "38500"
 city: Voiron
-street: "Rue Hector Blanchet"
-housenumber: 33
+street: Rue Hector Blanchet
+housenumber: "33"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voiron/routens-evolution-voiron.yml b/data/cities/voiron/routens-evolution-voiron.yml
index 04f94f79e..1b1583afa 100644
--- a/data/cities/voiron/routens-evolution-voiron.yml
+++ b/data/cities/voiron/routens-evolution-voiron.yml
@@ -4,8 +4,8 @@ latitude: 45.36038
 longitude: 5.59597
 postcode: "38500"
 city: Voiron
-street: "Boulevard Denfert-Rochereau"
-housenumber: 97
+street: Boulevard Denfert-Rochereau
+housenumber: "97"
 phone: ""
-opening_hours: "Tu-Sa 09:30-12:00, 14:00-19:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Sa 09:30-12:00, 14:00-19:00
+website: ""
diff --git a/data/cities/voiron/satoriz-voiron.yml b/data/cities/voiron/satoriz-voiron.yml
index 4e39cc7c5..9a735b7cf 100644
--- a/data/cities/voiron/satoriz-voiron.yml
+++ b/data/cities/voiron/satoriz-voiron.yml
@@ -5,7 +5,7 @@ longitude: 5.5817
 postcode: "38500"
 city: Voiron
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00"
-website: "https://www.satoriz.fr/magasin-bio/satoriz-voiron/"
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:00
+website: https://www.satoriz.fr/magasin-bio/satoriz-voiron/
diff --git a/data/cities/voiron/sikkens.yml b/data/cities/voiron/sikkens.yml
index 3acb32589..d00da15ae 100644
--- a/data/cities/voiron/sikkens.yml
+++ b/data/cities/voiron/sikkens.yml
@@ -4,8 +4,8 @@ latitude: 45.35971
 longitude: 5.59353
 postcode: "38500"
 city: Voiron
-street: "Boulevard Denfert-Rochereau"
-housenumber: 42
-phone: "+33 4 76 65 96 96"
+street: Boulevard Denfert-Rochereau
+housenumber: "42"
+phone: +33 4 76 65 96 96
 opening_hours: ""
-website: "https://www.sikkens-solutions.fr/stores/voiron"
\ No newline at end of file
+website: https://www.sikkens-solutions.fr/stores/voiron
diff --git a/data/cities/voiron/sport-2000-gozzi-sports.yml b/data/cities/voiron/sport-2000-gozzi-sports.yml
index aa94b0bd0..fb40ea7ea 100644
--- a/data/cities/voiron/sport-2000-gozzi-sports.yml
+++ b/data/cities/voiron/sport-2000-gozzi-sports.yml
@@ -5,7 +5,7 @@ longitude: 5.58098
 postcode: "38500"
 city: Voiron
 street: ""
-housenumber: 
+housenumber: ""
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:30"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Sa 09:00-19:30
+website: ""
diff --git a/data/cities/voiron/style-coiffure-by-ludivine.yml b/data/cities/voiron/style-coiffure-by-ludivine.yml
index 87e36f543..730e1f346 100644
--- a/data/cities/voiron/style-coiffure-by-ludivine.yml
+++ b/data/cities/voiron/style-coiffure-by-ludivine.yml
@@ -4,8 +4,8 @@ latitude: 45.36731
 longitude: 5.58879
 postcode: "38500"
 city: Voiron
-street: "Avenue Jean Jaurès"
-housenumber: 16
+street: Avenue Jean Jaurès
+housenumber: "16"
 phone: ""
-opening_hours: "Tu-Fr 09:00-18:30; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 09:00-18:30; Sa 08:00-16:00
+website: ""
diff --git a/data/cities/voiron/torrefaction-de-chartreuse.yml b/data/cities/voiron/torrefaction-de-chartreuse.yml
index 881b91e52..1a7023e92 100644
--- a/data/cities/voiron/torrefaction-de-chartreuse.yml
+++ b/data/cities/voiron/torrefaction-de-chartreuse.yml
@@ -4,8 +4,9 @@ latitude: 45.36732
 longitude: 5.59041
 postcode: "38500"
 city: Voiron
-street: "Avenue Raymond Tézier"
-housenumber: 11
+street: Avenue Raymond Tézier
+housenumber: "11"
 phone: ""
-opening_hours: "Tu 9:30-13:00,14:30-19:00; We 8:30-19:00; Th-Fr 9:30-19:00; Sa 8:30-18:30; PH off"
-website: ""
\ No newline at end of file
+opening_hours: Tu 9:30-13:00,14:30-19:00; We 8:30-19:00; Th-Fr 9:30-19:00; Sa 8:30-18:30;
+    PH off
+website: ""
diff --git a/data/cities/voiron/veligood.yml b/data/cities/voiron/veligood.yml
index dc1ea94b2..e23997a90 100644
--- a/data/cities/voiron/veligood.yml
+++ b/data/cities/voiron/veligood.yml
@@ -4,8 +4,8 @@ latitude: 45.35753
 longitude: 5.59808
 postcode: "38500"
 city: Voiron
-street: "Rue Hector Blanchet"
-housenumber: 33
+street: Rue Hector Blanchet
+housenumber: "33"
 phone: ""
-opening_hours: "Tu-Fr 08:30-18:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Tu-Fr 08:30-18:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/voreppe/alpes-evasion-38.yml b/data/cities/voreppe/alpes-evasion-38.yml
index ce0aaa607..7c1f6bd89 100644
--- a/data/cities/voreppe/alpes-evasion-38.yml
+++ b/data/cities/voreppe/alpes-evasion-38.yml
@@ -4,8 +4,8 @@ latitude: 45.30976
 longitude: 5.6158
 postcode: "38340"
 city: Voreppe
-street: "Rue de la Résistance"
-housenumber: 105
-phone: "+33 6 63 67 59 46"
+street: Rue de la Résistance
+housenumber: "105"
+phone: +33 6 63 67 59 46
 opening_hours: ""
-website: "https://www.alpesevasion.com/"
\ No newline at end of file
+website: https://www.alpesevasion.com/
diff --git a/data/cities/voreppe/au-nom-du-loisir.yml b/data/cities/voreppe/au-nom-du-loisir.yml
index 64785dafa..201b00454 100644
--- a/data/cities/voreppe/au-nom-du-loisir.yml
+++ b/data/cities/voreppe/au-nom-du-loisir.yml
@@ -4,8 +4,8 @@ latitude: 45.30929
 longitude: 5.61659
 postcode: "38340"
 city: Voreppe
-street: "Rue de la Résistance"
-housenumber: 105
-phone: "+33 4 76 19 03 20"
-opening_hours: "Mo-Sa 08:00-12:00,14:00-18:00"
-website: "https://www.aunomduloisir.fr/"
\ No newline at end of file
+street: Rue de la Résistance
+housenumber: "105"
+phone: +33 4 76 19 03 20
+opening_hours: Mo-Sa 08:00-12:00,14:00-18:00
+website: https://www.aunomduloisir.fr/
diff --git a/data/cities/voreppe/biocoop.yml b/data/cities/voreppe/biocoop.yml
index a744fc406..9a5296dfa 100644
--- a/data/cities/voreppe/biocoop.yml
+++ b/data/cities/voreppe/biocoop.yml
@@ -1,11 +1,11 @@
 id: 80579481
-type: way
+type: node
 latitude: 45.30026
 longitude: 5.62844
 postcode: "38340"
 city: Voreppe
-street: "Avenue de Juin 1940"
-housenumber: 470
-phone: "+33 4 38 03 09 05"
+street: Avenue de Juin 1940
+housenumber: "470"
+phone: +33 4 38 03 09 05
 opening_hours: ""
-website: "http://biocoopvoreppe.fr/"
\ No newline at end of file
+website: http://biocoopvoreppe.fr/
diff --git a/data/cities/voreppe/carrosserie-du-chevalon.yml b/data/cities/voreppe/carrosserie-du-chevalon.yml
index e07623cf9..863f2c335 100644
--- a/data/cities/voreppe/carrosserie-du-chevalon.yml
+++ b/data/cities/voreppe/carrosserie-du-chevalon.yml
@@ -4,8 +4,8 @@ latitude: 45.2742
 longitude: 5.64648
 postcode: "38340"
 city: Voreppe
-street: "Allée des Sarrasins"
-housenumber: 140
+street: Allée des Sarrasins
+housenumber: "140"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/chartreuse-depannages.yml b/data/cities/voreppe/chartreuse-depannages.yml
index cef00220e..f51c59d9a 100644
--- a/data/cities/voreppe/chartreuse-depannages.yml
+++ b/data/cities/voreppe/chartreuse-depannages.yml
@@ -4,8 +4,8 @@ latitude: 45.30353
 longitude: 5.61881
 postcode: "38340"
 city: Voreppe
-street: "Chemin de l'Île Plancon"
-housenumber: 107
-phone: "+33 4 38020501"
-opening_hours: "Mo-Fr 08:00-12:00,14:00-18:00"
-website: "https://chartreused.site-solocal.com/"
\ No newline at end of file
+street: Chemin de l'Île Plancon
+housenumber: "107"
+phone: +33 4 38020501
+opening_hours: Mo-Fr 08:00-12:00,14:00-18:00
+website: https://chartreused.site-solocal.com/
diff --git a/data/cities/voreppe/davat-auto-distribution.yml b/data/cities/voreppe/davat-auto-distribution.yml
index 6e355c2a5..901670fa9 100644
--- a/data/cities/voreppe/davat-auto-distribution.yml
+++ b/data/cities/voreppe/davat-auto-distribution.yml
@@ -4,8 +4,8 @@ latitude: 45.30336
 longitude: 5.61827
 postcode: "38340"
 city: Voreppe
-street: "Chemin de l'Île Plancon"
-housenumber: 142
-phone: "+33 4 76502225"
-opening_hours: "Mo-Fr 08:30-12:00,13:30-18:00; Sa 09:00-13:00"
-website: ""
\ No newline at end of file
+street: Chemin de l'Île Plancon
+housenumber: "142"
+phone: +33 4 76502225
+opening_hours: Mo-Fr 08:30-12:00,13:30-18:00; Sa 09:00-13:00
+website: ""
diff --git a/data/cities/voreppe/happy-bike.yml b/data/cities/voreppe/happy-bike.yml
index 9b8d0dd14..59fec99f4 100644
--- a/data/cities/voreppe/happy-bike.yml
+++ b/data/cities/voreppe/happy-bike.yml
@@ -4,8 +4,8 @@ latitude: 45.29045
 longitude: 5.63297
 postcode: "38340"
 city: Voreppe
-street: "Chemin des Seites"
-housenumber: 1
+street: Chemin des Seites
+housenumber: "1"
 phone: ""
-opening_hours: "Mo-Tu 14:30-19:00; Th-Fr 14:30-19:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: Mo-Tu 14:30-19:00; Th-Fr 14:30-19:00; Sa 09:00-12:00
+website: ""
diff --git a/data/cities/voreppe/le-cellier-du-gravillas.yml b/data/cities/voreppe/le-cellier-du-gravillas.yml
index 68feac44c..09ff7719a 100644
--- a/data/cities/voreppe/le-cellier-du-gravillas.yml
+++ b/data/cities/voreppe/le-cellier-du-gravillas.yml
@@ -4,8 +4,8 @@ latitude: 45.30282
 longitude: 5.64003
 postcode: "38340"
 city: Voreppe
-street: "Chemin du Gigot"
-housenumber: 122
+street: Chemin du Gigot
+housenumber: "122"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/m-autos-38.yml b/data/cities/voreppe/m-autos-38.yml
index 1a73d8eec..8f25569da 100644
--- a/data/cities/voreppe/m-autos-38.yml
+++ b/data/cities/voreppe/m-autos-38.yml
@@ -4,8 +4,8 @@ latitude: 45.302
 longitude: 5.62731
 postcode: "38340"
 city: Voreppe
-street: "Avenue Henri Chapays"
-housenumber: 839
+street: Avenue Henri Chapays
+housenumber: "839"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/mg-meca-auto.yml b/data/cities/voreppe/mg-meca-auto.yml
index 22bdb8d78..236940778 100644
--- a/data/cities/voreppe/mg-meca-auto.yml
+++ b/data/cities/voreppe/mg-meca-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.30397
 longitude: 5.61866
 postcode: "38340"
 city: Voreppe
-street: "Chemin de l'Île Plancon"
-housenumber: 51
-phone: "+33 4 76 50 80 40"
+street: Chemin de l'Île Plancon
+housenumber: "51"
+phone: +33 4 76 50 80 40
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/piscine-discount.yml b/data/cities/voreppe/piscine-discount.yml
index 924323a2c..9ef267fb9 100644
--- a/data/cities/voreppe/piscine-discount.yml
+++ b/data/cities/voreppe/piscine-discount.yml
@@ -4,8 +4,8 @@ latitude: 45.31045
 longitude: 5.61347
 postcode: "38340"
 city: Voreppe
-street: "Rue Aristide Bergès"
-housenumber: 292
-phone: "+33 4 76 26 07 04"
+street: Rue Aristide Bergès
+housenumber: "292"
+phone: +33 4 76 26 07 04
 opening_hours: ""
-website: "https://www.piscine-discount.info/"
\ No newline at end of file
+website: https://www.piscine-discount.info/
diff --git a/data/cities/voreppe/r-a-e-garage.yml b/data/cities/voreppe/r-a-e-garage.yml
index 8277e6bbc..c9e7ca014 100644
--- a/data/cities/voreppe/r-a-e-garage.yml
+++ b/data/cities/voreppe/r-a-e-garage.yml
@@ -4,8 +4,8 @@ latitude: 45.30045
 longitude: 5.62703
 postcode: "38340"
 city: Voreppe
-street: "Avenue de Juin 1940"
-housenumber: 577
+street: Avenue de Juin 1940
+housenumber: "577"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/remorques-du-dauphine.yml b/data/cities/voreppe/remorques-du-dauphine.yml
index 25ca75fb3..44bed80a7 100644
--- a/data/cities/voreppe/remorques-du-dauphine.yml
+++ b/data/cities/voreppe/remorques-du-dauphine.yml
@@ -4,8 +4,8 @@ latitude: 45.30039
 longitude: 5.62736
 postcode: "38340"
 city: Voreppe
-street: "Avenue de Juin 1940"
-housenumber: 563
+street: Avenue de Juin 1940
+housenumber: "563"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/saveur-du-pain.yml b/data/cities/voreppe/saveur-du-pain.yml
index 225aa0200..5a4d1308e 100644
--- a/data/cities/voreppe/saveur-du-pain.yml
+++ b/data/cities/voreppe/saveur-du-pain.yml
@@ -4,8 +4,8 @@ latitude: 45.27872
 longitude: 5.64708
 postcode: "38340"
 city: Voreppe
-street: "Rue Beyle Stendhal"
-housenumber: 
+street: Rue Beyle Stendhal
+housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/super-u.yml b/data/cities/voreppe/super-u.yml
index 7f8992923..41896fde5 100644
--- a/data/cities/voreppe/super-u.yml
+++ b/data/cities/voreppe/super-u.yml
@@ -4,8 +4,8 @@ latitude: 45.28931
 longitude: 5.6395
 postcode: "38340"
 city: Voreppe
-street: "Avenue Simone Veil"
-housenumber: 129
-phone: "+33 4 76 50 61 81"
-opening_hours: "Mo-Sa 08:30-20:00; Su 08:30-12:30"
-website: "https://www.magasins-u.com/magasin/superu-voreppe"
\ No newline at end of file
+street: Avenue Simone Veil
+housenumber: "129"
+phone: +33 4 76 50 61 81
+opening_hours: Mo-Sa 08:30-20:00; Su 08:30-12:30
+website: https://www.magasins-u.com/magasin/superu-voreppe
diff --git a/data/cities/voreppe/tabac-presse-les-platanes.yml b/data/cities/voreppe/tabac-presse-les-platanes.yml
index 90cca8c8d..87fcc4701 100644
--- a/data/cities/voreppe/tabac-presse-les-platanes.yml
+++ b/data/cities/voreppe/tabac-presse-les-platanes.yml
@@ -4,8 +4,8 @@ latitude: 45.27881
 longitude: 5.64706
 postcode: "38340"
 city: Voreppe
-street: "Rue Beyle Stendhal"
-housenumber: 
-phone: "+33 4 76 50 68 48"
+street: Rue Beyle Stendhal
+housenumber: ""
+phone: +33 4 76 50 68 48
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/voreppe/youride-shop.yml b/data/cities/voreppe/youride-shop.yml
index 2dbed2514..8282f0b09 100644
--- a/data/cities/voreppe/youride-shop.yml
+++ b/data/cities/voreppe/youride-shop.yml
@@ -4,8 +4,8 @@ latitude: 45.29992
 longitude: 5.62995
 postcode: "38340"
 city: Voreppe
-street: "Avenue Henri Chapays"
-housenumber: 557
+street: Avenue Henri Chapays
+housenumber: "557"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/vourey/ferme-du-may.yml b/data/cities/vourey/ferme-du-may.yml
index 35e050329..cb9f3cd00 100644
--- a/data/cities/vourey/ferme-du-may.yml
+++ b/data/cities/vourey/ferme-du-may.yml
@@ -4,8 +4,8 @@ latitude: 45.316
 longitude: 5.52394
 postcode: "38210"
 city: Vourey
-street: "Route de la Gare"
-housenumber: 355
+street: Route de la Gare
+housenumber: "355"
 phone: "+33749263582"
-opening_hours: "We,Fr 16:00-19:00;Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+opening_hours: We,Fr 16:00-19:00;Sa 09:00-12:00
+website: ""
diff --git a/data/cities/yvoire/jardin-des-5-sens.yml b/data/cities/yvoire/jardin-des-5-sens.yml
index dd49f9223..9df12d614 100644
--- a/data/cities/yvoire/jardin-des-5-sens.yml
+++ b/data/cities/yvoire/jardin-des-5-sens.yml
@@ -1,11 +1,11 @@
 id: 69012143
-type: way
+type: node
 latitude: 46.37041
 longitude: 6.32591
 postcode: "74140"
 city: Yvoire
-street: "Rue du Lac"
-housenumber: 12
+street: Rue du Lac
+housenumber: "12"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/yvoire/o-paint-qui-chante.yml b/data/cities/yvoire/o-paint-qui-chante.yml
index 1a466d3c8..bd743094f 100644
--- a/data/cities/yvoire/o-paint-qui-chante.yml
+++ b/data/cities/yvoire/o-paint-qui-chante.yml
@@ -4,8 +4,8 @@ latitude: 46.36971
 longitude: 6.3261
 postcode: "74140"
 city: Yvoire
-street: "Rue des Terroz"
-housenumber: 54
-phone: "+33 7 62 50 48 04"
+street: Rue des Terroz
+housenumber: "54"
+phone: +33 7 62 50 48 04
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/yvoire/omayaka.yml b/data/cities/yvoire/omayaka.yml
index 548fff741..9f0d715d6 100644
--- a/data/cities/yvoire/omayaka.yml
+++ b/data/cities/yvoire/omayaka.yml
@@ -1,11 +1,11 @@
 id: 1054728294
-type: way
+type: node
 latitude: 46.36931
 longitude: 6.33165
 postcode: "74140"
 city: Yvoire
-street: "Rue des Bouchets"
-housenumber: 120
+street: Rue des Bouchets
+housenumber: "120"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/yzeron/alexandra-coiffure.yml b/data/cities/yzeron/alexandra-coiffure.yml
index 710329adb..a13bf56b3 100644
--- a/data/cities/yzeron/alexandra-coiffure.yml
+++ b/data/cities/yzeron/alexandra-coiffure.yml
@@ -4,8 +4,8 @@ latitude: 45.70744
 longitude: 4.58928
 postcode: "69510"
 city: Yzeron
-street: "Grande Rue"
-housenumber: 3
+street: Grande Rue
+housenumber: "3"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/yzeron/arte-sincero.yml b/data/cities/yzeron/arte-sincero.yml
index e74241c0f..f541cec25 100644
--- a/data/cities/yzeron/arte-sincero.yml
+++ b/data/cities/yzeron/arte-sincero.yml
@@ -4,8 +4,8 @@ latitude: 45.70761
 longitude: 4.59005
 postcode: "69510"
 city: Yzeron
-street: "Grande Rue"
-housenumber: 19
-phone: "+33 6 49 54 74 45"
+street: Grande Rue
+housenumber: "19"
+phone: +33 6 49 54 74 45
 opening_hours: ""
-website: "https://www.arte-sincero.com/"
\ No newline at end of file
+website: https://www.arte-sincero.com/
diff --git a/data/cities/yzeron/garage-fp-auto.yml b/data/cities/yzeron/garage-fp-auto.yml
index 6bbd5dbec..9e594d76d 100644
--- a/data/cities/yzeron/garage-fp-auto.yml
+++ b/data/cities/yzeron/garage-fp-auto.yml
@@ -4,8 +4,8 @@ latitude: 45.70832
 longitude: 4.58667
 postcode: "69510"
 city: Yzeron
-street: "Route de la Rivière"
-housenumber: 16
+street: Route de la Rivière
+housenumber: "16"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/yzeron/le-bocal-dart.yml b/data/cities/yzeron/le-bocal-dart.yml
index f3f81bdfe..c3ebc0783 100644
--- a/data/cities/yzeron/le-bocal-dart.yml
+++ b/data/cities/yzeron/le-bocal-dart.yml
@@ -4,8 +4,8 @@ latitude: 45.70764
 longitude: 4.59017
 postcode: "69510"
 city: Yzeron
-street: "Grande rue"
-housenumber: 23
+street: Grande rue
+housenumber: "23"
 phone: ""
-opening_hours: "Fr-Su 15:00-18:00"
-website: "https://fr-fr.facebook.com/boutiquedecreateurs.yzeron/"
\ No newline at end of file
+opening_hours: Fr-Su 15:00-18:00
+website: https://fr-fr.facebook.com/boutiquedecreateurs.yzeron/
diff --git a/data/cities/yzeron/spa-yzeron-evasion.yml b/data/cities/yzeron/spa-yzeron-evasion.yml
index 5a56cc64b..dcbce15d0 100644
--- a/data/cities/yzeron/spa-yzeron-evasion.yml
+++ b/data/cities/yzeron/spa-yzeron-evasion.yml
@@ -1,11 +1,11 @@
 id: 67485359
-type: way
+type: node
 latitude: 45.70409
 longitude: 4.57967
 postcode: "69510"
 city: Yzeron
-street: "Le Plat"
-housenumber: 741
+street: Le Plat
+housenumber: "741"
 phone: ""
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: ""
diff --git a/data/cities/yzeron/zone-rouge-motos.yml b/data/cities/yzeron/zone-rouge-motos.yml
index 8ffc497c5..35ad97c05 100644
--- a/data/cities/yzeron/zone-rouge-motos.yml
+++ b/data/cities/yzeron/zone-rouge-motos.yml
@@ -1,11 +1,11 @@
 id: 67485260
-type: way
+type: node
 latitude: 45.70527
 longitude: 4.61729
 postcode: ""
 city: Yzeron
-street: "Châteauvieux"
-housenumber: 
-phone: "+33 6 58 68 55 45"
-opening_hours: "Tu-Sa 09:00-12:30, 13:30-18:00"
-website: ""
\ No newline at end of file
+street: Châteauvieux
+housenumber: ""
+phone: +33 6 58 68 55 45
+opening_hours: Tu-Sa 09:00-12:30, 13:30-18:00
+website: ""