diff --git a/content/cities/farebersviller/la-maison-point-vert.md b/content/cities/farebersviller/la-maison-point-vert.md
index 1bf7d99d..da267a5b 100644
--- a/content/cities/farebersviller/la-maison-point-vert.md
+++ b/content/cities/farebersviller/la-maison-point-vert.md
@@ -1,5 +1,5 @@
 ---
 title: "La maison point vert"
 url: /farebersviller/la-maison-point-vert/
-shop: shop
+shop: agraire
 ---
\ No newline at end of file
diff --git a/content/cities/fontenoy-le-chateau/_index.md b/content/cities/fontenoy-le-chateau/_index.md
deleted file mode 100644
index ec68839a..00000000
--- a/content/cities/fontenoy-le-chateau/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fontenoy-le-Château
-url: /fontenoy-le-chateau/
-latitude: 47.974
-longitude: 6.2
----
\ No newline at end of file
diff --git a/content/cities/fontenoy-le-chateau/proxi.md b/content/cities/fontenoy-le-chateau/proxi.md
deleted file mode 100644
index 4615cca1..00000000
--- a/content/cities/fontenoy-le-chateau/proxi.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Proxi"
-url: /fontenoy-le-chateau/proxi/
-shop: commodité
----
\ No newline at end of file
diff --git a/content/cities/gerardmer/lovely-lisa-boulevard-kelsch.md b/content/cities/gerardmer/lovely-lisa-boulevard-kelsch.md
index 4bfc4179..8b624c52 100644
--- a/content/cities/gerardmer/lovely-lisa-boulevard-kelsch.md
+++ b/content/cities/gerardmer/lovely-lisa-boulevard-kelsch.md
@@ -1,5 +1,5 @@
 ---
 title: "Lovely Lisa"
 url: /gerardmer/lovely-lisa/
-shop: vêtements
+shop: magasin de campagne
 ---
\ No newline at end of file
diff --git a/content/cities/gerardmer/lovely-lisa.md b/content/cities/gerardmer/lovely-lisa.md
index 8b624c52..4bfc4179 100644
--- a/content/cities/gerardmer/lovely-lisa.md
+++ b/content/cities/gerardmer/lovely-lisa.md
@@ -1,5 +1,5 @@
 ---
 title: "Lovely Lisa"
 url: /gerardmer/lovely-lisa/
-shop: magasin de campagne
+shop: vêtements
 ---
\ No newline at end of file
diff --git a/content/cities/gironcourt-sur-vraine/_index.md b/content/cities/gironcourt-sur-vraine/_index.md
new file mode 100644
index 00000000..46e4da7d
--- /dev/null
+++ b/content/cities/gironcourt-sur-vraine/_index.md
@@ -0,0 +1,6 @@
+---
+title: Gironcourt-sur-Vraine
+url: /gironcourt-sur-vraine/
+latitude: 48.301
+longitude: 5.909
+---
\ No newline at end of file
diff --git a/content/cities/gironcourt-sur-vraine/rolin-auto-industrie.md b/content/cities/gironcourt-sur-vraine/rolin-auto-industrie.md
new file mode 100644
index 00000000..cec8aa28
--- /dev/null
+++ b/content/cities/gironcourt-sur-vraine/rolin-auto-industrie.md
@@ -0,0 +1,5 @@
+---
+title: "Rolin Auto Industrie"
+url: /gironcourt-sur-vraine/rolin-auto-industrie/
+shop: réparation de voitures
+---
\ No newline at end of file
diff --git a/content/cities/montmedy/aux-trois-kawas.md b/content/cities/montmedy/aux-trois-kawas.md
deleted file mode 100644
index f48a97a6..00000000
--- a/content/cities/montmedy/aux-trois-kawas.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Aux Trois Kawas"
-url: /montmedy/aux-trois-kawas/
-shop: café
----
\ No newline at end of file
diff --git a/content/cities/montmedy/la-piece-du-velo.md b/content/cities/montmedy/la-piece-du-velo.md
index 11aa829e..9c77dec8 100644
--- a/content/cities/montmedy/la-piece-du-velo.md
+++ b/content/cities/montmedy/la-piece-du-velo.md
@@ -1,5 +1,5 @@
 ---
 title: "La Pièce du Vélo"
 url: /montmedy/la-piece-du-velo/
-shop: vélo
+shop: shop
 ---
