diff --git a/content/cities/annaberg-buchholz/netto-marken-discount-bahnhofsplatz.md b/content/cities/annaberg-buchholz/netto-marken-discount-bahnhofsplatz.md
deleted file mode 100644
index 03fb788cfa..0000000000
--- a/content/cities/annaberg-buchholz/netto-marken-discount-bahnhofsplatz.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /annaberg-buchholz/netto-marken-discount-bahnhofsplatz/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/annaberg-buchholz/netto-marken-discount-dresdner-strasse.md b/content/cities/annaberg-buchholz/netto-marken-discount-dresdner-strasse.md
new file mode 100644
index 0000000000..3672234896
--- /dev/null
+++ b/content/cities/annaberg-buchholz/netto-marken-discount-dresdner-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /annaberg-buchholz/netto-marken-discount-dresdner-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
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/bennewitz/_index.md b/content/cities/bennewitz/_index.md
index 6897218403..1ca5bd81c2 100644
--- a/content/cities/bennewitz/_index.md
+++ b/content/cities/bennewitz/_index.md
@@ -2,5 +2,5 @@
 title: Bennewitz
 url: /bennewitz/
 latitude: 51.361
-longitude: 12.714
+longitude: 12.715
 ---
\ No newline at end of file
diff --git a/content/cities/bergen/_index.md b/content/cities/bergen/_index.md
index a243116649..50650dee47 100644
--- a/content/cities/bergen/_index.md
+++ b/content/cities/bergen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bergen
 url: /bergen/
-latitude: 50.473
-longitude: 12.277
+latitude: 50.475
+longitude: 12.284
 ---
\ 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
deleted file mode 100644
index 09ff742efc..0000000000
--- a/content/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 0000000000..eedaef0250
--- /dev/null
+++ b/content/cities/bischofswerda/netto-marken-discount-dresdener-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /bischofswerda/netto-marken-discount-dresdener-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/brand-erbisdorf/aldi-nord.md b/content/cities/brand-erbisdorf/aldi-nord.md
new file mode 100644
index 0000000000..378a48c42d
--- /dev/null
+++ b/content/cities/brand-erbisdorf/aldi-nord.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI Nord"
+url: /brand-erbisdorf/aldi-nord/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/brand-erbisdorf/tedi.md b/content/cities/brand-erbisdorf/tedi.md
index cb3b8d8c47..c991852da7 100644
--- a/content/cities/brand-erbisdorf/tedi.md
+++ b/content/cities/brand-erbisdorf/tedi.md
@@ -1,5 +1,5 @@
 ---
-title: "Tedi"
+title: "TEDi"
 url: /brand-erbisdorf/tedi/
 shop: Kramladen
 ---
\ No newline at end of file
diff --git a/content/cities/chemnitz/gems.md b/content/cities/chemnitz/gems.md
new file mode 100644
index 0000000000..3972094c3b
--- /dev/null
+++ b/content/cities/chemnitz/gems.md
@@ -0,0 +1,5 @@
+---
+title: "Gems"
+url: /chemnitz/gems/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/chemnitz/lidl-eckstrasse.md b/content/cities/chemnitz/lidl-eckstrasse.md
deleted file mode 100644
index 06472a2bf0..0000000000
--- a/content/cities/chemnitz/lidl-eckstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Lidl"
-url: /chemnitz/lidl-eckstrasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/chemnitz/lidl-limbacher-strasse-2.md b/content/cities/chemnitz/lidl-limbacher-strasse-2.md
new file mode 100644
index 0000000000..24f5e1f9c0
--- /dev/null
+++ b/content/cities/chemnitz/lidl-limbacher-strasse-2.md
@@ -0,0 +1,5 @@
+---
+title: "Lidl"
+url: /chemnitz/lidl-limbacher-strasse-2/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/chemnitz/norma-reichenbrander-strasse.md b/content/cities/chemnitz/norma-reichenbrander-strasse.md
deleted file mode 100644
index eae4739a95..0000000000
--- a/content/cities/chemnitz/norma-reichenbrander-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Norma"
-url: /chemnitz/norma-reichenbrander-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/chemnitz/norma-zschopauer-strasse.md b/content/cities/chemnitz/norma-zschopauer-strasse.md
new file mode 100644
index 0000000000..4c262c79b3
--- /dev/null
+++ b/content/cities/chemnitz/norma-zschopauer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "NORMA"
+url: /chemnitz/norma-zschopauer-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/chemnitz/norma.md b/content/cities/chemnitz/norma.md
index a2fa4d3798..f5216a09ed 100644
--- a/content/cities/chemnitz/norma.md
+++ b/content/cities/chemnitz/norma.md
@@ -1,5 +1,5 @@
 ---
-title: "NORMA"
+title: "Norma"
 url: /chemnitz/norma/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/crimmitschau/reifenhaus-diana-schmiedel-feldstrasse.md b/content/cities/crimmitschau/reifenhaus-diana-schmiedel-feldstrasse.md
new file mode 100644
index 0000000000..dabde29936
--- /dev/null
+++ b/content/cities/crimmitschau/reifenhaus-diana-schmiedel-feldstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Reifenhaus Diana Schmiedel"
+url: /crimmitschau/reifenhaus-diana-schmiedel-feldstrasse/
+shop: Reifen
+---
\ No newline at end of file
diff --git a/content/cities/crimmitschau/reifenhaus-diana-schmiedel-glauchauer-landstrasse.md b/content/cities/crimmitschau/reifenhaus-diana-schmiedel-glauchauer-landstrasse.md
deleted file mode 100644
index 24121915e5..0000000000
--- a/content/cities/crimmitschau/reifenhaus-diana-schmiedel-glauchauer-landstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Reifenhaus Diana Schmiedel"
-url: /crimmitschau/reifenhaus-diana-schmiedel-glauchauer-landstrasse/
-shop: Reifen
----
\ No newline at end of file
diff --git a/content/cities/dresden/a-t-u-washingtonstrasse.md b/content/cities/dresden/a-t-u-michaelisstrasse.md
similarity index 51%
rename from content/cities/dresden/a-t-u-washingtonstrasse.md
rename to content/cities/dresden/a-t-u-michaelisstrasse.md
index 81c7e04111..ee00c97c8e 100644
--- a/content/cities/dresden/a-t-u-washingtonstrasse.md
+++ b/content/cities/dresden/a-t-u-michaelisstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "A.T.U"
-url: /dresden/a-t-u-washingtonstrasse/
+url: /dresden/a-t-u-michaelisstrasse/
 shop: Autowerkstatt
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/baeckerei-gehre-altnickern.md b/content/cities/dresden/baeckerei-gehre-altnickern.md
new file mode 100644
index 0000000000..6855ac44cf
--- /dev/null
+++ b/content/cities/dresden/baeckerei-gehre-altnickern.md
@@ -0,0 +1,5 @@
+---
+title: "Bäckerei Gehre"
+url: /dresden/baeckerei-gehre-altnickern/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.md b/content/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.md
deleted file mode 100644
index 4752fd72da..0000000000
--- a/content/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bäckerei Gehre"
-url: /dresden/baeckerei-gehre-roehrsdorfer-strasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/dresden/brillen-de.md b/content/cities/dresden/brillen-de.md
new file mode 100644
index 0000000000..b51b9a6bd5
--- /dev/null
+++ b/content/cities/dresden/brillen-de.md
@@ -0,0 +1,5 @@
+---
+title: "brillen.de"
+url: /dresden/brillen-de/
+shop: Optiker
+---
\ No newline at end of file
diff --git a/content/cities/dresden/dresdner-naehkabinett.md b/content/cities/dresden/dresdner-naehkabinett.md
index a23addd06c..7b7b5ecb93 100644
--- a/content/cities/dresden/dresdner-naehkabinett.md
+++ b/content/cities/dresden/dresdner-naehkabinett.md
@@ -1,5 +1,5 @@
 ---
 title: "Dresdner Nähkabinett"
 url: /dresden/dresdner-naehkabinett/
-shop: Textil
+shop: Wolle
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/greenbeershop.md b/content/cities/dresden/greenbeershop.md
new file mode 100644
index 0000000000..18babb739a
--- /dev/null
+++ b/content/cities/dresden/greenbeershop.md
@@ -0,0 +1,5 @@
+---
+title: "Greenbeershop"
+url: /dresden/greenbeershop/
+shop: Lebensmittel
+---
\ No newline at end of file
diff --git a/content/cities/dresden/nachfuellbasis.md b/content/cities/dresden/nachfuellbasis.md
new file mode 100644
index 0000000000..ebf9dc44b0
--- /dev/null
+++ b/content/cities/dresden/nachfuellbasis.md
@@ -0,0 +1,5 @@
+---
+title: "Nachfüllbasis"
+url: /dresden/nachfuellbasis/
+shop: Kopieren
+---
\ No newline at end of file
diff --git a/content/cities/dresden/thor-steinar-outlet.md b/content/cities/dresden/thor-steinar-outlet.md
deleted file mode 100644
index 9c0dbb5d57..0000000000
--- a/content/cities/dresden/thor-steinar-outlet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Thor Steinar Outlet"
-url: /dresden/thor-steinar-outlet/
-shop: Kleidung
----
\ 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/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.md b/content/cities/goerlitz/haarschneider.md
new file mode 100644
index 0000000000..f9efd9840a
--- /dev/null
+++ b/content/cities/goerlitz/haarschneider.md
@@ -0,0 +1,5 @@
+---
+title: "HAARSCHNEIDER"
+url: /goerlitz/haarschneider/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/goerlitz/haarschneider2.md b/content/cities/goerlitz/haarschneider2.md
deleted file mode 100644
index baf8e36d89..0000000000
--- a/content/cities/goerlitz/haarschneider2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "HAARSCHNEIDER²"
-url: /goerlitz/haarschneider2/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/goerlitz/kaufland-zittauer-strasse.md b/content/cities/goerlitz/kaufland-scultetusstrasse.md
similarity index 50%
rename from content/cities/goerlitz/kaufland-zittauer-strasse.md
rename to content/cities/goerlitz/kaufland-scultetusstrasse.md
index 1f0ed3d4cd..ee6e67844e 100644
--- a/content/cities/goerlitz/kaufland-zittauer-strasse.md
+++ b/content/cities/goerlitz/kaufland-scultetusstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Kaufland"
-url: /goerlitz/kaufland-zittauer-strasse/
+url: /goerlitz/kaufland-scultetusstrasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/goerlitz/zeeman-wilhelmsplatz.md b/content/cities/goerlitz/zeeman-jakobstrasse.md
similarity index 50%
rename from content/cities/goerlitz/zeeman-wilhelmsplatz.md
rename to content/cities/goerlitz/zeeman-jakobstrasse.md
index 5bfad83360..1c8ba0891a 100644
--- a/content/cities/goerlitz/zeeman-wilhelmsplatz.md
+++ b/content/cities/goerlitz/zeeman-jakobstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Zeeman"
-url: /goerlitz/zeeman-wilhelmsplatz/
+url: /goerlitz/zeeman-jakobstrasse/
 shop: Kleidung
 ---
\ No newline at end of file
diff --git a/content/cities/grosspoesna/ronny-dreizehner.md b/content/cities/grosspoesna/ronny-dreizehner.md
new file mode 100644
index 0000000000..6ebecbd89e
--- /dev/null
+++ b/content/cities/grosspoesna/ronny-dreizehner.md
@@ -0,0 +1,5 @@
+---
+title: "Ronny Dreizehner"
+url: /grosspoesna/ronny-dreizehner/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/heidersdorf/_index.md b/content/cities/heidersdorf/_index.md
index ff1e3090c7..1b2635548c 100644
--- a/content/cities/heidersdorf/_index.md
+++ b/content/cities/heidersdorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Heidersdorf
 url: /heidersdorf/
-latitude: 50.671
-longitude: 13.419
+latitude: 50.663
+longitude: 13.417
 ---
\ No newline at end of file
diff --git a/content/cities/herrnhut/_index.md b/content/cities/herrnhut/_index.md
index eebe0748b5..97de56deee 100644
--- a/content/cities/herrnhut/_index.md
+++ b/content/cities/herrnhut/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Herrnhut
 url: /herrnhut/
-latitude: 51.02
-longitude: 14.739
+latitude: 51.026
+longitude: 14.746
 ---
