diff --git a/content/cities/auerbach/wunderlichs-backstuben-goeltzschtalstrasse.md b/content/cities/auerbach/wunderlichs-backstuben-goeltzschtalstrasse.md
deleted file mode 100644
index 6b4b0b5ee6..0000000000
--- a/content/cities/auerbach/wunderlichs-backstuben-goeltzschtalstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Wunderlichs Backstuben"
-url: /auerbach/wunderlichs-backstuben-goeltzschtalstrasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/auerbach/wunderlichs-backstuben-klingenthaler-strasse.md b/content/cities/auerbach/wunderlichs-backstuben-klingenthaler-strasse.md
new file mode 100644
index 0000000000..cb06a0fe99
--- /dev/null
+++ b/content/cities/auerbach/wunderlichs-backstuben-klingenthaler-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Wunderlichs Backstuben"
+url: /auerbach/wunderlichs-backstuben-klingenthaler-strasse/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/bad-schandau/katrins-naturkostladen.md b/content/cities/bad-schandau/katrins-naturkostladen.md
deleted file mode 100644
index 6f9edfdde6..0000000000
--- a/content/cities/bad-schandau/katrins-naturkostladen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Katrins Naturkostladen"
-url: /bad-schandau/katrins-naturkostladen/
-shop: Lebensmittel
----
\ No newline at end of file
diff --git a/content/cities/bergen/_index.md b/content/cities/bergen/_index.md
index 50650dee47..a243116649 100644
--- a/content/cities/bergen/_index.md
+++ b/content/cities/bergen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bergen
 url: /bergen/
-latitude: 50.475
-longitude: 12.284
+latitude: 50.473
+longitude: 12.277
 ---
\ No newline at end of file
diff --git a/content/cities/bernstadt-auf-dem-eigen/_index.md b/content/cities/bernstadt-auf-dem-eigen/_index.md
index eb7ed4b888..f9dd78ceea 100644
--- a/content/cities/bernstadt-auf-dem-eigen/_index.md
+++ b/content/cities/bernstadt-auf-dem-eigen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bernstadt auf dem Eigen
 url: /bernstadt-auf-dem-eigen/
-latitude: 51.048
-longitude: 14.826
+latitude: 51.047
+longitude: 14.827
 ---
\ No newline at end of file
diff --git a/content/cities/bischofswerda/_index.md b/content/cities/bischofswerda/_index.md
index a19afedb5a..7843c987bb 100644
--- a/content/cities/bischofswerda/_index.md
+++ b/content/cities/bischofswerda/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bischofswerda
 url: /bischofswerda/
-latitude: 51.128
-longitude: 14.179
+latitude: 51.121
+longitude: 14.193
 ---
\ No newline at end of file
diff --git a/content/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.md b/content/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.md
new file mode 100644
index 0000000000..09ff742efc
--- /dev/null
+++ b/content/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /bischofswerda/netto-marken-discount-belmsdorfer-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/bischofswerda/netto-marken-discount-dresdener-strasse.md b/content/cities/bischofswerda/netto-marken-discount-dresdener-strasse.md
deleted file mode 100644
index eedaef0250..0000000000
--- a/content/cities/bischofswerda/netto-marken-discount-dresdener-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /bischofswerda/netto-marken-discount-dresdener-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/borsdorf/aldi-nord.md b/content/cities/borsdorf/aldi-nord.md
new file mode 100644
index 0000000000..66773f2f7f
--- /dev/null
+++ b/content/cities/borsdorf/aldi-nord.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI Nord"
+url: /borsdorf/aldi-nord/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/brandis/fleischer-hoehl.md b/content/cities/brandis/fleischer-hoehl.md
deleted file mode 100644
index 60e830183c..0000000000
--- a/content/cities/brandis/fleischer-hoehl.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Fleischer Höhl"
-url: /brandis/fleischer-hoehl/
-shop: Metzgerei
----
\ No newline at end of file
diff --git a/content/cities/breitenbrunn-erzgeb/_index.md b/content/cities/breitenbrunn-erzgeb/_index.md
index 6dc59e5472..a3f527d693 100644
--- a/content/cities/breitenbrunn-erzgeb/_index.md
+++ b/content/cities/breitenbrunn-erzgeb/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Breitenbrunn/Erzgeb.
 url: /breitenbrunn-erzgeb/
-latitude: 50.478
-longitude: 12.744
+latitude: 50.503
+longitude: 12.757
 ---
\ No newline at end of file
diff --git a/content/cities/chemnitz/baeckerei-meyer-kreherstrasse.md b/content/cities/chemnitz/baeckerei-meyer-kreherstrasse.md
deleted file mode 100644
index e13e2a6f69..0000000000
--- a/content/cities/chemnitz/baeckerei-meyer-kreherstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bäckerei Meyer"
-url: /chemnitz/baeckerei-meyer-kreherstrasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/chemnitz/dehner-im-neefepark.md b/content/cities/chemnitz/dehner-nordstrasse.md
similarity index 54%
rename from content/cities/chemnitz/dehner-im-neefepark.md
rename to content/cities/chemnitz/dehner-nordstrasse.md
index c6f998a681..e4b0f02f3c 100644
--- a/content/cities/chemnitz/dehner-im-neefepark.md
+++ b/content/cities/chemnitz/dehner-nordstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Dehner"
-url: /chemnitz/dehner-im-neefepark/
+url: /chemnitz/dehner-nordstrasse/
 shop: Garten-Center
 ---
\ No newline at end of file
diff --git a/content/cities/chemnitz/fristo-hermann-poege-strasse.md b/content/cities/chemnitz/fristo-hermann-poege-strasse.md
deleted file mode 100644
index 76c07a9c46..0000000000
--- a/content/cities/chemnitz/fristo-hermann-poege-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Fristo"
-url: /chemnitz/fristo-hermann-poege-strasse/
-shop: Getränke
----
\ No newline at end of file
diff --git a/content/cities/chemnitz/fristo-stollberger-strasse.md b/content/cities/chemnitz/fristo-stollberger-strasse.md
new file mode 100644
index 0000000000..0f04ab872d
--- /dev/null
+++ b/content/cities/chemnitz/fristo-stollberger-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Fristo"
+url: /chemnitz/fristo-stollberger-strasse/
+shop: Getränke
+---
\ No newline at end of file
diff --git a/content/cities/dresden/_index.md b/content/cities/dresden/_index.md
index 258dcf171e..c00d6e518c 100644
--- a/content/cities/dresden/_index.md
+++ b/content/cities/dresden/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Dresden
 url: /dresden/
-latitude: 51.143
-longitude: 13.799
+latitude: 51.02
+longitude: 13.722
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/a-t-u-michaelisstrasse.md b/content/cities/dresden/a-t-u-washingtonstrasse.md
similarity index 51%
rename from content/cities/dresden/a-t-u-michaelisstrasse.md
rename to content/cities/dresden/a-t-u-washingtonstrasse.md
index ee00c97c8e..81c7e04111 100644
--- a/content/cities/dresden/a-t-u-michaelisstrasse.md
+++ b/content/cities/dresden/a-t-u-washingtonstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "A.T.U"
-url: /dresden/a-t-u-michaelisstrasse/
+url: /dresden/a-t-u-washingtonstrasse/
 shop: Autowerkstatt
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.md b/content/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.md
index 1882c79668..3d284ccd1d 100644
--- a/content/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.md
+++ b/content/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.md
@@ -1,5 +1,5 @@
 ---
-title: "Bäckerei & Cafe Eckert"
+title: "Bäckerei & Café Eckert"
 url: /dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse/
 shop: Bäckerei
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/baeckerei-und-cafe-eckert.md b/content/cities/dresden/baeckerei-und-cafe-eckert.md
index e494a4a229..cef143f4fc 100644
--- a/content/cities/dresden/baeckerei-und-cafe-eckert.md
+++ b/content/cities/dresden/baeckerei-und-cafe-eckert.md
@@ -1,5 +1,5 @@
 ---
-title: "Bäckerei & Café Eckert"
+title: "Bäckerei & Cafe Eckert"
 url: /dresden/baeckerei-und-cafe-eckert/
 shop: Bäckerei
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/delhi-store.md b/content/cities/dresden/delhi-store.md
new file mode 100644
index 0000000000..feb67352fc
--- /dev/null
+++ b/content/cities/dresden/delhi-store.md
@@ -0,0 +1,5 @@
+---
+title: "DELHI Store"
+url: /dresden/delhi-store/
+shop: Lebensmittel
+---
\ No newline at end of file
diff --git a/content/cities/dresden/feinbaeckerei-mueller.md b/content/cities/dresden/feinbaeckerei-mueller.md
deleted file mode 100644
index bc1dac2ff3..0000000000
--- a/content/cities/dresden/feinbaeckerei-mueller.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Feinbäckerei Müller"
-url: /dresden/feinbaeckerei-mueller/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/dresden/landbaeckerei-schmidt-duererstrasse.md b/content/cities/dresden/landbaeckerei-schmidt-wiener-strasse.md
similarity index 50%
rename from content/cities/dresden/landbaeckerei-schmidt-duererstrasse.md
rename to content/cities/dresden/landbaeckerei-schmidt-wiener-strasse.md
index a70dc7e13f..84cc97f5d4 100644
--- a/content/cities/dresden/landbaeckerei-schmidt-duererstrasse.md
+++ b/content/cities/dresden/landbaeckerei-schmidt-wiener-strasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Landbäckerei Schmidt"
-url: /dresden/landbaeckerei-schmidt-duererstrasse/
+url: /dresden/landbaeckerei-schmidt-wiener-strasse/
 shop: Bäckerei
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/unser-baecker-leubener-strasse.md b/content/cities/dresden/unser-baecker-borsbergstrasse.md
similarity index 50%
rename from content/cities/dresden/unser-baecker-leubener-strasse.md
rename to content/cities/dresden/unser-baecker-borsbergstrasse.md
index 71e0e2cd31..7635638e2b 100644
--- a/content/cities/dresden/unser-baecker-leubener-strasse.md
+++ b/content/cities/dresden/unser-baecker-borsbergstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Unser Bäcker"
-url: /dresden/unser-baecker-leubener-strasse/
+url: /dresden/unser-baecker-borsbergstrasse/
 shop: Bäckerei
 ---
\ No newline at end of file
diff --git a/content/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.md b/content/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.md
new file mode 100644
index 0000000000..1165a9c1cb
--- /dev/null
+++ b/content/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.md
@@ -0,0 +1,5 @@
+---
+title: "Fördertechnik Bernd Ficker"
+url: /falkenstein-vogtl/foerdertechnik-bernd-ficker/
+shop: Maschinen
+---
\ No newline at end of file
diff --git a/content/cities/floeha/_index.md b/content/cities/floeha/_index.md
index 5762fb7c8d..c94af4086b 100644
--- a/content/cities/floeha/_index.md
+++ b/content/cities/floeha/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Flöha
 url: /floeha/
-latitude: 50.856
-longitude: 13.073
+latitude: 50.863
+longitude: 13.067
 ---
\ No newline at end of file
diff --git a/content/cities/frankenberg-sachsen/_index.md b/content/cities/frankenberg-sachsen/_index.md
index 7ad9cdc59b..7e012f5134 100644
--- a/content/cities/frankenberg-sachsen/_index.md
+++ b/content/cities/frankenberg-sachsen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Frankenberg/Sachsen
 url: /frankenberg-sachsen/
-latitude: 50.913
-longitude: 13.033
+latitude: 50.91
+longitude: 13.031
 ---
\ No newline at end of file
diff --git a/content/cities/frohburg/_index.md b/content/cities/frohburg/_index.md
index 2ce3837785..e5244aac24 100644
--- a/content/cities/frohburg/_index.md
+++ b/content/cities/frohburg/_index.md
@@ -2,5 +2,5 @@
 title: Frohburg
 url: /frohburg/
 latitude: 51.057
-longitude: 12.56
+longitude: 12.561
 ---
\ No newline at end of file
diff --git a/content/cities/geyer/_index.md b/content/cities/geyer/_index.md
index ae4d0eb4e1..f0db66895b 100644
--- a/content/cities/geyer/_index.md
+++ b/content/cities/geyer/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Geyer
 url: /geyer/
-latitude: 50.627
-longitude: 12.929
+latitude: 50.625
+longitude: 12.92
 ---
\ No newline at end of file
diff --git a/content/cities/goerlitz/haarschneider-2.md b/content/cities/goerlitz/haarschneider-2.md
new file mode 100644
index 0000000000..1137b55045
--- /dev/null
+++ b/content/cities/goerlitz/haarschneider-2.md
@@ -0,0 +1,5 @@
+---
+title: "HAARSCHNEIDER 2"
+url: /goerlitz/haarschneider-2/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/goerlitz/haarschneider.md b/content/cities/goerlitz/haarschneider.md
deleted file mode 100644
index f9efd9840a..0000000000
--- a/content/cities/goerlitz/haarschneider.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "HAARSCHNEIDER"
-url: /goerlitz/haarschneider/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/goerlitz/kaufland-scultetusstrasse.md b/content/cities/goerlitz/kaufland-zittauer-strasse.md
similarity index 50%
rename from content/cities/goerlitz/kaufland-scultetusstrasse.md
rename to content/cities/goerlitz/kaufland-zittauer-strasse.md
index ee6e67844e..1f0ed3d4cd 100644
--- a/content/cities/goerlitz/kaufland-scultetusstrasse.md
+++ b/content/cities/goerlitz/kaufland-zittauer-strasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Kaufland"
-url: /goerlitz/kaufland-scultetusstrasse/
+url: /goerlitz/kaufland-zittauer-strasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/grimma/schreibwaren-meutzner.md b/content/cities/grimma/schreibwaren-meutzner.md
deleted file mode 100644
index 8b3b781c3d..0000000000
--- a/content/cities/grimma/schreibwaren-meutzner.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Schreibwaren Meutzner"
-url: /grimma/schreibwaren-meutzner/
-shop: Schreibwaren
----
\ No newline at end of file
diff --git a/content/cities/klingenberg/_index.md b/content/cities/klingenberg/_index.md
index d261d2d75e..b050c4d4e0 100644
--- a/content/cities/klingenberg/_index.md
+++ b/content/cities/klingenberg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Klingenberg
 url: /klingenberg/
-latitude: 50.925
-longitude: 13.589
+latitude: 50.886
+longitude: 13.586
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/_index.md b/content/cities/leipzig/_index.md
index a61333c7ef..b22f4c9623 100644
--- a/content/cities/leipzig/_index.md
+++ b/content/cities/leipzig/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Leipzig
 url: /leipzig/
-latitude: 51.319
-longitude: 12.4
+latitude: 51.379
+longitude: 12.407
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/adidas.md b/content/cities/leipzig/adidas.md
new file mode 100644
index 0000000000..bb8808b45b
--- /dev/null
+++ b/content/cities/leipzig/adidas.md
@@ -0,0 +1,5 @@
+---
+title: "Adidas"
+url: /leipzig/adidas/
+shop: Sport
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/aesthetica-loft.md b/content/cities/leipzig/aesthetica-loft.md
new file mode 100644
index 0000000000..e8f843a24a
--- /dev/null
+++ b/content/cities/leipzig/aesthetica-loft.md
@@ -0,0 +1,5 @@
+---
+title: "Aesthetica Loft"
+url: /leipzig/aesthetica-loft/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/aldi-nord-eilenburger-strasse.md b/content/cities/leipzig/aldi-nord-eilenburger-strasse.md
deleted file mode 100644
index 0be1a507f1..0000000000
--- a/content/cities/leipzig/aldi-nord-eilenburger-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "ALDI Nord"
-url: /leipzig/aldi-nord-eilenburger-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/leipzig/aldi-nord-nonnenstrasse.md b/content/cities/leipzig/aldi-nord-nonnenstrasse.md
new file mode 100644
index 0000000000..88c7e02079
--- /dev/null
+++ b/content/cities/leipzig/aldi-nord-nonnenstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI Nord"
+url: /leipzig/aldi-nord-nonnenstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/amida.md b/content/cities/leipzig/amida.md
new file mode 100644
index 0000000000..d8d6e71a8e
--- /dev/null
+++ b/content/cities/leipzig/amida.md
@@ -0,0 +1,5 @@
+---
+title: "AMIDA"
+url: /leipzig/amida/
+shop: Andenken
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/apollo-optik-bruehl.md b/content/cities/leipzig/apollo-optik-bruehl.md
new file mode 100644
index 0000000000..472c3bed2b
--- /dev/null
+++ b/content/cities/leipzig/apollo-optik-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Apollo-Optik"
+url: /leipzig/apollo-optik-bruehl/
+shop: Optiker
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/baeckerei-moebius-bruehl.md b/content/cities/leipzig/baeckerei-moebius-bruehl.md
new file mode 100644
index 0000000000..d5abc60410
--- /dev/null
+++ b/content/cities/leipzig/baeckerei-moebius-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Bäckerei Möbius"
+url: /leipzig/baeckerei-moebius-bruehl/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/bijou-brigitte-bruehl.md b/content/cities/leipzig/bijou-brigitte-bruehl.md
new file mode 100644
index 0000000000..0397186710
--- /dev/null
+++ b/content/cities/leipzig/bijou-brigitte-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Bijou Brigitte"
+url: /leipzig/bijou-brigitte-bruehl/
+shop: Schmuck
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/body-attack.md b/content/cities/leipzig/body-attack.md
new file mode 100644
index 0000000000..1082c9c123
--- /dev/null
+++ b/content/cities/leipzig/body-attack.md
@@ -0,0 +1,5 @@
+---
+title: "Body Attack"
+url: /leipzig/body-attack/
+shop: Nahrungsergänzung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/camp-david-soccx.md b/content/cities/leipzig/camp-david-soccx.md
new file mode 100644
index 0000000000..3de2e46a9c
--- /dev/null
+++ b/content/cities/leipzig/camp-david-soccx.md
@@ -0,0 +1,5 @@
+---
+title: "CAMP DAVID | SOCCX"
+url: /leipzig/camp-david-soccx/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/cecil-street-one.md b/content/cities/leipzig/cecil-street-one.md
deleted file mode 100644
index ebe6f3cd56..0000000000
--- a/content/cities/leipzig/cecil-street-one.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "CECIL - STREET ONE"
-url: /leipzig/cecil-street-one/
-shop: Kleidung
----
\ No newline at end of file
diff --git a/content/cities/leipzig/change-lingerie.md b/content/cities/leipzig/change-lingerie.md
new file mode 100644
index 0000000000..e2639733c9
--- /dev/null
+++ b/content/cities/leipzig/change-lingerie.md
@@ -0,0 +1,5 @@
+---
+title: "CHANGE Lingerie"
+url: /leipzig/change-lingerie/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/close-up.md b/content/cities/leipzig/close-up.md
new file mode 100644
index 0000000000..0f8c11a32f
--- /dev/null
+++ b/content/cities/leipzig/close-up.md
@@ -0,0 +1,5 @@
+---
+title: "Close Up"
+url: /leipzig/close-up/
+shop: Allgemein
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/cosmo.md b/content/cities/leipzig/cosmo.md
new file mode 100644
index 0000000000..e7c8005bff
--- /dev/null
+++ b/content/cities/leipzig/cosmo.md
@@ -0,0 +1,5 @@
+---
+title: "Cosmo"
+url: /leipzig/cosmo/
+shop: Friseurbedarf
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/das-creative-hobby.md b/content/cities/leipzig/das-creative-hobby.md
new file mode 100644
index 0000000000..ba03d70a4f
--- /dev/null
+++ b/content/cities/leipzig/das-creative-hobby.md
@@ -0,0 +1,5 @@
+---
+title: "Das creative Hobby"
+url: /leipzig/das-creative-hobby/
+shop: Basteln
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/denns-biomarkt.md b/content/cities/leipzig/denns-biomarkt.md
index 78db6ee3bd..1234944db6 100644
--- a/content/cities/leipzig/denns-biomarkt.md
+++ b/content/cities/leipzig/denns-biomarkt.md
@@ -1,5 +1,5 @@
 ---
