diff --git a/content/cities/dijon/intermarche-super-boulevard-de-luniversite.md b/content/cities/dijon/intermarche-super-boulevard-de-luniversite.md
new file mode 100644
index 00000000..59d86d5c
--- /dev/null
+++ b/content/cities/dijon/intermarche-super-boulevard-de-luniversite.md
@@ -0,0 +1,5 @@
+---
+title: "Intermarché Super"
+url: /dijon/intermarche-super-boulevard-de-luniversite/
+shop: supermarché
+---
\ No newline at end of file
diff --git a/content/cities/dijon/intermarche-super-boulevard-georges-clemenceau.md b/content/cities/dijon/intermarche-super-boulevard-georges-clemenceau.md
deleted file mode 100644
index 1aaea011..00000000
--- a/content/cities/dijon/intermarche-super-boulevard-georges-clemenceau.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Intermarché Super"
-url: /dijon/intermarche-super-boulevard-georges-clemenceau/
-shop: supermarché
----
\ No newline at end of file
diff --git a/content/cities/genelard/quincaillerie-laupin.md b/content/cities/genelard/quincaillerie-laupin.md
index e832dc39..576b284e 100644
--- a/content/cities/genelard/quincaillerie-laupin.md
+++ b/content/cities/genelard/quincaillerie-laupin.md
@@ -1,5 +1,5 @@
 ---
 title: "Quincaillerie Laupin"
 url: /genelard/quincaillerie-laupin/
-shop: à faire soi-même
+shop: matériel informatique
 ---
\ No newline at end of file
diff --git a/content/cities/magny-cours/mitjet-international.md b/content/cities/magny-cours/mitjet-international.md
deleted file mode 100644
index 2716a300..00000000
--- a/content/cities/magny-cours/mitjet-international.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Mitjet International"
-url: /magny-cours/mitjet-international/
-shop: réparation de voitures
----
\ No newline at end of file
diff --git a/content/cities/montceau-les-mines/e-leclerc.md b/content/cities/montceau-les-mines/e-leclerc.md
index a12eea46..6751b3c4 100644
--- a/content/cities/montceau-les-mines/e-leclerc.md
+++ b/content/cities/montceau-les-mines/e-leclerc.md
@@ -1,5 +1,5 @@
 ---
-title: "E. Leclerc"
+title: "E.Leclerc"
 url: /montceau-les-mines/e-leclerc/
 shop: supermarché
 ---
\ No newline at end of file
diff --git a/content/cities/montceau-les-mines/geant-casino.md b/content/cities/montceau-les-mines/geant-casino.md
deleted file mode 100644
index 39a813e0..00000000
--- a/content/cities/montceau-les-mines/geant-casino.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Géant Casino"
-url: /montceau-les-mines/geant-casino/
-shop: supermarché
----
\ No newline at end of file
diff --git a/content/cities/montchanin/_index.md b/content/cities/montchanin/_index.md
index bae4cf7f..98ee65a4 100644
--- a/content/cities/montchanin/_index.md
+++ b/content/cities/montchanin/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Montchanin
 url: /montchanin/
-latitude: 46.735
-longitude: 4.478
+latitude: 46.749
+longitude: 4.469
 ---