\ No newline at end of file
diff --git a/content/cities/nancy/_index.md b/content/cities/nancy/_index.md
index c197e1e7..ac005470 100644
--- a/content/cities/nancy/_index.md
+++ b/content/cities/nancy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Nancy
 url: /nancy/
-latitude: 48.682
-longitude: 6.165
+latitude: 48.683
+longitude: 6.173
 ---
\ No newline at end of file
diff --git a/content/cities/nancy/laverie-de-la-source.md b/content/cities/nancy/laverie-de-la-source.md
deleted file mode 100644
index 00452cd9..00000000
--- a/content/cities/nancy/laverie-de-la-source.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Laverie de la Source"
-url: /nancy/laverie-de-la-source/
-shop: blanchisserie
----
\ No newline at end of file
diff --git a/content/cities/nancy/laverie-painleve.md b/content/cities/nancy/laverie-painleve.md
deleted file mode 100644
index bcd2b024..00000000
--- a/content/cities/nancy/laverie-painleve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Laverie Painlevé"
-url: /nancy/laverie-painleve/
-shop: blanchisserie
----
\ No newline at end of file
diff --git a/content/cities/neufchateau/bar-tabac-au-rendez-vous-des-quilleurs.md b/content/cities/neufchateau/bar-tabac-au-rendez-vous-des-quilleurs.md
deleted file mode 100644
index ea458d06..00000000
--- a/content/cities/neufchateau/bar-tabac-au-rendez-vous-des-quilleurs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bar Tabac Au Rendez-vous des Quilleurs"
-url: /neufchateau/bar-tabac-au-rendez-vous-des-quilleurs/
-shop: tabac
----
\ No newline at end of file
diff --git a/content/cities/saint-avold/bureau-vallee.md b/content/cities/saint-avold/bureau-vallee.md
deleted file mode 100644
index c3090200..00000000
--- a/content/cities/saint-avold/bureau-vallee.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bureau Vallée"
-url: /saint-avold/bureau-vallee/
-shop: fournitures de bureau
----
\ No newline at end of file
diff --git a/content/cities/saint-avold/la-maison-point-vert.md b/content/cities/saint-avold/la-maison-point-vert.md
deleted file mode 100644
index 3f521648..00000000
--- a/content/cities/saint-avold/la-maison-point-vert.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "La Maison Point Vert"
-url: /saint-avold/la-maison-point-vert/
-shop: centre de jardinage
----
\ No newline at end of file
diff --git a/content/cities/sainte-genevieve/_index.md b/content/cities/sainte-genevieve/_index.md
new file mode 100644
index 00000000..b803f863
--- /dev/null
+++ b/content/cities/sainte-genevieve/_index.md
@@ -0,0 +1,6 @@
+---
+title: Sainte-Geneviève
+url: /sainte-genevieve/
+latitude: 48.87
+longitude: 6.115
+---
\ No newline at end of file
diff --git a/content/cities/sainte-genevieve/la-miche-tranquille.md b/content/cities/sainte-genevieve/la-miche-tranquille.md
new file mode 100644
index 00000000..17286ff5
--- /dev/null
+++ b/content/cities/sainte-genevieve/la-miche-tranquille.md
@@ -0,0 +1,5 @@
+---
+title: "La Miche Tranquille"
+url: /sainte-genevieve/la-miche-tranquille/
+shop: boulangerie
+---
\ No newline at end of file
diff --git a/content/cities/vandoeuvre-les-nancy/_index.md b/content/cities/vandoeuvre-les-nancy/_index.md
deleted file mode 100644
index a3e8c5ff..00000000
--- a/content/cities/vandoeuvre-les-nancy/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Vandœuvre-lès-Nancy
-url: /vandoeuvre-les-nancy/
-latitude: 48.661
-longitude: 6.163
----
\ No newline at end of file
diff --git a/content/cities/vandoeuvre-les-nancy/laverie-belvue.md b/content/cities/vandoeuvre-les-nancy/laverie-belvue.md
deleted file mode 100644
index 732e0a74..00000000
--- a/content/cities/vandoeuvre-les-nancy/laverie-belvue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Laverie Bel'vue"
-url: /vandoeuvre-les-nancy/laverie-belvue/
-shop: blanchisserie
----
\ No newline at end of file
diff --git a/content/shops/cafe/_index.md b/content/shops/cafe/_index.md
deleted file mode 100644
index 0145679e..00000000
--- a/content/shops/cafe/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: café
-url: /cafe/
-icon: coffee
----
\ No newline at end of file
diff --git a/data/cities/fontenoy-le-chateau/proxi.yml b/data/cities/fontenoy-le-chateau/proxi.yml
deleted file mode 100644
index f37cb656..00000000
--- a/data/cities/fontenoy-le-chateau/proxi.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2560600094
-type: node
-latitude: 47.97432
-longitude: 6.2001
-postcode: "88240"
-city: Fontenoy-le-Château
-street: "Grande Rue"
-housenumber: 7
-phone: "+33 3 29 37 06 39"
-opening_hours: "Mo-Sa 08:15-12:15"
-website: ""
\ No newline at end of file
diff --git a/data/cities/gerardmer/lovely-lisa-boulevard-kelsch.yml b/data/cities/gerardmer/lovely-lisa-boulevard-kelsch.yml
index 5825abea..bd07f60f 100644
--- a/data/cities/gerardmer/lovely-lisa-boulevard-kelsch.yml
+++ b/data/cities/gerardmer/lovely-lisa-boulevard-kelsch.yml
@@ -1,11 +1,11 @@
-id: 3780152075
+id: 4216870189
 type: node