-title: "denn's Biomarkt"
+title: "Denns BioMarkt"
 url: /leipzig/denns-biomarkt/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/depot-bruehl.md b/content/cities/leipzig/depot-bruehl.md
new file mode 100644
index 0000000000..178bb5261b
--- /dev/null
+++ b/content/cities/leipzig/depot-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Depot"
+url: /leipzig/depot-bruehl/
+shop: Raumausstattung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/easy2vape.md b/content/cities/leipzig/easy2vape.md
new file mode 100644
index 0000000000..01f398bbe6
--- /dev/null
+++ b/content/cities/leipzig/easy2vape.md
@@ -0,0 +1,5 @@
+---
+title: "Easy2Vape"
+url: /leipzig/easy2vape/
+shop: E-Zigaretten
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/edelweiss.md b/content/cities/leipzig/edelweiss.md
new file mode 100644
index 0000000000..99be0bccfd
--- /dev/null
+++ b/content/cities/leipzig/edelweiss.md
@@ -0,0 +1,5 @@
+---
+title: "Edelweiß"
+url: /leipzig/edelweiss/
+shop: Blumen
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/engbers-bruehl.md b/content/cities/leipzig/engbers-bruehl.md
new file mode 100644
index 0000000000..372ed5b831
--- /dev/null
+++ b/content/cities/leipzig/engbers-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "engbers"
+url: /leipzig/engbers-bruehl/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/fast-forward.md b/content/cities/leipzig/fast-forward.md
new file mode 100644
index 0000000000..05cd017b5a
--- /dev/null
+++ b/content/cities/leipzig/fast-forward.md
@@ -0,0 +1,5 @@
+---
+title: "Fast Forward"
+url: /leipzig/fast-forward/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/foot-locker.md b/content/cities/leipzig/foot-locker.md
new file mode 100644
index 0000000000..ff1170e5b7
--- /dev/null
+++ b/content/cities/leipzig/foot-locker.md
@@ -0,0 +1,5 @@
+---
+title: "Foot Locker"
+url: /leipzig/foot-locker/
+shop: Schuhe
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/g-star-raw.md b/content/cities/leipzig/g-star-raw.md
new file mode 100644
index 0000000000..386f2f31e6
--- /dev/null
+++ b/content/cities/leipzig/g-star-raw.md
@@ -0,0 +1,5 @@
+---
+title: "G-Star Raw"
+url: /leipzig/g-star-raw/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/ganos.md b/content/cities/leipzig/ganos.md
new file mode 100644
index 0000000000..a7fafa0b5d
--- /dev/null
+++ b/content/cities/leipzig/ganos.md
@@ -0,0 +1,5 @@
+---
+title: "Ganos"
+url: /leipzig/ganos/
+shop: Kaffee
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/glorious-art.md b/content/cities/leipzig/glorious-art.md
new file mode 100644
index 0000000000..166b93cc8c
--- /dev/null
+++ b/content/cities/leipzig/glorious-art.md
@@ -0,0 +1,5 @@
+---
+title: "Glorious Art"
+url: /leipzig/glorious-art/
+shop: Tattoo
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/h-nails.md b/content/cities/leipzig/h-nails.md
new file mode 100644
index 0000000000..b895e24cf7
--- /dev/null
+++ b/content/cities/leipzig/h-nails.md
@@ -0,0 +1,5 @@
+---
+title: "H-Nails"
+url: /leipzig/h-nails/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/hugendubel-bruehl.md b/content/cities/leipzig/hugendubel-bruehl.md
new file mode 100644
index 0000000000..509a8cd3cc
--- /dev/null
+++ b/content/cities/leipzig/hugendubel-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Hugendubel"
+url: /leipzig/hugendubel-bruehl/
+shop: Bücher
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/hugo-boss.md b/content/cities/leipzig/hugo-boss.md
new file mode 100644
index 0000000000..1a26c22036
--- /dev/null
+++ b/content/cities/leipzig/hugo-boss.md
@@ -0,0 +1,5 @@
+---
+title: "Hugo Boss"
+url: /leipzig/hugo-boss/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/im-einklang-zentrum-fuer-lebensbalance.md b/content/cities/leipzig/im-einklang-zentrum-fuer-lebensbalance.md
deleted file mode 100644
index 60650ea20d..0000000000
--- a/content/cities/leipzig/im-einklang-zentrum-fuer-lebensbalance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Im Einklang − Zentrum für Lebensbalance"
-url: /leipzig/im-einklang-zentrum-fuer-lebensbalance/
-shop: Allgemein
----
\ No newline at end of file
diff --git a/content/cities/leipzig/intersport.md b/content/cities/leipzig/intersport.md
new file mode 100644
index 0000000000..89b8ebe737
--- /dev/null
+++ b/content/cities/leipzig/intersport.md
@@ -0,0 +1,5 @@
+---
+title: "Intersport"
+url: /leipzig/intersport/
+shop: Sport
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/jack-und-jones-bruehl.md b/content/cities/leipzig/jack-und-jones-bruehl.md
new file mode 100644
index 0000000000..cb19b76c87
--- /dev/null
+++ b/content/cities/leipzig/jack-und-jones-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Jack & Jones"
+url: /leipzig/jack-und-jones-bruehl/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/juwelier-kraemer.md b/content/cities/leipzig/juwelier-kraemer.md
new file mode 100644
index 0000000000..165e906911
--- /dev/null
+++ b/content/cities/leipzig/juwelier-kraemer.md
@@ -0,0 +1,5 @@
+---
+title: "Juwelier Kraemer"
+url: /leipzig/juwelier-kraemer/
+shop: Schmuck
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/klauser.md b/content/cities/leipzig/klauser.md
deleted file mode 100644
index 2c14ebc89d..0000000000
--- a/content/cities/leipzig/klauser.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Klauser"
-url: /leipzig/klauser/
-shop: Schuhe
----
\ No newline at end of file
diff --git a/content/cities/leipzig/klier.md b/content/cities/leipzig/klier.md
new file mode 100644
index 0000000000..ac32ee456d
--- /dev/null
+++ b/content/cities/leipzig/klier.md
@@ -0,0 +1,5 @@
+---
+title: "Klier"
+url: /leipzig/klier/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/kosmetik-und-med-fusspflege.md b/content/cities/leipzig/kosmetik-und-med-fusspflege.md
new file mode 100644
index 0000000000..4935496062
--- /dev/null
+++ b/content/cities/leipzig/kosmetik-und-med-fusspflege.md
@@ -0,0 +1,5 @@
+---
+title: "Kosmetik & med. Fußpflege"
+url: /leipzig/kosmetik-und-med-fusspflege/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/krass-optik.md b/content/cities/leipzig/krass-optik.md
new file mode 100644
index 0000000000..c0853193f5
--- /dev/null
+++ b/content/cities/leipzig/krass-optik.md
@@ -0,0 +1,5 @@
+---
+title: "KRASS Optik"
+url: /leipzig/krass-optik/
+shop: Optiker
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/l-a-nails-bruehl.md b/content/cities/leipzig/l-a-nails-bruehl.md
new file mode 100644
index 0000000000..21d853a37d
--- /dev/null
+++ b/content/cities/leipzig/l-a-nails-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "L.A. Nails"
+url: /leipzig/l-a-nails-bruehl/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/lidl-bruehl.md b/content/cities/leipzig/lidl-bruehl.md
new file mode 100644
index 0000000000..2131f5fbb0
--- /dev/null
+++ b/content/cities/leipzig/lidl-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Lidl"
+url: /leipzig/lidl-bruehl/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/lovisa.md b/content/cities/leipzig/lovisa.md
new file mode 100644
index 0000000000..2eef68ca29
--- /dev/null
+++ b/content/cities/leipzig/lovisa.md
@@ -0,0 +1,5 @@
+---
+title: "Lovisa"
+url: /leipzig/lovisa/
+shop: Schmuck
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/marc-opolo.md b/content/cities/leipzig/marc-opolo.md
new file mode 100644
index 0000000000..7446bd6804
--- /dev/null
+++ b/content/cities/leipzig/marc-opolo.md
@@ -0,0 +1,5 @@
+---
+title: "Marc O'Polo"
+url: /leipzig/marc-opolo/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/mein-fischer-paunsdorfer-allee.md b/content/cities/leipzig/mein-fischer-paunsdorfer-allee.md
deleted file mode 100644
index 2858171dbf..0000000000
--- a/content/cities/leipzig/mein-fischer-paunsdorfer-allee.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Mein Fischer"
-url: /leipzig/mein-fischer-paunsdorfer-allee/
-shop: Kleidung
----
\ No newline at end of file
diff --git a/content/cities/leipzig/mein-fischer-seit-1832.md b/content/cities/leipzig/mein-fischer-seit-1832.md
new file mode 100644
index 0000000000..a821bff7b7
--- /dev/null
+++ b/content/cities/leipzig/mein-fischer-seit-1832.md
@@ -0,0 +1,5 @@
+---
+title: "Mein Fischer seit 1832"
+url: /leipzig/mein-fischer-seit-1832/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/mila-nails-salon.md b/content/cities/leipzig/mila-nails-salon.md
new file mode 100644
index 0000000000..c2f9d58c47
--- /dev/null
+++ b/content/cities/leipzig/mila-nails-salon.md
@@ -0,0 +1,5 @@
+---
+title: "Mila Nails Salon"
+url: /leipzig/mila-nails-salon/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/mueller-bruehl.md b/content/cities/leipzig/mueller-bruehl.md
new file mode 100644
index 0000000000..08ed0956af
--- /dev/null
+++ b/content/cities/leipzig/mueller-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Müller"
+url: /leipzig/mueller-bruehl/
+shop: Drogerie
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/mueller-paunsdorfer-allee.md b/content/cities/leipzig/mueller-paunsdorfer-allee.md
deleted file mode 100644
index b037906224..0000000000
--- a/content/cities/leipzig/mueller-paunsdorfer-allee.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Müller"
-url: /leipzig/mueller-paunsdorfer-allee/
-shop: Drogerie
----
\ No newline at end of file
diff --git a/content/cities/leipzig/nanu-nana-bruehl.md b/content/cities/leipzig/nanu-nana-bruehl.md
new file mode 100644
index 0000000000..6baa698e07
--- /dev/null
+++ b/content/cities/leipzig/nanu-nana-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Nanu-Nana"
+url: /leipzig/nanu-nana-bruehl/
+shop: Andenken
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/oil-und-vinegar.md b/content/cities/leipzig/oil-und-vinegar.md
new file mode 100644
index 0000000000..cf94ffc876
--- /dev/null
+++ b/content/cities/leipzig/oil-und-vinegar.md
@@ -0,0 +1,5 @@
+---
+title: "Oil & Vinegar"
+url: /leipzig/oil-und-vinegar/
+shop: Feinkost
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/olymp-und-hades-bruehl.md b/content/cities/leipzig/olymp-und-hades-bruehl.md
new file mode 100644
index 0000000000..de0ec4a3ca
--- /dev/null
+++ b/content/cities/leipzig/olymp-und-hades-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Olymp & Hades"
+url: /leipzig/olymp-und-hades-bruehl/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/olymp.md b/content/cities/leipzig/olymp.md
new file mode 100644
index 0000000000..16e664a5a3
--- /dev/null
+++ b/content/cities/leipzig/olymp.md
@@ -0,0 +1,5 @@
+---
+title: "OLYMP"
+url: /leipzig/olymp/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/only-bruehl.md b/content/cities/leipzig/only-bruehl.md
new file mode 100644
index 0000000000..c279649324
--- /dev/null
+++ b/content/cities/leipzig/only-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "ONLY"
+url: /leipzig/only-bruehl/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/pandora.md b/content/cities/leipzig/pandora.md
index 3d4ebae42f..f927f27783 100644
--- a/content/cities/leipzig/pandora.md
+++ b/content/cities/leipzig/pandora.md
@@ -1,5 +1,5 @@
 ---
 title: "Pandora"
 url: /leipzig/pandora/
-shop: Kleidung
+shop: Schmuck
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/phone-praxis.md b/content/cities/leipzig/phone-praxis.md
new file mode 100644
index 0000000000..ce90ef6912
--- /dev/null
+++ b/content/cities/leipzig/phone-praxis.md
@@ -0,0 +1,5 @@
+---
+title: "Phone Praxis"
+url: /leipzig/phone-praxis/
+shop: Handy
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/playmobil-funstore.md b/content/cities/leipzig/playmobil-funstore.md
new file mode 100644
index 0000000000..b5994a6bbe
--- /dev/null
+++ b/content/cities/leipzig/playmobil-funstore.md
@@ -0,0 +1,5 @@
+---
+title: "Playmobil FunStore"
+url: /leipzig/playmobil-funstore/
+shop: Spielzeug
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/ragazzi.md b/content/cities/leipzig/ragazzi.md
new file mode 100644
index 0000000000..82e426fad4
--- /dev/null
+++ b/content/cities/leipzig/ragazzi.md
@@ -0,0 +1,5 @@
+---
+title: "Ragazzi"
+url: /leipzig/ragazzi/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/salon-monteil-paris.md b/content/cities/leipzig/salon-monteil-paris.md
new file mode 100644
index 0000000000..7015942c7f
--- /dev/null
+++ b/content/cities/leipzig/salon-monteil-paris.md
@@ -0,0 +1,5 @@
+---
+title: "Salon Monteil Paris"
+url: /leipzig/salon-monteil-paris/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/schiesser.md b/content/cities/leipzig/schiesser.md
new file mode 100644
index 0000000000..cf94325a9d
--- /dev/null
+++ b/content/cities/leipzig/schiesser.md
@@ -0,0 +1,5 @@
+---
+title: "Schiesser"
+url: /leipzig/schiesser/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/side-cut-barber.md b/content/cities/leipzig/side-cut-barber.md
new file mode 100644
index 0000000000..6fc37e0bd1
--- /dev/null
+++ b/content/cities/leipzig/side-cut-barber.md
@@ -0,0 +1,5 @@
+---
+title: "Side Cut Barber"
+url: /leipzig/side-cut-barber/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/softeis-in-boehlitz.md b/content/cities/leipzig/softeis-in-boehlitz.md
new file mode 100644
index 0000000000..e40ef736fb
--- /dev/null
+++ b/content/cities/leipzig/softeis-in-boehlitz.md
@@ -0,0 +1,5 @@
+---
+title: "Softeis in Böhlitz"
+url: /leipzig/softeis-in-boehlitz/
+shop: Lebensmittel
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/spiele-max.md b/content/cities/leipzig/spiele-max.md
deleted file mode 100644
index 72d67181e0..0000000000
--- a/content/cities/leipzig/spiele-max.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Spiele Max"
-url: /leipzig/spiele-max/
-shop: Spielzeug
----
\ No newline at end of file
diff --git a/content/cities/leipzig/stadtstromer.md b/content/cities/leipzig/stadtstromer.md
new file mode 100644
index 0000000000..b2233cfea3
--- /dev/null
+++ b/content/cities/leipzig/stadtstromer.md
@@ -0,0 +1,5 @@
+---
+title: "Stadtstromer"
+url: /leipzig/stadtstromer/
+shop: Reisebüro
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/street-one-und-cecil.md b/content/cities/leipzig/street-one-und-cecil.md
new file mode 100644
index 0000000000..d618ebc445
--- /dev/null
+++ b/content/cities/leipzig/street-one-und-cecil.md
@@ -0,0 +1,5 @@
+---
+title: "Street One & Cecil"
+url: /leipzig/street-one-und-cecil/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/tabak-presse-lotto.md b/content/cities/leipzig/tabak-presse-lotto.md
new file mode 100644
index 0000000000..a91beb9788
--- /dev/null
+++ b/content/cities/leipzig/tabak-presse-lotto.md
@@ -0,0 +1,5 @@
+---
+title: "Tabak Presse Lotto"
+url: /leipzig/tabak-presse-lotto/
+shop: Lotterie
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/tally-weijl-bruehl.md b/content/cities/leipzig/tally-weijl-bruehl.md
new file mode 100644
index 0000000000..1c3fc4803b
--- /dev/null
+++ b/content/cities/leipzig/tally-weijl-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Tally Weijl"
+url: /leipzig/tally-weijl-bruehl/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/thomas-sabo-bruehl.md b/content/cities/leipzig/thomas-sabo-bruehl.md
new file mode 100644
index 0000000000..7ef89de3bd
--- /dev/null
+++ b/content/cities/leipzig/thomas-sabo-bruehl.md
@@ -0,0 +1,5 @@
+---
+title: "Thomas Sabo"
+url: /leipzig/thomas-sabo-bruehl/
+shop: Schmuck
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/tommy-hilfiger.md b/content/cities/leipzig/tommy-hilfiger.md
new file mode 100644
index 0000000000..f63fbdb4ad
--- /dev/null
+++ b/content/cities/leipzig/tommy-hilfiger.md
@@ -0,0 +1,5 @@
+---
+title: "Tommy Hilfiger"
+url: /leipzig/tommy-hilfiger/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/tui-travelstar.md b/content/cities/leipzig/tui-travelstar.md
new file mode 100644
index 0000000000..a06883c7a9
--- /dev/null
+++ b/content/cities/leipzig/tui-travelstar.md
@@ -0,0 +1,5 @@
+---
+title: "TUI Travelstar"
+url: /leipzig/tui-travelstar/
+shop: Reisebüro
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/vans.md b/content/cities/leipzig/vans.md
new file mode 100644
index 0000000000..b032062252
--- /dev/null
+++ b/content/cities/leipzig/vans.md
@@ -0,0 +1,5 @@
+---
+title: "Vans"
+url: /leipzig/vans/
+shop: Schuhe
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/vodafone.md b/content/cities/leipzig/vodafone.md
new file mode 100644
index 0000000000..a9c508e8c2
--- /dev/null
+++ b/content/cities/leipzig/vodafone.md
@@ -0,0 +1,5 @@
+---
+title: "Vodafone"
+url: /leipzig/vodafone/
+shop: Handy
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/vorwerk.md b/content/cities/leipzig/vorwerk.md
new file mode 100644
index 0000000000..1d85e95cb0
--- /dev/null
+++ b/content/cities/leipzig/vorwerk.md
@@ -0,0 +1,5 @@
+---
+title: "Vorwerk"
+url: /leipzig/vorwerk/
+shop: Staubsauger
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/zumnorde.md b/content/cities/leipzig/zumnorde.md
new file mode 100644
index 0000000000..0f9c4e0800
--- /dev/null
+++ b/content/cities/leipzig/zumnorde.md
@@ -0,0 +1,5 @@
+---
+title: "Zumnorde"
+url: /leipzig/zumnorde/
+shop: Schuhe
+---
\ No newline at end of file
diff --git a/content/cities/lichtentanne/norma.md b/content/cities/lichtentanne/norma.md
new file mode 100644
index 0000000000..18487cb95c
--- /dev/null
+++ b/content/cities/lichtentanne/norma.md
@@ -0,0 +1,5 @@
+---
+title: "NORMA"
+url: /lichtentanne/norma/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/lugau/_index.md b/content/cities/lugau/_index.md
index 95307b96eb..844bef53c4 100644
--- a/content/cities/lugau/_index.md
+++ b/content/cities/lugau/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lugau
 url: /lugau/