\ No newline at end of file
diff --git a/content/cities/herrnhut/fahrzeugservice-urland.md b/content/cities/herrnhut/fahrzeugservice-urland.md
new file mode 100644
index 0000000000..f5526d1705
--- /dev/null
+++ b/content/cities/herrnhut/fahrzeugservice-urland.md
@@ -0,0 +1,5 @@
+---
+title: "Fahrzeugservice Urland"
+url: /herrnhut/fahrzeugservice-urland/
+shop: Autohaus
+---
\ No newline at end of file
diff --git a/content/cities/herrnhut/fleischerei-krumpholt.md b/content/cities/herrnhut/fleischerei-krumpholt.md
new file mode 100644
index 0000000000..fea953a401
--- /dev/null
+++ b/content/cities/herrnhut/fleischerei-krumpholt.md
@@ -0,0 +1,5 @@
+---
+title: "Fleischerei Krumpholt"
+url: /herrnhut/fleischerei-krumpholt/
+shop: Metzgerei
+---
\ No newline at end of file
diff --git a/content/cities/herrnhut/gartenbau-dienel.md b/content/cities/herrnhut/gartenbau-dienel.md
new file mode 100644
index 0000000000..f26c4c5b81
--- /dev/null
+++ b/content/cities/herrnhut/gartenbau-dienel.md
@@ -0,0 +1,5 @@
+---
+title: "Gartenbau Dienel"
+url: /herrnhut/gartenbau-dienel/
+shop: Hofladen
+---
\ No newline at end of file
diff --git a/content/cities/herrnhut/kraftfahrzeuginstandsetzung-haeschke.md b/content/cities/herrnhut/kraftfahrzeuginstandsetzung-haeschke.md
new file mode 100644
index 0000000000..336a6553c0
--- /dev/null
+++ b/content/cities/herrnhut/kraftfahrzeuginstandsetzung-haeschke.md
@@ -0,0 +1,5 @@
+---
+title: "Kraftfahrzeuginstandsetzung Häschke"
+url: /herrnhut/kraftfahrzeuginstandsetzung-haeschke/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/herrnhut/schneiderei-goehle.md b/content/cities/herrnhut/schneiderei-goehle.md
new file mode 100644
index 0000000000..9aaf0c8292
--- /dev/null
+++ b/content/cities/herrnhut/schneiderei-goehle.md
@@ -0,0 +1,5 @@
+---
+title: "Schneiderei Göhle"
+url: /herrnhut/schneiderei-goehle/
+shop: Schneiderei
+---
\ No newline at end of file
diff --git a/content/cities/hoyerswerda/aldi-nord-ziolkowskistrasse.md b/content/cities/hoyerswerda/aldi-nord-ziolkowskistrasse.md
new file mode 100644
index 0000000000..eed3a6b958
--- /dev/null
+++ b/content/cities/hoyerswerda/aldi-nord-ziolkowskistrasse.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI Nord"
+url: /hoyerswerda/aldi-nord-ziolkowskistrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/hoyerswerda/aldi.md b/content/cities/hoyerswerda/aldi.md
deleted file mode 100644
index a2522111e4..0000000000
--- a/content/cities/hoyerswerda/aldi.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Aldi"
-url: /hoyerswerda/aldi/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/leipzig/_index.md b/content/cities/leipzig/_index.md
index fb07f0d664..b22f4c9623 100644
--- a/content/cities/leipzig/_index.md
+++ b/content/cities/leipzig/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Leipzig
 url: /leipzig/
-latitude: 51.353
-longitude: 12.46
+latitude: 51.379
+longitude: 12.407
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/aldi-heinrich-heine-strasse.md b/content/cities/leipzig/aldi-heinrich-heine-strasse.md
deleted file mode 100644
index a6fece3d95..0000000000
--- a/content/cities/leipzig/aldi-heinrich-heine-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Aldi"
-url: /leipzig/aldi-heinrich-heine-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/leipzig/aldi-nord-grimmaische-strasse.md b/content/cities/leipzig/aldi-nord-grimmaische-strasse.md
new file mode 100644
index 0000000000..d685ecc98a
--- /dev/null
+++ b/content/cities/leipzig/aldi-nord-grimmaische-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI Nord"
+url: /leipzig/aldi-nord-grimmaische-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/auto-station-leipzig.md b/content/cities/leipzig/auto-station-leipzig.md
new file mode 100644
index 0000000000..34329bf6e6
--- /dev/null
+++ b/content/cities/leipzig/auto-station-leipzig.md
@@ -0,0 +1,5 @@
+---
+title: "Auto-Station Leipzig"
+url: /leipzig/auto-station-leipzig/
+shop: Autohaus
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/bestattung-anake.md b/content/cities/leipzig/bestattung-anake.md
new file mode 100644
index 0000000000..5302d21600
--- /dev/null
+++ b/content/cities/leipzig/bestattung-anake.md
@@ -0,0 +1,5 @@
+---
+title: "Bestattung Anake"
+url: /leipzig/bestattung-anake/
+shop: Bestattungen
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/fielmann-2.md b/content/cities/leipzig/fielmann-2.md
new file mode 100644
index 0000000000..8312201419
--- /dev/null
+++ b/content/cities/leipzig/fielmann-2.md
@@ -0,0 +1,5 @@
+---
+title: "Fielmann"
+url: /leipzig/fielmann-2/
+shop: Optiker
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/fristo-floessenstrasse.md b/content/cities/leipzig/fristo-floessenstrasse.md
new file mode 100644
index 0000000000..0d5e2e815c
--- /dev/null
+++ b/content/cities/leipzig/fristo-floessenstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Fristo"
+url: /leipzig/fristo-floessenstrasse/
+shop: Getränke
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/fristo-max-liebermann-strasse.md b/content/cities/leipzig/fristo-max-liebermann-strasse.md
deleted file mode 100644
index f8a1a05ffb..0000000000
--- a/content/cities/leipzig/fristo-max-liebermann-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Fristo"
-url: /leipzig/fristo-max-liebermann-strasse/
-shop: Getränke
----
\ No newline at end of file
diff --git a/content/cities/leipzig/lebensgarten.md b/content/cities/leipzig/lebensgarten.md
deleted file mode 100644
index fcc59df09d..0000000000
--- a/content/cities/leipzig/lebensgarten.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Lebensgarten"
-url: /leipzig/lebensgarten/
-shop: Lebensmittel
----
\ No newline at end of file
diff --git a/content/cities/leipzig/lucky-bike-handelsstrasse.md b/content/cities/leipzig/lucky-bike-handelsstrasse.md
deleted file mode 100644
index bded00af6c..0000000000
--- a/content/cities/leipzig/lucky-bike-handelsstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Lucky Bike"
-url: /leipzig/lucky-bike-handelsstrasse/
-shop: Fahrrad
----
\ No newline at end of file
diff --git a/content/cities/leipzig/lucky-bike-hans-poeche-strasse.md b/content/cities/leipzig/lucky-bike-hans-poeche-strasse.md
new file mode 100644
index 0000000000..6c35c1ac6d
--- /dev/null
+++ b/content/cities/leipzig/lucky-bike-hans-poeche-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Lucky Bike"
+url: /leipzig/lucky-bike-hans-poeche-strasse/
+shop: Fahrrad
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/puche-international.md b/content/cities/leipzig/puche-international.md
deleted file mode 100644
index 8e25826f59..0000000000
--- a/content/cities/leipzig/puche-international.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Púche International"
-url: /leipzig/puche-international/
-shop: Friseurbedarf
----
\ No newline at end of file
diff --git a/content/cities/leipzig/puche-professional.md b/content/cities/leipzig/puche-professional.md
new file mode 100644
index 0000000000..cfb9e5a811
--- /dev/null
+++ b/content/cities/leipzig/puche-professional.md
@@ -0,0 +1,5 @@
+---
+title: "Púche Professional"
+url: /leipzig/puche-professional/
+shop: Friseurbedarf
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/salon-elaziz.md b/content/cities/leipzig/salon-elaziz.md
deleted file mode 100644
index 4391a98668..0000000000
--- a/content/cities/leipzig/salon-elaziz.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Salon Elaziz"
-url: /leipzig/salon-elaziz/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/leipzig/salon-hauptsache.md b/content/cities/leipzig/salon-hauptsache.md
new file mode 100644
index 0000000000..a425d33e73
--- /dev/null
+++ b/content/cities/leipzig/salon-hauptsache.md
@@ -0,0 +1,5 @@
+---
+title: "Salon HAUPTsache"
+url: /leipzig/salon-hauptsache/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/shredderei.md b/content/cities/leipzig/shredderei.md
new file mode 100644
index 0000000000..322542c941
--- /dev/null
+++ b/content/cities/leipzig/shredderei.md
@@ -0,0 +1,5 @@
+---
+title: "Shredderei"
+url: /leipzig/shredderei/
+shop: Sport
+---
\ 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/muldenhammer/_index.md b/content/cities/muldenhammer/_index.md
index 59bb0c4d98..ddbf18ee6b 100644
--- a/content/cities/muldenhammer/_index.md
+++ b/content/cities/muldenhammer/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Muldenhammer
 url: /muldenhammer/
-latitude: 50.46
-longitude: 12.491
+latitude: 50.445
+longitude: 12.512
 ---
\ No newline at end of file
diff --git a/content/cities/neukirchen-erzgebirge/penny-adorfer-hauptstrasse.md b/content/cities/neukirchen-erzgebirge/penny-adorfer-hauptstrasse.md
deleted file mode 100644
index 73a1cd57d7..0000000000
--- a/content/cities/neukirchen-erzgebirge/penny-adorfer-hauptstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "PENNY"
-url: /neukirchen-erzgebirge/penny-adorfer-hauptstrasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/neukirchen-erzgebirge/penny-am-marktplatz.md b/content/cities/neukirchen-erzgebirge/penny-am-marktplatz.md
new file mode 100644
index 0000000000..5b59b0903f
--- /dev/null
+++ b/content/cities/neukirchen-erzgebirge/penny-am-marktplatz.md
@@ -0,0 +1,5 @@
+---
+title: "PENNY"
+url: /neukirchen-erzgebirge/penny-am-marktplatz/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/plauen/netto-marken-discount-pausaer-strasse.md b/content/cities/nossen/netto-marken-discount-bismarckstrasse.md
similarity index 51%
rename from content/cities/plauen/netto-marken-discount-pausaer-strasse.md
rename to content/cities/nossen/netto-marken-discount-bismarckstrasse.md
index 339e5ba7b2..1c3ae0985c 100644
--- a/content/cities/plauen/netto-marken-discount-pausaer-strasse.md
+++ b/content/cities/nossen/netto-marken-discount-bismarckstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Netto Marken-Discount"
-url: /plauen/netto-marken-discount-pausaer-strasse/
+url: /nossen/netto-marken-discount-bismarckstrasse/
 shop: Supermarkt
 ---
\ 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
deleted file mode 100644
index 31c5adc335..0000000000
--- a/content/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 0000000000..12d4080a1e
--- /dev/null
+++ b/content/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /ottendorf-okrilla/netto-marken-discount-poststrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/plauen/blumenliebe-vergissmeinnicht.md b/content/cities/plauen/blumenliebe-vergissmeinnicht.md
new file mode 100644
index 0000000000..53810b6cf6
--- /dev/null
+++ b/content/cities/plauen/blumenliebe-vergissmeinnicht.md
@@ -0,0 +1,5 @@
+---
+title: "Blumenliebe Vergissmeinnicht"
+url: /plauen/blumenliebe-vergissmeinnicht/
+shop: Blumen
+---
\ No newline at end of file
diff --git a/content/cities/nossen/netto-marken-discount-zellsteig.md b/content/cities/plauen/netto-marken-discount-luetzowstrasse.md
similarity index 51%
rename from content/cities/nossen/netto-marken-discount-zellsteig.md
rename to content/cities/plauen/netto-marken-discount-luetzowstrasse.md
index e5b8b26390..9c4ade7655 100644
--- a/content/cities/nossen/netto-marken-discount-zellsteig.md
+++ b/content/cities/plauen/netto-marken-discount-luetzowstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Netto Marken-Discount"
-url: /nossen/netto-marken-discount-zellsteig/
+url: /plauen/netto-marken-discount-luetzowstrasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/plauen/someflowers-blumenfachgeschaeft.md b/content/cities/plauen/someflowers-blumenfachgeschaeft.md
deleted file mode 100644
index d056de01bb..0000000000
--- a/content/cities/plauen/someflowers-blumenfachgeschaeft.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "someFlowers Blumenfachgeschäft"
-url: /plauen/someflowers-blumenfachgeschaeft/
-shop: Blumen
----
\ No newline at end of file
diff --git a/content/cities/regis-breitingen/friseursalon-flach.md b/content/cities/regis-breitingen/friseursalon-flach.md
new file mode 100644
index 0000000000..309d659c66
--- /dev/null
+++ b/content/cities/regis-breitingen/friseursalon-flach.md
@@ -0,0 +1,5 @@
+---
+title: "Friseursalon Flach"
+url: /regis-breitingen/friseursalon-flach/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/schoenberg/_index.md b/content/cities/schoenberg/_index.md
index 67527ebeac..44bb7fc178 100644
--- a/content/cities/schoenberg/_index.md
+++ b/content/cities/schoenberg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Schönberg
 url: /schoenberg/