\ No newline at end of file
diff --git a/content/cities/montchanin/agri-sud-est-montchanin.md b/content/cities/montchanin/agri-sud-est-montchanin.md
new file mode 100644
index 00000000..ab6c8905
--- /dev/null
+++ b/content/cities/montchanin/agri-sud-est-montchanin.md
@@ -0,0 +1,5 @@
+---
+title: "Agri Sud-Est - Montchanin"
+url: /montchanin/agri-sud-est-montchanin/
+shop: commerce
+---
\ No newline at end of file
diff --git a/content/cities/montchanin/atol.md b/content/cities/montchanin/atol.md
new file mode 100644
index 00000000..e7c04e79
--- /dev/null
+++ b/content/cities/montchanin/atol.md
@@ -0,0 +1,5 @@
+---
+title: "Atol"
+url: /montchanin/atol/
+shop: opticien
+---
\ No newline at end of file
diff --git a/content/cities/montchanin/christian-boucaud.md b/content/cities/montchanin/christian-boucaud.md
new file mode 100644
index 00000000..dd503353
--- /dev/null
+++ b/content/cities/montchanin/christian-boucaud.md
@@ -0,0 +1,5 @@
+---
+title: "Christian Boucaud"
+url: /montchanin/christian-boucaud/
+shop: pâtisserie
+---
\ No newline at end of file
diff --git a/content/cities/montchanin/elegance-coiffure.md b/content/cities/montchanin/elegance-coiffure.md
new file mode 100644
index 00000000..67f81ae0
--- /dev/null
+++ b/content/cities/montchanin/elegance-coiffure.md
@@ -0,0 +1,5 @@
+---
+title: "Elegance Coiffure"
+url: /montchanin/elegance-coiffure/
+shop: coiffeur
+---
\ No newline at end of file
diff --git a/content/cities/montchanin/le-carre-das.md b/content/cities/montchanin/le-carre-das.md
new file mode 100644
index 00000000..cb7a49b8
--- /dev/null
+++ b/content/cities/montchanin/le-carre-das.md
@@ -0,0 +1,5 @@
+---
+title: "Le Carré d'As"
+url: /montchanin/le-carre-das/
+shop: marchand de journaux
+---
\ No newline at end of file
diff --git a/content/cities/montchanin/le-relais-de-montchanin.md b/content/cities/montchanin/le-relais-de-montchanin.md
new file mode 100644
index 00000000..845331dd
--- /dev/null
+++ b/content/cities/montchanin/le-relais-de-montchanin.md
@@ -0,0 +1,5 @@
+---
+title: "Le Relais de Montchanin"
+url: /montchanin/le-relais-de-montchanin/
+shop: commodité
+---
\ No newline at end of file
diff --git a/content/cities/montchanin/maison-de-la-presse.md b/content/cities/montchanin/maison-de-la-presse.md
new file mode 100644
index 00000000..6816a45f
--- /dev/null
+++ b/content/cities/montchanin/maison-de-la-presse.md
@@ -0,0 +1,5 @@
+---
+title: "Maison de la Presse"
+url: /montchanin/maison-de-la-presse/
+shop: marchand de journaux
+---
\ No newline at end of file
diff --git a/content/cities/paray-le-monial/millenium-multimedia.md b/content/cities/paray-le-monial/millenium-multimedia.md
deleted file mode 100644
index c0b8dee6..00000000
--- a/content/cities/paray-le-monial/millenium-multimedia.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Millenium Multimédia"
-url: /paray-le-monial/millenium-multimedia/
-shop: ordinateur
----
\ No newline at end of file
diff --git a/content/cities/vitry-en-charollais/aubert.md b/content/cities/vitry-en-charollais/aubert.md
deleted file mode 100644
index 1a96670f..00000000
--- a/content/cities/vitry-en-charollais/aubert.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Aubert"
-url: /vitry-en-charollais/aubert/
-shop: produits pour bébés
----
\ No newline at end of file
diff --git a/data/cities/beaune/action.yml b/data/cities/beaune/action.yml
index 2ce295bf..2e6128ec 100644
--- a/data/cities/beaune/action.yml
+++ b/data/cities/beaune/action.yml
@@ -1,7 +1,7 @@
 id: 11340948292
 type: node
-latitude: 47.04035
-longitude: 4.84192
+latitude: 47.04054
+longitude: 4.84248
 postcode: "21200"
 city: Beaune
 street: Chemin de la Maladière
diff --git a/data/cities/chenove/objectif-presse-c-cial-les-grands-crus.yml b/data/cities/chenove/objectif-presse-c-cial-les-grands-crus.yml
index 640fc457..9b6f9b81 100644
--- a/data/cities/chenove/objectif-presse-c-cial-les-grands-crus.yml
+++ b/data/cities/chenove/objectif-presse-c-cial-les-grands-crus.yml
@@ -7,5 +7,6 @@ city: Chenôve
 street: Avenue Roland Carraz
 housenumber: "120"
 phone: ""
-opening_hours: ""
+opening_hours: Mo-We,Fr 09:00-12:00,14:30-18:45; Th 09:00-12:00; Sa 09:00-12:00,14:00-17:45;
+    Su,PH off
 website: ""