-latitude: 50.744
-longitude: 12.749
+latitude: 50.739
+longitude: 12.746
 ---
\ No newline at end of file
diff --git a/content/cities/markranstaedt/aldi-nord.md b/content/cities/markranstaedt/aldi-nord.md
new file mode 100644
index 0000000000..a0b2f40765
--- /dev/null
+++ b/content/cities/markranstaedt/aldi-nord.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI Nord"
+url: /markranstaedt/aldi-nord/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/markranstaedt/aldi.md b/content/cities/markranstaedt/aldi.md
deleted file mode 100644
index 8e2f98acca..0000000000
--- a/content/cities/markranstaedt/aldi.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Aldi"
-url: /markranstaedt/aldi/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/meerane/netto-marken-discount-glauchauer-strasse.md b/content/cities/meerane/netto-marken-discount-glauchauer-strasse.md
deleted file mode 100644
index 9e79e0ea0d..0000000000
--- a/content/cities/meerane/netto-marken-discount-glauchauer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /meerane/netto-marken-discount-glauchauer-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.md b/content/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.md
new file mode 100644
index 0000000000..0bd1caeb0d
--- /dev/null
+++ b/content/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /meerane/netto-marken-discount-rosa-luxemburg-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/muegeln/_index.md b/content/cities/muegeln/_index.md
index 55ada8d528..01fd65ee95 100644
--- a/content/cities/muegeln/_index.md
+++ b/content/cities/muegeln/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Mügeln
 url: /muegeln/
-latitude: 51.235
-longitude: 13.048
+latitude: 51.215
+longitude: 13.016
 ---
\ No newline at end of file
diff --git a/content/cities/neuhausen-erzgeb/_index.md b/content/cities/neuhausen-erzgeb/_index.md
index 5a47ea05c0..dde3c6482b 100644
--- a/content/cities/neuhausen-erzgeb/_index.md
+++ b/content/cities/neuhausen-erzgeb/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Neuhausen/Erzgeb.
 url: /neuhausen-erzgeb/
-latitude: 50.676
-longitude: 13.462
+latitude: 50.674
+longitude: 13.465
 ---
\ No newline at end of file
diff --git a/content/cities/nossen/_index.md b/content/cities/nossen/_index.md
index 7abfee6883..636c0bb875 100644
--- a/content/cities/nossen/_index.md
+++ b/content/cities/nossen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Nossen
 url: /nossen/
-latitude: 51.057
-longitude: 13.299
+latitude: 51.063
+longitude: 13.294
 ---
\ No newline at end of file
diff --git a/content/cities/oelsnitz-erzgeb/konditorei-bauerfeind.md b/content/cities/oelsnitz-erzgeb/konditorei-bauerfeind.md
new file mode 100644
index 0000000000..5d702a0351
--- /dev/null
+++ b/content/cities/oelsnitz-erzgeb/konditorei-bauerfeind.md
@@ -0,0 +1,5 @@
+---
+title: "Konditorei Bauerfeind"
+url: /oelsnitz-erzgeb/konditorei-bauerfeind/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/ossling/_index.md b/content/cities/ossling/_index.md
index cd2f98d615..2ba04dc97f 100644
--- a/content/cities/ossling/_index.md
+++ b/content/cities/ossling/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Oßling
 url: /ossling/
-latitude: 51.359
-longitude: 14.167
+latitude: 51.36
+longitude: 14.168
 ---
\ No newline at end of file
diff --git a/content/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.md b/content/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.md
new file mode 100644
index 0000000000..31c5adc335
--- /dev/null
+++ b/content/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /ottendorf-okrilla/netto-marken-discount-gaswerkstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.md b/content/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.md
deleted file mode 100644
index 12d4080a1e..0000000000
--- a/content/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /ottendorf-okrilla/netto-marken-discount-poststrasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/penig/rhg-baustoffe-penig.md b/content/cities/penig/rhg-baustoffe-penig.md
deleted file mode 100644
index fa64f70625..0000000000
--- a/content/cities/penig/rhg-baustoffe-penig.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "RHG Baustoffe Penig"
-url: /penig/rhg-baustoffe-penig/
-shop: Baustoffe
----
\ No newline at end of file
diff --git a/content/cities/penig/rhg-baustoffe.md b/content/cities/penig/rhg-baustoffe.md
new file mode 100644
index 0000000000..c87fa9c188
--- /dev/null
+++ b/content/cities/penig/rhg-baustoffe.md
@@ -0,0 +1,5 @@
+---
+title: "RHG Baustoffe"
+url: /penig/rhg-baustoffe/
+shop: Baustoffe
+---
\ No newline at end of file
diff --git a/content/cities/pirna/_index.md b/content/cities/pirna/_index.md
index 8ebb6e2bbc..d543fb0988 100644
--- a/content/cities/pirna/_index.md
+++ b/content/cities/pirna/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Pirna
 url: /pirna/
-latitude: 51
-longitude: 13.921
+latitude: 50.958
+longitude: 13.925
 ---
\ No newline at end of file
diff --git a/content/cities/plauen/netto-marken-discount-pausaer-strasse.md b/content/cities/plauen/netto-marken-discount-luetzowstrasse.md
similarity index 51%
rename from content/cities/plauen/netto-marken-discount-pausaer-strasse.md
rename to content/cities/plauen/netto-marken-discount-luetzowstrasse.md
index 339e5ba7b2..9c4ade7655 100644
--- a/content/cities/plauen/netto-marken-discount-pausaer-strasse.md
+++ b/content/cities/plauen/netto-marken-discount-luetzowstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Netto Marken-Discount"
-url: /plauen/netto-marken-discount-pausaer-strasse/
+url: /plauen/netto-marken-discount-luetzowstrasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/radebeul/baeckerei-sachse-meissner-strasse.md b/content/cities/radebeul/baeckerei-sachse-meissner-strasse.md
deleted file mode 100644
index 5f5121cfc7..0000000000
--- a/content/cities/radebeul/baeckerei-sachse-meissner-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bäckerei Sachse"
-url: /radebeul/baeckerei-sachse-meissner-strasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/radebeul/baeckerei-sachse-weinboehlaer-strasse.md b/content/cities/radebeul/baeckerei-sachse-weinboehlaer-strasse.md
new file mode 100644
index 0000000000..b3766a1f6a
--- /dev/null
+++ b/content/cities/radebeul/baeckerei-sachse-weinboehlaer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Bäckerei Sachse"
+url: /radebeul/baeckerei-sachse-weinboehlaer-strasse/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/rosenbach-vogtl/_index.md b/content/cities/rosenbach-vogtl/_index.md
index c581eb0fe0..fbff114de8 100644
--- a/content/cities/rosenbach-vogtl/_index.md
+++ b/content/cities/rosenbach-vogtl/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Rosenbach/Vogtl.
 url: /rosenbach-vogtl/
-latitude: 50.508
-longitude: 11.998
+latitude: 50.53
+longitude: 11.962
 ---
\ No newline at end of file
diff --git a/content/cities/schoenheide/_index.md b/content/cities/schoenheide/_index.md
index 48d370746c..e181551a21 100644
--- a/content/cities/schoenheide/_index.md
+++ b/content/cities/schoenheide/_index.md
@@ -2,5 +2,5 @@
 title: Schönheide
 url: /schoenheide/
 latitude: 50.503
-longitude: 12.504
+longitude: 12.533
 ---
\ No newline at end of file
diff --git a/content/cities/schwarzenberg-erzgebirge/_index.md b/content/cities/schwarzenberg-erzgebirge/_index.md
index c68ef15b8a..0f353e3fbe 100644
--- a/content/cities/schwarzenberg-erzgebirge/_index.md
+++ b/content/cities/schwarzenberg-erzgebirge/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Schwarzenberg/Erzgebirge
 url: /schwarzenberg-erzgebirge/
-latitude: 50.534
-longitude: 12.769
+latitude: 50.539
+longitude: 12.785
 ---
\ No newline at end of file
diff --git a/content/cities/torgau/_index.md b/content/cities/torgau/_index.md
index b21dcec63c..abc0b3fe31 100644
--- a/content/cities/torgau/_index.md
+++ b/content/cities/torgau/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Torgau
 url: /torgau/
-latitude: 51.566
-longitude: 12.972
+latitude: 51.561
+longitude: 12.991
 ---
\ No newline at end of file
diff --git a/content/cities/vierkirchen/dussa-gmbh.md b/content/cities/vierkirchen/dussa-gmbh.md
deleted file mode 100644
index 80a5d27244..0000000000
--- a/content/cities/vierkirchen/dussa-gmbh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Dussa GmbH"
-url: /vierkirchen/dussa-gmbh/
-shop: Autoservice
----
\ No newline at end of file
diff --git a/content/cities/wachau/schramm-gruenanlagen-und-baumschule.md b/content/cities/wachau/schramm-gruenanlagen-und-baumschule.md
deleted file mode 100644
index 68967a0ed7..0000000000
--- a/content/cities/wachau/schramm-gruenanlagen-und-baumschule.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Schramm Grünanlagen und Baumschule"
-url: /wachau/schramm-gruenanlagen-und-baumschule/
-shop: Garten-Center
----
\ No newline at end of file
diff --git a/content/cities/zittau/friseur-figaro-frauenstrasse-2.md b/content/cities/zittau/friseur-figaro-frauenstrasse-2.md
deleted file mode 100644
index d46edab57c..0000000000
--- a/content/cities/zittau/friseur-figaro-frauenstrasse-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Friseur Figaro"
-url: /zittau/friseur-figaro-frauenstrasse-2/
-shop: Kosmetik
----
\ No newline at end of file
diff --git a/content/cities/zittau/friseur-figaro-frauenstrasse.md b/content/cities/zittau/friseur-figaro-frauenstrasse.md
index bd7384361a..7142c0ae46 100644
--- a/content/cities/zittau/friseur-figaro-frauenstrasse.md
+++ b/content/cities/zittau/friseur-figaro-frauenstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Friseur Figaro"
 url: /zittau/friseur-figaro-frauenstrasse/
-shop: Friseur
+shop: Kosmetik
 ---
\ No newline at end of file
diff --git a/content/cities/zittau/friseur-figaro-markt.md b/content/cities/zittau/friseur-figaro-markt.md
new file mode 100644
index 0000000000..d62c51598d
--- /dev/null
+++ b/content/cities/zittau/friseur-figaro-markt.md
@@ -0,0 +1,5 @@
+---
+title: "Friseur Figaro"
+url: /zittau/friseur-figaro-markt/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/shops/maschinen/_index.md b/content/shops/maschinen/_index.md
new file mode 100644
index 0000000000..6e2e491105
--- /dev/null
+++ b/content/shops/maschinen/_index.md
@@ -0,0 +1,5 @@
+---
+title: Maschinen
+url: /maschinen/
+icon: other
+---
\ No newline at end of file
diff --git a/data/cities/aue-bad-schlema/thomas-philipps-sonderposten.yml b/data/cities/aue-bad-schlema/thomas-philipps-sonderposten.yml
index 1ae4b41e22..24ac5e7681 100644
--- a/data/cities/aue-bad-schlema/thomas-philipps-sonderposten.yml
+++ b/data/cities/aue-bad-schlema/thomas-philipps-sonderposten.yml
@@ -8,4 +8,4 @@ street: "Bockauer Talstraße"
 housenumber: 10
 phone: "+49 3771 565428"
 opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-16:00"
-website: "http://thomas-philipps.de"
\ No newline at end of file
+website: "https://www.thomas-philipps.de/"
\ No newline at end of file
diff --git a/data/cities/auerbach/wunderlichs-backstuben-goeltzschtalstrasse.yml b/data/cities/auerbach/wunderlichs-backstuben-goeltzschtalstrasse.yml
deleted file mode 100644
index e9d6f0958b..0000000000
--- a/data/cities/auerbach/wunderlichs-backstuben-goeltzschtalstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7412866521
-type: node
-latitude: 50.49221
-longitude: 12.39512
-postcode: "08209"
-city: Auerbach
-street: "Göltzschtalstraße"
-housenumber: 81
-phone: ""
-opening_hours: "Mo-Sa 07:00-18:00; Su 07:00-10:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/auerbach/wunderlichs-backstuben-klingenthaler-strasse.yml b/data/cities/auerbach/wunderlichs-backstuben-klingenthaler-strasse.yml
new file mode 100644
index 0000000000..3c9d9eb569
--- /dev/null
+++ b/data/cities/auerbach/wunderlichs-backstuben-klingenthaler-strasse.yml
@@ -0,0 +1,11 @@
+id: 7418174743
+type: node
+latitude: 50.4968
+longitude: 12.42192
+postcode: "08209"
+city: Auerbach
+street: "Klingenthaler Straße"
+housenumber: 107
+phone: ""
+opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/auerbach/wunderlichs-backstuben.yml b/data/cities/auerbach/wunderlichs-backstuben.yml
index 3c9d9eb569..e9d6f0958b 100644
--- a/data/cities/auerbach/wunderlichs-backstuben.yml
+++ b/data/cities/auerbach/wunderlichs-backstuben.yml
@@ -1,11 +1,11 @@
-id: 7418174743
+id: 7412866521
 type: node
-latitude: 50.4968
-longitude: 12.42192
+latitude: 50.49221
+longitude: 12.39512
 postcode: "08209"
 city: Auerbach
-street: "Klingenthaler Straße"
-housenumber: 107
+street: "Göltzschtalstraße"
+housenumber: 81
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
+opening_hours: "Mo-Sa 07:00-18:00; Su 07:00-10:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/bad-schandau/katrins-naturkostladen.yml b/data/cities/bad-schandau/katrins-naturkostladen.yml
deleted file mode 100644
index 9e2253ba18..0000000000
--- a/data/cities/bad-schandau/katrins-naturkostladen.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1150062815
-type: node
-latitude: 50.91892
-longitude: 14.15268
-postcode: "01814"
-city: Bad Schandau
-street: "Zaukenstraße"
-housenumber: 4
-phone: "+4935022"
-opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-12:00"
-website: "https://adressen.naturkost.de/katrin-s-naturkostladen-01814-bad-schandau"
\ No newline at end of file
diff --git a/data/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.yml b/data/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.yml
new file mode 100644
index 0000000000..370efbe7ff
--- /dev/null
+++ b/data/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.yml
@@ -0,0 +1,11 @@
+id: 49712354
+type: way
+latitude: 51.12491
+longitude: 14.19182
+postcode: "01877"
+city: Bischofswerda
+street: "Belmsdorfer Straße"
+housenumber: 29
+phone: ""
+opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/bischofswerda/netto-marken-discount-dresdener-strasse.yml b/data/cities/bischofswerda/netto-marken-discount-dresdener-strasse.yml
deleted file mode 100644
index d83ac2636e..0000000000
--- a/data/cities/bischofswerda/netto-marken-discount-dresdener-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 46344338
-type: way
-latitude: 51.12443
-longitude: 14.17533
-postcode: "01877"
-city: Bischofswerda
-street: "Dresdener Straße"
-housenumber: 45
-phone: ""
-opening_hours: ""
-website: "https://www.netto-online.de"
\ No newline at end of file
diff --git a/data/cities/bischofswerda/netto-marken-discount.yml b/data/cities/bischofswerda/netto-marken-discount.yml
index 370efbe7ff..d83ac2636e 100644
--- a/data/cities/bischofswerda/netto-marken-discount.yml
+++ b/data/cities/bischofswerda/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 49712354
+id: 46344338
 type: way
-latitude: 51.12491
-longitude: 14.19182
+latitude: 51.12443
+longitude: 14.17533
 postcode: "01877"
 city: Bischofswerda