-latitude: 48.07149
-longitude: 6.87344
+latitude: 48.07152
+longitude: 6.87346
 postcode: "88400"
 city: Gérardmer
 street: "Boulevard Kelsch"
-housenumber: 1b
+housenumber: 1 B
 phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:00"
+website: "https://www.chalet-des-peluches.com/"
\ No newline at end of file
diff --git a/data/cities/gerardmer/lovely-lisa.yml b/data/cities/gerardmer/lovely-lisa.yml
index bd07f60f..5825abea 100644
--- a/data/cities/gerardmer/lovely-lisa.yml
+++ b/data/cities/gerardmer/lovely-lisa.yml
@@ -1,11 +1,11 @@
-id: 4216870189
+id: 3780152075
 type: node
-latitude: 48.07152
-longitude: 6.87346
+latitude: 48.07149
+longitude: 6.87344
 postcode: "88400"
 city: Gérardmer
 street: "Boulevard Kelsch"
-housenumber: 1 B
+housenumber: 1b
 phone: ""
-opening_hours: "Mo-Fr 09:00-12:00, 14:00-18:00"
-website: "https://www.chalet-des-peluches.com/"
\ No newline at end of file
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/gironcourt-sur-vraine/rolin-auto-industrie.yml b/data/cities/gironcourt-sur-vraine/rolin-auto-industrie.yml
new file mode 100644
index 00000000..aa15717c
--- /dev/null
+++ b/data/cities/gironcourt-sur-vraine/rolin-auto-industrie.yml
@@ -0,0 +1,11 @@
+id: 11161950138
+type: node
+latitude: 48.30069
+longitude: 5.90892
+postcode: "88170"
+city: Gironcourt-sur-Vraine
+street: "Z.A. de la Grande Bataille"
+housenumber: 
+phone: "+33 3 29 94 69 21"
+opening_hours: "Mo-Fr 08:00-12:00,13:30-18:30; Sa 08:00-12:00"
+website: "http://www.rolinauto.fr/"
\ No newline at end of file
diff --git a/data/cities/montmedy/aux-trois-kawas.yml b/data/cities/montmedy/aux-trois-kawas.yml
deleted file mode 100644
index d41b4246..00000000
--- a/data/cities/montmedy/aux-trois-kawas.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9708702199
-type: node
-latitude: 49.51869
-longitude: 5.36766
-postcode: "55600"
-city: Montmédy
-street: "Rue Ernest Mabille"
-housenumber: 19
-phone: ""
-opening_hours: "Tu-Fr 08:00-12:00,13:00-18:00; Sa 11:00-19:00"
-website: "https://www.auxtroiskawas.fr"
\ No newline at end of file
diff --git a/data/cities/nancy/laverie-de-la-source.yml b/data/cities/nancy/laverie-de-la-source.yml
deleted file mode 100644
index 8287d8dc..00000000
--- a/data/cities/nancy/laverie-de-la-source.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2491405652
-type: node
-latitude: 48.69448
-longitude: 6.1786
-postcode: "54000"
-city: Nancy
-street: "Rue de la Source"
-housenumber: 19
-phone: ""
-opening_hours: "Mo-Su 07:00-20:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/nancy/laverie-painleve.yml b/data/cities/nancy/laverie-painleve.yml
deleted file mode 100644
index 391ef533..00000000
--- a/data/cities/nancy/laverie-painleve.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2242722407
-type: node
-latitude: 48.68229
-longitude: 6.16522
-postcode: "54000"
-city: Nancy
-street: "Place Paul Painlevé"
-housenumber: 12
-phone: ""
-opening_hours: "Mo-Su 07:00-19:30"
-website: ""
\ No newline at end of file
diff --git a/data/cities/neufchateau/bar-tabac-au-rendez-vous-des-quilleurs.yml b/data/cities/neufchateau/bar-tabac-au-rendez-vous-des-quilleurs.yml
deleted file mode 100644
index b66c238c..00000000
--- a/data/cities/neufchateau/bar-tabac-au-rendez-vous-des-quilleurs.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 97269804
-type: way
-latitude: 48.35052
-longitude: 5.69556
-postcode: "88300"
-city: Neufchâteau
-street: "Rue des Pépinières"
-housenumber: 2
-phone: "+33 3 29 94 15 05"
-opening_hours: "Mo-We 08:00-20:00; Th off; Fr-Sa 08:00-20:00; Su 17:00-19:30"
-website: ""
\ No newline at end of file
diff --git a/data/cities/peltre/ferme-du-crepy.yml b/data/cities/peltre/ferme-du-crepy.yml
index e20be880..980fb912 100644
--- a/data/cities/peltre/ferme-du-crepy.yml
+++ b/data/cities/peltre/ferme-du-crepy.yml
@@ -6,6 +6,6 @@ postcode: "57245"
 city: Peltre
 street: "Rue de Metz"
 housenumber: 