diff --git a/data/cities/cluny/extra.yml b/data/cities/cluny/extra.yml
index 576bd32d..c6933239 100644
--- a/data/cities/cluny/extra.yml
+++ b/data/cities/cluny/extra.yml
@@ -8,4 +8,4 @@ street: ""
 housenumber: ""
 phone: ""
 opening_hours: Tu-Th 09:00-12:00; Fr 09:00-12:00, 14:00-19:00; Sa 09:00-12:00
-website: ""
+website: https://cluny.extra.fr/
diff --git a/data/cities/dijon/intermarche-super-boulevard-de-luniversite.yml b/data/cities/dijon/intermarche-super-boulevard-de-luniversite.yml
new file mode 100644
index 00000000..13faa234
--- /dev/null
+++ b/data/cities/dijon/intermarche-super-boulevard-de-luniversite.yml
@@ -0,0 +1,11 @@
+id: 257398271
+type: node
+latitude: 47.31364
+longitude: 5.0536
+postcode: "21000"
+city: Dijon
+street: Boulevard de l'Université
+housenumber: "11"
+phone: +33 3 80 63 19 40
+opening_hours: Mo-Sa 08:00-20:00; Su 09:00-12:30
+website: https://www.intermarche.com/magasins/07152/dijon-21000/infos-pratiques
diff --git a/data/cities/dijon/intermarche-super-boulevard-georges-clemenceau.yml b/data/cities/dijon/intermarche-super-boulevard-georges-clemenceau.yml
deleted file mode 100644
index 030df8de..00000000
--- a/data/cities/dijon/intermarche-super-boulevard-georges-clemenceau.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 262693472
-type: node
-latitude: 47.32719
-longitude: 5.0487
-postcode: "21000"
-city: Dijon
-street: Boulevard Georges Clemenceau
-housenumber: "12"
-phone: +33 3 80 78 96 00
-opening_hours: Mo-Sa 08:00-20:00; Su 09:00-12:30
-website: https://www.intermarche.com/magasins/10710/dijon-21000/infos-pratiques
diff --git a/data/cities/dijon/intermarche-super.yml b/data/cities/dijon/intermarche-super.yml
index 13faa234..030df8de 100644
--- a/data/cities/dijon/intermarche-super.yml
+++ b/data/cities/dijon/intermarche-super.yml
@@ -1,11 +1,11 @@
-id: 257398271
+id: 262693472
 type: node
-latitude: 47.31364
-longitude: 5.0536
+latitude: 47.32719
+longitude: 5.0487
 postcode: "21000"
 city: Dijon
-street: Boulevard de l'Université
-housenumber: "11"
-phone: +33 3 80 63 19 40
+street: Boulevard Georges Clemenceau
+housenumber: "12"
+phone: +33 3 80 78 96 00
 opening_hours: Mo-Sa 08:00-20:00; Su 09:00-12:30
-website: https://www.intermarche.com/magasins/07152/dijon-21000/infos-pratiques
+website: https://www.intermarche.com/magasins/10710/dijon-21000/infos-pratiques
diff --git a/data/cities/genelard/quincaillerie-laupin.yml b/data/cities/genelard/quincaillerie-laupin.yml
index dca2d1a6..9d289530 100644
--- a/data/cities/genelard/quincaillerie-laupin.yml
+++ b/data/cities/genelard/quincaillerie-laupin.yml
@@ -8,4 +8,4 @@ street: Rue du Crié
 housenumber: "2"
 phone: +33 3 85 79 21 90
 opening_hours: Tu-Fr 08:30-12:00, 14:00-18:30; Sa 09:00-12:00
-website: https://www.quincaillerie-laupin.com/
+website: http://www.quincaillerie-laupin.com/
diff --git a/data/cities/magny-cours/danielson-equipement.yml b/data/cities/magny-cours/danielson-equipement.yml
index 7f8e2987..728dbfa0 100644
--- a/data/cities/magny-cours/danielson-equipement.yml
+++ b/data/cities/magny-cours/danielson-equipement.yml
@@ -4,7 +4,7 @@ latitude: 46.88268
 longitude: 3.15513
 postcode: "58470"
 city: Magny-Cours