-latitude: 50.868
-longitude: 12.492
+latitude: 50.887
+longitude: 12.499
 ---
\ No newline at end of file
diff --git a/content/cities/schoeneck-vogtl/_index.md b/content/cities/schoeneck-vogtl/_index.md
index 633bed1dba..9d96b77d44 100644
--- a/content/cities/schoeneck-vogtl/_index.md
+++ b/content/cities/schoeneck-vogtl/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Schöneck/Vogtl.
 url: /schoeneck-vogtl/
-latitude: 50.391
-longitude: 12.327
+latitude: 50.398
+longitude: 12.328
 ---
\ No newline at end of file
diff --git a/content/cities/schwarzenberg-erzgebirge/_index.md b/content/cities/schwarzenberg-erzgebirge/_index.md
index 0f353e3fbe..c68ef15b8a 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.539
-longitude: 12.785
+latitude: 50.534
+longitude: 12.769
 ---
\ No newline at end of file
diff --git a/content/cities/sebnitz/gnauck-s-backhaus-hohnsteiner-strasse.md b/content/cities/sebnitz/gnauck-s-backhaus-hohnsteiner-strasse.md
deleted file mode 100644
index e2b84f2684..0000000000
--- a/content/cities/sebnitz/gnauck-s-backhaus-hohnsteiner-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Gnauck´s Backhaus"
-url: /sebnitz/gnauck-s-backhaus-hohnsteiner-strasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/sebnitz/gnauck-s-backhaus-schandauer-strasse.md b/content/cities/sebnitz/gnauck-s-backhaus-schandauer-strasse.md
new file mode 100644
index 0000000000..2771c2ec62
--- /dev/null
+++ b/content/cities/sebnitz/gnauck-s-backhaus-schandauer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Gnauck´s Backhaus"
+url: /sebnitz/gnauck-s-backhaus-schandauer-strasse/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/steina/_index.md b/content/cities/steina/_index.md
index b783a05973..649c60f435 100644
--- a/content/cities/steina/_index.md
+++ b/content/cities/steina/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Steina
 url: /steina/
-latitude: 51.2
-longitude: 14.056
+latitude: 51.199
+longitude: 14.059
 ---
\ 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/weissenborn-erzgeb/autohaus-martin.md b/content/cities/weissenborn-erzgeb/autohaus-martin.md
new file mode 100644
index 0000000000..4a2acd9f79
--- /dev/null
+++ b/content/cities/weissenborn-erzgeb/autohaus-martin.md
@@ -0,0 +1,5 @@
+---
+title: "Autohaus Martin"
+url: /weissenborn-erzgeb/autohaus-martin/
+shop: Autohaus
+---
\ No newline at end of file
diff --git a/content/cities/weissenborn-erzgeb/autoservice-mueller.md b/content/cities/weissenborn-erzgeb/autoservice-mueller.md
new file mode 100644
index 0000000000..354c0d8495
--- /dev/null
+++ b/content/cities/weissenborn-erzgeb/autoservice-mueller.md
@@ -0,0 +1,5 @@
+---
+title: "Autoservice Müller"
+url: /weissenborn-erzgeb/autoservice-mueller/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/weissenborn-erzgeb/avanti-service.md b/content/cities/weissenborn-erzgeb/avanti-service.md
new file mode 100644
index 0000000000..aa149ce451
--- /dev/null
+++ b/content/cities/weissenborn-erzgeb/avanti-service.md
@@ -0,0 +1,5 @@
+---
+title: "Avanti Service"
+url: /weissenborn-erzgeb/avanti-service/
+shop: Wäscherei
+---
\ No newline at end of file
diff --git a/content/cities/weissenborn-erzgeb/fotoschreiber.md b/content/cities/weissenborn-erzgeb/fotoschreiber.md
deleted file mode 100644
index c5aac9b335..0000000000
--- a/content/cities/weissenborn-erzgeb/fotoschreiber.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "fotoschreiber"
-url: /weissenborn-erzgeb/fotoschreiber/
-shop: Foto
----
\ No newline at end of file
diff --git a/content/cities/weissenborn-erzgeb/mueller-autoreparatur.md b/content/cities/weissenborn-erzgeb/mueller-autoreparatur.md
deleted file mode 100644
index 53d394e4eb..0000000000
--- a/content/cities/weissenborn-erzgeb/mueller-autoreparatur.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "müller autoreparatur"
-url: /weissenborn-erzgeb/mueller-autoreparatur/
-shop: Autowerkstatt
----
\ No newline at end of file
diff --git a/content/cities/weissenborn-erzgeb/p-meyer.md b/content/cities/weissenborn-erzgeb/p-meyer.md
deleted file mode 100644
index b27bda394a..0000000000
--- a/content/cities/weissenborn-erzgeb/p-meyer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "P. Meyer"
-url: /weissenborn-erzgeb/p-meyer/
-shop: Autohaus
----
\ No newline at end of file
diff --git a/content/cities/weissenborn-erzgeb/salon-hairklotz.md b/content/cities/weissenborn-erzgeb/salon-hairklotz.md
new file mode 100644
index 0000000000..fa3aaeacb6
--- /dev/null
+++ b/content/cities/weissenborn-erzgeb/salon-hairklotz.md
@@ -0,0 +1,5 @@
+---
+title: "Salon Hairklotz"
+url: /weissenborn-erzgeb/salon-hairklotz/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/zwickau/ernstings-family-innere-plauensche-strasse.md b/content/cities/zwickau/ernstings-family-innere-plauensche-strasse.md
new file mode 100644
index 0000000000..4d176772e8
--- /dev/null
+++ b/content/cities/zwickau/ernstings-family-innere-plauensche-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Ernsting's family"
+url: /zwickau/ernstings-family-innere-plauensche-strasse/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/zwickau/ernstings-family-oskar-arnold-strasse.md b/content/cities/zwickau/ernstings-family-oskar-arnold-strasse.md
deleted file mode 100644
index 05a00dd4db..0000000000
--- a/content/cities/zwickau/ernstings-family-oskar-arnold-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Ernsting's family"
-url: /zwickau/ernstings-family-oskar-arnold-strasse/
-shop: Kleidung
----
\ No newline at end of file
diff --git a/data/cities/annaberg-buchholz/netto-marken-discount-bahnhofsplatz.yml b/data/cities/annaberg-buchholz/netto-marken-discount-bahnhofsplatz.yml
deleted file mode 100644
index 895e59008e..0000000000
--- a/data/cities/annaberg-buchholz/netto-marken-discount-bahnhofsplatz.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 125963015
-type: way
-latitude: 50.57677
-longitude: 12.99896
-postcode: "09456"
-city: Annaberg-Buchholz
-street: "Bahnhofsplatz"
-housenumber: 5
-phone: ""
-opening_hours: "geschlossen, wird renoviert"
-website: ""
\ No newline at end of file
diff --git a/data/cities/annaberg-buchholz/netto-marken-discount-dresdner-strasse.yml b/data/cities/annaberg-buchholz/netto-marken-discount-dresdner-strasse.yml
new file mode 100644
index 0000000000..2ec50d9f40
--- /dev/null
+++ b/data/cities/annaberg-buchholz/netto-marken-discount-dresdner-strasse.yml
@@ -0,0 +1,11 @@
+id: 113667873
+type: way
+latitude: 50.59136
+longitude: 13.01558
+postcode: "09456"
+city: Annaberg-Buchholz
+street: "Dresdner Straße"
+housenumber: 12
+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/annaberg-buchholz/netto-marken-discount.yml b/data/cities/annaberg-buchholz/netto-marken-discount.yml
index 2ec50d9f40..895e59008e 100644
--- a/data/cities/annaberg-buchholz/netto-marken-discount.yml
+++ b/data/cities/annaberg-buchholz/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 113667873
+id: 125963015
 type: way
-latitude: 50.59136
-longitude: 13.01558
+latitude: 50.57677
+longitude: 12.99896
 postcode: "09456"
 city: Annaberg-Buchholz
-street: "Dresdner Straße"
-housenumber: 12
+street: "Bahnhofsplatz"
+housenumber: 5
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
-website: "https://www.netto-online.de/"
\ No newline at end of file
+opening_hours: "geschlossen, wird renoviert"
+website: ""
\ 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/lidl.yml b/data/cities/bad-schandau/lidl.yml
index 46bd204161..3df287b0c3 100644
--- a/data/cities/bad-schandau/lidl.yml
+++ b/data/cities/bad-schandau/lidl.yml
@@ -7,5 +7,5 @@ city: Bad Schandau
 street: "Dresdner Straße"
 housenumber: 15
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su 11:00-18:00"
+opening_hours: "Mo-Sa 07:00-21:00"
 website: ""
\ 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
deleted file mode 100644
index 370efbe7ff..0000000000
--- a/data/cities/bischofswerda/netto-marken-discount-belmsdorfer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 0000000000..d83ac2636e
--- /dev/null
+++ b/data/cities/bischofswerda/netto-marken-discount-dresdener-strasse.yml
@@ -0,0 +1,11 @@
+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 d83ac2636e..370efbe7ff 100644
--- a/data/cities/bischofswerda/netto-marken-discount.yml
+++ b/data/cities/bischofswerda/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 46344338
+id: 49712354
 type: way
-latitude: 51.12443
-longitude: 14.17533
+latitude: 51.12491
+longitude: 14.19182
 postcode: "01877"
 city: Bischofswerda
-street: "Dresdener Straße"
-housenumber: 45
+street: "Belmsdorfer Straße"
+housenumber: 29
 phone: ""
-opening_hours: ""
-website: "https://www.netto-online.de"
\ No newline at end of file
+opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/brand-erbisdorf/aldi-nord.yml b/data/cities/brand-erbisdorf/aldi-nord.yml
new file mode 100644
index 0000000000..a28cefa9e7
--- /dev/null
+++ b/data/cities/brand-erbisdorf/aldi-nord.yml
@@ -0,0 +1,11 @@
+id: 1245436073
+type: way
+latitude: 50.85729
+longitude: 13.32056
+postcode: "09618"
+city: Brand-Erbisdorf
+street: "Großhartmannsdorfer Straße"
+housenumber: 13
+phone: ""
+opening_hours: "Mo-Sa 07:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/gems.yml b/data/cities/chemnitz/gems.yml
new file mode 100644
index 0000000000..19e1d63f62
--- /dev/null
+++ b/data/cities/chemnitz/gems.yml
@@ -0,0 +1,11 @@
+id: 11557267384
+type: node
+latitude: 50.83316
+longitude: 12.92392
+postcode: "09111"
+city: Chemnitz
+street: "Johannisstraße"
+housenumber: 2
+phone: "+4915237933293"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/lidl-eckstrasse.yml b/data/cities/chemnitz/lidl-eckstrasse.yml
deleted file mode 100644
index 2f51adc1b5..0000000000
--- a/data/cities/chemnitz/lidl-eckstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 46717193
-type: way
-latitude: 50.84634
-longitude: 12.92499
-postcode: "09113"
-city: Chemnitz
-street: "Eckstraße"
-housenumber: 4
-phone: ""
-opening_hours: "Mo-Sa 07:00-21:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/lidl-limbacher-strasse-2.yml b/data/cities/chemnitz/lidl-limbacher-strasse-2.yml
new file mode 100644
index 0000000000..a02f7e551b
--- /dev/null
+++ b/data/cities/chemnitz/lidl-limbacher-strasse-2.yml
@@ -0,0 +1,11 @@
+id: 112558946
+type: way
+latitude: 50.83357
+longitude: 12.87507
+postcode: "09116"
+city: Chemnitz
+street: "Limbacher Straße"
+housenumber: 208
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/lidl-limbacher-strasse.yml b/data/cities/chemnitz/lidl-limbacher-strasse.yml
index a02f7e551b..d17bd897f3 100644
--- a/data/cities/chemnitz/lidl-limbacher-strasse.yml
+++ b/data/cities/chemnitz/lidl-limbacher-strasse.yml
@@ -1,11 +1,11 @@
-id: 112558946
+id: 53417647
 type: way
-latitude: 50.83357
-longitude: 12.87507
-postcode: "09116"
+latitude: 50.83853
+longitude: 12.90172
+postcode: "09113"
 city: Chemnitz
 street: "Limbacher Straße"
-housenumber: 208
+housenumber: 31
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/lidl.yml b/data/cities/chemnitz/lidl.yml
index d17bd897f3..2f51adc1b5 100644
--- a/data/cities/chemnitz/lidl.yml
+++ b/data/cities/chemnitz/lidl.yml
@@ -1,11 +1,11 @@
-id: 53417647
+id: 46717193
 type: way