-street: "Belmsdorfer Straße"
-housenumber: 29
+street: "Dresdener Straße"
+housenumber: 45
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
-website: ""
\ No newline at end of file
+opening_hours: ""
+website: "https://www.netto-online.de"
\ No newline at end of file
diff --git a/data/cities/borsdorf/aldi-nord.yml b/data/cities/borsdorf/aldi-nord.yml
new file mode 100644
index 0000000000..06b80861af
--- /dev/null
+++ b/data/cities/borsdorf/aldi-nord.yml
@@ -0,0 +1,11 @@
+id: 1248301821
+type: way
+latitude: 51.35256
+longitude: 12.54305
+postcode: "04451"
+city: Borsdorf
+street: "Panitzscher Straße"
+housenumber: 27
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/brandis/fleischer-hoehl.yml b/data/cities/brandis/fleischer-hoehl.yml
deleted file mode 100644
index 6b5c62e34e..0000000000
--- a/data/cities/brandis/fleischer-hoehl.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5071878922
-type: node
-latitude: 51.33554
-longitude: 12.61003
-postcode: "04821"
-city: Brandis
-street: "Leipziger Straße"
-housenumber: 4
-phone: ""
-opening_hours: "Tu-Fr 08:00-18:00; Sa 07:00-14:00; Mo,Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/baeckerei-meyer-kreherstrasse.yml b/data/cities/chemnitz/baeckerei-meyer-kreherstrasse.yml
deleted file mode 100644
index f1b3f3cc5c..0000000000
--- a/data/cities/chemnitz/baeckerei-meyer-kreherstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1248974021
-type: node
-latitude: 50.83028
-longitude: 12.95085
-postcode: "09126"
-city: Chemnitz
-street: "Kreherstraße"
-housenumber: 17
-phone: ""
-opening_hours: "Mo-Fr 06:00-17:30; Sa 06:30-11:00; Su 07:00-11:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/dehner-im-neefepark.yml b/data/cities/chemnitz/dehner-im-neefepark.yml
deleted file mode 100644
index 81fd4face3..0000000000
--- a/data/cities/chemnitz/dehner-im-neefepark.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 94527331
-type: way
-latitude: 50.80767
-longitude: 12.86159
-postcode: "09116"
-city: Chemnitz
-street: "Im Neefepark"
-housenumber: 4
-phone: "+49 371 77516350"
-opening_hours: "Mo-Sa 09:00-20:00"
-website: "https://www.dehner.de/market"
\ No newline at end of file
diff --git a/data/cities/chemnitz/dehner-nordstrasse.yml b/data/cities/chemnitz/dehner-nordstrasse.yml
new file mode 100644
index 0000000000..22c97b7981
--- /dev/null
+++ b/data/cities/chemnitz/dehner-nordstrasse.yml
@@ -0,0 +1,11 @@
+id: 96693283
+type: way
+latitude: 50.86496
+longitude: 12.85391
+postcode: "09247"
+city: Chemnitz
+street: "Nordstraße"
+housenumber: 2
+phone: "+49 3722 779170"
+opening_hours: "Mo-Sa 09:00-20:00"
+website: "https://www.dehner.de/"
\ No newline at end of file
diff --git a/data/cities/chemnitz/dehner.yml b/data/cities/chemnitz/dehner.yml
index 22c97b7981..81fd4face3 100644
--- a/data/cities/chemnitz/dehner.yml
+++ b/data/cities/chemnitz/dehner.yml
@@ -1,11 +1,11 @@
-id: 96693283
+id: 94527331
 type: way
-latitude: 50.86496
-longitude: 12.85391
-postcode: "09247"
+latitude: 50.80767
+longitude: 12.86159
+postcode: "09116"
 city: Chemnitz
-street: "Nordstraße"
-housenumber: 2
-phone: "+49 3722 779170"
+street: "Im Neefepark"
+housenumber: 4
+phone: "+49 371 77516350"
 opening_hours: "Mo-Sa 09:00-20:00"
-website: "https://www.dehner.de/"
\ No newline at end of file
+website: "https://www.dehner.de/market"
\ No newline at end of file
diff --git a/data/cities/chemnitz/fristo-hermann-poege-strasse.yml b/data/cities/chemnitz/fristo-hermann-poege-strasse.yml
deleted file mode 100644
index 2a17c1176c..0000000000
--- a/data/cities/chemnitz/fristo-hermann-poege-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 94696621
-type: way
-latitude: 50.80472
-longitude: 12.92144
-postcode: "09120"
-city: Chemnitz
-street: "Hermann-Pöge-Straße"
-housenumber: 3
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/fristo-stollberger-strasse.yml b/data/cities/chemnitz/fristo-stollberger-strasse.yml
new file mode 100644
index 0000000000..f1ae8a07bf
--- /dev/null
+++ b/data/cities/chemnitz/fristo-stollberger-strasse.yml
@@ -0,0 +1,11 @@
+id: 92665694
+type: way
+latitude: 50.79738
+longitude: 12.88185
+postcode: "09122"
+city: Chemnitz
+street: "Stollberger Straße"
+housenumber: 174
+phone: ""
+opening_hours: "Mo-Sa 08:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/fristo.yml b/data/cities/chemnitz/fristo.yml
index f1ae8a07bf..2a17c1176c 100644
--- a/data/cities/chemnitz/fristo.yml
+++ b/data/cities/chemnitz/fristo.yml
@@ -1,11 +1,11 @@
-id: 92665694
+id: 94696621
 type: way
-latitude: 50.79738
-longitude: 12.88185
-postcode: "09122"
+latitude: 50.80472
+longitude: 12.92144
+postcode: "09120"
 city: Chemnitz
-street: "Stollberger Straße"
-housenumber: 174
+street: "Hermann-Pöge-Straße"
+housenumber: 3
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00"
+opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/doebeln/a-t-u.yml b/data/cities/doebeln/a-t-u.yml
index b8fd1e9455..3ad2cbb97b 100644
--- a/data/cities/doebeln/a-t-u.yml
+++ b/data/cities/doebeln/a-t-u.yml
@@ -1,7 +1,7 @@
 id: 159882292
 type: way
-latitude: 51.11857
-longitude: 13.15712
+latitude: 51.11858
+longitude: 13.15714
 postcode: "04720"
 city: Döbeln
 street: "Richard-Köberlin-Straße"
diff --git a/data/cities/doebeln/autohaus-krumbiegel-gmbh.yml b/data/cities/doebeln/autohaus-krumbiegel-gmbh.yml
index 0e6cb16087..e3e9e5c35a 100644
--- a/data/cities/doebeln/autohaus-krumbiegel-gmbh.yml
+++ b/data/cities/doebeln/autohaus-krumbiegel-gmbh.yml
@@ -1,7 +1,7 @@
 id: 107441905
 type: way
-latitude: 51.1203
-longitude: 13.1478
+latitude: 51.12028
+longitude: 13.14813
 postcode: "04720"
 city: Döbeln
 street: "Daniel-Wilhelm-Beck-Straße"
diff --git a/data/cities/doebeln/autohaus-michael-wilde.yml b/data/cities/doebeln/autohaus-michael-wilde.yml
index d58ce34bbb..465827c785 100644
--- a/data/cities/doebeln/autohaus-michael-wilde.yml
+++ b/data/cities/doebeln/autohaus-michael-wilde.yml
@@ -1,7 +1,7 @@
 id: 107465356
 type: way
-latitude: 51.12033
-longitude: 13.14868
+latitude: 51.12031
+longitude: 13.1487
 postcode: "04720"
 city: Döbeln
 street: "Daniel-Wilhelm-Beck-Straße"
diff --git a/data/cities/doebeln/handelshof-doebeln.yml b/data/cities/doebeln/handelshof-doebeln.yml
index 4203da08ec..a2adf8c2f3 100644
--- a/data/cities/doebeln/handelshof-doebeln.yml
+++ b/data/cities/doebeln/handelshof-doebeln.yml
@@ -1,7 +1,7 @@
-id: 4337549295
-type: node
-latitude: 51.1168
-longitude: 13.15481
+id: 107514578
+type: way
+latitude: 51.11647
+longitude: 13.1548
 postcode: "04720"
 city: Döbeln
 street: "Richard-Köberlin-Straße"
diff --git a/data/cities/dresden/a-t-u-michaelisstrasse.yml b/data/cities/dresden/a-t-u-michaelisstrasse.yml
deleted file mode 100644
index 921de7ee5d..0000000000
--- a/data/cities/dresden/a-t-u-michaelisstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 33807049
-type: way
-latitude: 50.99443
-longitude: 13.80265
-postcode: ""
-city: Dresden
-street: "Michaelisstraße"
-housenumber: 3
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/a-t-u-washingtonstrasse.yml b/data/cities/dresden/a-t-u-washingtonstrasse.yml
new file mode 100644
index 0000000000..4704e4e979
--- /dev/null
+++ b/data/cities/dresden/a-t-u-washingtonstrasse.yml
@@ -0,0 +1,11 @@
+id: 23168071
+type: way
+latitude: 51.07931
+longitude: 13.69026
+postcode: "01139"
+city: Dresden
+street: "Washingtonstraße"
+housenumber: 10
+phone: ""
+opening_hours: "Mo-Fr 07:30-20:00; Sa 08:00-16:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/a-t-u.yml b/data/cities/dresden/a-t-u.yml
index 4704e4e979..921de7ee5d 100644
--- a/data/cities/dresden/a-t-u.yml
+++ b/data/cities/dresden/a-t-u.yml
@@ -1,11 +1,11 @@
-id: 23168071
+id: 33807049
 type: way
-latitude: 51.07931
-longitude: 13.69026
-postcode: "01139"
+latitude: 50.99443
+longitude: 13.80265
+postcode: ""
 city: Dresden
-street: "Washingtonstraße"
-housenumber: 10
+street: "Michaelisstraße"
+housenumber: 3
 phone: ""
-opening_hours: "Mo-Fr 07:30-20:00; Sa 08:00-16:00"
+opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/baeckerei-krause-waldschloesschenstrasse.yml b/data/cities/dresden/baeckerei-krause-waldschloesschenstrasse.yml
index fd4addcec9..1f34d4cb5f 100644
--- a/data/cities/dresden/baeckerei-krause-waldschloesschenstrasse.yml
+++ b/data/cities/dresden/baeckerei-krause-waldschloesschenstrasse.yml
@@ -6,6 +6,6 @@ postcode: "01099"
 city: Dresden
 street: "Waldschlößchenstraße"
 housenumber: 22
-phone: "03512015627"
-opening_hours: "Mo-Fr 06:00-19:00; Sa 06:00-18:00; Su 07:30-19:00"
+phone: "+493518036119"
+opening_hours: "Mo-Sa 06:00-18:00; Su 07:30-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.yml b/data/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.yml
index 165a2ae7ce..1ff42ef6d0 100644
--- a/data/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.yml
+++ b/data/cities/dresden/baeckerei-und-cafe-eckert-grossenhainer-strasse.yml
@@ -1,11 +1,11 @@
-id: 598534428
+id: 612570555
 type: node
-latitude: 51.09325
-longitude: 13.72059
+latitude: 51.09567
+longitude: 13.71902
 postcode: "01129"
 city: Dresden
 street: "Großenhainer Straße"
-housenumber: 182
+housenumber: 221
 phone: ""
-opening_hours: "Mo-Fr 06:00-18:00; Sa 06:00-12:00; Su,PH off"
+opening_hours: "Mo-Sa 06:00-18:00; Su,PH 07:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/baeckerei-und-cafe-eckert.yml b/data/cities/dresden/baeckerei-und-cafe-eckert.yml
index 1ff42ef6d0..165a2ae7ce 100644
--- a/data/cities/dresden/baeckerei-und-cafe-eckert.yml
+++ b/data/cities/dresden/baeckerei-und-cafe-eckert.yml
@@ -1,11 +1,11 @@
-id: 612570555
+id: 598534428
 type: node
-latitude: 51.09567
-longitude: 13.71902
+latitude: 51.09325
+longitude: 13.72059
 postcode: "01129"
 city: Dresden
 street: "Großenhainer Straße"
-housenumber: 221
+housenumber: 182
 phone: ""
-opening_hours: "Mo-Sa 06:00-18:00; Su,PH 07:00-18:00"
+opening_hours: "Mo-Fr 06:00-18:00; Sa 06:00-12:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/blumen-trache.yml b/data/cities/dresden/blumen-trache.yml
index 91dfb7c89c..2b7d6ef590 100644
--- a/data/cities/dresden/blumen-trache.yml
+++ b/data/cities/dresden/blumen-trache.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Leipziger Straße"
 housenumber: 162
 phone: "+49 351 8489400"
-opening_hours: "Mo-Fr 08:00-18:30; Sa 08:00-15:00"
+opening_hours: "Mo-Fr 08:00-18:30; Sa 08:00-14:00"
 website: "https://www.blumen-trache.de"
\ No newline at end of file
diff --git a/data/cities/dresden/blumen-und-florales.yml b/data/cities/dresden/blumen-und-florales.yml
index eefc1702e1..f1b8cafeff 100644
--- a/data/cities/dresden/blumen-und-florales.yml
+++ b/data/cities/dresden/blumen-und-florales.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Freiberger Straße"
 housenumber: 33
 phone: "+49 351 4902627"
-opening_hours: "Mo-Fr 07:30-18:30; Sa 08:00-13:00"
+opening_hours: "Tu-Fr 07:30-18:30; Sa 08:00-13:00; Mo 07:00-18:30"
 website: "https://www.blumen-florales.de/"
\ No newline at end of file
diff --git a/data/cities/dresden/delhi-store.yml b/data/cities/dresden/delhi-store.yml
new file mode 100644
index 0000000000..6303b469a6
--- /dev/null
+++ b/data/cities/dresden/delhi-store.yml
@@ -0,0 +1,11 @@
+id: 3576424505
+type: node
+latitude: 51.04274
+longitude: 13.69057
+postcode: "01159"
+city: Dresden
+street: "Kesselsdorfer Straße"
+housenumber: 68
+phone: "+49 179 4703266"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/feinbaeckerei-mueller.yml b/data/cities/dresden/feinbaeckerei-mueller.yml
deleted file mode 100644
index aa7d63dfab..0000000000
--- a/data/cities/dresden/feinbaeckerei-mueller.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 420675557
-type: node
-latitude: 51.1279
-longitude: 13.84417
-postcode: "01465"
-city: Dresden
-street: "Hauptstraße"
-housenumber: 14
-phone: "+49 35201 70870"
-opening_hours: "Th-Fr 10:00-12:00"
-website: "https://www.dresdner-striezel.de/"
\ No newline at end of file
diff --git a/data/cities/dresden/landbaeckerei-schmidt-duererstrasse.yml b/data/cities/dresden/landbaeckerei-schmidt-duererstrasse.yml
deleted file mode 100644
index dcf0001292..0000000000
--- a/data/cities/dresden/landbaeckerei-schmidt-duererstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 540421342
-type: node
-latitude: 51.05235
-longitude: 13.76286
-postcode: "01307"
-city: Dresden
-street: "Dürerstraße"
-housenumber: 51
-phone: ""
-opening_hours: "Mo-Fr 07:00-19:00; Sa 07:00-18:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/landbaeckerei-schmidt-wiener-strasse.yml b/data/cities/dresden/landbaeckerei-schmidt-wiener-strasse.yml
new file mode 100644
index 0000000000..e761589a39
--- /dev/null
+++ b/data/cities/dresden/landbaeckerei-schmidt-wiener-strasse.yml
@@ -0,0 +1,11 @@
+id: 544466634
+type: node
+latitude: 51.03282
+longitude: 13.75723
+postcode: "01219"
+city: Dresden
+street: "Wiener Straße"
+housenumber: 78
+phone: ""
+opening_hours: "Mo-Sa 07:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/landbaeckerei-schmidt.yml b/data/cities/dresden/landbaeckerei-schmidt.yml
index e761589a39..dcf0001292 100644
--- a/data/cities/dresden/landbaeckerei-schmidt.yml
+++ b/data/cities/dresden/landbaeckerei-schmidt.yml
@@ -1,11 +1,11 @@
-id: 544466634
+id: 540421342
 type: node
-latitude: 51.03282
-longitude: 13.75723
-postcode: "01219"
+latitude: 51.05235
+longitude: 13.76286
+postcode: "01307"
 city: Dresden
-street: "Wiener Straße"
-housenumber: 78
+street: "Dürerstraße"
+housenumber: 51
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
+opening_hours: "Mo-Fr 07:00-19:00; Sa 07:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/textilien-und-geschenkideen.yml b/data/cities/dresden/textilien-und-geschenkideen.yml
index b2a179333c..a801639e74 100644
--- a/data/cities/dresden/textilien-und-geschenkideen.yml
+++ b/data/cities/dresden/textilien-und-geschenkideen.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Leipziger Straße"
 housenumber: 160
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Fr 10:00-17:00; Sa 10:00-14:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/unser-baecker-borsbergstrasse.yml b/data/cities/dresden/unser-baecker-borsbergstrasse.yml
new file mode 100644
index 0000000000..d2a021fe71
--- /dev/null
+++ b/data/cities/dresden/unser-baecker-borsbergstrasse.yml
@@ -0,0 +1,11 @@
+id: 559554851
+type: node
+latitude: 51.0443
+longitude: 13.78098
+postcode: "01309"
+city: Dresden
+street: "Borsbergstraße"
+housenumber: 35
+phone: ""
+opening_hours: "Mo-Sa 07:00-18:00"
+website: "https://www.unser-baecker.de/"
\ No newline at end of file
diff --git a/data/cities/dresden/unser-baecker-leubener-strasse.yml b/data/cities/dresden/unser-baecker-leubener-strasse.yml
deleted file mode 100644
index c0260f49d3..0000000000
--- a/data/cities/dresden/unser-baecker-leubener-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 519658188
-type: node
-latitude: 51.02185
-longitude: 13.83342
-postcode: "01279"
-city: Dresden
-street: "Leubener Straße"
-housenumber: 34
-phone: "+49 351 21760463"
-opening_hours: "Mo-Fr 06:30-18:00; Sa 06:30-11:30; Su 07:00-12:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/unser-baecker.yml b/data/cities/dresden/unser-baecker.yml
index d2a021fe71..c0260f49d3 100644
--- a/data/cities/dresden/unser-baecker.yml
+++ b/data/cities/dresden/unser-baecker.yml
@@ -1,11 +1,11 @@
-id: 559554851
+id: 519658188
 type: node
-latitude: 51.0443
-longitude: 13.78098
-postcode: "01309"
+latitude: 51.02185
+longitude: 13.83342
+postcode: "01279"
 city: Dresden