-street: Rue du Champ de Magny
+street: ""
 housenumber: "5"
 phone: +33 3 86 21 22 55
 opening_hours: ""
diff --git a/data/cities/magny-cours/mitjet-international.yml b/data/cities/magny-cours/mitjet-international.yml
deleted file mode 100644
index 64c4d894..00000000
--- a/data/cities/magny-cours/mitjet-international.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7275431880
-type: node
-latitude: 46.88254
-longitude: 3.15588
-postcode: "58470"
-city: Magny-Cours
-street: Rue du Champ de Magny
-housenumber: "8"
-phone: +33 3 39 57 05 70
-opening_hours: ""
-website: https://mitjet-international.com/
diff --git a/data/cities/montceau-les-mines/e-leclerc.yml b/data/cities/montceau-les-mines/e-leclerc.yml
index 94db2146..29f2059d 100644
--- a/data/cities/montceau-les-mines/e-leclerc.yml
+++ b/data/cities/montceau-les-mines/e-leclerc.yml
@@ -1,7 +1,7 @@
 id: 134438588
 type: node
-latitude: 46.68265
-longitude: 4.37437
+latitude: 46.68258
+longitude: 4.37424
 postcode: "71300"
 city: Montceau-les-Mines
 street: Avenue Maréchal Leclerc
diff --git a/data/cities/montceau-les-mines/geant-casino.yml b/data/cities/montceau-les-mines/geant-casino.yml
deleted file mode 100644
index 76d70b8d..00000000
--- a/data/cities/montceau-les-mines/geant-casino.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 134447127
-type: node
-latitude: 46.67761
-longitude: 4.37079
-postcode: "71300"
-city: Montceau-les-Mines
-street: Boulevard de Lattre de Tassigny
-housenumber: ""
-phone: +33 3 85 69 54 00
-opening_hours: Mo-Sa 08:00-20:30; Su 09:00-20:30
-website: https://magasins.geantcasino.fr/magasin/montceau-les-mines/CG831
diff --git a/data/cities/montchanin/agri-sud-est-montchanin.yml b/data/cities/montchanin/agri-sud-est-montchanin.yml
new file mode 100644
index 00000000..8a69f3ff
--- /dev/null
+++ b/data/cities/montchanin/agri-sud-est-montchanin.yml
@@ -0,0 +1,11 @@
+id: 230312206
+type: node
+latitude: 46.75141
+longitude: 4.47033
+postcode: "71210"
+city: Montchanin
+street: Rue du Creusot
+housenumber: 4 bis
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/montchanin/atol.yml b/data/cities/montchanin/atol.yml
new file mode 100644
index 00000000..1295a23b
--- /dev/null
+++ b/data/cities/montchanin/atol.yml
@@ -0,0 +1,11 @@
+id: 12207840991
+type: node
+latitude: 46.74868
+longitude: 4.46896
+postcode: "71210"
+city: Montchanin
+street: Avenue de la République
+housenumber: "72"
+phone: +33 3 85 78 16 86
+opening_hours: ""
+website: https://www.atol.fr/opticiens/france/saone-et-loire/opticien-montchanin/montchanin-72-avenue-de-la-republique
diff --git a/data/cities/montchanin/christian-boucaud.yml b/data/cities/montchanin/christian-boucaud.yml
new file mode 100644
index 00000000..1aed5d26
--- /dev/null
+++ b/data/cities/montchanin/christian-boucaud.yml
@@ -0,0 +1,11 @@
+id: 2509264156
+type: node
+latitude: 46.74942
+longitude: 4.46863
+postcode: "71210"
+city: Montchanin
+street: Avenue de la République
+housenumber: "60"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/montchanin/elegance-coiffure.yml b/data/cities/montchanin/elegance-coiffure.yml
new file mode 100644
index 00000000..0e8ad3aa
--- /dev/null
+++ b/data/cities/montchanin/elegance-coiffure.yml
@@ -0,0 +1,11 @@
+id: 12207840990
+type: node
+latitude: 46.74889
+longitude: 4.46888
+postcode: "71210"
+city: Montchanin
+street: Avenue de la République
+housenumber: 68 bis
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/montchanin/le-carre-das.yml b/data/cities/montchanin/le-carre-das.yml
new file mode 100644
index 00000000..f5c87474
--- /dev/null
+++ b/data/cities/montchanin/le-carre-das.yml
@@ -0,0 +1,11 @@
+id: 5044730225
+type: node
+latitude: 46.74995
+longitude: 4.469
+postcode: "71210"
+city: Montchanin
+street: Avenue de la République
+housenumber: "73"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/montchanin/le-relais-de-montchanin.yml b/data/cities/montchanin/le-relais-de-montchanin.yml
new file mode 100644
index 00000000..b5136645
--- /dev/null
+++ b/data/cities/montchanin/le-relais-de-montchanin.yml
@@ -0,0 +1,11 @@
+id: 125640451
+type: node
+latitude: 46.75289
+longitude: 4.4677
+postcode: "71210"
+city: Montchanin
+street: Avenue de la République
+housenumber: "45"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/montchanin/maison-de-la-presse.yml b/data/cities/montchanin/maison-de-la-presse.yml
new file mode 100644
index 00000000..6d744efc
--- /dev/null
+++ b/data/cities/montchanin/maison-de-la-presse.yml
@@ -0,0 +1,11 @@
+id: 3676616184
+type: node
+latitude: 46.74881
+longitude: 4.46891
+postcode: "71210"
+city: Montchanin
+street: Avenue de la République
+housenumber: "70"
+phone: +33 3 85 73 26 37
+opening_hours: ""
+website: https://www.maisondelapresse.com/magasin/MaisondelaPresse-71210-montchanin.html
diff --git a/data/cities/paray-le-monial/millenium-multimedia.yml b/data/cities/paray-le-monial/millenium-multimedia.yml
deleted file mode 100644
index 2e5904ea..00000000
--- a/data/cities/paray-le-monial/millenium-multimedia.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2890697604
-type: node
-latitude: 46.4489
-longitude: 4.11522
-postcode: "71600"
-city: Paray-le-Monial
-street: Avenue Charles de Gaulle
-housenumber: "75"
-phone: +33 3 85 81 95 52
-opening_hours: ""
-website: http://www.milleniummultimedia.fr/
diff --git a/data/cities/saint-christophe-en-brionnais/philibert-electricite.yml b/data/cities/saint-christophe-en-brionnais/philibert-electricite.yml
index 71f4b40f..b0ce4544 100644
--- a/data/cities/saint-christophe-en-brionnais/philibert-electricite.yml
+++ b/data/cities/saint-christophe-en-brionnais/philibert-electricite.yml
@@ -7,5 +7,5 @@ city: Saint-Christophe-en-Brionnais
 street: Grande Allée de Tenay
 housenumber: "73"
 phone: ""