-latitude: 50.83853
-longitude: 12.90172
+latitude: 50.84634
+longitude: 12.92499
 postcode: "09113"
 city: Chemnitz
-street: "Limbacher Straße"
-housenumber: 31
+street: "Eckstraße"
+housenumber: 4
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
+opening_hours: "Mo-Sa 07:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/norma-reichenbrander-strasse.yml b/data/cities/chemnitz/norma-reichenbrander-strasse.yml
deleted file mode 100644
index 819a140961..0000000000
--- a/data/cities/chemnitz/norma-reichenbrander-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 53845606
-type: way
-latitude: 50.80596
-longitude: 12.8379
-postcode: "09117"
-city: Chemnitz
-street: "Reichenbrander Straße"
-housenumber: 126
-phone: ""
-opening_hours: "Mo-Sa 08:00-20:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/norma-zschopauer-strasse.yml b/data/cities/chemnitz/norma-zschopauer-strasse.yml
new file mode 100644
index 0000000000..75a45d1e36
--- /dev/null
+++ b/data/cities/chemnitz/norma-zschopauer-strasse.yml
@@ -0,0 +1,11 @@
+id: 46623365
+type: way
+latitude: 50.8125
+longitude: 12.95859
+postcode: "09126"
+city: Chemnitz
+street: "Zschopauer Straße"
+housenumber: 256
+phone: ""
+opening_hours: "Mo-Fr 08:00-20:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/norma.yml b/data/cities/chemnitz/norma.yml
index 75a45d1e36..819a140961 100644
--- a/data/cities/chemnitz/norma.yml
+++ b/data/cities/chemnitz/norma.yml
@@ -1,11 +1,11 @@
-id: 46623365
+id: 53845606
 type: way
-latitude: 50.8125
-longitude: 12.95859
-postcode: "09126"
+latitude: 50.80596
+longitude: 12.8379
+postcode: "09117"
 city: Chemnitz
-street: "Zschopauer Straße"
-housenumber: 256
+street: "Reichenbrander Straße"
+housenumber: 126
 phone: ""
-opening_hours: "Mo-Fr 08:00-20:00"
+opening_hours: "Mo-Sa 08:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/crimmitschau/reifenhaus-diana-schmiedel-feldstrasse.yml b/data/cities/crimmitschau/reifenhaus-diana-schmiedel-feldstrasse.yml
new file mode 100644
index 0000000000..ba08cb9400
--- /dev/null
+++ b/data/cities/crimmitschau/reifenhaus-diana-schmiedel-feldstrasse.yml
@@ -0,0 +1,11 @@
+id: 586393454
+type: way
+latitude: 50.82835
+longitude: 12.39829
+postcode: "08451"
+city: Crimmitschau
+street: "Feldstraße"
+housenumber: 5
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/crimmitschau/reifenhaus-diana-schmiedel-glauchauer-landstrasse.yml b/data/cities/crimmitschau/reifenhaus-diana-schmiedel-glauchauer-landstrasse.yml
deleted file mode 100644
index 30b59c58a2..0000000000
--- a/data/cities/crimmitschau/reifenhaus-diana-schmiedel-glauchauer-landstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 570445201
-type: way
-latitude: 50.81818
-longitude: 12.39563
-postcode: "08451"
-city: Crimmitschau
-street: "Glauchauer Landstraße"
-housenumber: 9b
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/crimmitschau/reifenhaus-diana-schmiedel.yml b/data/cities/crimmitschau/reifenhaus-diana-schmiedel.yml
index ba08cb9400..30b59c58a2 100644
--- a/data/cities/crimmitschau/reifenhaus-diana-schmiedel.yml
+++ b/data/cities/crimmitschau/reifenhaus-diana-schmiedel.yml
@@ -1,11 +1,11 @@
-id: 586393454
+id: 570445201
 type: way
-latitude: 50.82835
-longitude: 12.39829
+latitude: 50.81818
+longitude: 12.39563
 postcode: "08451"
 city: Crimmitschau
-street: "Feldstraße"
-housenumber: 5
+street: "Glauchauer Landstraße"
+housenumber: 9b
 phone: ""
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/a-t-u-michaelisstrasse.yml b/data/cities/dresden/a-t-u-michaelisstrasse.yml
new file mode 100644
index 0000000000..921de7ee5d
--- /dev/null
+++ b/data/cities/dresden/a-t-u-michaelisstrasse.yml
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index 4704e4e979..0000000000
--- a/data/cities/dresden/a-t-u-washingtonstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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 921de7ee5d..4704e4e979 100644
--- a/data/cities/dresden/a-t-u.yml
+++ b/data/cities/dresden/a-t-u.yml
@@ -1,11 +1,11 @@
-id: 33807049
+id: 23168071
 type: way
-latitude: 50.99443
-longitude: 13.80265
-postcode: ""
+latitude: 51.07931
+longitude: 13.69026
+postcode: "01139"
 city: Dresden
-street: "Michaelisstraße"
-housenumber: 3
+street: "Washingtonstraße"
+housenumber: 10
 phone: ""
-opening_hours: ""
+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/baeckerei-gehre-altnickern.yml b/data/cities/dresden/baeckerei-gehre-altnickern.yml
new file mode 100644
index 0000000000..d2390cb8d2
--- /dev/null
+++ b/data/cities/dresden/baeckerei-gehre-altnickern.yml
@@ -0,0 +1,11 @@
+id: 2399358782
+type: node
+latitude: 50.99449
+longitude: 13.78826
+postcode: "01239"
+city: Dresden
+street: "Altnickern"
+housenumber: 27
+phone: ""
+opening_hours: "Tu-Fr 05:00-18:00; Sa 05:00-12:00"
+website: "http://baeckerei.gehre-nickern.de/"
\ No newline at end of file
diff --git a/data/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.yml b/data/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.yml
deleted file mode 100644
index 88ea23c586..0000000000
--- a/data/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2408827238
-type: node
-latitude: 50.98684
-longitude: 13.80589
-postcode: "01257"
-city: Dresden
-street: "Röhrsdorfer Straße"
-housenumber: 4
-phone: "+49 351 386580"
-opening_hours: "Tu-Fr 06:30-18:00; Sa 06:30-11:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/baeckerei-gehre.yml b/data/cities/dresden/baeckerei-gehre.yml
index d2390cb8d2..88ea23c586 100644
--- a/data/cities/dresden/baeckerei-gehre.yml
+++ b/data/cities/dresden/baeckerei-gehre.yml
@@ -1,11 +1,11 @@
-id: 2399358782
+id: 2408827238
 type: node
-latitude: 50.99449
-longitude: 13.78826
-postcode: "01239"
+latitude: 50.98684
+longitude: 13.80589
+postcode: "01257"
 city: Dresden
-street: "Altnickern"
-housenumber: 27
-phone: ""
-opening_hours: "Tu-Fr 05:00-18:00; Sa 05:00-12:00"
-website: "http://baeckerei.gehre-nickern.de/"
\ No newline at end of file
+street: "Röhrsdorfer Straße"
+housenumber: 4
+phone: "+49 351 386580"
+opening_hours: "Tu-Fr 06:30-18:00; Sa 06:30-11:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/brillen-de.yml b/data/cities/dresden/brillen-de.yml
new file mode 100644
index 0000000000..34a2d548d6
--- /dev/null
+++ b/data/cities/dresden/brillen-de.yml
@@ -0,0 +1,11 @@
+id: 10550596919
+type: node
+latitude: 51.04365
+longitude: 13.69822
+postcode: "01159"
+city: Dresden
+street: "Kesselsdorfer Straße"
+housenumber: 
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/emil-reimann-schlesischer-platz.yml b/data/cities/dresden/emil-reimann-schlesischer-platz.yml
index 75af7b8fb7..dd7176cfd5 100644
--- a/data/cities/dresden/emil-reimann-schlesischer-platz.yml
+++ b/data/cities/dresden/emil-reimann-schlesischer-platz.yml
@@ -1,7 +1,7 @@
-id: 1276153911
-type: node
-latitude: 51.06529
-longitude: 13.74088
+id: 1245087413
+type: way
+latitude: 51.06525
+longitude: 13.74091
 postcode: "01097"
 city: Dresden
 street: "Schlesischer Platz"
diff --git a/data/cities/dresden/greenbeershop.yml b/data/cities/dresden/greenbeershop.yml
new file mode 100644
index 0000000000..930ff76e1e
--- /dev/null
+++ b/data/cities/dresden/greenbeershop.yml
@@ -0,0 +1,11 @@
+id: 2184311456
+type: node
+latitude: 51.0437
+longitude: 13.69874
+postcode: "01159"
+city: Dresden
+street: "Kesselsdorfer Straße"
+housenumber: 28
+phone: ""
+opening_hours: "Mo-Th 14:00-23:00; Fr-Sa 14:00-24:00; Su 14:00-22:00; PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/le-crobag.yml b/data/cities/dresden/le-crobag.yml
index 7e26a7d4cc..dd0ecbcad1 100644
--- a/data/cities/dresden/le-crobag.yml
+++ b/data/cities/dresden/le-crobag.yml
@@ -1,7 +1,7 @@
-id: 1492233514
-type: node
-latitude: 51.06537
-longitude: 13.74101
+id: 1245087419
+type: way
+latitude: 51.06534
+longitude: 13.74107
 postcode: "01097"
 city: Dresden
 street: "Schlesischer Platz"
diff --git a/data/cities/dresden/lidl-schlesischer-platz.yml b/data/cities/dresden/lidl-schlesischer-platz.yml
index e418ebde10..3aaef533d4 100644
--- a/data/cities/dresden/lidl-schlesischer-platz.yml
+++ b/data/cities/dresden/lidl-schlesischer-platz.yml
@@ -1,7 +1,7 @@
-id: 262134960
-type: node
-latitude: 51.0651
-longitude: 13.74051
+id: 1245087397
+type: way
+latitude: 51.06496
+longitude: 13.74037
 postcode: "01097"
 city: Dresden
 street: "Schlesischer Platz"
diff --git a/data/cities/dresden/nachfuellbasis.yml b/data/cities/dresden/nachfuellbasis.yml
new file mode 100644
index 0000000000..8316ab98b9
--- /dev/null
+++ b/data/cities/dresden/nachfuellbasis.yml
@@ -0,0 +1,11 @@
+id: 11574124864
+type: node
+latitude: 51.08041
+longitude: 13.71498
+postcode: "01127"
+city: Dresden
+street: "Wurzener Straße"
+housenumber: 41
+phone: "0351 32958633"
+opening_hours: "Mo-Fr 08:30-18:00; Sa 09:00-14:00"
+website: "https://nachfüllbasis.de"
\ No newline at end of file
diff --git a/data/cities/dresden/netto-marken-discount-karlsruher-strasse-2.yml b/data/cities/dresden/netto-marken-discount-karlsruher-strasse-2.yml
index 5d09940762..b61307c232 100644
--- a/data/cities/dresden/netto-marken-discount-karlsruher-strasse-2.yml
+++ b/data/cities/dresden/netto-marken-discount-karlsruher-strasse-2.yml
@@ -1,11 +1,11 @@
-id: 24678211
+id: 5200951
 type: way
-latitude: 51.0121
-longitude: 13.6927
+latitude: 51.01564
+longitude: 13.69842
 postcode: "01189"
 city: Dresden
 street: "Karlsruher Straße"
-housenumber: 80
+housenumber: 46
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
+opening_hours: "Mo-Sa 07:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/netto-marken-discount-karlsruher-strasse.yml b/data/cities/dresden/netto-marken-discount-karlsruher-strasse.yml
index b61307c232..5d09940762 100644
--- a/data/cities/dresden/netto-marken-discount-karlsruher-strasse.yml
+++ b/data/cities/dresden/netto-marken-discount-karlsruher-strasse.yml
@@ -1,11 +1,11 @@
-id: 5200951
+id: 24678211
 type: way
-latitude: 51.01564
-longitude: 13.69842
+latitude: 51.0121
+longitude: 13.6927
 postcode: "01189"
 city: Dresden
 street: "Karlsruher Straße"
-housenumber: 46
+housenumber: 80
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00"
+opening_hours: "Mo-Sa 07:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/rossmann-schlesischer-platz.yml b/data/cities/dresden/rossmann-schlesischer-platz.yml
index 84d4a65598..32247d1503 100644
--- a/data/cities/dresden/rossmann-schlesischer-platz.yml
+++ b/data/cities/dresden/rossmann-schlesischer-platz.yml
@@ -1,7 +1,7 @@
-id: 3224459530
-type: node
-latitude: 51.06562
-longitude: 13.741
+id: 1245087421
+type: way
+latitude: 51.06558
+longitude: 13.74074
 postcode: "01097"
 city: Dresden
 street: "Schlesischer Platz"