-street: "Borsbergstraße"
-housenumber: 35
-phone: ""
-opening_hours: "Mo-Sa 07:00-18:00"
-website: "https://www.unser-baecker.de/"
\ No newline at end of file
+street: "Leubener Straße"
+housenumber: 34
+phone: "+49 351 21760463"
+opening_hours: "Mo-Fr 06:30-18:00; Sa 06:30-11:30; Su 07:00-12:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/eilenburg/massagen-wellness-eilenburg-corina-wuttig.yml b/data/cities/eilenburg/massagen-wellness-eilenburg-corina-wuttig.yml
index 4862f4adf5..3f210760fc 100644
--- a/data/cities/eilenburg/massagen-wellness-eilenburg-corina-wuttig.yml
+++ b/data/cities/eilenburg/massagen-wellness-eilenburg-corina-wuttig.yml
@@ -8,4 +8,4 @@ street: "Bergstraße"
 housenumber: 37
 phone: ""
 opening_hours: "nach Vereinbarung"
-website: "www.massagenineilenburg.com"
\ No newline at end of file
+website: "https://www.massagenineilenburg.com/"
\ No newline at end of file
diff --git a/data/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.yml b/data/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.yml
new file mode 100644
index 0000000000..11aa5b2eed
--- /dev/null
+++ b/data/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.yml
@@ -0,0 +1,11 @@
+id: 463842854
+type: way
+latitude: 50.48369
+longitude: 12.36881
+postcode: "08223"
+city: Falkenstein/Vogtl.
+street: "Rathenaustraße"
+housenumber: 19a
+phone: "+49 3745 6018"
+opening_hours: ""
+website: "https://foerdertechnik-ficker.de/"
\ No newline at end of file
diff --git a/data/cities/goerlitz/das-gruene-gold.yml b/data/cities/goerlitz/das-gruene-gold.yml
index a2cac8020b..72220d5544 100644
--- a/data/cities/goerlitz/das-gruene-gold.yml
+++ b/data/cities/goerlitz/das-gruene-gold.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Demianiplatz"
 housenumber: 9
 phone: "+49 176 60802404"
-opening_hours: "Mo-Fr 10:00-17:00"
+opening_hours: "Mo-Fr 10:30-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/haarschneider.yml b/data/cities/goerlitz/haarschneider-2.yml
similarity index 100%
rename from data/cities/goerlitz/haarschneider.yml
rename to data/cities/goerlitz/haarschneider-2.yml
diff --git a/data/cities/goerlitz/kaufland-scultetusstrasse.yml b/data/cities/goerlitz/kaufland-scultetusstrasse.yml
deleted file mode 100644
index 2ff6acd847..0000000000
--- a/data/cities/goerlitz/kaufland-scultetusstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 45327052
-type: way
-latitude: 51.16405
-longitude: 14.97721
-postcode: "02828"
-city: Görlitz
-street: "Scultetusstraße"
-housenumber: 24
-phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/kaufland-zittauer-strasse.yml b/data/cities/goerlitz/kaufland-zittauer-strasse.yml
new file mode 100644
index 0000000000..e39a0a2590
--- /dev/null
+++ b/data/cities/goerlitz/kaufland-zittauer-strasse.yml
@@ -0,0 +1,11 @@
+id: 72029676
+type: way
+latitude: 51.12685
+longitude: 14.98232
+postcode: "02827"
+city: Görlitz
+street: "Zittauer Straße"
+housenumber: 120
+phone: ""
+opening_hours: "Mo-Sa 07:00-22:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/kaufland.yml b/data/cities/goerlitz/kaufland.yml
index e39a0a2590..2ff6acd847 100644
--- a/data/cities/goerlitz/kaufland.yml
+++ b/data/cities/goerlitz/kaufland.yml
@@ -1,11 +1,11 @@
-id: 72029676
+id: 45327052
 type: way
-latitude: 51.12685
-longitude: 14.98232
-postcode: "02827"
+latitude: 51.16405
+longitude: 14.97721
+postcode: "02828"
 city: Görlitz
-street: "Zittauer Straße"
-housenumber: 120
+street: "Scultetusstraße"
+housenumber: 24
 phone: ""
-opening_hours: "Mo-Sa 07:00-22:00; Su,PH off"
+opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/mode-express.yml b/data/cities/goerlitz/mode-express.yml
index 2e1693eea4..cf6aca3902 100644
--- a/data/cities/goerlitz/mode-express.yml
+++ b/data/cities/goerlitz/mode-express.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Jakobstraße"
 housenumber: 34
 phone: ""
-opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-16:00"
+opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-14:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/rituals.yml b/data/cities/goerlitz/rituals.yml
index 5e51410afc..d2d1d31e7e 100644
--- a/data/cities/goerlitz/rituals.yml
+++ b/data/cities/goerlitz/rituals.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Berliner Straße"
 housenumber: 57
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Fr 09:30-18:30; Sa 09:30-16:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/tom-tailor.yml b/data/cities/goerlitz/tom-tailor.yml
index a98c182fe8..c45a6e37b6 100644
--- a/data/cities/goerlitz/tom-tailor.yml
+++ b/data/cities/goerlitz/tom-tailor.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Berliner Straße"
 housenumber: 5
 phone: ""
-opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-16:00"
+opening_hours: "Mo-Fr 09:30-19:00; Sa 09:30-16:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/grimma/schreibwaren-meutzner.yml b/data/cities/grimma/schreibwaren-meutzner.yml
deleted file mode 100644
index 0788df3f48..0000000000
--- a/data/cities/grimma/schreibwaren-meutzner.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 98234401
-type: way
-latitude: 51.23728
-longitude: 12.72924
-postcode: "04668"
-city: Grimma
-street: "Hohnstädter Straße"
-housenumber: 1
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/7camicie.yml b/data/cities/leipzig/7camicie.yml
index b51a94d7c4..d924f6cce5 100644
--- a/data/cities/leipzig/7camicie.yml
+++ b/data/cities/leipzig/7camicie.yml
@@ -1,11 +1,11 @@
 id: 2459035506
 type: node
-latitude: 51.34332
-longitude: 12.37383
+latitude: 51.34354
+longitude: 12.37428
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+phone: "+4934199391114"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://7camicie.com/de"
\ No newline at end of file
diff --git a/data/cities/leipzig/adidas.yml b/data/cities/leipzig/adidas.yml
new file mode 100644
index 0000000000..de6c9f7487
--- /dev/null
+++ b/data/cities/leipzig/adidas.yml
@@ -0,0 +1,11 @@
+id: 2623235646
+type: node
+latitude: 51.34339
+longitude: 12.37518
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934123106562"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.adidas.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/aesthetica-loft.yml b/data/cities/leipzig/aesthetica-loft.yml
new file mode 100644
index 0000000000..776e113e82
--- /dev/null
+++ b/data/cities/leipzig/aesthetica-loft.yml
@@ -0,0 +1,11 @@
+id: 11645191027
+type: node
+latitude: 51.34385
+longitude: 12.37514
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934156633007"
+opening_hours: "Mo-Fr 10:00-18:00"
+website: "https://aesthetica-loft.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-nord-eilenburger-strasse.yml b/data/cities/leipzig/aldi-nord-eilenburger-strasse.yml
deleted file mode 100644
index 92491d3702..0000000000
--- a/data/cities/leipzig/aldi-nord-eilenburger-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 256721319
-type: node
-latitude: 51.33201
-longitude: 12.41168
-postcode: "04317"
-city: Leipzig
-street: "Eilenburger Straße"
-housenumber: 55
-phone: "+49 800 7234870"
-opening_hours: "Mo-Sa 07:00-21:00; Su off"
-website: "https://www.aldi-nord.de/filialen-und-oeffnungszeiten.html/l/leipzig/eilenburger-strasse-55/3182723"
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-nord-nonnenstrasse.yml b/data/cities/leipzig/aldi-nord-nonnenstrasse.yml
new file mode 100644
index 0000000000..134b7709eb
--- /dev/null
+++ b/data/cities/leipzig/aldi-nord-nonnenstrasse.yml
@@ -0,0 +1,11 @@
+id: 252441137
+type: node
+latitude: 51.32884
+longitude: 12.34399
+postcode: "04229"
+city: Leipzig
+street: "Nonnenstraße"
+housenumber: 15
+phone: ""
+opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-nord.yml b/data/cities/leipzig/aldi-nord.yml
index 134b7709eb..92491d3702 100644
--- a/data/cities/leipzig/aldi-nord.yml
+++ b/data/cities/leipzig/aldi-nord.yml
@@ -1,11 +1,11 @@
-id: 252441137
+id: 256721319
 type: node
-latitude: 51.32884
-longitude: 12.34399
-postcode: "04229"
+latitude: 51.33201
+longitude: 12.41168
+postcode: "04317"
 city: Leipzig
-street: "Nonnenstraße"
-housenumber: 15
-phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
-website: ""
\ No newline at end of file
+street: "Eilenburger Straße"
+housenumber: 55
+phone: "+49 800 7234870"
+opening_hours: "Mo-Sa 07:00-21:00; Su off"
+website: "https://www.aldi-nord.de/filialen-und-oeffnungszeiten.html/l/leipzig/eilenburger-strasse-55/3182723"
\ No newline at end of file
diff --git a/data/cities/leipzig/spiele-max.yml b/data/cities/leipzig/amida.yml
similarity index 52%
rename from data/cities/leipzig/spiele-max.yml
rename to data/cities/leipzig/amida.yml
index bf329f2235..ff5e6124bd 100644
--- a/data/cities/leipzig/spiele-max.yml
+++ b/data/cities/leipzig/amida.yml
@@ -1,11 +1,11 @@
-id: 2623235694
+id: 11644984183
 type: node
-latitude: 51.34369
-longitude: 12.37308
+latitude: 51.34347
+longitude: 12.37568
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934169700276"
 opening_hours: "Mo-Sa 10:00-20:00"
-website: "https://www.spielemax.de/"
\ No newline at end of file
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/apollo-optik-bruehl.yml b/data/cities/leipzig/apollo-optik-bruehl.yml
new file mode 100644
index 0000000000..1dfca931d1
--- /dev/null
+++ b/data/cities/leipzig/apollo-optik-bruehl.yml
@@ -0,0 +1,11 @@
+id: 10584731316
+type: node
+latitude: 51.34374
+longitude: 12.37443
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934122540143"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://filialen.apollo.de/sachsen/leipzig/bruehl-1.html"
\ No newline at end of file
diff --git a/data/cities/leipzig/baeckerei-moebius-bruehl.yml b/data/cities/leipzig/baeckerei-moebius-bruehl.yml
new file mode 100644
index 0000000000..0934a3b103
--- /dev/null
+++ b/data/cities/leipzig/baeckerei-moebius-bruehl.yml
@@ -0,0 +1,11 @@
+id: 11645089702
+type: node
+latitude: 51.34374
+longitude: 12.37284
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934149278667"
+opening_hours: "Mo-Sa 06:30-19:00"
+website: "https://www.moebius-baeckerei.de/stores/leipzig-bruehl-1"
\ No newline at end of file
diff --git a/data/cities/leipzig/bijou-brigitte-bruehl.yml b/data/cities/leipzig/bijou-brigitte-bruehl.yml
new file mode 100644
index 0000000000..804536750d
--- /dev/null
+++ b/data/cities/leipzig/bijou-brigitte-bruehl.yml
@@ -0,0 +1,11 @@
+id: 11644969578
+type: node
+latitude: 51.34374
+longitude: 12.37426
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934125693752"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.bijou-brigitte.com"
\ No newline at end of file
diff --git a/data/cities/leipzig/body-attack.yml b/data/cities/leipzig/body-attack.yml
new file mode 100644
index 0000000000..f716dad703
--- /dev/null
+++ b/data/cities/leipzig/body-attack.yml
@@ -0,0 +1,11 @@
+id: 11644899652
+type: node
+latitude: 51.34374
+longitude: 12.37323
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934196285437"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.body-attack.de/body-attack-premium-store-leipzig.html"
\ No newline at end of file
diff --git a/data/cities/leipzig/camp-david-soccx.yml b/data/cities/leipzig/camp-david-soccx.yml
new file mode 100644
index 0000000000..bda5b21876
--- /dev/null
+++ b/data/cities/leipzig/camp-david-soccx.yml
@@ -0,0 +1,11 @@
+id: 11645288340
+type: node
+latitude: 51.34354
+longitude: 12.37447
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934123106692"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.campdavid-soccx.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/change-lingerie.yml b/data/cities/leipzig/change-lingerie.yml
new file mode 100644
index 0000000000..189cfe27b4
--- /dev/null
+++ b/data/cities/leipzig/change-lingerie.yml
@@ -0,0 +1,11 @@
+id: 11645140790
+type: node
+latitude: 51.34339
+longitude: 12.37453
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934125352840"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.change.com/de"
\ No newline at end of file
diff --git a/data/cities/leipzig/close-up.yml b/data/cities/leipzig/close-up.yml
new file mode 100644
index 0000000000..2d7250c9d2
--- /dev/null
+++ b/data/cities/leipzig/close-up.yml
@@ -0,0 +1,11 @@
+id: 11644942756
+type: node
+latitude: 51.34373
+longitude: 12.37407
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934146259143"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.closeup.de/leipzig"
\ No newline at end of file
diff --git a/data/cities/leipzig/contigo.yml b/data/cities/leipzig/contigo.yml
index b9da34e956..e15e148992 100644
--- a/data/cities/leipzig/contigo.yml
+++ b/data/cities/leipzig/contigo.yml
@@ -1,7 +1,7 @@
 id: 1330196263
 type: node
-latitude: 51.34091
-longitude: 12.37825
+latitude: 51.34096
+longitude: 12.37822
 postcode: "04109"
 city: Leipzig
 street: "Strohsackpassage"
diff --git a/data/cities/leipzig/cosmo.yml b/data/cities/leipzig/cosmo.yml
new file mode 100644
index 0000000000..7abfd8d88b
--- /dev/null
+++ b/data/cities/leipzig/cosmo.yml
@@ -0,0 +1,11 @@
+id: 11644910998
+type: node
+latitude: 51.34347
+longitude: 12.37428
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934191367111"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.cosmo-hairshop.de/shops/details/leipzig/7338"
\ No newline at end of file
diff --git a/data/cities/leipzig/das-creative-hobby.yml b/data/cities/leipzig/das-creative-hobby.yml
new file mode 100644
index 0000000000..b64562da78
--- /dev/null
+++ b/data/cities/leipzig/das-creative-hobby.yml
@@ -0,0 +1,11 @@
+id: 11644926885
+type: node
+latitude: 51.34347
+longitude: 12.37447
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934158064955"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.dascreativehobby.de/sites/Team/team_leipzig.html"
\ No newline at end of file
diff --git a/data/cities/leipzig/denns-biomarkt.yml b/data/cities/leipzig/denns-biomarkt.yml
index 7f3e209f76..3e0890bb08 100644
--- a/data/cities/leipzig/denns-biomarkt.yml
+++ b/data/cities/leipzig/denns-biomarkt.yml
@@ -1,11 +1,11 @@
 id: 2128948550
 type: node
-latitude: 51.34338
-longitude: 12.37659
+latitude: 51.34367
+longitude: 12.37657
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: "+4934130863190"
-opening_hours: "Mo-Sa 08:00-21:00; PH off"
-website: ""
\ No newline at end of file
+phone: "+4934125249848"
+opening_hours: "Mo-Sa 08:00-21:00"
+website: "https://www.biomarkt.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/depot-bruehl.yml b/data/cities/leipzig/depot-bruehl.yml
new file mode 100644
index 0000000000..74518e1050
--- /dev/null
+++ b/data/cities/leipzig/depot-bruehl.yml
@@ -0,0 +1,11 @@
+id: 2128948902
+type: node
+latitude: 51.34374
+longitude: 12.37387
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934122540715"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.depot-online.de/de/filialfinder#!/l/leipzig/bruhl-1/3258599"
\ No newline at end of file
diff --git a/data/cities/leipzig/dm-bruehl.yml b/data/cities/leipzig/dm-bruehl.yml
index 700516a632..8910043f61 100644
--- a/data/cities/leipzig/dm-bruehl.yml
+++ b/data/cities/leipzig/dm-bruehl.yml
@@ -1,11 +1,11 @@
 id: 2128950526
 type: node
-latitude: 51.34347
-longitude: 12.37588
+latitude: 51.34367
+longitude: 12.37614
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
 phone: ""
-opening_hours: "Mo-Sa 09:30-20:30"
-website: ""
\ No newline at end of file
+opening_hours: "Mo-Sa 09:30-20:00"
+website: "https://www.dm.de/store/d39b/leipzig/bruehl-1"
\ No newline at end of file
diff --git a/data/cities/leipzig/klauser.yml b/data/cities/leipzig/easy2vape.yml
similarity index 70%
rename from data/cities/leipzig/klauser.yml
rename to data/cities/leipzig/easy2vape.yml
index a8c827b996..7e08fa8797 100644
--- a/data/cities/leipzig/klauser.yml
+++ b/data/cities/leipzig/easy2vape.yml
@@ -1,7 +1,7 @@
-id: 2623235680
+id: 11644953509
 type: node
-latitude: 51.34347
-longitude: 12.37437
+latitude: 51.34374
+longitude: 12.37462
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
diff --git a/data/cities/leipzig/edelweiss.yml b/data/cities/leipzig/edelweiss.yml
new file mode 100644
index 0000000000..ce45a76e3c
--- /dev/null
+++ b/data/cities/leipzig/edelweiss.yml
@@ -0,0 +1,11 @@
+id: 11645026813
+type: node
+latitude: 51.34374
+longitude: 12.37587
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934196273840"
+opening_hours: "Mo-Sa 10:00-19:00"
+website: "https://www.blumenversand-edelweiss.de/filialen/blumenladen-edelweiss-leipzig-hoefe-am-bruehl"
\ No newline at end of file
diff --git a/data/cities/leipzig/engbers-bruehl.yml b/data/cities/leipzig/engbers-bruehl.yml
new file mode 100644
index 0000000000..89a1fd6401
--- /dev/null
+++ b/data/cities/leipzig/engbers-bruehl.yml
@@ -0,0 +1,11 @@
+id: 10584731319
+type: node
+latitude: 51.34347
+longitude: 12.37529
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934122225578"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.engbers.com"
\ No newline at end of file
diff --git a/data/cities/leipzig/fast-forward.yml b/data/cities/leipzig/fast-forward.yml
new file mode 100644
index 0000000000..813cfedbbd
--- /dev/null
+++ b/data/cities/leipzig/fast-forward.yml
@@ -0,0 +1,11 @@
+id: 11645267615
+type: node
+latitude: 51.34367
+longitude: 12.37366
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+493412101989"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.fast-forward-fashion.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/foot-locker.yml b/data/cities/leipzig/foot-locker.yml
new file mode 100644
index 0000000000..530393c5c1
--- /dev/null
+++ b/data/cities/leipzig/foot-locker.yml
@@ -0,0 +1,11 @@
+id: 7611959960
+type: node
+latitude: 51.34354
+longitude: 12.37464
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934130865642"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.footlocker.de/de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/g-star-raw.yml b/data/cities/leipzig/g-star-raw.yml
new file mode 100644
index 0000000000..65d4784b62
--- /dev/null
+++ b/data/cities/leipzig/g-star-raw.yml
@@ -0,0 +1,11 @@
+id: 2128947524
+type: node
+latitude: 51.34367
+longitude: 12.37501
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934197690955"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.g-star.com/de_de"
\ No newline at end of file
diff --git a/data/cities/leipzig/ganos.yml b/data/cities/leipzig/ganos.yml
new file mode 100644
index 0000000000..9a0916f383
--- /dev/null
+++ b/data/cities/leipzig/ganos.yml
@@ -0,0 +1,11 @@
+id: 1488977475
+type: node
+latitude: 51.33855
+longitude: 12.37178
+postcode: "04109"
+city: Leipzig
+street: "Dittrichring"
+housenumber: 6
+phone: ""
+opening_hours: "Th, Fr 10:00-19:00; Sa 10:00-17:00; Tu, We 10:00-18:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/gentlemens-cut.yml b/data/cities/leipzig/gentlemens-cut.yml
index bc5aea5d3b..b00115d854 100644
--- a/data/cities/leipzig/gentlemens-cut.yml
+++ b/data/cities/leipzig/gentlemens-cut.yml
@@ -1,7 +1,7 @@
 id: 2203090060
 type: node