-opening_hours: ""
-website: ""
+opening_hours: Tu-Fr 09:00-18:00; Sa 09:00-17:00
+website: https://st-christophe.extra.fr/
diff --git a/data/cities/vitry-en-charollais/aubert.yml b/data/cities/vitry-en-charollais/aubert.yml
deleted file mode 100644
index 11860a09..00000000
--- a/data/cities/vitry-en-charollais/aubert.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5699789041
-type: node
-latitude: 46.46165
-longitude: 4.08502
-postcode: "71600"
-city: Vitry-en-Charollais
-street: Zac le Mont
-housenumber: ""
-phone: +33 3 85 81 50 16
-opening_hours: Mo-Fr 09:30-12:00, 14:00-19:00; Sa 09:30-19:00; Su off
-website: https://www.aubert.com/magasin/MI5/aubert-paray-le-monial
diff --git a/data/cities/vitry-en-charollais/d-boss.yml b/data/cities/vitry-en-charollais/d-boss.yml
index c44441a8..bceb4f6b 100644
--- a/data/cities/vitry-en-charollais/d-boss.yml
+++ b/data/cities/vitry-en-charollais/d-boss.yml
@@ -1,7 +1,7 @@
 id: 11050504913
 type: node
-latitude: 46.46291
-longitude: 4.08471
+latitude: 46.46297
+longitude: 4.08469
 postcode: "71600"
 city: Vitry-en-Charollais
 street: Route de Digoin