diff --git a/data/cities/dresden/sternenbaeck-nuernberger-strasse.yml b/data/cities/dresden/sternenbaeck-nuernberger-strasse.yml
index 1a3217fba2..b98ec0ff9c 100644
--- a/data/cities/dresden/sternenbaeck-nuernberger-strasse.yml
+++ b/data/cities/dresden/sternenbaeck-nuernberger-strasse.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Nürnberger Straße"
 housenumber: 31a
 phone: ""
-opening_hours: "Mo-Fr 07:00-18:00; Sa, Su 08:00-16:00; Su 08:00-17:00"
+opening_hours: "Mo-Fr 07:00-18:00; Sa,Su 08:00-13:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/thor-steinar-outlet.yml b/data/cities/dresden/thor-steinar-outlet.yml
deleted file mode 100644
index 1f1df29666..0000000000
--- a/data/cities/dresden/thor-steinar-outlet.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5251954377
-type: node
-latitude: 51.04335
-longitude: 13.69823
-postcode: "01159"
-city: Dresden
-street: "Kesselsdorfer Straße"
-housenumber: 21
-phone: "+49 351 42419092"
-opening_hours: "Mo-Fr 10:00-19:00, Sa 10:00-18:00"
-website: "https://thorsteinar-outlet.de/"
\ No newline at end of file
diff --git a/data/cities/freiberg/fashaneta.yml b/data/cities/freiberg/fashaneta.yml
index b8233c3984..f83cdfb647 100644
--- a/data/cities/freiberg/fashaneta.yml
+++ b/data/cities/freiberg/fashaneta.yml
@@ -7,5 +7,5 @@ city: Freiberg
 street: "Obermarkt"
 housenumber: 18
 phone: "+49 3731 7750365"
-opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-13:00"
+opening_hours: "Mo-Sa 11:00-13:00, Mo-Fr 15:00-18:00"
 website: "http://www.fashaneta.de"
\ No newline at end of file
diff --git a/data/cities/goerlitz/antik-ansorge.yml b/data/cities/goerlitz/antik-ansorge.yml
index 3627bb2165..a5df7fe057 100644
--- a/data/cities/goerlitz/antik-ansorge.yml
+++ b/data/cities/goerlitz/antik-ansorge.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Jakobstraße"
 housenumber: 35
 phone: ""
-opening_hours: "Tu-Fr 10:00-15:00,16:00-18:00; Sa 11:00-13:00"
+opening_hours: "Tu-Fr 10:00-15:00,16:00-18:00; Sa 11:00-13:00; Mo,Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/cafe-ii-dreissig.yml b/data/cities/goerlitz/cafe-ii-dreissig.yml
index 2cb44da656..be05090454 100644
--- a/data/cities/goerlitz/cafe-ii-dreissig.yml
+++ b/data/cities/goerlitz/cafe-ii-dreissig.yml
@@ -1,7 +1,7 @@
 id: 1945549849
 type: node
-latitude: 51.14785
-longitude: 14.94963
+latitude: 51.14786
+longitude: 14.94969
 postcode: "02827"
 city: Görlitz
 street: "Reichenbacher Straße"
diff --git a/data/cities/goerlitz/edeka-friedrich-engels-strasse.yml b/data/cities/goerlitz/edeka-friedrich-engels-strasse.yml
index 743c88cc75..e63b4ff244 100644
--- a/data/cities/goerlitz/edeka-friedrich-engels-strasse.yml
+++ b/data/cities/goerlitz/edeka-friedrich-engels-strasse.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Friedrich-Engels-Straße"
 housenumber: 37b
 phone: ""
-opening_hours: "Mo-Fr 06:30-20:00 Sa 07:00-16:00"
+opening_hours: "Mo-Fr 06:30-20:00, Sa 07:00-16:00; Su,PH off"
 website: "https://edeka-foodservice.de/ueber-uns/standorte/goerlitz"
\ No newline at end of file
diff --git a/data/cities/goerlitz/gunter-ende.yml b/data/cities/goerlitz/gunter-ende.yml
index 312c1eb380..f508b892e9 100644
--- a/data/cities/goerlitz/gunter-ende.yml
+++ b/data/cities/goerlitz/gunter-ende.yml
@@ -8,4 +8,4 @@ street: "Hospitalstraße"
 housenumber: 5
 phone: "+49 3581 404444"
 opening_hours: "Mo-Fr 09:00-13:00,14:00-18:00; Sa 09:00-13:00; Su,PH off"
-website: "https://gunter-ende.de/"
\ No newline at end of file
+website: "https://gunter-ende.de"
\ No newline at end of file
diff --git a/data/cities/goerlitz/haarschneider2.yml b/data/cities/goerlitz/haarschneider.yml
similarity index 91%
rename from data/cities/goerlitz/haarschneider2.yml
rename to data/cities/goerlitz/haarschneider.yml
index dab2eb39a7..728bfb0baa 100644
--- a/data/cities/goerlitz/haarschneider2.yml
+++ b/data/cities/goerlitz/haarschneider.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Fischmarktstraße"
 housenumber: 1
 phone: ""
-opening_hours: "Mo 12:00-18:00; Tu,We 10:00-18:00; Th,Fr 09:00-17:00"
+opening_hours: "Mo 12:00-18:00; Tu,We 10:00-18:00; Th,Fr 09:00-17:00; Sa,Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/kaufland-scultetusstrasse.yml b/data/cities/goerlitz/kaufland-scultetusstrasse.yml
new file mode 100644
index 0000000000..2ff6acd847
--- /dev/null
+++ b/data/cities/goerlitz/kaufland-scultetusstrasse.yml
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index e39a0a2590..0000000000
--- a/data/cities/goerlitz/kaufland-zittauer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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 2ff6acd847..e39a0a2590 100644
--- a/data/cities/goerlitz/kaufland.yml
+++ b/data/cities/goerlitz/kaufland.yml
@@ -1,11 +1,11 @@
-id: 45327052
+id: 72029676
 type: way
-latitude: 51.16405
-longitude: 14.97721
-postcode: "02828"
+latitude: 51.12685
+longitude: 14.98232
+postcode: "02827"
 city: Görlitz
-street: "Scultetusstraße"
-housenumber: 24
+street: "Zittauer Straße"
+housenumber: 120
 phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
+opening_hours: "Mo-Sa 07:00-22:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/laba-flagship-store.yml b/data/cities/goerlitz/laba-flagship-store.yml
index 3fbeffc2b3..af2230afdf 100644
--- a/data/cities/goerlitz/laba-flagship-store.yml
+++ b/data/cities/goerlitz/laba-flagship-store.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Sohrstraße"
 housenumber: 17
 phone: ""
-opening_hours: "Mi: 11:30 - 18:30; Fr: 16:00 - 19:30"
+opening_hours: "We 12:00-18:30, Fr 16:30-19:30; Mo,Tu,Th,Sa,Su,PH off"
 website: "https://laba.de"
\ No newline at end of file
diff --git a/data/cities/goerlitz/madeleine.yml b/data/cities/goerlitz/madeleine.yml
index 4526f29ad8..551e367160 100644
--- a/data/cities/goerlitz/madeleine.yml
+++ b/data/cities/goerlitz/madeleine.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Jakobstraße"
 housenumber: 34
 phone: ""
-opening_hours: "Mo-Fr 08:00-18:00; Sa 08:00-12:30"
+opening_hours: "Mo-Fr 08:00-18:00; Sa 08:00-12:30; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/zeeman-jakobstrasse.yml b/data/cities/goerlitz/zeeman-jakobstrasse.yml
new file mode 100644
index 0000000000..9d966228ec
--- /dev/null
+++ b/data/cities/goerlitz/zeeman-jakobstrasse.yml
@@ -0,0 +1,11 @@
+id: 11584787619
+type: node
+latitude: 51.1502
+longitude: 14.98538
+postcode: "02826"
+city: Görlitz
+street: "Jakobstraße"
+housenumber: 1
+phone: ""
+opening_hours: "Mo-Fr 09:00-20:00; Sa 09:00-15:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/zeeman-wilhelmsplatz.yml b/data/cities/goerlitz/zeeman-wilhelmsplatz.yml
deleted file mode 100644
index 7d5af01944..0000000000
--- a/data/cities/goerlitz/zeeman-wilhelmsplatz.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 156365779
-type: way
-latitude: 51.15025
-longitude: 14.98553
-postcode: "02826"
-city: Görlitz
-street: "Wilhelmsplatz"
-housenumber: 1
-phone: ""
-opening_hours: "Mo-Fr 09:00-20:00; Sa 09:00-15:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/grosspoesna/ronny-dreizehner.yml b/data/cities/grosspoesna/ronny-dreizehner.yml
new file mode 100644
index 0000000000..767095391c
--- /dev/null
+++ b/data/cities/grosspoesna/ronny-dreizehner.yml
@@ -0,0 +1,11 @@
+id: 11572984111
+type: node
+latitude: 51.27091
+longitude: 12.50378
+postcode: "04463"
+city: Großpösna
+street: "Seitenstraße"
+housenumber: 16B
+phone: "+493429714448"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/herrnhut/fahrzeugservice-urland.yml b/data/cities/herrnhut/fahrzeugservice-urland.yml
new file mode 100644
index 0000000000..5c1b981776
--- /dev/null
+++ b/data/cities/herrnhut/fahrzeugservice-urland.yml
@@ -0,0 +1,11 @@
+id: 923695528
+type: node
+latitude: 51.02793
+longitude: 14.72635
+postcode: "02747"
+city: Herrnhut
+street: "Berthelsdorfer Straße"
+housenumber: 1a
+phone: ""
+opening_hours: "Mo-Fr 07:00-18:00; Sa 09:00-12:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/herrnhut/fleischerei-krumpholt.yml b/data/cities/herrnhut/fleischerei-krumpholt.yml
new file mode 100644
index 0000000000..81f2f928c4
--- /dev/null
+++ b/data/cities/herrnhut/fleischerei-krumpholt.yml
@@ -0,0 +1,11 @@
+id: 574615724
+type: node
+latitude: 51.02615
+longitude: 14.74555
+postcode: "02747"
+city: Herrnhut
+street: "Südstraße"
+housenumber: 35
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/herrnhut/gartenbau-dienel.yml b/data/cities/herrnhut/gartenbau-dienel.yml
new file mode 100644
index 0000000000..4e40934803
--- /dev/null
+++ b/data/cities/herrnhut/gartenbau-dienel.yml
@@ -0,0 +1,11 @@
+id: 11581576724
+type: node
+latitude: 51.02491
+longitude: 14.7594
+postcode: "02747"
+city: Herrnhut
+street: "Herrnhuter Straße"
+housenumber: 22
+phone: ""
+opening_hours: "Mo-Fr 14.30-18:00; Sa,Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/herrnhut/kraftfahrzeuginstandsetzung-haeschke.yml b/data/cities/herrnhut/kraftfahrzeuginstandsetzung-haeschke.yml
new file mode 100644
index 0000000000..6d6eece356
--- /dev/null
+++ b/data/cities/herrnhut/kraftfahrzeuginstandsetzung-haeschke.yml
@@ -0,0 +1,11 @@
+id: 923695136
+type: node
+latitude: 51.02677
+longitude: 14.74498
+postcode: "02747"
+city: Herrnhut
+street: "Obere Dorfstraße"
+housenumber: 20
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/herrnhut/schneiderei-goehle.yml b/data/cities/herrnhut/schneiderei-goehle.yml
new file mode 100644
index 0000000000..ea89702cc5
--- /dev/null
+++ b/data/cities/herrnhut/schneiderei-goehle.yml
@@ -0,0 +1,11 @@
+id: 11581622028
+type: node
+latitude: 51.02916
+longitude: 14.76537
+postcode: "02747"
+city: Herrnhut
+street: "Hauptstraße"
+housenumber: 99
+phone: ""
+opening_hours: "Tu,Th 09:00-11:00,13:00-17:00; Mo,We,Fr-Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/hoyerswerda/aldi.yml b/data/cities/hoyerswerda/aldi-nord-ziolkowskistrasse.yml
similarity index 55%
rename from data/cities/hoyerswerda/aldi.yml
rename to data/cities/hoyerswerda/aldi-nord-ziolkowskistrasse.yml
index ddfd00f586..9d7543c858 100644
--- a/data/cities/hoyerswerda/aldi.yml
+++ b/data/cities/hoyerswerda/aldi-nord-ziolkowskistrasse.yml
@@ -1,11 +1,11 @@
-id: 166725542
+id: 1245111433
 type: way