-latitude: 51.33844
-longitude: 12.37174
+latitude: 51.33835
+longitude: 12.37172
 postcode: "04109"
 city: Leipzig
 street: "Dittrichring"
diff --git a/data/cities/leipzig/glorious-art.yml b/data/cities/leipzig/glorious-art.yml
new file mode 100644
index 0000000000..19d508fd78
--- /dev/null
+++ b/data/cities/leipzig/glorious-art.yml
@@ -0,0 +1,11 @@
+id: 11645303105
+type: node
+latitude: 51.34367
+longitude: 12.37346
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934135129305"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://glorious-art.de/leipzig-hoefe-am-bruehl"
\ No newline at end of file
diff --git a/data/cities/leipzig/h-nails.yml b/data/cities/leipzig/h-nails.yml
new file mode 100644
index 0000000000..21027805bf
--- /dev/null
+++ b/data/cities/leipzig/h-nails.yml
@@ -0,0 +1,11 @@
+id: 11644891000
+type: node
+latitude: 51.34355
+longitude: 12.37349
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934158155015"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/hugendubel-bruehl.yml b/data/cities/leipzig/hugendubel-bruehl.yml
new file mode 100644
index 0000000000..c0db7b3c7c
--- /dev/null
+++ b/data/cities/leipzig/hugendubel-bruehl.yml
@@ -0,0 +1,11 @@
+id: 11644931902
+type: node
+latitude: 51.34347
+longitude: 12.375
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934114909784"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.hugendubel.de/de/branch?branchId=9891"
\ No newline at end of file
diff --git a/data/cities/leipzig/hugo-boss.yml b/data/cities/leipzig/hugo-boss.yml
new file mode 100644
index 0000000000..e4dc157eb3
--- /dev/null
+++ b/data/cities/leipzig/hugo-boss.yml
@@ -0,0 +1,11 @@
+id: 11645220712
+type: node
+latitude: 51.34339
+longitude: 12.37546
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934156117469"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.hugoboss.com/de/herren/"
\ No newline at end of file
diff --git a/data/cities/leipzig/hundm-bruehl.yml b/data/cities/leipzig/hundm-bruehl.yml
index 2f04007b6c..00d7836bc9 100644
--- a/data/cities/leipzig/hundm-bruehl.yml
+++ b/data/cities/leipzig/hundm-bruehl.yml
@@ -1,7 +1,7 @@
 id: 2128942839
 type: node
-latitude: 51.34365
-longitude: 12.3739
+latitude: 51.34367
+longitude: 12.37407
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
diff --git a/data/cities/leipzig/im-einklang-zentrum-fuer-lebensbalance.yml b/data/cities/leipzig/im-einklang-zentrum-fuer-lebensbalance.yml
deleted file mode 100644
index fd3f51bb40..0000000000
--- a/data/cities/leipzig/im-einklang-zentrum-fuer-lebensbalance.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5901572785
-type: node
-latitude: 51.34437
-longitude: 12.36268
-postcode: "04105"
-city: Leipzig
-street: "Funkenburgstraße"
-housenumber: 10
-phone: "+4934133399377"
-opening_hours: "Mo-Fr 15:00-17:00"
-website: "https://im-einklang-leipzig.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/intersport.yml b/data/cities/leipzig/intersport.yml
new file mode 100644
index 0000000000..0faf1e460c
--- /dev/null
+++ b/data/cities/leipzig/intersport.yml
@@ -0,0 +1,11 @@
+id: 11644887454
+type: node
+latitude: 51.34355
+longitude: 12.37326
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934133734560"
+opening_hours: "Mo-Sa 10:00-18:00"
+website: "https://www.intersport.de/haendlersuche/sportgeschaefte-sachsen/04109-leipzig-intersport/"
\ No newline at end of file
diff --git a/data/cities/leipzig/jack-und-jones-bruehl.yml b/data/cities/leipzig/jack-und-jones-bruehl.yml
new file mode 100644
index 0000000000..e22edf0ab6
--- /dev/null
+++ b/data/cities/leipzig/jack-und-jones-bruehl.yml
@@ -0,0 +1,11 @@
+id: 11645103764
+type: node
+latitude: 51.34367
+longitude: 12.37442
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934123109166"
+opening_hours: "Mo-Sa 10:00-19:00"
+website: "https://www.jackjones.com/de-de"
\ No newline at end of file
diff --git a/data/cities/leipzig/juwelier-kraemer.yml b/data/cities/leipzig/juwelier-kraemer.yml
new file mode 100644
index 0000000000..284f911756
--- /dev/null
+++ b/data/cities/leipzig/juwelier-kraemer.yml
@@ -0,0 +1,11 @@
+id: 2623235675
+type: node
+latitude: 51.34367
+longitude: 12.37573
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934122299901"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://juweliere-kraemer.de/info/filiale/leipzig-bruhl/"
\ No newline at end of file
diff --git a/data/cities/leipzig/klier.yml b/data/cities/leipzig/klier.yml
new file mode 100644
index 0000000000..9a4f377954
--- /dev/null
+++ b/data/cities/leipzig/klier.yml
@@ -0,0 +1,11 @@
+id: 11644825362
+type: node
+latitude: 51.34355
+longitude: 12.3737
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934199393765"
+opening_hours: "Mo-Fr 09:00-20:00; Sa 10:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/konsum-dufourstrasse.yml b/data/cities/leipzig/konsum-dufourstrasse.yml
index 2d93b96cee..c2869a7ad5 100644
--- a/data/cities/leipzig/konsum-dufourstrasse.yml
+++ b/data/cities/leipzig/konsum-dufourstrasse.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Dufourstraße"
 housenumber: 25
 phone: ""
-opening_hours: "Mo-Sa 07:30-22:00; Su,PH off"
+opening_hours: "PH,Su off; Mo-Sa 07:00-22:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/kosmetik-und-med-fusspflege.yml b/data/cities/leipzig/kosmetik-und-med-fusspflege.yml
new file mode 100644
index 0000000000..d5c2c37f64
--- /dev/null
+++ b/data/cities/leipzig/kosmetik-und-med-fusspflege.yml
@@ -0,0 +1,11 @@
+id: 11648922693
+type: node
+latitude: 51.32195
+longitude: 12.3416
+postcode: "04229"
+city: Leipzig
+street: "Schnorrstraße"
+housenumber: 32
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/kosmetikstudio-kerstin-wuestling.yml b/data/cities/leipzig/kosmetikstudio-kerstin-wuestling.yml
index 9fd7244f19..0385d5058d 100644
--- a/data/cities/leipzig/kosmetikstudio-kerstin-wuestling.yml
+++ b/data/cities/leipzig/kosmetikstudio-kerstin-wuestling.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Härtelstraße"
 housenumber: 25
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-We 10:00-18:00; Th 08:00-15:00"
 website: "https://www.kosmetikstudio-wuestling.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/krass-optik.yml b/data/cities/leipzig/krass-optik.yml
new file mode 100644
index 0000000000..d754927ec8
--- /dev/null
+++ b/data/cities/leipzig/krass-optik.yml
@@ -0,0 +1,11 @@
+id: 10584731322
+type: node
+latitude: 51.34367
+longitude: 12.37528
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934130863202"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.krass-optik.com"
\ No newline at end of file
diff --git a/data/cities/leipzig/l-a-nails-bruehl.yml b/data/cities/leipzig/l-a-nails-bruehl.yml
new file mode 100644
index 0000000000..f35d42a3b3
--- /dev/null
+++ b/data/cities/leipzig/l-a-nails-bruehl.yml
@@ -0,0 +1,11 @@
+id: 11645245526
+type: node
+latitude: 51.34379
+longitude: 12.37603
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934126820682"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://lanails-hoefeambruehl.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/lascana.yml b/data/cities/leipzig/lascana.yml
index 02915d836f..7c1ee5af90 100644
--- a/data/cities/leipzig/lascana.yml
+++ b/data/cities/leipzig/lascana.yml
@@ -1,11 +1,11 @@
 id: 2128947144
 type: node
-latitude: 51.34333
-longitude: 12.37442
+latitude: 51.3434
+longitude: 12.3744
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934196298310"
 opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+website: "https://www.lascana.de/store/leipzig/store-leipzig/"
\ No newline at end of file
diff --git a/data/cities/leipzig/lego.yml b/data/cities/leipzig/lego.yml
index 1b0f538aa0..c05b9b86fc 100644
--- a/data/cities/leipzig/lego.yml
+++ b/data/cities/leipzig/lego.yml
@@ -1,11 +1,11 @@
 id: 2623235685
 type: node
-latitude: 51.34348
-longitude: 12.3741
+latitude: 51.34368
+longitude: 12.37426
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934139298501"
 opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+website: "https://www.lego.com/de-de/stores/store/leipzig"
\ No newline at end of file
diff --git a/data/cities/leipzig/lidl-bruehl.yml b/data/cities/leipzig/lidl-bruehl.yml
new file mode 100644
index 0000000000..ae2d227005
--- /dev/null
+++ b/data/cities/leipzig/lidl-bruehl.yml
@@ -0,0 +1,11 @@
+id: 11645040041
+type: node
+latitude: 51.34347
+longitude: 12.37656
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: ""
+opening_hours: "Mo-Sa 09:00-21:00"
+website: "https://www.lidl.de/f/leipzig/bruehl-1.html"
\ No newline at end of file
diff --git a/data/cities/leipzig/lipsi-klub-concept-store-fuer-handwerk-und-design.yml b/data/cities/leipzig/lipsi-klub-concept-store-fuer-handwerk-und-design.yml
index 23d5ec321f..32f46257d6 100644
--- a/data/cities/leipzig/lipsi-klub-concept-store-fuer-handwerk-und-design.yml
+++ b/data/cities/leipzig/lipsi-klub-concept-store-fuer-handwerk-und-design.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Markt"
 housenumber: 11
 phone: ""
-opening_hours: "Mo-Fr 11:00-19:00 & Sa 11:00 - 18:00"
+opening_hours: "Mo-Fr 11:00-19:00;Sa 11:00-18:00;Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/cecil-street-one.yml b/data/cities/leipzig/lovisa.yml
similarity index 61%
rename from data/cities/leipzig/cecil-street-one.yml
rename to data/cities/leipzig/lovisa.yml
index b00ffea6f4..dffe6bcfd4 100644
--- a/data/cities/leipzig/cecil-street-one.yml
+++ b/data/cities/leipzig/lovisa.yml
@@ -1,11 +1,11 @@
-id: 2128946200
+id: 7174975716
 type: node
-latitude: 51.34333
-longitude: 12.37426
+latitude: 51.3434
+longitude: 12.37344
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4922165085952"
 opening_hours: "Mo-Sa 10:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/ltur-reisebuero-leipzig.yml b/data/cities/leipzig/ltur-reisebuero-leipzig.yml
index 511b3341f8..c842c987ed 100644
--- a/data/cities/leipzig/ltur-reisebuero-leipzig.yml
+++ b/data/cities/leipzig/ltur-reisebuero-leipzig.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Nikolaistraße"
 housenumber: 16
 phone: "0341 2122227"
-opening_hours: "Mo-Fr: 10:00-17:00; Sa: 10:00-14:00"
+opening_hours: "Mo-Fr 10:00-17:00; Sa 10:00-14:00"
 website: "https://www.ltur.com/de/information/shopfinder/l/leipzig/nikolaistrasse-16/1151460"
\ No newline at end of file
diff --git a/data/cities/leipzig/lukas-baecker-bruehl.yml b/data/cities/leipzig/lukas-baecker-bruehl.yml
index 47c992b98a..e2287e5700 100644
--- a/data/cities/leipzig/lukas-baecker-bruehl.yml
+++ b/data/cities/leipzig/lukas-baecker-bruehl.yml
@@ -1,11 +1,11 @@
 id: 2128946870
 type: node
-latitude: 51.34318
-longitude: 12.37463
+latitude: 51.34326
+longitude: 12.37462
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934122558210"
 opening_hours: "Mo-Sa 06:30-20:30; Su 07:00-18:00"
 website: "https://lukas-baecker.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/marc-opolo.yml b/data/cities/leipzig/marc-opolo.yml
new file mode 100644
index 0000000000..1d7981b3e9
--- /dev/null
+++ b/data/cities/leipzig/marc-opolo.yml
@@ -0,0 +1,11 @@
+id: 2128947791
+type: node
+latitude: 51.34367
+longitude: 12.37604
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934199381322"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.marc-o-polo.com/de-de"
\ No newline at end of file
diff --git a/data/cities/leipzig/mediamarkt-bruehl.yml b/data/cities/leipzig/mediamarkt-bruehl.yml
index f99e264b5e..f7d08d53f4 100644
--- a/data/cities/leipzig/mediamarkt-bruehl.yml
+++ b/data/cities/leipzig/mediamarkt-bruehl.yml
@@ -1,7 +1,7 @@
 id: 2128948068
 type: node
-latitude: 51.34365
-longitude: 12.373
+latitude: 51.34364
+longitude: 12.37285
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
diff --git a/data/cities/leipzig/mein-fischer-paunsdorfer-allee.yml b/data/cities/leipzig/mein-fischer-paunsdorfer-allee.yml
deleted file mode 100644
index 3bfee96bfe..0000000000
--- a/data/cities/leipzig/mein-fischer-paunsdorfer-allee.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4007613589
-type: node
-latitude: 51.34728
-longitude: 12.47772
-postcode: "04329"
-city: Leipzig
-street: "Paunsdorfer Allee"
-housenumber: 1
-phone: ""
-opening_hours: "Mo-Sa 10:00-20:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/mein-fischer-seit-1832.yml b/data/cities/leipzig/mein-fischer-seit-1832.yml
new file mode 100644
index 0000000000..2f8c9a75cf
--- /dev/null
+++ b/data/cities/leipzig/mein-fischer-seit-1832.yml
@@ -0,0 +1,11 @@
+id: 2128947578
+type: node
+latitude: 51.34367
+longitude: 12.37559
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+493412114700"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.meinfischer.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/mein-fischer.yml b/data/cities/leipzig/mein-fischer.yml
index be392805b2..3bfee96bfe 100644
--- a/data/cities/leipzig/mein-fischer.yml
+++ b/data/cities/leipzig/mein-fischer.yml
@@ -1,11 +1,11 @@
-id: 2128947578
+id: 4007613589
 type: node
-latitude: 51.34345
-longitude: 12.37563
-postcode: ""
+latitude: 51.34728
+longitude: 12.47772
+postcode: "04329"
 city: Leipzig
-street: ""
-housenumber: 
+street: "Paunsdorfer Allee"
+housenumber: 1
 phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
+opening_hours: "Mo-Sa 10:00-20:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/mila-nails-salon.yml b/data/cities/leipzig/mila-nails-salon.yml
new file mode 100644
index 0000000000..e88f0f6985
--- /dev/null
+++ b/data/cities/leipzig/mila-nails-salon.yml
@@ -0,0 +1,11 @@
+id: 8138310067
+type: node
+latitude: 51.33668
+longitude: 12.33676
+postcode: "04177"
+city: Leipzig
+street: "Kuhturmstraße"
+housenumber: 4
+phone: "+49 173 7021580"
+opening_hours: "Mo-Fr 09:00-18:30; Su off"
+website: "https://www.mila-nails.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/monki.yml b/data/cities/leipzig/monki.yml
index b98e077ca4..713b243000 100644
--- a/data/cities/leipzig/monki.yml
+++ b/data/cities/leipzig/monki.yml
@@ -1,11 +1,11 @@
 id: 2128946165
 type: node
-latitude: 51.34334
-longitude: 12.37408
+latitude: 51.3434
+longitude: 12.37415
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934196283821"
 opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+website: "https://www.monki.com/de_de/index.html"
\ No newline at end of file
diff --git a/data/cities/leipzig/mueller-bruehl.yml b/data/cities/leipzig/mueller-bruehl.yml
new file mode 100644
index 0000000000..687d39d205
--- /dev/null
+++ b/data/cities/leipzig/mueller-bruehl.yml
@@ -0,0 +1,11 @@
+id: 2128947789
+type: node
+latitude: 51.34367
+longitude: 12.3764
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934199381300"
+opening_hours: "Mo-Sa 09:30-20:00"
+website: "https://www.mueller.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/mueller-paunsdorfer-allee.yml b/data/cities/leipzig/mueller-paunsdorfer-allee.yml
deleted file mode 100644
index 6c3c4adc89..0000000000
--- a/data/cities/leipzig/mueller-paunsdorfer-allee.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2129866706
-type: node
-latitude: 51.35001
-longitude: 12.47763
-postcode: "04329"
-city: Leipzig
-street: "Paunsdorfer Allee"
-housenumber: 1
-phone: ""
-opening_hours: "Mo-Sa 09:30-20:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/mueller.yml b/data/cities/leipzig/mueller.yml
index 1ab20c635f..6c3c4adc89 100644
--- a/data/cities/leipzig/mueller.yml
+++ b/data/cities/leipzig/mueller.yml
@@ -1,11 +1,11 @@
-id: 2128947789
+id: 2129866706
 type: node