-phone: "03 87 74 16 36"
+phone: "+33 3 87 74 16 36"
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/saint-avold/bureau-vallee.yml b/data/cities/saint-avold/bureau-vallee.yml
deleted file mode 100644
index f39c9ba7..00000000
--- a/data/cities/saint-avold/bureau-vallee.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6220781586
-type: node
-latitude: 49.10874
-longitude: 6.71959
-postcode: "57500"
-city: Saint-Avold
-street: "Rue des Généraux Altmayer"
-housenumber: 2
-phone: "+33387892522"
-opening_hours: "Mo-Sa 09:00-12:30,13:30-19:00"
-website: "https://www.bureau-vallee.fr/nos-magasins/magasin-saint-avold-271/"
\ No newline at end of file
diff --git a/data/cities/saint-avold/la-maison-point-vert.yml b/data/cities/saint-avold/la-maison-point-vert.yml
deleted file mode 100644
index 05663ba3..00000000
--- a/data/cities/saint-avold/la-maison-point-vert.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 997899001
-type: way
-latitude: 49.10995
-longitude: 6.72035
-postcode: "57500"
-city: Saint-Avold
-street: "Rue des Généraux Altmayer"
-housenumber: 40
-phone: "+33387910637"
-opening_hours: "Mo-Sa 09:00-12:00,14:00-19:00"
-website: "https://www.magasin-point-vert.fr/magasin/saint-avold"
\ No newline at end of file
diff --git a/data/cities/sainte-genevieve/la-miche-tranquille.yml b/data/cities/sainte-genevieve/la-miche-tranquille.yml
new file mode 100644
index 00000000..87c72dd1
--- /dev/null
+++ b/data/cities/sainte-genevieve/la-miche-tranquille.yml
@@ -0,0 +1,11 @@
+id: 2462638467
+type: node
+latitude: 48.87006
+longitude: 6.11527
+postcode: "54700"
+city: Sainte-Geneviève
+street: "Route de Bezaumont"
+housenumber: 1
+phone: "+33 6 10 56 98 47"
+opening_hours: "Tu 16:00-19:00; We 15:00-17:00; Th 14:00-16:00"
+website: "https://www.lamichetranquille.fr/"
\ No newline at end of file
diff --git a/data/cities/vandoeuvre-les-nancy/laverie-belvue.yml b/data/cities/vandoeuvre-les-nancy/laverie-belvue.yml
deleted file mode 100644
index 66a726d7..00000000
--- a/data/cities/vandoeuvre-les-nancy/laverie-belvue.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 10753880765
-type: node
-latitude: 48.6607
-longitude: 6.16333
-postcode: "54500"
-city: Vandœuvre-lès-Nancy
-street: "Avenue du Général Leclerc"
-housenumber: 3
-phone: "+33 7 60679780"
-opening_hours: "Mo-Su 07:00-21:00"
-website: "http://www.laverie.54500.net/"
\ No newline at end of file