-latitude: 51.42969
-longitude: 14.27072
+latitude: 51.42967
+longitude: 14.27131
 postcode: "02977"
 city: Hoyerswerda
 street: "Ziolkowskistraße"
 housenumber: 18
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Sa 07:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/afrika-market-diallo.yml b/data/cities/leipzig/afrika-market-diallo.yml
index 9e31351416..a96a74f4b8 100644
--- a/data/cities/leipzig/afrika-market-diallo.yml
+++ b/data/cities/leipzig/afrika-market-diallo.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Nürnberger Straße"
 housenumber: 7
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Sa 09:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-heinrich-heine-strasse.yml b/data/cities/leipzig/aldi-heinrich-heine-strasse.yml
deleted file mode 100644
index a61acad0a0..0000000000
--- a/data/cities/leipzig/aldi-heinrich-heine-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 77862850
-type: way
-latitude: 51.35465
-longitude: 12.29309
-postcode: "04178"
-city: Leipzig
-street: "Heinrich-Heine-Straße"
-housenumber: 39
-phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
-website: "https://www.aldi-nord.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-nord-grimmaische-strasse.yml b/data/cities/leipzig/aldi-nord-grimmaische-strasse.yml
new file mode 100644
index 0000000000..ebcc436f53
--- /dev/null
+++ b/data/cities/leipzig/aldi-nord-grimmaische-strasse.yml
@@ -0,0 +1,11 @@
+id: 501578985
+type: node
+latitude: 51.33987
+longitude: 12.37734
+postcode: "04109"
+city: Leipzig
+street: "Grimmaische Straße"
+housenumber: 15
+phone: ""
+opening_hours: "Mo-Sa 08:00-21:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi.yml b/data/cities/leipzig/aldi.yml
index 80f0d2b86e..a61acad0a0 100644
--- a/data/cities/leipzig/aldi.yml
+++ b/data/cities/leipzig/aldi.yml
@@ -1,11 +1,11 @@
-id: 501578985
-type: node
-latitude: 51.33989
-longitude: 12.37731
-postcode: "04109"
+id: 77862850
+type: way
+latitude: 51.35465
+longitude: 12.29309
+postcode: "04178"
 city: Leipzig
-street: "Grimmaische Straße"
-housenumber: 15
+street: "Heinrich-Heine-Straße"
+housenumber: 39
 phone: ""
-opening_hours: "Mo-Sa 08:00-21:00"
-website: ""
\ No newline at end of file
+opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
+website: "https://www.aldi-nord.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/auto-station-leipzig.yml b/data/cities/leipzig/auto-station-leipzig.yml
new file mode 100644
index 0000000000..8ee61abc4e
--- /dev/null
+++ b/data/cities/leipzig/auto-station-leipzig.yml
@@ -0,0 +1,11 @@
+id: 397483174
+type: way
+latitude: 51.34542
+longitude: 12.45028
+postcode: "04328"
+city: Leipzig
+street: "Riesaer Straße"
+housenumber: 58
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/bestattung-anake.yml b/data/cities/leipzig/bestattung-anake.yml
new file mode 100644
index 0000000000..a267542bcf
--- /dev/null
+++ b/data/cities/leipzig/bestattung-anake.yml
@@ -0,0 +1,11 @@
+id: 9855220771
+type: node
+latitude: 51.35199
+longitude: 12.46032
+postcode: "04329"
+city: Leipzig
+street: "Waldzieststraße"
+housenumber: 6
+phone: "+49 341 2519199"
+opening_hours: ""
+website: "https://www.anankebestattungen.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/bistro-indisches-kaffee.yml b/data/cities/leipzig/bistro-indisches-kaffee.yml
index 1b3a210908..35d7baaf03 100644
--- a/data/cities/leipzig/bistro-indisches-kaffee.yml
+++ b/data/cities/leipzig/bistro-indisches-kaffee.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Selliner Straße"
 housenumber: 1C
 phone: ""
-opening_hours: "Mo-Su 07:00-20:00"
+opening_hours: "Tu-Fr 10:30-14:00,17:00-22:00; Sa 17:00-22:00; Su 12:00-22:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/blumenfachgeschaeft-katrin-waniek.yml b/data/cities/leipzig/blumenfachgeschaeft-katrin-waniek.yml
index e4fe96b587..d10bb5163f 100644
--- a/data/cities/leipzig/blumenfachgeschaeft-katrin-waniek.yml
+++ b/data/cities/leipzig/blumenfachgeschaeft-katrin-waniek.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Selliner Straße"
 housenumber: 1B
 phone: ""
-opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-12:30; Su off"
+opening_hours: "Mo-Fr 09:00-17:00; Sa 08:00-12:30; Su off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/charmant-karl-liebknecht-strasse.yml b/data/cities/leipzig/charmant-karl-liebknecht-strasse.yml
index 6be28476ae..18e9fc549c 100644
--- a/data/cities/leipzig/charmant-karl-liebknecht-strasse.yml
+++ b/data/cities/leipzig/charmant-karl-liebknecht-strasse.yml
@@ -8,4 +8,4 @@ street: "Karl-Liebknecht-Straße"
 housenumber: 167
 phone: ""
 opening_hours: "Mo 09:00-18:00; Tu-Fr 07:00-20:00; Sa 08:00-13:00"
-website: ""
\ No newline at end of file
+website: "https://www.charmant-friseure.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/color-clinic-tattoo-and-piercing.yml b/data/cities/leipzig/color-clinic-tattoo-and-piercing.yml
index bef8bfcd87..dd61e54010 100644
--- a/data/cities/leipzig/color-clinic-tattoo-and-piercing.yml
+++ b/data/cities/leipzig/color-clinic-tattoo-and-piercing.yml
@@ -4,7 +4,7 @@ latitude: 51.32355
 longitude: 12.33243
 postcode: "04229"
 city: Leipzig
-street: "Zschochersche Str."
+street: "Zschochersche Straße"
 housenumber: 82b
 phone: ""
 opening_hours: "Mo-Th, Sa 10:00-15:00; Fr 12:00-17:00"
diff --git a/data/cities/leipzig/die-brille-an-der-koe.yml b/data/cities/leipzig/die-brille-an-der-koe.yml
index d4ac5d891b..bf9753fbb8 100644
--- a/data/cities/leipzig/die-brille-an-der-koe.yml
+++ b/data/cities/leipzig/die-brille-an-der-koe.yml
@@ -6,6 +6,6 @@ postcode: "04229"
 city: Leipzig
 street: "Könneritzstraße"
 housenumber: 90
-phone: ""
+phone: "+49 341 24922307"
 opening_hours: "Mo,Tu,Th,Fr 10:00-18:00; We 10:00-14:00; Sa 09:00-12:00"
-website: ""
\ No newline at end of file
+website: "https://www.diebrilleanderkoe.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/fielmann-2.yml b/data/cities/leipzig/fielmann-2.yml
new file mode 100644
index 0000000000..82718e7604
--- /dev/null
+++ b/data/cities/leipzig/fielmann-2.yml
@@ -0,0 +1,11 @@
+id: 6416772503
+type: node
+latitude: 51.31928
+longitude: 12.2904
+postcode: ""
+city: Leipzig
+street: ""
+housenumber: 
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/fielmann.yml b/data/cities/leipzig/fielmann.yml
index 82718e7604..f3518d9124 100644
--- a/data/cities/leipzig/fielmann.yml
+++ b/data/cities/leipzig/fielmann.yml
@@ -1,11 +1,11 @@
-id: 6416772503
+id: 916961106
 type: node
-latitude: 51.31928
-longitude: 12.2904
-postcode: ""
+latitude: 51.33982
+longitude: 12.37501
+postcode: "04109"
 city: Leipzig
 street: ""
 housenumber: 
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+phone: "+49 341 9605281"
+opening_hours: "Mo-Fr 09:00-19:00; Sa 09:00-18:00"
+website: "https://www.fielmann.de/niederlassungen/leipzig/04109-markt-17/"
\ No newline at end of file
diff --git a/data/cities/leipzig/fristo-floessenstrasse.yml b/data/cities/leipzig/fristo-floessenstrasse.yml
new file mode 100644
index 0000000000..b63a988d8e
--- /dev/null
+++ b/data/cities/leipzig/fristo-floessenstrasse.yml
@@ -0,0 +1,11 @@
+id: 239751726
+type: way
+latitude: 51.37684
+longitude: 12.31584
+postcode: "04159"
+city: Leipzig
+street: "Flößenstraße"
+housenumber: 2
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/fristo-max-liebermann-strasse.yml b/data/cities/leipzig/fristo-max-liebermann-strasse.yml
deleted file mode 100644
index 33b3c421cd..0000000000
--- a/data/cities/leipzig/fristo-max-liebermann-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 249368235
-type: way
-latitude: 51.37645
-longitude: 12.37845
-postcode: "04157"
-city: Leipzig
-street: "Max-Liebermann-Straße"
-housenumber: 103
-phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/fristo.yml b/data/cities/leipzig/fristo.yml
index b63a988d8e..33b3c421cd 100644
--- a/data/cities/leipzig/fristo.yml
+++ b/data/cities/leipzig/fristo.yml
@@ -1,11 +1,11 @@
-id: 239751726
+id: 249368235
 type: way
-latitude: 51.37684
-longitude: 12.31584
-postcode: "04159"
+latitude: 51.37645
+longitude: 12.37845
+postcode: "04157"
 city: Leipzig
-street: "Flößenstraße"
-housenumber: 2
+street: "Max-Liebermann-Straße"
+housenumber: 103
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Sa 08:00-20:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/kaufland-georg-schumann-strasse-2.yml b/data/cities/leipzig/kaufland-georg-schumann-strasse-2.yml
index 37aa3f181a..bb2ed67c86 100644
--- a/data/cities/leipzig/kaufland-georg-schumann-strasse-2.yml
+++ b/data/cities/leipzig/kaufland-georg-schumann-strasse-2.yml
@@ -1,11 +1,11 @@
-id: 30069271
+id: 40803219
 type: way
-latitude: 51.37323
-longitude: 12.32913
-postcode: "04159"
+latitude: 51.3621
+longitude: 12.36141
+postcode: "04155"
 city: Leipzig
 street: "Georg-Schumann-Straße"
-housenumber: 290
-phone: "+49 341 900420"
-opening_hours: "Mo-Sa 06:00-22:00; Su off"
+housenumber: 105-109
+phone: ""
+opening_hours: "Mo-Sa 07:00-21:30"
 website: "https://www.kaufland.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/kaufland-georg-schumann-strasse.yml b/data/cities/leipzig/kaufland-georg-schumann-strasse.yml
index bb2ed67c86..37aa3f181a 100644
--- a/data/cities/leipzig/kaufland-georg-schumann-strasse.yml
+++ b/data/cities/leipzig/kaufland-georg-schumann-strasse.yml
@@ -1,11 +1,11 @@
-id: 40803219
+id: 30069271
 type: way
-latitude: 51.3621
-longitude: 12.36141
-postcode: "04155"
+latitude: 51.37323
+longitude: 12.32913
+postcode: "04159"
 city: Leipzig
 street: "Georg-Schumann-Straße"
-housenumber: 105-109
-phone: ""
-opening_hours: "Mo-Sa 07:00-21:30"
+housenumber: 290
+phone: "+49 341 900420"
+opening_hours: "Mo-Sa 06:00-22:00; Su off"
 website: "https://www.kaufland.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/klimbim-kindermode.yml b/data/cities/leipzig/klimbim-kindermode.yml
index b9d92ec04d..cdff891887 100644
--- a/data/cities/leipzig/klimbim-kindermode.yml
+++ b/data/cities/leipzig/klimbim-kindermode.yml
@@ -6,6 +6,6 @@ postcode: "04229"
 city: Leipzig
 street: "Könneritzstraße"
 housenumber: 60
-phone: ""
+phone: "+49 341 2535552"
 opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-12:00"
-website: "www.klimbim-leipzig.de"
\ No newline at end of file
+website: "https://www.klimbim-leipzig.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/kontakt-leipzig-service-gmbh.yml b/data/cities/leipzig/kontakt-leipzig-service-gmbh.yml
index ec5754569e..745ffec47c 100644
--- a/data/cities/leipzig/kontakt-leipzig-service-gmbh.yml
+++ b/data/cities/leipzig/kontakt-leipzig-service-gmbh.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Waldzieststraße"
 housenumber: 2
 phone: "+49 341 2331468"
-opening_hours: ""
+opening_hours: "Mo,Tu,Th 08:00-16:15, Tu 08:00-18:00"
 website: "https://www.kls-info.net/"