-latitude: 51.34338
-longitude: 12.37643
-postcode: ""
+latitude: 51.35001
+longitude: 12.47763
+postcode: "04329"
 city: Leipzig
-street: ""
-housenumber: 
+street: "Paunsdorfer Allee"
+housenumber: 1
 phone: ""
-opening_hours: "Mo-Fr 09:30-20:30; Sa 10:00-20:30"
+opening_hours: "Mo-Sa 09:30-20:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/nanu-nana-bruehl.yml b/data/cities/leipzig/nanu-nana-bruehl.yml
new file mode 100644
index 0000000000..a00964812a
--- /dev/null
+++ b/data/cities/leipzig/nanu-nana-bruehl.yml
@@ -0,0 +1,11 @@
+id: 10584731320
+type: node
+latitude: 51.34347
+longitude: 12.37543
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934130858710"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://unternehmen.nanu-nana.de/filiale/leipzig-hoefe-am-bruehl-bruehl-1"
\ No newline at end of file
diff --git a/data/cities/leipzig/new-yorker.yml b/data/cities/leipzig/new-yorker.yml
index 67bc65bb12..940706db6e 100644
--- a/data/cities/leipzig/new-yorker.yml
+++ b/data/cities/leipzig/new-yorker.yml
@@ -1,11 +1,11 @@
 id: 2128942329
 type: node
-latitude: 51.34372
-longitude: 12.37349
+latitude: 51.34374
+longitude: 12.37301
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934191367192"
 opening_hours: "Mo-Sa 10:00-20:00"
 website: "http://www.newyorker.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/o2.yml b/data/cities/leipzig/o2.yml
index f44520b160..e96dfc6944 100644
--- a/data/cities/leipzig/o2.yml
+++ b/data/cities/leipzig/o2.yml
@@ -1,7 +1,7 @@
 id: 2459035507
 type: node
-latitude: 51.34331
-longitude: 12.37375
+latitude: 51.34367
+longitude: 12.37388
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
diff --git a/data/cities/leipzig/oil-und-vinegar.yml b/data/cities/leipzig/oil-und-vinegar.yml
new file mode 100644
index 0000000000..a25d5d85be
--- /dev/null
+++ b/data/cities/leipzig/oil-und-vinegar.yml
@@ -0,0 +1,11 @@
+id: 7174975715
+type: node
+latitude: 51.34355
+longitude: 12.37305
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934199392492"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.oilvinegar.de/store/oil-vinegar-leipzig-innenstadt?_gl=1*16g6bgd*_up*MQ..&gclid=EAIaIQobChMIyJLd8cy5hAMVMzkGAB34VwiWEAAYASAAEgJqRvD_BwE"
\ No newline at end of file
diff --git a/data/cities/leipzig/olymp-und-hades-bruehl.yml b/data/cities/leipzig/olymp-und-hades-bruehl.yml
new file mode 100644
index 0000000000..a0da3bfe45
--- /dev/null
+++ b/data/cities/leipzig/olymp-und-hades-bruehl.yml
@@ -0,0 +1,11 @@
+id: 11645335337
+type: node
+latitude: 51.34374
+longitude: 12.37346
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934196276491"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.kult-olymp-hades.de/olymp-hades-leipzig-hoefe-am-bruehl"
\ No newline at end of file
diff --git a/data/cities/leipzig/olymp.yml b/data/cities/leipzig/olymp.yml
new file mode 100644
index 0000000000..d66ae646b6
--- /dev/null
+++ b/data/cities/leipzig/olymp.yml
@@ -0,0 +1,11 @@
+id: 7174975717
+type: node
+latitude: 51.3434
+longitude: 12.37353
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934196278734"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/only-bruehl.yml b/data/cities/leipzig/only-bruehl.yml
new file mode 100644
index 0000000000..c071153541
--- /dev/null
+++ b/data/cities/leipzig/only-bruehl.yml
@@ -0,0 +1,11 @@
+id: 10584731318
+type: node
+latitude: 51.34347
+longitude: 12.37515
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934199388773"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.only.com/de-de"
\ No newline at end of file
diff --git a/data/cities/leipzig/pandora.yml b/data/cities/leipzig/pandora.yml
index 1497023961..bab56d1f9a 100644
--- a/data/cities/leipzig/pandora.yml
+++ b/data/cities/leipzig/pandora.yml
@@ -1,11 +1,11 @@
 id: 2623235717
 type: node
-latitude: 51.34332
-longitude: 12.37467
+latitude: 51.34339
+longitude: 12.37464
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
-opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+phone: "+4934196278484"
+opening_hours: "Mo-Sa 10:00-19:00"
+website: "https://de.pandora.net/de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/phone-praxis.yml b/data/cities/leipzig/phone-praxis.yml
new file mode 100644
index 0000000000..7ea0754dbf
--- /dev/null
+++ b/data/cities/leipzig/phone-praxis.yml
@@ -0,0 +1,11 @@
+id: 11645201322
+type: node
+latitude: 51.34383
+longitude: 12.37603
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934112694249"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.phonepraxis.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/playmobil-funstore.yml b/data/cities/leipzig/playmobil-funstore.yml
new file mode 100644
index 0000000000..be682da4cf
--- /dev/null
+++ b/data/cities/leipzig/playmobil-funstore.yml
@@ -0,0 +1,11 @@
+id: 11645026832
+type: node
+latitude: 51.34367
+longitude: 12.37587
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4991196662379"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://funstores.playmobil.com/FunStore-Leipzig"
\ No newline at end of file
diff --git a/data/cities/leipzig/ragazzi.yml b/data/cities/leipzig/ragazzi.yml
new file mode 100644
index 0000000000..eaab6a9312
--- /dev/null
+++ b/data/cities/leipzig/ragazzi.yml
@@ -0,0 +1,11 @@
+id: 11644900350
+type: node
+latitude: 51.34347
+longitude: 12.37556
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934149252445"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "http://ragazzi-mg.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/rituals.yml b/data/cities/leipzig/rituals.yml
index 9970b9e37f..5ae64a388d 100644
--- a/data/cities/leipzig/rituals.yml
+++ b/data/cities/leipzig/rituals.yml
@@ -1,11 +1,11 @@
 id: 2128946084
 type: node
-latitude: 51.34335
-longitude: 12.3739
+latitude: 51.3434
+longitude: 12.37399
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934199391745"
 opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+website: "https://www.rituals.com/de-de/store-detail?store=Leipzig-Höfe-am-Brühl"
\ No newline at end of file
diff --git a/data/cities/leipzig/salon-monteil-paris.yml b/data/cities/leipzig/salon-monteil-paris.yml
new file mode 100644
index 0000000000..53b17131c1
--- /dev/null
+++ b/data/cities/leipzig/salon-monteil-paris.yml
@@ -0,0 +1,11 @@
+id: 9633473653
+type: node
+latitude: 51.34359
+longitude: 12.36085
+postcode: "04105"
+city: Leipzig
+street: "Gustav-Adolf-Straße"
+housenumber: 39
+phone: "+49 341 58146586"
+opening_hours: "Mo-Tu,Th 10:00-19:00; We 10:00-15:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/schiesser.yml b/data/cities/leipzig/schiesser.yml
new file mode 100644
index 0000000000..9dbda437c8
--- /dev/null
+++ b/data/cities/leipzig/schiesser.yml
@@ -0,0 +1,11 @@
+id: 11645267891
+type: node
+latitude: 51.34367
+longitude: 12.37625
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934122540613"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.schiesser.com"
\ No newline at end of file
diff --git a/data/cities/leipzig/side-cut-barber.yml b/data/cities/leipzig/side-cut-barber.yml
new file mode 100644
index 0000000000..1635cc38cf
--- /dev/null
+++ b/data/cities/leipzig/side-cut-barber.yml
@@ -0,0 +1,11 @@
+id: 11645245527
+type: node
+latitude: 51.34374
+longitude: 12.37613
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+491629781985"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://side-cut-barber.business.site"
\ No newline at end of file
diff --git a/data/cities/leipzig/softeis-in-boehlitz.yml b/data/cities/leipzig/softeis-in-boehlitz.yml
new file mode 100644
index 0000000000..c65a175ebf
--- /dev/null
+++ b/data/cities/leipzig/softeis-in-boehlitz.yml
@@ -0,0 +1,11 @@
+id: 11559820693
+type: node
+latitude: 51.35886
+longitude: 12.29404
+postcode: "04178"
+city: Leipzig
+street: "Leipziger Straße"
+housenumber: 57
+phone: ""
+opening_hours: "Tu 10:00-18:00; We-Fr 13:00-18:00; Sa-Su 14:00-18:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/stadtstromer.yml b/data/cities/leipzig/stadtstromer.yml
new file mode 100644
index 0000000000..e63b535a9d
--- /dev/null
+++ b/data/cities/leipzig/stadtstromer.yml
@@ -0,0 +1,11 @@
+id: 4109527306
+type: node
+latitude: 51.3438
+longitude: 12.37462
+postcode: "04109"
+city: Leipzig
+street: "Richard-Wagner-Straße"
+housenumber: 13
+phone: "+4915204252390"
+opening_hours: ""
+website: "https://www.stadtstromer.com/"
\ No newline at end of file
diff --git a/data/cities/leipzig/street-one-und-cecil.yml b/data/cities/leipzig/street-one-und-cecil.yml
new file mode 100644
index 0000000000..cb98ed19a9
--- /dev/null
+++ b/data/cities/leipzig/street-one-und-cecil.yml
@@ -0,0 +1,11 @@
+id: 2128946200
+type: node
+latitude: 51.3434
+longitude: 12.37428
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934126821495"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.street-one.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/tabak-presse-lotto.yml b/data/cities/leipzig/tabak-presse-lotto.yml
new file mode 100644
index 0000000000..31ce178fe9
--- /dev/null
+++ b/data/cities/leipzig/tabak-presse-lotto.yml
@@ -0,0 +1,11 @@
+id: 11645033106
+type: node
+latitude: 51.34374
+longitude: 12.37603
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934123108670"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/tally-weijl-bruehl.yml b/data/cities/leipzig/tally-weijl-bruehl.yml
new file mode 100644
index 0000000000..47bacca0c4
--- /dev/null
+++ b/data/cities/leipzig/tally-weijl-bruehl.yml
@@ -0,0 +1,11 @@
+id: 10584731317
+type: node
+latitude: 51.34374
+longitude: 12.37366
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934199383940"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.tally-weijl.com/de_DE/stores/Leipzig/2N66"
\ No newline at end of file
diff --git a/data/cities/leipzig/tayler.yml b/data/cities/leipzig/tayler.yml
index 585c6072e5..e520a2a105 100644
--- a/data/cities/leipzig/tayler.yml
+++ b/data/cities/leipzig/tayler.yml
@@ -1,7 +1,7 @@
 id: 2128941971
 type: node
-latitude: 51.34352
-longitude: 12.37287
+latitude: 51.34355
+longitude: 12.37285
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
diff --git a/data/cities/leipzig/the-factory-store.yml b/data/cities/leipzig/the-factory-store.yml
index da7a86ccae..ed18eeb61e 100644
--- a/data/cities/leipzig/the-factory-store.yml
+++ b/data/cities/leipzig/the-factory-store.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Härtelstraße"
 housenumber: 21
 phone: "+49 341 68414746"
-opening_hours: "Tu-Fr 13:00-18:00; Sa 12:00-17:00; PH,Su off"
+opening_hours: "Tu-Sa 10:00-18:00; Mo off"
 website: "https://www.abendkleid-leipzig.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/thomas-sabo-bruehl.yml b/data/cities/leipzig/thomas-sabo-bruehl.yml
new file mode 100644
index 0000000000..333651f484
--- /dev/null
+++ b/data/cities/leipzig/thomas-sabo-bruehl.yml
@@ -0,0 +1,11 @@
+id: 2623235712
+type: node
+latitude: 51.34339
+longitude: 12.37562
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934130854590"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.thomassabo.com/"
\ No newline at end of file
diff --git a/data/cities/leipzig/tommy-hilfiger.yml b/data/cities/leipzig/tommy-hilfiger.yml
new file mode 100644
index 0000000000..a2751299a9
--- /dev/null
+++ b/data/cities/leipzig/tommy-hilfiger.yml
@@ -0,0 +1,11 @@
+id: 2128947634
+type: node
+latitude: 51.34339
+longitude: 12.37532
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934122288146"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://de.tommy.com"
\ No newline at end of file
diff --git a/data/cities/leipzig/tui-travelstar.yml b/data/cities/leipzig/tui-travelstar.yml
new file mode 100644
index 0000000000..e050d25f21
--- /dev/null
+++ b/data/cities/leipzig/tui-travelstar.yml
@@ -0,0 +1,11 @@
+id: 11644924119
+type: node
+latitude: 51.34348
+longitude: 12.37464
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934196275010"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.vetter-touristik.de/reisebueros/hoefe-am-bruehl"
\ No newline at end of file
diff --git a/data/cities/leipzig/vans.yml b/data/cities/leipzig/vans.yml
new file mode 100644
index 0000000000..bc777b3c58
--- /dev/null
+++ b/data/cities/leipzig/vans.yml
@@ -0,0 +1,11 @@
+id: 10584731321
+type: node
+latitude: 51.34367
+longitude: 12.37512
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934196273597"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.vans.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/vero-moda-bruehl.yml b/data/cities/leipzig/vero-moda-bruehl.yml
index fa77018cf4..6cb7ac62e2 100644
--- a/data/cities/leipzig/vero-moda-bruehl.yml
+++ b/data/cities/leipzig/vero-moda-bruehl.yml
@@ -1,11 +1,11 @@
 id: 2623235703
 type: node
-latitude: 51.34347
-longitude: 12.37463
+latitude: 51.34368
+longitude: 12.37462
 postcode: "04109"
 city: Leipzig
 street: "Brühl"
 housenumber: 1
-phone: ""
+phone: "+4934123109166"
 opening_hours: "Mo-Sa 10:00-20:00"
-website: ""
\ No newline at end of file
+website: "https://www.veromoda.com/de-de"
\ No newline at end of file
diff --git a/data/cities/leipzig/vodafone.yml b/data/cities/leipzig/vodafone.yml
new file mode 100644
index 0000000000..0d56d78b91
--- /dev/null
+++ b/data/cities/leipzig/vodafone.yml
@@ -0,0 +1,11 @@
+id: 11644902982
+type: node
+latitude: 51.34347
+longitude: 12.3741
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+491727979710"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://shops.vodafone.de/leipzig/bruehl-1"
\ No newline at end of file
diff --git a/data/cities/leipzig/vorwerk.yml b/data/cities/leipzig/vorwerk.yml
new file mode 100644
index 0000000000..3c1523ff18
--- /dev/null
+++ b/data/cities/leipzig/vorwerk.yml
@@ -0,0 +1,11 @@
+id: 11645242162
+type: node
+latitude: 51.34354
+longitude: 12.37388
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934123064780"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.vorwerk.com/de/de/c/home"
\ No newline at end of file
diff --git a/data/cities/leipzig/zumnorde.yml b/data/cities/leipzig/zumnorde.yml
new file mode 100644
index 0000000000..55c996e057
--- /dev/null
+++ b/data/cities/leipzig/zumnorde.yml
@@ -0,0 +1,11 @@
+id: 7611942490
+type: node
+latitude: 51.34367
+longitude: 12.37543
+postcode: "04109"
+city: Leipzig
+street: "Brühl"
+housenumber: 1
+phone: "+4934133734570"
+opening_hours: "Mo-Sa 10:00-20:00"
+website: "https://www.zumnorde.de"
\ No newline at end of file
diff --git a/data/cities/lichtentanne/norma.yml b/data/cities/lichtentanne/norma.yml
new file mode 100644
index 0000000000..156123faa6
--- /dev/null
+++ b/data/cities/lichtentanne/norma.yml
@@ -0,0 +1,11 @@
+id: 1127503039
+type: way
+latitude: 50.67583
+longitude: 12.40903
+postcode: "08115"
+city: Lichtentanne
+street: "Neumarker Straße"
+housenumber: 2
+phone: ""
+opening_hours: "Mo-Sa 07:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/loebau/sternenbaeck.yml b/data/cities/loebau/sternenbaeck.yml
index 431a3119eb..43013fe046 100644
--- a/data/cities/loebau/sternenbaeck.yml
+++ b/data/cities/loebau/sternenbaeck.yml
@@ -7,5 +7,5 @@ city: Löbau
 street: "Bahnhofstraße"
 housenumber: 15
 phone: "+49 3585 862443"
-opening_hours: "Mo-Fr 06:30-18:00; Sa 06:30-12:00"
-website: "https://www.sternenbaeck.de/unsere-filialen/detail/filial-finder/loebau/"
\ No newline at end of file
+opening_hours: "Mo-Fr 06:30-17:00; Sa 06:30-11:00"
+website: "https://www.sternenbaeck.de/unsere-filialen/detail?tx_zwbisdreifilialen_filialliste%5Baction%5D=detail&tx_zwbisdreifilialen_filialliste%5Bcontroller%5D=Filialen&tx_zwbisdreifilialen_filialliste%5Bfiliale%5D=3&cHash=b13eef24a881224eb1db477ab8820457"
\ No newline at end of file
diff --git a/data/cities/markranstaedt/aldi.yml b/data/cities/markranstaedt/aldi-nord.yml
similarity index 100%
rename from data/cities/markranstaedt/aldi.yml
rename to data/cities/markranstaedt/aldi-nord.yml
diff --git a/data/cities/meerane/netto-marken-discount-glauchauer-strasse.yml b/data/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.yml
similarity index 55%
rename from data/cities/meerane/netto-marken-discount-glauchauer-strasse.yml
rename to data/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.yml
index 1dd979c058..135b212c13 100644
--- a/data/cities/meerane/netto-marken-discount-glauchauer-strasse.yml
+++ b/data/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.yml
@@ -1,11 +1,11 @@
-id: 204014436
+id: 198862495
 type: way
-latitude: 50.84339
-longitude: 12.47835
+latitude: 50.85433
+longitude: 12.45871
 postcode: "08393"
 city: Meerane
-street: "Glauchauer Straße"
-housenumber: 12a
+street: "Rosa-Luxemburg-Straße"
+housenumber: 24
 phone: ""
 opening_hours: "Mo-Sa 07:00-20:00"
 website: "https://www.netto-online.de/"