\ No newline at end of file
diff --git a/data/cities/leipzig/lebensgarten.yml b/data/cities/leipzig/lebensgarten.yml
deleted file mode 100644
index 1c05c0753e..0000000000
--- a/data/cities/leipzig/lebensgarten.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2900308065
-type: node
-latitude: 51.32515
-longitude: 12.3779
-postcode: "04107"
-city: Leipzig
-street: "Körnerstraße"
-housenumber: 41
-phone: ""
-opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-13:00"
-website: "http://www.der-lebensgarten.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/lucky-bike-handelsstrasse.yml b/data/cities/leipzig/lucky-bike-handelsstrasse.yml
deleted file mode 100644
index a842eec306..0000000000
--- a/data/cities/leipzig/lucky-bike-handelsstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2791970390
-type: node
-latitude: 51.40158
-longitude: 12.39899
-postcode: "04356"
-city: Leipzig
-street: "Handelsstraße"
-housenumber: 4-8
-phone: ""
-opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-18:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/lucky-bike-hans-poeche-strasse.yml b/data/cities/leipzig/lucky-bike-hans-poeche-strasse.yml
new file mode 100644
index 0000000000..263af4b73e
--- /dev/null
+++ b/data/cities/leipzig/lucky-bike-hans-poeche-strasse.yml
@@ -0,0 +1,11 @@
+id: 2785287844
+type: node
+latitude: 51.34594
+longitude: 12.38839
+postcode: "04103"
+city: Leipzig
+street: "Hans-Poeche-Straße"
+housenumber: 23-25
+phone: ""
+opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-18:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/lucky-bike.yml b/data/cities/leipzig/lucky-bike.yml
index 263af4b73e..a842eec306 100644
--- a/data/cities/leipzig/lucky-bike.yml
+++ b/data/cities/leipzig/lucky-bike.yml
@@ -1,11 +1,11 @@
-id: 2785287844
+id: 2791970390
 type: node
-latitude: 51.34594
-longitude: 12.38839
-postcode: "04103"
+latitude: 51.40158
+longitude: 12.39899
+postcode: "04356"
 city: Leipzig
-street: "Hans-Poeche-Straße"
-housenumber: 23-25
+street: "Handelsstraße"
+housenumber: 4-8
 phone: ""
 opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-18:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/marini.yml b/data/cities/leipzig/marini.yml
index d87d5d8630..153d657f06 100644
--- a/data/cities/leipzig/marini.yml
+++ b/data/cities/leipzig/marini.yml
@@ -4,7 +4,7 @@ latitude: 51.3299
 longitude: 12.33746
 postcode: "04229"
 city: Leipzig
-street: "Zschochersche Str."
+street: "Zschochersche Straße"
 housenumber: 41a
 phone: "+49 341 4873660"
 opening_hours: "Sa 09:00-14:00; Mo-Fr 09:00-19:00"
diff --git a/data/cities/leipzig/naehzentrum-leipzig.yml b/data/cities/leipzig/naehzentrum-leipzig.yml
index b0b8560aad..98522567fb 100644
--- a/data/cities/leipzig/naehzentrum-leipzig.yml
+++ b/data/cities/leipzig/naehzentrum-leipzig.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Zschochersche Straße"
 housenumber: 48
 phone: "+49 341 2519548"
-opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-14:00"
+opening_hours: "Mo,Tu 10:00-18:00; Th,Fr 10:00-18:00; We off"
 website: "https://www.naehzentrum-leipzig.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/natta-spa.yml b/data/cities/leipzig/natta-spa.yml
index d8d6b95895..e44be80cf0 100644
--- a/data/cities/leipzig/natta-spa.yml
+++ b/data/cities/leipzig/natta-spa.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Demmeringstraße"
 housenumber: 44
 phone: "+4934152950641"
-opening_hours: "Mo-Fr 09:-19:00; Sa 10:00-17:00"
+opening_hours: "Mo-Fr 09:00-19:00; Sa 10:00-14:00"
 website: "https://www.natta-spa.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/phd-obst-gemuese.yml b/data/cities/leipzig/phd-obst-gemuese.yml
index 4a84712e10..8c0d5c2e07 100644
--- a/data/cities/leipzig/phd-obst-gemuese.yml
+++ b/data/cities/leipzig/phd-obst-gemuese.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Selliner Straße"
 housenumber: 1C
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-We 08:00-18:00; Th 08:00-18:30; Fr 08:00-18:00; Sa 08:00-13:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/puche-international.yml b/data/cities/leipzig/puche-professional.yml
similarity index 100%
rename from data/cities/leipzig/puche-international.yml
rename to data/cities/leipzig/puche-professional.yml
diff --git a/data/cities/leipzig/reudnitz-center.yml b/data/cities/leipzig/reudnitz-center.yml
index 440ebce8c6..6b78d9e351 100644
--- a/data/cities/leipzig/reudnitz-center.yml
+++ b/data/cities/leipzig/reudnitz-center.yml
@@ -5,7 +5,7 @@ longitude: 12.40527
 postcode: "04317"
 city: Leipzig
 street: "Dresdner Straße"
-housenumber: 78,80
+housenumber: 78-80
 phone: ""
 opening_hours: "Mo-Sa 06:00-22:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/rewe-petersstrasse.yml b/data/cities/leipzig/rewe-petersstrasse.yml
index 08b8620ed1..cb9a116e74 100644
--- a/data/cities/leipzig/rewe-petersstrasse.yml
+++ b/data/cities/leipzig/rewe-petersstrasse.yml
@@ -1,4 +1,4 @@
-id: 6801282228
+id: 11581969805
 type: node
 latitude: 51.33808
 longitude: 12.37537
diff --git a/data/cities/leipzig/salon-elaziz.yml b/data/cities/leipzig/salon-elaziz.yml
deleted file mode 100644
index 5f8dcc1026..0000000000
--- a/data/cities/leipzig/salon-elaziz.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 10955964952
-type: node
-latitude: 51.31881
-longitude: 12.34117
-postcode: "04229"
-city: Leipzig
-street: "Könneritzstraße"
-housenumber: 107
-phone: ""
-opening_hours: "Mo-Fr 09:30-18:00; Sa 10:00-18:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/salon-hauptsache.yml b/data/cities/leipzig/salon-hauptsache.yml
new file mode 100644
index 0000000000..2735418520
--- /dev/null
+++ b/data/cities/leipzig/salon-hauptsache.yml
@@ -0,0 +1,11 @@
+id: 3587737460
+type: node
+latitude: 51.31381
+longitude: 12.26469
+postcode: "04207"
+city: Leipzig
+street: "Selliner Straße"
+housenumber: 1C
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/shredderei.yml b/data/cities/leipzig/shredderei.yml
new file mode 100644
index 0000000000..b265ca31cf
--- /dev/null
+++ b/data/cities/leipzig/shredderei.yml
@@ -0,0 +1,11 @@
+id: 2179567148
+type: node
+latitude: 51.33959
+longitude: 12.32652
+postcode: "04177"
+city: Leipzig
+street: "Georg-Schwarz-Straße"
+housenumber: 18a
+phone: ""
+opening_hours: "Mo-Sa 12:00-18:00; Fr 12:00-21:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/zweirad-woj.yml b/data/cities/leipzig/zweirad-woj.yml
index c36769bd19..32b51df7d2 100644
--- a/data/cities/leipzig/zweirad-woj.yml
+++ b/data/cities/leipzig/zweirad-woj.yml
@@ -6,6 +6,6 @@ postcode: "04229"
 city: Leipzig
 street: "Könneritzstraße"
 housenumber: 98a
-phone: ""
+phone: "+49 341 4791110"
 opening_hours: "Mo-Fr 09:00-18:00"
 website: "https://angebot.zweirad-woj.de/"
\ No newline at end of file
diff --git a/data/cities/leknica/biedronka-lesna.yml b/data/cities/leknica/biedronka-lesna.yml
index df1d1bd465..3e55899524 100644
--- a/data/cities/leknica/biedronka-lesna.yml
+++ b/data/cities/leknica/biedronka-lesna.yml
@@ -1,7 +1,7 @@
 id: 1124294034
 type: way
-latitude: 51.53349
-longitude: 14.74172
+latitude: 51.53337
+longitude: 14.74176
 postcode: "68-208"
 city: Łęknica
 street: "Leśna"
diff --git a/data/cities/leknica/leknica-gaz.yml b/data/cities/leknica/leknica-gaz.yml
index 58d958ba69..baffcc750f 100644
--- a/data/cities/leknica/leknica-gaz.yml
+++ b/data/cities/leknica/leknica-gaz.yml
@@ -1,7 +1,7 @@
 id: 1125701905
 type: way
-latitude: 51.53385
-longitude: 14.7424
+latitude: 51.53394
+longitude: 14.74239
 postcode: "68-208"
 city: Łęknica
 street: "Tadeusza Kościuszki"
diff --git a/data/cities/leknica/rozlewnia-gazu-leknica-gaz.yml b/data/cities/leknica/rozlewnia-gazu-leknica-gaz.yml
index 37d9cb6524..b1f7332ae0 100644
--- a/data/cities/leknica/rozlewnia-gazu-leknica-gaz.yml
+++ b/data/cities/leknica/rozlewnia-gazu-leknica-gaz.yml
@@ -1,7 +1,7 @@
 id: 10646564781
 type: node
-latitude: 51.53379
-longitude: 14.74233
+latitude: 51.53384
+longitude: 14.74243
 postcode: "68-208"
 city: Łęknica
 street: "Tadeusza Kościuszki"
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/neukirchen-erzgebirge/penny-adorfer-hauptstrasse.yml b/data/cities/neukirchen-erzgebirge/penny-am-marktplatz.yml
similarity index 55%
rename from data/cities/neukirchen-erzgebirge/penny-adorfer-hauptstrasse.yml
rename to data/cities/neukirchen-erzgebirge/penny-am-marktplatz.yml
index 5bed544b22..a14ec1eae5 100644
--- a/data/cities/neukirchen-erzgebirge/penny-adorfer-hauptstrasse.yml
+++ b/data/cities/neukirchen-erzgebirge/penny-am-marktplatz.yml
@@ -1,11 +1,11 @@
-id: 111531436
+id: 105327114
 type: way
-latitude: 50.76116
-longitude: 12.87462
+latitude: 50.77861
+longitude: 12.86727
 postcode: "09221"
 city: Neukirchen/Erzgebirge
-street: "Adorfer Hauptstraße"
-housenumber: 28
+street: "Am Marktplatz"
+housenumber: 3
 phone: ""
 opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/neukirchen-erzgebirge/penny.yml b/data/cities/neukirchen-erzgebirge/penny.yml
index a14ec1eae5..5bed544b22 100644
--- a/data/cities/neukirchen-erzgebirge/penny.yml
+++ b/data/cities/neukirchen-erzgebirge/penny.yml
@@ -1,11 +1,11 @@
-id: 105327114
+id: 111531436
 type: way
-latitude: 50.77861
-longitude: 12.86727
+latitude: 50.76116
+longitude: 12.87462
 postcode: "09221"
 city: Neukirchen/Erzgebirge
-street: "Am Marktplatz"
-housenumber: 3
+street: "Adorfer Hauptstraße"
+housenumber: 28
 phone: ""
 opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/nossen/netto-marken-discount-zellsteig.yml b/data/cities/nossen/netto-marken-discount-bismarckstrasse.yml
similarity index 54%
rename from data/cities/nossen/netto-marken-discount-zellsteig.yml
rename to data/cities/nossen/netto-marken-discount-bismarckstrasse.yml
index 6b99eb54b4..c813623181 100644
--- a/data/cities/nossen/netto-marken-discount-zellsteig.yml
+++ b/data/cities/nossen/netto-marken-discount-bismarckstrasse.yml
@@ -1,11 +1,11 @@
-id: 133887488
+id: 126884373
 type: way
-latitude: 51.05037
-longitude: 13.29079
+latitude: 51.06
+longitude: 13.28947
 postcode: "01683"
 city: Nossen
-street: "Zellsteig"
-housenumber: 1
+street: "Bismarckstraße"
+housenumber: 46
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/nossen/netto-marken-discount.yml b/data/cities/nossen/netto-marken-discount.yml
index c813623181..6b99eb54b4 100644
--- a/data/cities/nossen/netto-marken-discount.yml
+++ b/data/cities/nossen/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 126884373
+id: 133887488
 type: way
-latitude: 51.06
-longitude: 13.28947
+latitude: 51.05037
+longitude: 13.29079
 postcode: "01683"
 city: Nossen
-street: "Bismarckstraße"
-housenumber: 46
+street: "Zellsteig"
+housenumber: 1
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml b/data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.yml
similarity index 54%
rename from data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
rename to data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.yml
index 90f9356aa9..8f17488f43 100644
--- a/data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
+++ b/data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.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/ottendorf-okrilla/netto-marken-discount.yml b/data/cities/ottendorf-okrilla/netto-marken-discount.yml
index 8f17488f43..90f9356aa9 100644
--- a/data/cities/ottendorf-okrilla/netto-marken-discount.yml
+++ b/data/cities/ottendorf-okrilla/netto-marken-discount.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/plauen/someflowers-blumenfachgeschaeft.yml b/data/cities/plauen/blumenliebe-vergissmeinnicht.yml
similarity index 92%
rename from data/cities/plauen/someflowers-blumenfachgeschaeft.yml
rename to data/cities/plauen/blumenliebe-vergissmeinnicht.yml
index 164215e00d..984123d44f 100644
--- a/data/cities/plauen/someflowers-blumenfachgeschaeft.yml
+++ b/data/cities/plauen/blumenliebe-vergissmeinnicht.yml
@@ -5,7 +5,7 @@ longitude: 12.17213
 postcode: "08529"
 city: Plauen
 street: "Kleinfriesener Straße"
-housenumber: 26
+housenumber: 14
 phone: ""
 opening_hours: "Mo-Sa 08:00-18:00; Su 09:30-11:30"
 website: ""
\ No newline at end of file
diff --git a/data/cities/plauen/edeka-voigt.yml b/data/cities/plauen/edeka-voigt.yml
index 095ce786e7..3f94c95443 100644
--- a/data/cities/plauen/edeka-voigt.yml
+++ b/data/cities/plauen/edeka-voigt.yml
@@ -6,6 +6,6 @@ postcode: "08523"
 city: Plauen
 street: "Neundorfer Straße"
 housenumber: 25
-phone: "+493741394452"
-opening_hours: "Mo-Sa 08:00-20:00"
-website: "https://www.edeka.de/eh/nordbayern-sachsen-th%C3%BCringen/edeka-voigt-neundorfer-stra%C3%9Fe-25/index.jsp"
\ No newline at end of file
+phone: ""
+opening_hours: "Mo-Sa 08:00-20:00; PH off"
+website: ""
\ 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/rossmann-meissner-strasse.yml b/data/cities/radebeul/rossmann-meissner-strasse.yml
index 7368e45bd3..868b5f5ad1 100644
--- a/data/cities/radebeul/rossmann-meissner-strasse.yml
+++ b/data/cities/radebeul/rossmann-meissner-strasse.yml
@@ -6,6 +6,6 @@ postcode: "01445"
 city: Radebeul
 street: "Meißner Straße"
 housenumber: 283
-phone: ""
-opening_hours: ""
+phone: "+4935187305046"
+opening_hours: "Mo-Sa 08:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/regis-breitingen/friseursalon-flach.yml b/data/cities/regis-breitingen/friseursalon-flach.yml
new file mode 100644
index 0000000000..dd224d74d7
--- /dev/null
+++ b/data/cities/regis-breitingen/friseursalon-flach.yml
@@ -0,0 +1,11 @@
+id: 11574521469
+type: node
+latitude: 51.08985
+longitude: 12.37286
+postcode: "04565"
+city: Regis-Breitingen
+street: "Borngasse"
+housenumber: 8
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/schoenheide/sportshop-rass.yml b/data/cities/schoenheide/sportshop-rass.yml
index 58fe0099ff..8c1d8414e2 100644
--- a/data/cities/schoenheide/sportshop-rass.yml
+++ b/data/cities/schoenheide/sportshop-rass.yml
@@ -7,5 +7,5 @@ city: Schönheide
 street: "Angerstraße"
 housenumber: 39c
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-12:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/sebnitz/gnauck-s-backhaus-hohnsteiner-strasse.yml b/data/cities/sebnitz/gnauck-s-backhaus-hohnsteiner-strasse.yml
deleted file mode 100644
index 4c4dd0382c..0000000000
--- a/data/cities/sebnitz/gnauck-s-backhaus-hohnsteiner-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2246986712
-type: node
-latitude: 50.9677
-longitude: 14.2445
-postcode: "01855"
-city: Sebnitz
-street: "Hohnsteiner Straße"
-housenumber: 2A
-phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/sebnitz/gnauck-s-backhaus-schandauer-strasse.yml b/data/cities/sebnitz/gnauck-s-backhaus-schandauer-strasse.yml
new file mode 100644
index 0000000000..366e0e0a7a
--- /dev/null
+++ b/data/cities/sebnitz/gnauck-s-backhaus-schandauer-strasse.yml
@@ -0,0 +1,11 @@
+id: 2278581144
+type: node
+latitude: 50.97164
+longitude: 14.27058
+postcode: "01855"
+city: Sebnitz
+street: "Schandauer Straße"
+housenumber: 6
+phone: ""
+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/sebnitz/gnauck-s-backhaus.yml b/data/cities/sebnitz/gnauck-s-backhaus.yml
index 366e0e0a7a..4c4dd0382c 100644
--- a/data/cities/sebnitz/gnauck-s-backhaus.yml
+++ b/data/cities/sebnitz/gnauck-s-backhaus.yml
@@ -1,11 +1,11 @@
-id: 2278581144
+id: 2246986712
 type: node
-latitude: 50.97164
-longitude: 14.27058
+latitude: 50.9677
+longitude: 14.2445
 postcode: "01855"
 city: Sebnitz
-street: "Schandauer Straße"
-housenumber: 6
+street: "Hohnsteiner Straße"
+housenumber: 2A
 phone: ""
-opening_hours: "Mo-Fr 06:00-18:00; Sa 06:00-12: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/selben/martina-nixdorf-getraenkemarkt.yml b/data/cities/selben/martina-nixdorf-getraenkemarkt.yml
index ddcfb2c555..14a2e4aa23 100644
--- a/data/cities/selben/martina-nixdorf-getraenkemarkt.yml
+++ b/data/cities/selben/martina-nixdorf-getraenkemarkt.yml
@@ -4,7 +4,7 @@ latitude: 51.49893
 longitude: 12.36655
 postcode: "04509"
 city: Selben
-street: "Große Dorfstr."
+street: "Große Dorfstraße"
 housenumber: 22
 phone: ""
 opening_hours: ""
diff --git a/data/cities/weissenborn-erzgeb/autodienst-wittig.yml b/data/cities/weissenborn-erzgeb/autodienst-wittig.yml
index 497bdaadbc..57119790c2 100644
--- a/data/cities/weissenborn-erzgeb/autodienst-wittig.yml
+++ b/data/cities/weissenborn-erzgeb/autodienst-wittig.yml
@@ -1,11 +1,11 @@
 id: 426492097
 type: node
-latitude: 50.86835
-longitude: 13.38084
+latitude: 50.86836
+longitude: 13.38074
 postcode: "09600"
 city: Weißenborn/Erzgeb.
 street: "Hauptstraße"
 housenumber: 112
-phone: "+49 37322 3836"
+phone: ""
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/weissenborn-erzgeb/p-meyer.yml b/data/cities/weissenborn-erzgeb/autohaus-martin.yml
similarity index 55%
rename from data/cities/weissenborn-erzgeb/p-meyer.yml
rename to data/cities/weissenborn-erzgeb/autohaus-martin.yml
index 789c0ae97b..9bc9531050 100644
--- a/data/cities/weissenborn-erzgeb/p-meyer.yml
+++ b/data/cities/weissenborn-erzgeb/autohaus-martin.yml
@@ -1,11 +1,11 @@
 id: 426515593
 type: node
-latitude: 50.86899
-longitude: 13.38915
+latitude: 50.86896
+longitude: 13.38917
 postcode: "09600"
 city: Weißenborn/Erzgeb.
 street: "Hauptstraße"
 housenumber: 142
-phone: "+49 37322 3536"
-opening_hours: ""
+phone: ""
+opening_hours: "Mo-Fr 08:00-16:45; Sa,Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/weissenborn-erzgeb/mueller-autoreparatur.yml b/data/cities/weissenborn-erzgeb/autoservice-mueller.yml
similarity index 88%
rename from data/cities/weissenborn-erzgeb/mueller-autoreparatur.yml
rename to data/cities/weissenborn-erzgeb/autoservice-mueller.yml
index c6efea3c41..ffa234b92e 100644
--- a/data/cities/weissenborn-erzgeb/mueller-autoreparatur.yml
+++ b/data/cities/weissenborn-erzgeb/autoservice-mueller.yml
@@ -6,6 +6,6 @@ postcode: "09600"
 city: Weißenborn/Erzgeb.
 street: "Hauptstraße"
 housenumber: 106
-phone: "+49 37322 3547"
+phone: ""
 opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/weissenborn-erzgeb/avanti-service.yml b/data/cities/weissenborn-erzgeb/avanti-service.yml
new file mode 100644
index 0000000000..0a2de9326e
--- /dev/null
+++ b/data/cities/weissenborn-erzgeb/avanti-service.yml
@@ -0,0 +1,11 @@
+id: 11584872495
+type: node
+latitude: 50.86748
+longitude: 13.37259
+postcode: "09600"
+city: Weißenborn/Erzgeb.
+street: "Hauptstraße"
+housenumber: 82
+phone: ""
+opening_hours: "Mo-Fr 08:30-13:00,15:00-18:00; Sa,Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/weissenborn-erzgeb/fotoschreiber.yml b/data/cities/weissenborn-erzgeb/fotoschreiber.yml
deleted file mode 100644
index 1b89d2d0fd..0000000000
--- a/data/cities/weissenborn-erzgeb/fotoschreiber.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2668630660
-type: node
-latitude: 50.87466
-longitude: 13.36351
-postcode: "09600"
-city: Weißenborn/Erzgeb.
-street: "Bahnhofstraße"
-housenumber: 47
-phone: "+49 37322 3817"
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/weissenborn-erzgeb/salon-hairklotz.yml b/data/cities/weissenborn-erzgeb/salon-hairklotz.yml
new file mode 100644
index 0000000000..42996e474b
--- /dev/null
+++ b/data/cities/weissenborn-erzgeb/salon-hairklotz.yml
@@ -0,0 +1,11 @@
+id: 956197768
+type: node
+latitude: 50.86873
+longitude: 13.383
+postcode: "09600"
+city: Weißenborn/Erzgeb.
+street: "Hauptstraße"
+housenumber: 87
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/wurzen/buchstabentempel.yml b/data/cities/wurzen/buchstabentempel.yml
index 694681d5ef..7f0e7816ea 100644
--- a/data/cities/wurzen/buchstabentempel.yml
+++ b/data/cities/wurzen/buchstabentempel.yml
@@ -8,4 +8,4 @@ street: "Jacobsgasse"
 housenumber: 25
 phone: "+49 3425 8530890"
 opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-12:00"
-website: "http://www.buchstaben-tempel.de/"
\ No newline at end of file
+website: "http://www.der-leseladen.de/"
\ No newline at end of file
diff --git a/data/cities/zgorzelec/lider.yml b/data/cities/zgorzelec/lider.yml
index 1d89281c96..17da0fca71 100644
--- a/data/cities/zgorzelec/lider.yml
+++ b/data/cities/zgorzelec/lider.yml
@@ -7,5 +7,5 @@ city: Zgorzelec
 street: "Ignacego Daszyńskiego"
 housenumber: 78
 phone: ""
-opening_hours: "Mo-Fr 10:00-17:00; Sa 10:00-13:00; PH closed "
+opening_hours: "Mo-Fr 10:00-17:00; Sa 10:00-13:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/ernstings-family-innere-plauensche-strasse.yml b/data/cities/zwickau/ernstings-family-innere-plauensche-strasse.yml
new file mode 100644
index 0000000000..0b6c01f784
--- /dev/null
+++ b/data/cities/zwickau/ernstings-family-innere-plauensche-strasse.yml
@@ -0,0 +1,11 @@
+id: 3718591631
+type: node
+latitude: 50.71859
+longitude: 12.49407
+postcode: "08056"
+city: Zwickau
+street: "Innere Plauensche Straße"
+housenumber: 21
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/ernstings-family-oskar-arnold-strasse.yml b/data/cities/zwickau/ernstings-family-oskar-arnold-strasse.yml
deleted file mode 100644
index d73b6e42f8..0000000000
--- a/data/cities/zwickau/ernstings-family-oskar-arnold-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3736655727
-type: node
-latitude: 50.70705
-longitude: 12.50059
-postcode: "08056"
-city: Zwickau
-street: "Oskar-Arnold-Straße"
-housenumber: 3
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/ernstings-family.yml b/data/cities/zwickau/ernstings-family.yml
index 0b6c01f784..d73b6e42f8 100644
--- a/data/cities/zwickau/ernstings-family.yml
+++ b/data/cities/zwickau/ernstings-family.yml
@@ -1,11 +1,11 @@
-id: 3718591631
+id: 3736655727
 type: node
-latitude: 50.71859
-longitude: 12.49407
+latitude: 50.70705
+longitude: 12.50059
 postcode: "08056"
 city: Zwickau
-street: "Innere Plauensche Straße"
-housenumber: 21
+street: "Oskar-Arnold-Straße"
+housenumber: 3
 phone: ""
 opening_hours: ""
 website: ""
\ No newline at end of file