\ No newline at end of file
diff --git a/data/cities/meerane/netto-marken-discount.yml b/data/cities/meerane/netto-marken-discount.yml
index 135b212c13..1dd979c058 100644
--- a/data/cities/meerane/netto-marken-discount.yml
+++ b/data/cities/meerane/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 198862495
+id: 204014436
 type: way
-latitude: 50.85433
-longitude: 12.45871
+latitude: 50.84339
+longitude: 12.47835
 postcode: "08393"
 city: Meerane
-street: "Rosa-Luxemburg-Straße"
-housenumber: 24
+street: "Glauchauer Straße"
+housenumber: 12a
 phone: ""
 opening_hours: "Mo-Sa 07:00-20:00"
 website: "https://www.netto-online.de/"
\ No newline at end of file
diff --git a/data/cities/neisseaue/blumenhaus-faerber.yml b/data/cities/neisseaue/blumenhaus-faerber.yml
index 76bbbdff79..12ccf221d9 100644
--- a/data/cities/neisseaue/blumenhaus-faerber.yml
+++ b/data/cities/neisseaue/blumenhaus-faerber.yml
@@ -7,5 +7,5 @@ city: Neißeaue
 street: "Dorfstraße"
 housenumber: 98
 phone: "+49 35820 62515"
-opening_hours: "Mo-Tue 07:00-17:30; We 07:00-12:00; Th-Fr 07:00-17:30; Sa 06:00-12:00"
+opening_hours: "Mo,Tu,Th,Fr 07:00-17:30; We 07:00-12:00; Sa 06:00-12:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/neisseaue/fleischerei-richter.yml b/data/cities/neisseaue/fleischerei-richter.yml
index b5b8d873d1..33745bbdf0 100644
--- a/data/cities/neisseaue/fleischerei-richter.yml
+++ b/data/cities/neisseaue/fleischerei-richter.yml
@@ -7,5 +7,5 @@ city: Neißeaue
 street: "Dorfstraße"
 housenumber: 83
 phone: "+49 35820 60282"
-opening_hours: "Tue-We 08:00-12:00; Th 13:00-18:00; Fr 08:00-18:00; Sa 08:00-11:00"
+opening_hours: "Tu-We 08:00-12:00; Th 13:00-18:00; Fr 08:00-18:00; Sa 08:00-11:00; Su,PH off"
 website: "https://www.fleischerei-richter.de"
\ No newline at end of file
diff --git a/data/cities/neisseaue/zimmis-einkaufsmarkt.yml b/data/cities/neisseaue/zimmis-einkaufsmarkt.yml
index b4b5e53565..bdb20ae7fc 100644
--- a/data/cities/neisseaue/zimmis-einkaufsmarkt.yml
+++ b/data/cities/neisseaue/zimmis-einkaufsmarkt.yml
@@ -7,5 +7,5 @@ city: Neißeaue
 street: "Dorfstraße"
 housenumber: 83
 phone: ""
-opening_hours: "Tue-We 08:00-12:00; Th 13:00-18:00; Fr 08:00-18:00; Sa 08:00-11:00"
+opening_hours: "Tu-We 08:00-12:00; Th 13:00-18:00; Fr 08:00-18:00; Sa 08:00-11:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/neustadt-in-sachsen/lidl.yml b/data/cities/neustadt-in-sachsen/lidl.yml
index 29308c73f6..591115db56 100644
--- a/data/cities/neustadt-in-sachsen/lidl.yml
+++ b/data/cities/neustadt-in-sachsen/lidl.yml
@@ -7,5 +7,5 @@ city: Neustadt in Sachsen
 street: "Wilhelm-Kaulisch-Straße"
 housenumber: 29
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Sa 07:00-20:00; PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/oelsnitz-erzgeb/konditorei-bauerfeind.yml b/data/cities/oelsnitz-erzgeb/konditorei-bauerfeind.yml
new file mode 100644
index 0000000000..d359abf051
--- /dev/null
+++ b/data/cities/oelsnitz-erzgeb/konditorei-bauerfeind.yml
@@ -0,0 +1,11 @@
+id: 5351671410
+type: node
+latitude: 50.69752
+longitude: 12.72471
+postcode: "09376"
+city: Oelsnitz/Erzgeb.
+street: "Konsumstraße"
+housenumber: 1
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.yml b/data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
similarity index 54%
rename from data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.yml
rename to data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
index 8f17488f43..90f9356aa9 100644
--- a/data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.yml
+++ b/data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
@@ -1,11 +1,11 @@
-id: 37412283
+id: 28621035
 type: way
-latitude: 51.18517
-longitude: 13.82957
+latitude: 51.1782
+longitude: 13.8244
 postcode: "01458"
 city: Ottendorf-Okrilla
-street: "Poststraße"
-housenumber: 1c
+street: "Gaswerkstraße"
+housenumber: 2a
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/ottendorf-okrilla/netto-marken-discount.yml b/data/cities/ottendorf-okrilla/netto-marken-discount.yml
index 90f9356aa9..8f17488f43 100644
--- a/data/cities/ottendorf-okrilla/netto-marken-discount.yml
+++ b/data/cities/ottendorf-okrilla/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 28621035
+id: 37412283
 type: way
-latitude: 51.1782
-longitude: 13.8244
+latitude: 51.18517
+longitude: 13.82957
 postcode: "01458"
 city: Ottendorf-Okrilla
-street: "Gaswerkstraße"
-housenumber: 2a
+street: "Poststraße"
+housenumber: 1c
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/penig/rhg-baustoffe-penig.yml b/data/cities/penig/rhg-baustoffe.yml
similarity index 100%
rename from data/cities/penig/rhg-baustoffe-penig.yml
rename to data/cities/penig/rhg-baustoffe.yml
diff --git a/data/cities/pirna/parfuemerie-thiemann.yml b/data/cities/pirna/parfuemerie-thiemann.yml
index e1e7d8cecf..e7c96278d7 100644
--- a/data/cities/pirna/parfuemerie-thiemann.yml
+++ b/data/cities/pirna/parfuemerie-thiemann.yml
@@ -7,5 +7,5 @@ city: Pirna
 street: "Schuhgasse"
 housenumber: 14
 phone: "+493501441019"
-opening_hours: ""
+opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-13:00"
 website: "https://www.parfuemerie-thiemann.de/"
\ No newline at end of file
diff --git a/data/cities/plauen/netto-marken-discount-luetzowstrasse.yml b/data/cities/plauen/netto-marken-discount-luetzowstrasse.yml
new file mode 100644
index 0000000000..06bed4f4be
--- /dev/null
+++ b/data/cities/plauen/netto-marken-discount-luetzowstrasse.yml
@@ -0,0 +1,11 @@
+id: 126186852
+type: way
+latitude: 50.49403
+longitude: 12.09675
+postcode: "08523"
+city: Plauen
+street: "Lützowstraße"
+housenumber: 1
+phone: ""
+opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/plauen/netto-marken-discount-pausaer-strasse.yml b/data/cities/plauen/netto-marken-discount-pausaer-strasse.yml
deleted file mode 100644
index 24b6ba5349..0000000000
--- a/data/cities/plauen/netto-marken-discount-pausaer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 105448777
-type: way
-latitude: 50.50813
-longitude: 12.12772
-postcode: "08525"
-city: Plauen
-street: "Pausaer Straße"
-housenumber: 15
-phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
-website: "https://www.netto-online.de"
\ No newline at end of file
diff --git a/data/cities/plauen/netto-marken-discount.yml b/data/cities/plauen/netto-marken-discount.yml
index 06bed4f4be..24b6ba5349 100644
--- a/data/cities/plauen/netto-marken-discount.yml
+++ b/data/cities/plauen/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 126186852
+id: 105448777
 type: way
-latitude: 50.49403
-longitude: 12.09675
-postcode: "08523"
+latitude: 50.50813
+longitude: 12.12772
+postcode: "08525"
 city: Plauen
-street: "Lützowstraße"
-housenumber: 1
+street: "Pausaer Straße"
+housenumber: 15
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
-website: ""
\ No newline at end of file
+opening_hours: "Mo-Sa 07:00-20:00"
+website: "https://www.netto-online.de"
\ No newline at end of file
diff --git a/data/cities/radebeul/baeckerei-sachse-meissner-strasse.yml b/data/cities/radebeul/baeckerei-sachse-meissner-strasse.yml
deleted file mode 100644
index 4d34b2c6ba..0000000000
--- a/data/cities/radebeul/baeckerei-sachse-meissner-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5807266769
-type: node
-latitude: 51.10396
-longitude: 13.67236
-postcode: "01445"
-city: Radebeul
-street: "Meißner Straße"
-housenumber: 116
-phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/radebeul/baeckerei-sachse-weinboehlaer-strasse.yml b/data/cities/radebeul/baeckerei-sachse-weinboehlaer-strasse.yml
new file mode 100644
index 0000000000..13b9169c38
--- /dev/null
+++ b/data/cities/radebeul/baeckerei-sachse-weinboehlaer-strasse.yml
@@ -0,0 +1,11 @@
+id: 5808524011
+type: node
+latitude: 51.11311
+longitude: 13.61294
+postcode: "01445"
+city: Radebeul
+street: "Weinböhlaer Straße"
+housenumber: 9
+phone: ""
+opening_hours: "Mo-Fr 07:00-19:00; Sa 07:00-15:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/radebeul/baeckerei-sachse.yml b/data/cities/radebeul/baeckerei-sachse.yml
index 13b9169c38..4d34b2c6ba 100644
--- a/data/cities/radebeul/baeckerei-sachse.yml
+++ b/data/cities/radebeul/baeckerei-sachse.yml
@@ -1,11 +1,11 @@
-id: 5808524011
+id: 5807266769
 type: node
-latitude: 51.11311
-longitude: 13.61294
+latitude: 51.10396
+longitude: 13.67236
 postcode: "01445"
 city: Radebeul
-street: "Weinböhlaer Straße"
-housenumber: 9
+street: "Meißner Straße"
+housenumber: 116
 phone: ""
-opening_hours: "Mo-Fr 07:00-19:00; Sa 07:00-15:00; Su,PH off"
+opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/reichenbach-o-l/schreib-spiel-postladen-und-lotto.yml b/data/cities/reichenbach-o-l/schreib-spiel-postladen-und-lotto.yml
index 768a4299aa..44c4a5cd4b 100644
--- a/data/cities/reichenbach-o-l/schreib-spiel-postladen-und-lotto.yml
+++ b/data/cities/reichenbach-o-l/schreib-spiel-postladen-und-lotto.yml
@@ -7,5 +7,5 @@ city: Reichenbach/O.L.
 street: "Markt"
 housenumber: 25
 phone: ""
-opening_hours: "Mo 09:00-12:30; Tu-Fr 09:00-12:30,15:00-18:00; Sa 09:00-11:00"
+opening_hours: "Mo 09:00-12:30; Tu-Fr 09:00-12:30,15:00-18:00; Sa 09:00-11:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/thum/bluetenzauber-lippmann.yml b/data/cities/thum/bluetenzauber-lippmann.yml
index 25c1732b7e..ef4b4c4063 100644
--- a/data/cities/thum/bluetenzauber-lippmann.yml
+++ b/data/cities/thum/bluetenzauber-lippmann.yml
@@ -1,7 +1,7 @@
 id: 7490869569
 type: node
-latitude: 50.66929
-longitude: 12.94563
+latitude: 50.6693
+longitude: 12.94552
 postcode: "09419"
 city: Thum
 street: "Stollberger Straße"
diff --git a/data/cities/vierkirchen/dussa-gmbh.yml b/data/cities/vierkirchen/dussa-gmbh.yml
deleted file mode 100644
index 2a996bae03..0000000000
--- a/data/cities/vierkirchen/dussa-gmbh.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 217804015
-type: way
-latitude: 51.19497
-longitude: 14.75339
-postcode: "02894"
-city: Vierkirchen
-street: "An der Autobahn"
-housenumber: 24A
-phone: "+49 800 0991000"
-opening_hours: ""
-website: "https://www.dussa-auto.de/"
\ No newline at end of file
diff --git a/data/cities/wachau/schramm-gruenanlagen-und-baumschule.yml b/data/cities/wachau/schramm-gruenanlagen-und-baumschule.yml
deleted file mode 100644
index e6bed8a922..0000000000
--- a/data/cities/wachau/schramm-gruenanlagen-und-baumschule.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 138463395
-type: way
-latitude: 51.15867
-longitude: 13.88704
-postcode: "01454"
-city: Wachau
-street: "Wachauer Straße"
-housenumber: 7b
-phone: ""
-opening_hours: "Mo-Fr 10:00-18:00; Sa 09:00-13:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/waldhufen/dorfladen-diehsa.yml b/data/cities/waldhufen/dorfladen-diehsa.yml
index c8bf466ae8..0beaa6db6b 100644
--- a/data/cities/waldhufen/dorfladen-diehsa.yml
+++ b/data/cities/waldhufen/dorfladen-diehsa.yml
@@ -7,5 +7,5 @@ city: Waldhufen
 street: "Jänkendorfer Straße"
 housenumber: 12
 phone: ""
-opening_hours: "Mo-Fr 08:00-12:00,15:00-17:30; Su 07:00-10:00"
+opening_hours: "Mo-Fr 08:00-12:00,15:00-17:30; Su 07:00-10:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/wilthen/ateam.yml b/data/cities/wilthen/ateam.yml
index b29b21509e..4107c87844 100644
--- a/data/cities/wilthen/ateam.yml
+++ b/data/cities/wilthen/ateam.yml
@@ -8,4 +8,4 @@ street: "Bahnhofstraße"
 housenumber: 12
 phone: "+49 3592 500000"
 opening_hours: "Mo-Fr 09:00-13:00,14:00-18:00"
-website: "http://www.ateams.de/ateams-wilthen.html"
\ No newline at end of file
+website: "https://www.ateams.de/ueber-uns/unsere-reisebueros/"
\ No newline at end of file
diff --git a/data/cities/wilthen/salon-wilthen.yml b/data/cities/wilthen/salon-wilthen.yml
index ac59002618..783c7c2ea2 100644
--- a/data/cities/wilthen/salon-wilthen.yml
+++ b/data/cities/wilthen/salon-wilthen.yml
@@ -8,4 +8,4 @@ street: "Bahnhofstraße"
 housenumber: 7
 phone: "+49 3592 33177"
 opening_hours: "Mo-Fr 07:00-19:00; Sa 08:00-12:00; Su,PH off"
-website: "http://www.figaro-bautzen.de/SalonWilthen"
\ No newline at end of file
+website: "https://www.figaro-bautzen.de/salons/salons-im-umland/friseursalon-wilthen/"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro-frauenstrasse-2.yml b/data/cities/zittau/friseur-figaro-frauenstrasse-2.yml
deleted file mode 100644
index 7d7dec24f4..0000000000
--- a/data/cities/zittau/friseur-figaro-frauenstrasse-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8220110942
-type: node
-latitude: 50.89681
-longitude: 14.8096
-postcode: "02763"
-city: Zittau
-street: "Frauenstraße"
-housenumber: 17
-phone: "+49 3583 510811"
-opening_hours: "Mo-Fr 09:00-18:00"
-website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro-frauenstrasse.yml b/data/cities/zittau/friseur-figaro-frauenstrasse.yml
index 6fb09a781f..7d7dec24f4 100644
--- a/data/cities/zittau/friseur-figaro-frauenstrasse.yml
+++ b/data/cities/zittau/friseur-figaro-frauenstrasse.yml
@@ -1,11 +1,11 @@
-id: 8220110941
+id: 8220110942
 type: node
-latitude: 50.8968
-longitude: 14.80956
+latitude: 50.89681
+longitude: 14.8096
 postcode: "02763"
 city: Zittau
 street: "Frauenstraße"
 housenumber: 17
 phone: "+49 3583 510811"
-opening_hours: "Tu-Fr 09:00-18:00; Mo 13:00-18:00; Sa 09:00-12:00"
+opening_hours: "Mo-Fr 09:00-18:00"
 website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro-markt.yml b/data/cities/zittau/friseur-figaro-markt.yml
new file mode 100644
index 0000000000..7a52870486
--- /dev/null
+++ b/data/cities/zittau/friseur-figaro-markt.yml
@@ -0,0 +1,11 @@
+id: 8197663839
+type: node
+latitude: 50.89653
+longitude: 14.80576
+postcode: "02763"
+city: Zittau
+street: "Markt"
+housenumber: 18
+phone: "+49 3583 510635"
+opening_hours: "Mo 12:00-18:00; Tu-Fr 08:00-18:00"
+website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro.yml b/data/cities/zittau/friseur-figaro.yml
index 7a52870486..6fb09a781f 100644
--- a/data/cities/zittau/friseur-figaro.yml
+++ b/data/cities/zittau/friseur-figaro.yml
@@ -1,11 +1,11 @@
-id: 8197663839
+id: 8220110941
 type: node
-latitude: 50.89653
-longitude: 14.80576
+latitude: 50.8968
+longitude: 14.80956
 postcode: "02763"
 city: Zittau
-street: "Markt"
-housenumber: 18
-phone: "+49 3583 510635"
-opening_hours: "Mo 12:00-18:00; Tu-Fr 08:00-18:00"
+street: "Frauenstraße"
+housenumber: 17
+phone: "+49 3583 510811"
+opening_hours: "Tu-Fr 09:00-18:00; Mo 13:00-18:00; Sa 09:00-12:00"
 website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zschopau/sachsenland-trinkparadies.yml b/data/cities/zschopau/sachsenland-trinkparadies.yml
index f7ae2b1d4d..2b37603512 100644
--- a/data/cities/zschopau/sachsenland-trinkparadies.yml
+++ b/data/cities/zschopau/sachsenland-trinkparadies.yml
@@ -1,7 +1,7 @@
 id: 379624131
 type: way
-latitude: 50.75062
-longitude: 13.07575
+latitude: 50.75064
+longitude: 13.0758
 postcode: "09405"
 city: Zschopau
 street: "Am Gräbel"
diff --git a/data/cities/zwickau/clauss.yml b/data/cities/zwickau/clauss.yml
index 550c14cab2..3a3cf4d9d7 100644
--- a/data/cities/zwickau/clauss.yml
+++ b/data/cities/zwickau/clauss.yml
@@ -7,5 +7,5 @@ city: Zwickau
 street: "Bosestraße"
 housenumber: 33
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Fr 06:00-17:00; Sa 06:00-11:00"
 website: ""
\ No newline at end of file