diff --git a/content/cities/arnsdorf/_index.md b/content/cities/arnsdorf/_index.md
index a08b754ba4..b4129890ed 100644
--- a/content/cities/arnsdorf/_index.md
+++ b/content/cities/arnsdorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Arnsdorf
 url: /arnsdorf/
-latitude: 51.098
-longitude: 13.995
+latitude: 51.094
+longitude: 13.988
 ---
\ 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 50650dee47..a243116649 100644
--- a/content/cities/bergen/_index.md
+++ b/content/cities/bergen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bergen
 url: /bergen/
-latitude: 50.475
-longitude: 12.284
+latitude: 50.473
+longitude: 12.277
 ---
\ No newline at end of file
diff --git a/content/cities/bischofswerda/_index.md b/content/cities/bischofswerda/_index.md
index 7843c987bb..a19afedb5a 100644
--- a/content/cities/bischofswerda/_index.md
+++ b/content/cities/bischofswerda/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bischofswerda
 url: /bischofswerda/
-latitude: 51.121
-longitude: 14.193
+latitude: 51.128
+longitude: 14.179
 ---
\ 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/burkau/_index.md b/content/cities/burkau/_index.md
index 7a65a7a70a..7890874677 100644
--- a/content/cities/burkau/_index.md
+++ b/content/cities/burkau/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Burkau
 url: /burkau/
-latitude: 51.176
-longitude: 14.18
+latitude: 51.175
+longitude: 14.172
 ---
\ No newline at end of file
diff --git a/content/cities/chemnitz/tedi-oberfrohnaer-strasse.md b/content/cities/chemnitz/tedi-oberfrohnaer-strasse.md
new file mode 100644
index 0000000000..740c4f8557
--- /dev/null
+++ b/content/cities/chemnitz/tedi-oberfrohnaer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "TEDi"
+url: /chemnitz/tedi-oberfrohnaer-strasse/
+shop: Kramladen
+---
\ No newline at end of file
diff --git a/content/cities/chemnitz/tedi-wladimir-sagorski-strasse.md b/content/cities/chemnitz/tedi-wladimir-sagorski-strasse.md
deleted file mode 100644
index 277103a5d6..0000000000
--- a/content/cities/chemnitz/tedi-wladimir-sagorski-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "TEDi"
-url: /chemnitz/tedi-wladimir-sagorski-strasse/
-shop: Kramladen
----
\ No newline at end of file
diff --git a/content/cities/chemnitz/vedha-bestattungen-romy-scharrer-carl-von-ossietzky-strasse.md b/content/cities/chemnitz/vedha-bestattungen-romy-scharrer-carl-von-ossietzky-strasse.md
deleted file mode 100644
index 1b9ac0805b..0000000000
--- a/content/cities/chemnitz/vedha-bestattungen-romy-scharrer-carl-von-ossietzky-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Vedha Bestattungen Romy Scharrer"
-url: /chemnitz/vedha-bestattungen-romy-scharrer-carl-von-ossietzky-strasse/
-shop: Bestattungen
----
\ No newline at end of file
diff --git a/content/cities/chemnitz/vedha-bestattungen-romy-scharrer-weststrasse.md b/content/cities/chemnitz/vedha-bestattungen-romy-scharrer-weststrasse.md
new file mode 100644
index 0000000000..6704ab208b
--- /dev/null
+++ b/content/cities/chemnitz/vedha-bestattungen-romy-scharrer-weststrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Vedha Bestattungen Romy Scharrer"
+url: /chemnitz/vedha-bestattungen-romy-scharrer-weststrasse/
+shop: Bestattungen
+---
\ No newline at end of file
diff --git a/content/cities/delitzsch/netto-marken-discount-albert-boehme-strasse.md b/content/cities/delitzsch/netto-marken-discount-albert-boehme-strasse.md
deleted file mode 100644
index 870aaec8f8..0000000000
--- a/content/cities/delitzsch/netto-marken-discount-albert-boehme-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /delitzsch/netto-marken-discount-albert-boehme-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/delitzsch/netto-marken-discount-securiusstrasse.md b/content/cities/delitzsch/netto-marken-discount-securiusstrasse.md
new file mode 100644
index 0000000000..a8aa167f60
--- /dev/null
+++ b/content/cities/delitzsch/netto-marken-discount-securiusstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /delitzsch/netto-marken-discount-securiusstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/dresden/baeckerei-gehre-altnickern.md b/content/cities/dresden/baeckerei-gehre-altnickern.md
deleted file mode 100644
index 6855ac44cf..0000000000
--- a/content/cities/dresden/baeckerei-gehre-altnickern.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 0000000000..4752fd72da
--- /dev/null
+++ b/content/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.md
@@ -0,0 +1,5 @@
+---
+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/orden-arsenal.md b/content/cities/dresden/orden-arsenal.md
deleted file mode 100644
index 27e0bb2e40..0000000000
--- a/content/cities/dresden/orden-arsenal.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Orden Arsenal"
-url: /dresden/orden-arsenal/
-shop: Gebrauchtwaren
----
\ No newline at end of file
diff --git a/content/cities/ellefeld/_index.md b/content/cities/ellefeld/_index.md
index 768f4a380f..664254281c 100644
--- a/content/cities/ellefeld/_index.md
+++ b/content/cities/ellefeld/_index.md
@@ -2,5 +2,5 @@
 title: Ellefeld
 url: /ellefeld/
 latitude: 50.487
-longitude: 12.38
+longitude: 12.381
 ---
\ No newline at end of file
diff --git a/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.md b/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.md
new file mode 100644
index 0000000000..b9f6c4d1ff
--- /dev/null
+++ b/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.md
@@ -0,0 +1,5 @@
+---
+title: "Friseur Haarstudio Cornelia Effenberger"
+url: /goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.md b/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.md
deleted file mode 100644
index 87221eaddd..0000000000
--- a/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Friseur Haarstudio Cornelia Effenberger"
-url: /goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/hohenstein-ernstthal/_index.md b/content/cities/hohenstein-ernstthal/_index.md
index 473d139d65..1ec998c41e 100644
--- a/content/cities/hohenstein-ernstthal/_index.md
+++ b/content/cities/hohenstein-ernstthal/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Hohenstein-Ernstthal
 url: /hohenstein-ernstthal/
-latitude: 50.801
-longitude: 12.723
+latitude: 50.798
+longitude: 12.702
 ---
\ No newline at end of file
diff --git a/content/cities/koenigsbrueck/_index.md b/content/cities/koenigsbrueck/_index.md
index 27968af42f..e1773b2116 100644
--- a/content/cities/koenigsbrueck/_index.md
+++ b/content/cities/koenigsbrueck/_index.md
@@ -2,5 +2,5 @@
 title: Königsbrück
 url: /koenigsbrueck/
 latitude: 51.257
-longitude: 13.889
+longitude: 13.89
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/aldi-nord-eilenburger-strasse.md b/content/cities/leipzig/aldi-nord-eilenburger-strasse.md
deleted file mode 100644
index 0be1a507f1..0000000000
--- a/content/cities/leipzig/aldi-nord-eilenburger-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "ALDI Nord"
-url: /leipzig/aldi-nord-eilenburger-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/leipzig/aldi-nord-nonnenstrasse.md b/content/cities/leipzig/aldi-nord-nonnenstrasse.md
new file mode 100644
index 0000000000..88c7e02079
--- /dev/null
+++ b/content/cities/leipzig/aldi-nord-nonnenstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "ALDI Nord"
+url: /leipzig/aldi-nord-nonnenstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/fristo-floessenstrasse.md b/content/cities/leipzig/fristo-floessenstrasse.md
deleted file mode 100644
index 0d5e2e815c..0000000000
--- a/content/cities/leipzig/fristo-floessenstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 0000000000..f8a1a05ffb
--- /dev/null
+++ b/content/cities/leipzig/fristo-max-liebermann-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Fristo"
+url: /leipzig/fristo-max-liebermann-strasse/
+shop: Getränke
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/netto-marken-discount-loebauer-strasse.md b/content/cities/leipzig/netto-marken-discount-gutsmuthsstrasse.md
similarity index 50%
rename from content/cities/leipzig/netto-marken-discount-loebauer-strasse.md
rename to content/cities/leipzig/netto-marken-discount-gutsmuthsstrasse.md
index ea6ba7767d..8660d57f8a 100644
--- a/content/cities/leipzig/netto-marken-discount-loebauer-strasse.md
+++ b/content/cities/leipzig/netto-marken-discount-gutsmuthsstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Netto Marken-Discount"
-url: /leipzig/netto-marken-discount-loebauer-strasse/
+url: /leipzig/netto-marken-discount-gutsmuthsstrasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/puche-international.md b/content/cities/leipzig/puche-international.md
new file mode 100644
index 0000000000..8e25826f59
--- /dev/null
+++ b/content/cities/leipzig/puche-international.md
@@ -0,0 +1,5 @@
+---
+title: "Púche International"
+url: /leipzig/puche-international/
+shop: Friseurbedarf
+---
\ No newline at end of file
diff --git a/content/cities/moritzburg/netto-marken-discount-grossenhainer-strasse.md b/content/cities/moritzburg/netto-marken-discount-grossenhainer-strasse.md
deleted file mode 100644
index 383aa0fddd..0000000000
--- a/content/cities/moritzburg/netto-marken-discount-grossenhainer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /moritzburg/netto-marken-discount-grossenhainer-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/moritzburg/netto-marken-discount-schlossallee.md b/content/cities/moritzburg/netto-marken-discount-schlossallee.md
new file mode 100644
index 0000000000..852ea1b92e
--- /dev/null
+++ b/content/cities/moritzburg/netto-marken-discount-schlossallee.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /moritzburg/netto-marken-discount-schlossallee/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/muldenhammer/_index.md b/content/cities/muldenhammer/_index.md
index ddbf18ee6b..59bb0c4d98 100644
--- a/content/cities/muldenhammer/_index.md
+++ b/content/cities/muldenhammer/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Muldenhammer
 url: /muldenhammer/
-latitude: 50.445
-longitude: 12.512
+latitude: 50.46
+longitude: 12.491
 ---
\ No newline at end of file
diff --git a/content/cities/pirna/tonis-baeckerladen-robert-koch-strasse.md b/content/cities/pirna/tonis-baeckerladen-robert-koch-strasse.md
deleted file mode 100644
index 1d375b01b9..0000000000
--- a/content/cities/pirna/tonis-baeckerladen-robert-koch-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Tonis Bäckerladen"
-url: /pirna/tonis-baeckerladen-robert-koch-strasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/pirna/tonis-baeckerladen-rottwerndorfer-strasse.md b/content/cities/pirna/tonis-baeckerladen-rottwerndorfer-strasse.md
new file mode 100644
index 0000000000..46d5a824b4
--- /dev/null
+++ b/content/cities/pirna/tonis-baeckerladen-rottwerndorfer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Tonis Bäckerladen"
+url: /pirna/tonis-baeckerladen-rottwerndorfer-strasse/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/radebeul/naundorfer-heimatstube.md b/content/cities/radebeul/naundorfer-heimatstube.md
new file mode 100644
index 0000000000..847b6a75ec
--- /dev/null
+++ b/content/cities/radebeul/naundorfer-heimatstube.md
@@ -0,0 +1,5 @@
+---
+title: "Naundorfer Heimatstube"
+url: /radebeul/naundorfer-heimatstube/
+shop: Basteln
+---
\ No newline at end of file
diff --git a/content/cities/radebeul/vales-autoservice.md b/content/cities/radebeul/vales-autoservice.md
new file mode 100644
index 0000000000..bde7b1f881
--- /dev/null
+++ b/content/cities/radebeul/vales-autoservice.md
@@ -0,0 +1,5 @@
+---
+title: "VALES Autoservice"
+url: /radebeul/vales-autoservice/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/roetha/sp-reifegerste.md b/content/cities/roetha/sp-reifegerste.md
deleted file mode 100644
index bb6c1e081d..0000000000
--- a/content/cities/roetha/sp-reifegerste.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "SP:Reifegerste"
-url: /roetha/sp-reifegerste/
-shop: Allgemein
----
\ No newline at end of file
diff --git a/content/cities/roetha/tv-reifegerste.md b/content/cities/roetha/tv-reifegerste.md
new file mode 100644
index 0000000000..4724f428f5
--- /dev/null
+++ b/content/cities/roetha/tv-reifegerste.md
@@ -0,0 +1,5 @@
+---
+title: "TV Reifegerste"
+url: /roetha/tv-reifegerste/
+shop: Allgemein
+---
\ 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/thermalbad-wiesenbad/_index.md b/content/cities/thermalbad-wiesenbad/_index.md
index 084f04e490..b61d672821 100644
--- a/content/cities/thermalbad-wiesenbad/_index.md
+++ b/content/cities/thermalbad-wiesenbad/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Thermalbad Wiesenbad
 url: /thermalbad-wiesenbad/
-latitude: 50.611
-longitude: 13.02
+latitude: 50.61
+longitude: 12.992
 ---
\ 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/waldenburg/_index.md b/content/cities/waldenburg/_index.md
index 73d194e206..39d433e08c 100644
--- a/content/cities/waldenburg/_index.md
+++ b/content/cities/waldenburg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Waldenburg
 url: /waldenburg/
-latitude: 50.9
-longitude: 12.607
+latitude: 50.871
+longitude: 12.61
 ---
\ No newline at end of file
diff --git a/content/cities/wurzen/_index.md b/content/cities/wurzen/_index.md
index f25d82018a..f515d19c72 100644
--- a/content/cities/wurzen/_index.md
+++ b/content/cities/wurzen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Wurzen
 url: /wurzen/
-latitude: 51.352
-longitude: 12.734
+latitude: 51.369
+longitude: 12.735
 ---
\ No newline at end of file
diff --git a/content/cities/zgorzelec/_index.md b/content/cities/zgorzelec/_index.md
index f7cb0e2fe4..23c8b4af6a 100644
--- a/content/cities/zgorzelec/_index.md
+++ b/content/cities/zgorzelec/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Zgorzelec
 url: /zgorzelec/
-latitude: 51.151
-longitude: 15.004
+latitude: 51.15
+longitude: 15.008
 ---
\ No newline at end of file
diff --git a/content/cities/zittau/friseur-figaro-frauenstrasse-2.md b/content/cities/zittau/friseur-figaro-frauenstrasse-2.md
new file mode 100644
index 0000000000..d46edab57c
--- /dev/null
+++ b/content/cities/zittau/friseur-figaro-frauenstrasse-2.md
@@ -0,0 +1,5 @@
+---
+title: "Friseur Figaro"
+url: /zittau/friseur-figaro-frauenstrasse-2/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/zittau/friseur-figaro-frauenstrasse.md b/content/cities/zittau/friseur-figaro-frauenstrasse.md
index 7142c0ae46..bd7384361a 100644
--- a/content/cities/zittau/friseur-figaro-frauenstrasse.md
+++ b/content/cities/zittau/friseur-figaro-frauenstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Friseur Figaro"
 url: /zittau/friseur-figaro-frauenstrasse/
-shop: Kosmetik
+shop: Friseur
 ---
\ No newline at end of file
diff --git a/content/cities/zittau/friseur-figaro-markt.md b/content/cities/zittau/friseur-figaro-markt.md
deleted file mode 100644
index d62c51598d..0000000000
--- a/content/cities/zittau/friseur-figaro-markt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Friseur Figaro"
-url: /zittau/friseur-figaro-markt/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/zittau/nah-und-frisch-zum-see.md b/content/cities/zittau/nah-und-frisch-zum-see.md
new file mode 100644
index 0000000000..01c8b2ca7c
--- /dev/null
+++ b/content/cities/zittau/nah-und-frisch-zum-see.md
@@ -0,0 +1,5 @@
+---
+title: "Nah & Frisch"
+url: /zittau/nah-und-frisch-zum-see/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/zwenkau/hillerts-radlerhof.md b/content/cities/zwenkau/hillerts-radlerhof.md
new file mode 100644
index 0000000000..4798dbaa29
--- /dev/null
+++ b/content/cities/zwenkau/hillerts-radlerhof.md
@@ -0,0 +1,5 @@
+---
+title: "Hillert's Radlerhof"
+url: /zwenkau/hillerts-radlerhof/
+shop: Fahrrad
+---
\ No newline at end of file
diff --git a/content/cities/zwickau/barber-shop-zwickau-dr-friedrichs-ring.md b/content/cities/zwickau/barber-shop-zwickau-dr-friedrichs-ring.md
deleted file mode 100644
index c72cf72591..0000000000
--- a/content/cities/zwickau/barber-shop-zwickau-dr-friedrichs-ring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Barber Shop Zwickau"
-url: /zwickau/barber-shop-zwickau-dr-friedrichs-ring/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/zwickau/barber-shop-zwickau-klosterstrasse.md b/content/cities/zwickau/barber-shop-zwickau-klosterstrasse.md
new file mode 100644
index 0000000000..76dbf2be2a
--- /dev/null
+++ b/content/cities/zwickau/barber-shop-zwickau-klosterstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Barber Shop Zwickau"
+url: /zwickau/barber-shop-zwickau-klosterstrasse/
+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
deleted file mode 100644
index 4d176772e8..0000000000
--- a/content/cities/zwickau/ernstings-family-innere-plauensche-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 0000000000..05a00dd4db
--- /dev/null
+++ b/content/cities/zwickau/ernstings-family-oskar-arnold-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Ernsting's family"
+url: /zwickau/ernstings-family-oskar-arnold-strasse/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/shops/friseurbedarf/_index.md b/content/shops/friseurbedarf/_index.md
new file mode 100644
index 0000000000..a7bf209fe3
--- /dev/null
+++ b/content/shops/friseurbedarf/_index.md
@@ -0,0 +1,5 @@
+---
+title: Friseurbedarf
+url: /friseurbedarf/
+icon: other
+---
\ No newline at end of file
diff --git a/data/cities/bertsdorf-hoernitz/wagner-spezialitaeten-und-speisen.yml b/data/cities/bertsdorf-hoernitz/wagner-spezialitaeten-und-speisen.yml
index 86ee20bba8..b6b7aca51b 100644
--- a/data/cities/bertsdorf-hoernitz/wagner-spezialitaeten-und-speisen.yml
+++ b/data/cities/bertsdorf-hoernitz/wagner-spezialitaeten-und-speisen.yml
@@ -1,7 +1,7 @@
 id: 302942376
 type: way
-latitude: 50.90068
-longitude: 14.74448
+latitude: 50.9007
+longitude: 14.74447
 postcode: "02763"
 city: Bertsdorf-Hörnitz
 street: "Zittauer Straße"
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/chemnitz/tedi-oberfrohnaer-strasse.yml b/data/cities/chemnitz/tedi-oberfrohnaer-strasse.yml
new file mode 100644
index 0000000000..131c1f057b
--- /dev/null
+++ b/data/cities/chemnitz/tedi-oberfrohnaer-strasse.yml
@@ -0,0 +1,11 @@
+id: 5367452070
+type: node
+latitude: 50.82626
+longitude: 12.8326
+postcode: "09117"
+city: Chemnitz
+street: "Oberfrohnaer Straße"
+housenumber: 
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/tedi-wladimir-sagorski-strasse.yml b/data/cities/chemnitz/tedi-wladimir-sagorski-strasse.yml
deleted file mode 100644
index 1f6a48fe9a..0000000000
--- a/data/cities/chemnitz/tedi-wladimir-sagorski-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5408488002
-type: node
-latitude: 50.79575
-longitude: 12.88959
-postcode: "09122"
-city: Chemnitz
-street: "Wladimir-Sagorski-Straße"
-housenumber: 
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/tedi.yml b/data/cities/chemnitz/tedi.yml
index 131c1f057b..1f6a48fe9a 100644
--- a/data/cities/chemnitz/tedi.yml
+++ b/data/cities/chemnitz/tedi.yml
@@ -1,10 +1,10 @@
-id: 5367452070
+id: 5408488002
 type: node
-latitude: 50.82626
-longitude: 12.8326
-postcode: "09117"
+latitude: 50.79575
+longitude: 12.88959
+postcode: "09122"
 city: Chemnitz
-street: "Oberfrohnaer Straße"
+street: "Wladimir-Sagorski-Straße"
 housenumber: 
 phone: ""
 opening_hours: ""
diff --git a/data/cities/chemnitz/vedha-bestattungen-romy-scharrer-carl-von-ossietzky-strasse.yml b/data/cities/chemnitz/vedha-bestattungen-romy-scharrer-carl-von-ossietzky-strasse.yml
deleted file mode 100644
index 6de3b84524..0000000000
--- a/data/cities/chemnitz/vedha-bestattungen-romy-scharrer-carl-von-ossietzky-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2508225596
-type: node
-latitude: 50.82212
-longitude: 12.95988
-postcode: "09127"
-city: Chemnitz
-street: "Carl-von-Ossietzky-Straße"
-housenumber: 153b
-phone: ""
-opening_hours: "Mo,Fr 09:00-13:00, We 14:00-18:00"
-website: "https://www.vedha-bestattungen.de/"
\ No newline at end of file
diff --git a/data/cities/chemnitz/vedha-bestattungen-romy-scharrer-weststrasse.yml b/data/cities/chemnitz/vedha-bestattungen-romy-scharrer-weststrasse.yml
new file mode 100644
index 0000000000..da9e01ea62
--- /dev/null
+++ b/data/cities/chemnitz/vedha-bestattungen-romy-scharrer-weststrasse.yml
@@ -0,0 +1,11 @@
+id: 2510595288
+type: node
+latitude: 50.83066
+longitude: 12.89046
+postcode: "09116"
+city: Chemnitz
+street: "Weststraße"
+housenumber: 114
+phone: ""
+opening_hours: "Mo,Th 13:00-17:00; Tu 10:00-14:00"
+website: "https://www.vedha-bestattungen.de/"
\ No newline at end of file
diff --git a/data/cities/chemnitz/vedha-bestattungen-romy-scharrer.yml b/data/cities/chemnitz/vedha-bestattungen-romy-scharrer.yml
index da9e01ea62..6de3b84524 100644
--- a/data/cities/chemnitz/vedha-bestattungen-romy-scharrer.yml
+++ b/data/cities/chemnitz/vedha-bestattungen-romy-scharrer.yml
@@ -1,11 +1,11 @@
-id: 2510595288
+id: 2508225596
 type: node
-latitude: 50.83066
-longitude: 12.89046
-postcode: "09116"
+latitude: 50.82212
+longitude: 12.95988
+postcode: "09127"
 city: Chemnitz
-street: "Weststraße"
-housenumber: 114
+street: "Carl-von-Ossietzky-Straße"
+housenumber: 153b
 phone: ""
-opening_hours: "Mo,Th 13:00-17:00; Tu 10:00-14:00"
+opening_hours: "Mo,Fr 09:00-13:00, We 14:00-18:00"
 website: "https://www.vedha-bestattungen.de/"
\ No newline at end of file
diff --git a/data/cities/delitzsch/netto-marken-discount-albert-boehme-strasse.yml b/data/cities/delitzsch/netto-marken-discount-securiusstrasse.yml
similarity index 52%
rename from data/cities/delitzsch/netto-marken-discount-albert-boehme-strasse.yml
rename to data/cities/delitzsch/netto-marken-discount-securiusstrasse.yml
index c59575dabc..4d023f0105 100644
--- a/data/cities/delitzsch/netto-marken-discount-albert-boehme-strasse.yml
+++ b/data/cities/delitzsch/netto-marken-discount-securiusstrasse.yml
@@ -1,11 +1,11 @@
-id: 48821863
+id: 43158491
 type: way
-latitude: 51.53104
-longitude: 12.34052
+latitude: 51.53243
+longitude: 12.32459
 postcode: "04509"
 city: Delitzsch
-street: "Albert-Böhme-Straße"
-housenumber: 1
+street: "Securiusstraße"
+housenumber: 33a
 phone: ""
 opening_hours: "Mo-Sa 07:00-20:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/delitzsch/netto-marken-discount.yml b/data/cities/delitzsch/netto-marken-discount.yml
index 4d023f0105..c59575dabc 100644
--- a/data/cities/delitzsch/netto-marken-discount.yml
+++ b/data/cities/delitzsch/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 43158491
+id: 48821863
 type: way
-latitude: 51.53243
-longitude: 12.32459
+latitude: 51.53104
+longitude: 12.34052
 postcode: "04509"
 city: Delitzsch
-street: "Securiusstraße"
-housenumber: 33a
+street: "Albert-Böhme-Straß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/dresden/baeckerei-gehre-altnickern.yml b/data/cities/dresden/baeckerei-gehre-altnickern.yml
deleted file mode 100644
index d2390cb8d2..0000000000
--- a/data/cities/dresden/baeckerei-gehre-altnickern.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 0000000000..88ea23c586
--- /dev/null
+++ b/data/cities/dresden/baeckerei-gehre-roehrsdorfer-strasse.yml
@@ -0,0 +1,11 @@
+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 88ea23c586..d2390cb8d2 100644
--- a/data/cities/dresden/baeckerei-gehre.yml
+++ b/data/cities/dresden/baeckerei-gehre.yml
@@ -1,11 +1,11 @@
-id: 2408827238
+id: 2399358782
 type: node
-latitude: 50.98684
-longitude: 13.80589
-postcode: "01257"
+latitude: 50.99449
+longitude: 13.78826
+postcode: "01239"
 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
+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/katha-frisur.yml b/data/cities/dresden/katha-frisur.yml
index cb08ee9b4b..60798d3595 100644
--- a/data/cities/dresden/katha-frisur.yml
+++ b/data/cities/dresden/katha-frisur.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Oschatzer Straße"
 housenumber: 1
 phone: ""
-opening_hours: ""
+opening_hours: "nach vereinbarung"
 website: ""
\ 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 b61307c232..5d09940762 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: 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/netto-marken-discount-karlsruher-strasse.yml b/data/cities/dresden/netto-marken-discount-karlsruher-strasse.yml
index 5d09940762..b61307c232 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: 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/orden-arsenal.yml b/data/cities/dresden/orden-arsenal.yml
deleted file mode 100644
index 9466fc8d2d..0000000000
--- a/data/cities/dresden/orden-arsenal.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3311590310
-type: node
-latitude: 51.07442
-longitude: 13.72342
-postcode: "01127"
-city: Dresden
-street: "Leipziger Straße"
-housenumber: 76
-phone: "+49 172 3505333"
-opening_hours: "Mo-Th 13:00-17:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/shirt-presswerk.yml b/data/cities/dresden/shirt-presswerk.yml
index 20adbf1914..f1c0bb6fc5 100644
--- a/data/cities/dresden/shirt-presswerk.yml
+++ b/data/cities/dresden/shirt-presswerk.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Leipziger Straße"
 housenumber: 78
 phone: "+49 351 3299326"
-opening_hours: "Mo-Fr 10:00-18:00"
+opening_hours: "Mo-Fr 11:30-14:00,14:30-18:00"
 website: "https://www.shirtpresswerk.de/"
\ No newline at end of file
diff --git a/data/cities/ebersbach-neugersdorf/aldi-nord.yml b/data/cities/ebersbach-neugersdorf/aldi-nord.yml
index abd438a68c..168241a6bd 100644
--- a/data/cities/ebersbach-neugersdorf/aldi-nord.yml
+++ b/data/cities/ebersbach-neugersdorf/aldi-nord.yml
@@ -1,11 +1,11 @@
-id: 11224724333
+id: 11410247917
 type: node
-latitude: 50.98383
-longitude: 14.61434
+latitude: 50.98105
+longitude: 14.60977
 postcode: "02727"
 city: Ebersbach-Neugersdorf
-street: "Spreequellstraße"
-housenumber: 6
+street: "Bleichenstraße"
+housenumber: 3
 phone: ""
-opening_hours: "Mo-Fr 08:00-20:00; Sa 08:00-20:00; Su,PH off"
-website: ""
\ No newline at end of file
+opening_hours: "Mo-Sa 7:00-20:00"
+website: "https://www.aldi-nord.de/"
\ No newline at end of file
diff --git a/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.yml b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.yml
new file mode 100644
index 0000000000..4f217f6822
--- /dev/null
+++ b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.yml
@@ -0,0 +1,11 @@
+id: 11233674997
+type: node
+latitude: 51.15262
+longitude: 14.98849
+postcode: "02826"
+city: Görlitz
+street: "An der Frauenkirche"
+housenumber: 12
+phone: "+49 3581 879081"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.yml b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.yml
deleted file mode 100644
index 2ade819f79..0000000000
--- a/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 11243321899
-type: node
-latitude: 51.17014
-longitude: 14.9784
-postcode: "02828"
-city: Görlitz
-street: "Lausitzer Straße"
-housenumber: 20
-phone: "+49 3581 429649"
-opening_hours: ""
-website: "http://www.ce-haarstudio.de/"
\ No newline at end of file
diff --git a/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger.yml b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger.yml
index 4f217f6822..2ade819f79 100644
--- a/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger.yml
+++ b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger.yml
@@ -1,11 +1,11 @@
-id: 11233674997
+id: 11243321899
 type: node
-latitude: 51.15262
-longitude: 14.98849
-postcode: "02826"
+latitude: 51.17014
+longitude: 14.9784
+postcode: "02828"
 city: Görlitz
-street: "An der Frauenkirche"
-housenumber: 12
-phone: "+49 3581 879081"
+street: "Lausitzer Straße"
+housenumber: 20
+phone: "+49 3581 429649"
 opening_hours: ""
-website: ""
\ No newline at end of file
+website: "http://www.ce-haarstudio.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-nord-eilenburger-strasse.yml b/data/cities/leipzig/aldi-nord-eilenburger-strasse.yml
deleted file mode 100644
index 92491d3702..0000000000
--- a/data/cities/leipzig/aldi-nord-eilenburger-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 256721319
-type: node
-latitude: 51.33201
-longitude: 12.41168
-postcode: "04317"
-city: Leipzig
-street: "Eilenburger Straße"
-housenumber: 55
-phone: "+49 800 7234870"
-opening_hours: "Mo-Sa 07:00-21:00; Su off"
-website: "https://www.aldi-nord.de/filialen-und-oeffnungszeiten.html/l/leipzig/eilenburger-strasse-55/3182723"
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-nord-nonnenstrasse.yml b/data/cities/leipzig/aldi-nord-nonnenstrasse.yml
new file mode 100644
index 0000000000..134b7709eb
--- /dev/null
+++ b/data/cities/leipzig/aldi-nord-nonnenstrasse.yml
@@ -0,0 +1,11 @@
+id: 252441137
+type: node
+latitude: 51.32884
+longitude: 12.34399
+postcode: "04229"
+city: Leipzig
+street: "Nonnenstraße"
+housenumber: 15
+phone: ""
+opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/aldi-nord.yml b/data/cities/leipzig/aldi-nord.yml
index 134b7709eb..92491d3702 100644
--- a/data/cities/leipzig/aldi-nord.yml
+++ b/data/cities/leipzig/aldi-nord.yml
@@ -1,11 +1,11 @@
-id: 252441137
+id: 256721319
 type: node
-latitude: 51.32884
-longitude: 12.34399
-postcode: "04229"
+latitude: 51.33201
+longitude: 12.41168
+postcode: "04317"
 city: Leipzig
-street: "Nonnenstraße"
-housenumber: 15
-phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
-website: ""
\ No newline at end of file
+street: "Eilenburger Straße"
+housenumber: 55
+phone: "+49 800 7234870"
+opening_hours: "Mo-Sa 07:00-21:00; Su off"
+website: "https://www.aldi-nord.de/filialen-und-oeffnungszeiten.html/l/leipzig/eilenburger-strasse-55/3182723"
\ No newline at end of file
diff --git a/data/cities/leipzig/backhaus-hennig-dresdner-strasse.yml b/data/cities/leipzig/backhaus-hennig-dresdner-strasse.yml
index 6d08c9676a..756f302a89 100644
--- a/data/cities/leipzig/backhaus-hennig-dresdner-strasse.yml
+++ b/data/cities/leipzig/backhaus-hennig-dresdner-strasse.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Dresdner Straße"
 housenumber: 80
 phone: ""
-opening_hours: "Mo-Fr 07:00-21:00; Sa 07:00-20:30; Su,PH off"
+opening_hours: "Mo-Fr 06:00-21:00; Sa 06:00-20:30; PH,Su off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/fristo-floessenstrasse.yml b/data/cities/leipzig/fristo-floessenstrasse.yml
deleted file mode 100644
index b63a988d8e..0000000000
--- a/data/cities/leipzig/fristo-floessenstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 0000000000..33b3c421cd
--- /dev/null
+++ b/data/cities/leipzig/fristo-max-liebermann-strasse.yml
@@ -0,0 +1,11 @@
+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 33b3c421cd..b63a988d8e 100644
--- a/data/cities/leipzig/fristo.yml
+++ b/data/cities/leipzig/fristo.yml
@@ -1,11 +1,11 @@
-id: 249368235
+id: 239751726
 type: way
-latitude: 51.37645
-longitude: 12.37845
-postcode: "04157"
+latitude: 51.37684
+longitude: 12.31584
+postcode: "04159"
 city: Leipzig
-street: "Max-Liebermann-Straße"
-housenumber: 103
+street: "Flößenstraße"
+housenumber: 2
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00; Su,PH off"
+opening_hours: ""
 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/netto-marken-discount-gutsmuthsstrasse.yml b/data/cities/leipzig/netto-marken-discount-gutsmuthsstrasse.yml
new file mode 100644
index 0000000000..e33b96af15
--- /dev/null
+++ b/data/cities/leipzig/netto-marken-discount-gutsmuthsstrasse.yml
@@ -0,0 +1,11 @@
+id: 361105451
+type: node
+latitude: 51.33508
+longitude: 12.3293
+postcode: "04177"
+city: Leipzig
+street: "GutsMuthsstraße"
+housenumber: 
+phone: ""
+opening_hours: "Mo-Sa 08:00-21:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/netto-marken-discount-loebauer-strasse.yml b/data/cities/leipzig/netto-marken-discount-loebauer-strasse.yml
deleted file mode 100644
index 4d9a2cf1d9..0000000000
--- a/data/cities/leipzig/netto-marken-discount-loebauer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 345277058
-type: node
-latitude: 51.35702
-longitude: 12.42548
-postcode: "04347"
-city: Leipzig
-street: "Löbauer Straße"
-housenumber: 68
-phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/netto-marken-discount.yml b/data/cities/leipzig/netto-marken-discount.yml
index e33b96af15..4d9a2cf1d9 100644
--- a/data/cities/leipzig/netto-marken-discount.yml
+++ b/data/cities/leipzig/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 361105451
+id: 345277058
 type: node
-latitude: 51.33508
-longitude: 12.3293
-postcode: "04177"
+latitude: 51.35702
+longitude: 12.42548
+postcode: "04347"
 city: Leipzig
-street: "GutsMuthsstraße"
-housenumber: 
+street: "Löbauer Straße"
+housenumber: 68
 phone: ""
-opening_hours: "Mo-Sa 08:00-21:00"
+opening_hours: "Mo-Sa 07:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/puche-international.yml b/data/cities/leipzig/puche-international.yml
new file mode 100644
index 0000000000..2ba90946b5
--- /dev/null
+++ b/data/cities/leipzig/puche-international.yml
@@ -0,0 +1,11 @@
+id: 5912601449
+type: node
+latitude: 51.33913
+longitude: 12.37439
+postcode: ""
+city: Leipzig
+street: "Petersstraße"
+housenumber: 12
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/mildenau/penny.yml b/data/cities/mildenau/penny.yml
index c2169e8653..4ab936a664 100644
--- a/data/cities/mildenau/penny.yml
+++ b/data/cities/mildenau/penny.yml
@@ -1,7 +1,7 @@
 id: 5347881222
 type: node
-latitude: 50.59978
-longitude: 13.06322
+latitude: 50.59979
+longitude: 13.06369
 postcode: "09456"
 city: Mildenau
 street: "Gewerbegebiet Nord"
diff --git a/data/cities/moritzburg/netto-marken-discount-grossenhainer-strasse.yml b/data/cities/moritzburg/netto-marken-discount-grossenhainer-strasse.yml
deleted file mode 100644
index dd4045067d..0000000000
--- a/data/cities/moritzburg/netto-marken-discount-grossenhainer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 43266939
-type: way
-latitude: 51.12365
-longitude: 13.68624
-postcode: "01468"
-city: Moritzburg
-street: "Großenhainer Straße"
-housenumber: 1f
-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/moritzburg/netto-marken-discount-schlossallee.yml b/data/cities/moritzburg/netto-marken-discount-schlossallee.yml
new file mode 100644
index 0000000000..b71a45a8c0
--- /dev/null
+++ b/data/cities/moritzburg/netto-marken-discount-schlossallee.yml
@@ -0,0 +1,11 @@
+id: 35825848
+type: way
+latitude: 51.15425
+longitude: 13.68175
+postcode: "01468"
+city: Moritzburg
+street: "Schloßallee"
+housenumber: 53
+phone: ""
+opening_hours: "Mo-Sa 07:00-20:00; Su,PH off; Feb 06-Mar 20 off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/moritzburg/netto-marken-discount.yml b/data/cities/moritzburg/netto-marken-discount.yml
index b71a45a8c0..dd4045067d 100644
--- a/data/cities/moritzburg/netto-marken-discount.yml
+++ b/data/cities/moritzburg/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 35825848
+id: 43266939
 type: way
-latitude: 51.15425
-longitude: 13.68175
+latitude: 51.12365
+longitude: 13.68624
 postcode: "01468"
 city: Moritzburg
-street: "Schloßallee"
-housenumber: 53
+street: "Großenhainer Straße"
+housenumber: 1f
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; Su,PH off; Feb 06-Mar 20 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/nuenchritz/lidl.yml b/data/cities/nuenchritz/lidl.yml
index fd992873f9..9348776b8f 100644
--- a/data/cities/nuenchritz/lidl.yml
+++ b/data/cities/nuenchritz/lidl.yml
@@ -1,7 +1,7 @@
 id: 780431644
 type: way
 latitude: 51.30064
-longitude: 13.38303
+longitude: 13.38302
 postcode: "01612"
 city: Nünchritz
 street: "Meißner Straße"
diff --git a/data/cities/nuenchritz/mode-schweinberger.yml b/data/cities/nuenchritz/mode-schweinberger.yml
index 14998ce26b..4c6ddaca9f 100644
--- a/data/cities/nuenchritz/mode-schweinberger.yml
+++ b/data/cities/nuenchritz/mode-schweinberger.yml
@@ -1,7 +1,7 @@
 id: 3320954815
 type: node
-latitude: 51.30155
-longitude: 13.38112
+latitude: 51.30156
+longitude: 13.38107
 postcode: "01612"
 city: Nünchritz
 street: "Riesaer Straße"
diff --git a/data/cities/pirna/tonis-baeckerladen-robert-koch-strasse.yml b/data/cities/pirna/tonis-baeckerladen-robert-koch-strasse.yml
deleted file mode 100644
index 42b10898d4..0000000000
--- a/data/cities/pirna/tonis-baeckerladen-robert-koch-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4239287394
-type: node
-latitude: 50.95958
-longitude: 13.93757
-postcode: "01796"
-city: Pirna
-street: "Robert-Koch-Straße"
-housenumber: 18
-phone: "+49 35024 70381"
-opening_hours: "Tu-Fr 06:30-17:30; Sa 06:30-10:00; PH closed; Mo 06:30-15:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/pirna/tonis-baeckerladen-rottwerndorfer-strasse.yml b/data/cities/pirna/tonis-baeckerladen-rottwerndorfer-strasse.yml
new file mode 100644
index 0000000000..4373ce7100
--- /dev/null
+++ b/data/cities/pirna/tonis-baeckerladen-rottwerndorfer-strasse.yml
@@ -0,0 +1,11 @@
+id: 4236925490
+type: node
+latitude: 50.9519
+longitude: 13.94016
+postcode: "01796"
+city: Pirna
+street: "Rottwerndorfer Straße"
+housenumber: 8
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/pirna/tonis-baeckerladen.yml b/data/cities/pirna/tonis-baeckerladen.yml
index 4373ce7100..42b10898d4 100644
--- a/data/cities/pirna/tonis-baeckerladen.yml
+++ b/data/cities/pirna/tonis-baeckerladen.yml
@@ -1,11 +1,11 @@
-id: 4236925490
+id: 4239287394
 type: node
-latitude: 50.9519
-longitude: 13.94016
+latitude: 50.95958
+longitude: 13.93757
 postcode: "01796"
 city: Pirna
-street: "Rottwerndorfer Straße"
-housenumber: 8
-phone: ""
-opening_hours: ""
+street: "Robert-Koch-Straße"
+housenumber: 18
+phone: "+49 35024 70381"
+opening_hours: "Tu-Fr 06:30-17:30; Sa 06:30-10:00; PH closed; Mo 06:30-15:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/plauen/lidl.yml b/data/cities/plauen/lidl.yml
index aeb10bb8e0..16a726391d 100644
--- a/data/cities/plauen/lidl.yml
+++ b/data/cities/plauen/lidl.yml
@@ -1,6 +1,6 @@
 id: 749325492
 type: way
-latitude: 50.49139
+latitude: 50.49137
 longitude: 12.14275
 postcode: "08527"
 city: Plauen
diff --git a/data/cities/radebeul/naundorfer-heimatstube.yml b/data/cities/radebeul/naundorfer-heimatstube.yml
new file mode 100644
index 0000000000..7143676075
--- /dev/null
+++ b/data/cities/radebeul/naundorfer-heimatstube.yml
@@ -0,0 +1,11 @@
+id: 11543572782
+type: node
+latitude: 51.10724
+longitude: 13.60805
+postcode: "01445"
+city: Radebeul
+street: "Fabrikstraße"
+housenumber: 60
+phone: "+4903518386832"
+opening_hours: "Mo-Do 13:00-18:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/radebeul/vales-autoservice.yml b/data/cities/radebeul/vales-autoservice.yml
new file mode 100644
index 0000000000..7bd74cd7a4
--- /dev/null
+++ b/data/cities/radebeul/vales-autoservice.yml
@@ -0,0 +1,11 @@
+id: 11543509609
+type: node
+latitude: 51.10771
+longitude: 13.60531
+postcode: "01445"
+city: Radebeul
+street: "Niederwarthaer Straße"
+housenumber: 12
+phone: "+493518386919"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/radeburg/baeckerei-breuer.yml b/data/cities/radeburg/baeckerei-breuer.yml
index a9be250fd9..594a020ea9 100644
--- a/data/cities/radeburg/baeckerei-breuer.yml
+++ b/data/cities/radeburg/baeckerei-breuer.yml
@@ -7,5 +7,5 @@ city: Radeburg
 street: "Berbisdorfer Hauptstraße"
 housenumber: 40
 phone: ""
-opening_hours: ""
+opening_hours: "Tu-Fr 06:00-18:00; Sa 07:00-11:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/roetha/sp-reifegerste.yml b/data/cities/roetha/tv-reifegerste.yml
similarity index 100%
rename from data/cities/roetha/sp-reifegerste.yml
rename to data/cities/roetha/tv-reifegerste.yml
diff --git a/data/cities/rosswein/autohaus-kessler-rosswein.yml b/data/cities/rosswein/autohaus-kessler-rosswein.yml
index 9e8a087f5e..7970e440fd 100644
--- a/data/cities/rosswein/autohaus-kessler-rosswein.yml
+++ b/data/cities/rosswein/autohaus-kessler-rosswein.yml
@@ -8,4 +8,4 @@ street: "Zum Neidhardt"
 housenumber: 2
 phone: ""
 opening_hours: ""
-website: "www.ah-kessler.de"
\ No newline at end of file
+website: "http://www.ah-kessler.de"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro-frauenstrasse-2.yml b/data/cities/zittau/friseur-figaro-frauenstrasse-2.yml
new file mode 100644
index 0000000000..7d7dec24f4
--- /dev/null
+++ b/data/cities/zittau/friseur-figaro-frauenstrasse-2.yml
@@ -0,0 +1,11 @@
+id: 8220110942
+type: node
+latitude: 50.89681
+longitude: 14.8096
+postcode: "02763"
+city: Zittau
+street: "Frauenstraße"
+housenumber: 17
+phone: "+49 3583 510811"
+opening_hours: "Mo-Fr 09:00-18:00"
+website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro-frauenstrasse.yml b/data/cities/zittau/friseur-figaro-frauenstrasse.yml
index 7d7dec24f4..6fb09a781f 100644
--- a/data/cities/zittau/friseur-figaro-frauenstrasse.yml
+++ b/data/cities/zittau/friseur-figaro-frauenstrasse.yml
@@ -1,11 +1,11 @@
-id: 8220110942
+id: 8220110941
 type: node
-latitude: 50.89681
-longitude: 14.8096
+latitude: 50.8968
+longitude: 14.80956
 postcode: "02763"
 city: Zittau
 street: "Frauenstraße"
 housenumber: 17
 phone: "+49 3583 510811"
-opening_hours: "Mo-Fr 09:00-18:00"
+opening_hours: "Tu-Fr 09:00-18:00; Mo 13:00-18:00; Sa 09:00-12:00"
 website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro-markt.yml b/data/cities/zittau/friseur-figaro-markt.yml
deleted file mode 100644
index 7a52870486..0000000000
--- a/data/cities/zittau/friseur-figaro-markt.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8197663839
-type: node
-latitude: 50.89653
-longitude: 14.80576
-postcode: "02763"
-city: Zittau
-street: "Markt"
-housenumber: 18
-phone: "+49 3583 510635"
-opening_hours: "Mo 12:00-18:00; Tu-Fr 08:00-18:00"
-website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zittau/friseur-figaro.yml b/data/cities/zittau/friseur-figaro.yml
index 6fb09a781f..7a52870486 100644
--- a/data/cities/zittau/friseur-figaro.yml
+++ b/data/cities/zittau/friseur-figaro.yml
@@ -1,11 +1,11 @@
-id: 8220110941
+id: 8197663839
 type: node
-latitude: 50.8968
-longitude: 14.80956
+latitude: 50.89653
+longitude: 14.80576
 postcode: "02763"
 city: Zittau
-street: "Frauenstraße"
-housenumber: 17
-phone: "+49 3583 510811"
-opening_hours: "Tu-Fr 09:00-18:00; Mo 13:00-18:00; Sa 09:00-12:00"
+street: "Markt"
+housenumber: 18
+phone: "+49 3583 510635"
+opening_hours: "Mo 12:00-18:00; Tu-Fr 08:00-18:00"
 website: "http://www.friseur-zittau.de/"
\ No newline at end of file
diff --git a/data/cities/zittau/nah-und-frisch-zum-see.yml b/data/cities/zittau/nah-und-frisch-zum-see.yml
new file mode 100644
index 0000000000..083d6d1eb5
--- /dev/null
+++ b/data/cities/zittau/nah-und-frisch-zum-see.yml
@@ -0,0 +1,11 @@
+id: 481366214
+type: way
+latitude: 50.89888
+longitude: 14.76863
+postcode: "02763"
+city: Zittau
+street: "Zum See"
+housenumber: 3
+phone: ""
+opening_hours: "Mo-Fr 07:30-18:30; Sa 07:30-13:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/zittau/nah-und-frisch.yml b/data/cities/zittau/nah-und-frisch.yml
index 083d6d1eb5..dcf4dadc19 100644
--- a/data/cities/zittau/nah-und-frisch.yml
+++ b/data/cities/zittau/nah-und-frisch.yml
@@ -1,11 +1,11 @@
-id: 481366214
+id: 94792377
 type: way
-latitude: 50.89888
-longitude: 14.76863
+latitude: 50.89861
+longitude: 14.80037
 postcode: "02763"
 city: Zittau
-street: "Zum See"
-housenumber: 3
+street: "Dresdner Straße"
+housenumber: 1a
 phone: ""
-opening_hours: "Mo-Fr 07:30-18:30; Sa 07:30-13:00"
+opening_hours: ""
 website: ""
\ No newline at end of file
diff --git a/data/cities/zwenkau/hillerts-radlerhof.yml b/data/cities/zwenkau/hillerts-radlerhof.yml
new file mode 100644
index 0000000000..8ddb6c21ec
--- /dev/null
+++ b/data/cities/zwenkau/hillerts-radlerhof.yml
@@ -0,0 +1,11 @@
+id: 4609498635
+type: node
+latitude: 51.21
+longitude: 12.32293
+postcode: "04442"
+city: Zwenkau
+street: "Zum Rittergut"
+housenumber: 16
+phone: "+49 34203 52650"
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/barber-shop-zwickau-dr-friedrichs-ring.yml b/data/cities/zwickau/barber-shop-zwickau-dr-friedrichs-ring.yml
deleted file mode 100644
index bd676cde49..0000000000
--- a/data/cities/zwickau/barber-shop-zwickau-dr-friedrichs-ring.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5226622352
-type: node
-latitude: 50.72175
-longitude: 12.4962
-postcode: "08056"
-city: Zwickau
-street: "Dr.-Friedrichs-Ring"
-housenumber: 49
-phone: "+49 (0) 375 27 03 59 5"
-opening_hours: "Mo-Fr 09:00-19:00, Sa 09:00-17:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/barber-shop-zwickau-klosterstrasse.yml b/data/cities/zwickau/barber-shop-zwickau-klosterstrasse.yml
new file mode 100644
index 0000000000..140d6087c7
--- /dev/null
+++ b/data/cities/zwickau/barber-shop-zwickau-klosterstrasse.yml
@@ -0,0 +1,11 @@
+id: 5247034009
+type: node
+latitude: 50.71537
+longitude: 12.4965
+postcode: "08056"
+city: Zwickau
+street: "Klosterstraße"
+housenumber: 22a
+phone: ""
+opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-17:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/barber-shop-zwickau.yml b/data/cities/zwickau/barber-shop-zwickau.yml
index 140d6087c7..bd676cde49 100644
--- a/data/cities/zwickau/barber-shop-zwickau.yml
+++ b/data/cities/zwickau/barber-shop-zwickau.yml
@@ -1,11 +1,11 @@
-id: 5247034009
+id: 5226622352
 type: node
-latitude: 50.71537
-longitude: 12.4965
+latitude: 50.72175
+longitude: 12.4962
 postcode: "08056"
 city: Zwickau
-street: "Klosterstraße"
-housenumber: 22a
-phone: ""
-opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-17:00"
+street: "Dr.-Friedrichs-Ring"
+housenumber: 49
+phone: "+49 (0) 375 27 03 59 5"
+opening_hours: "Mo-Fr 09:00-19:00, Sa 09:00-17:00"
 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
deleted file mode 100644
index 0b6c01f784..0000000000
--- a/data/cities/zwickau/ernstings-family-innere-plauensche-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 0000000000..d73b6e42f8
--- /dev/null
+++ b/data/cities/zwickau/ernstings-family-oskar-arnold-strasse.yml
@@ -0,0 +1,11 @@
+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 d73b6e42f8..0b6c01f784 100644
--- a/data/cities/zwickau/ernstings-family.yml
+++ b/data/cities/zwickau/ernstings-family.yml
@@ -1,11 +1,11 @@
-id: 3736655727
+id: 3718591631
 type: node
-latitude: 50.70705
-longitude: 12.50059
+latitude: 50.71859
+longitude: 12.49407
 postcode: "08056"
 city: Zwickau
-street: "Oskar-Arnold-Straße"
-housenumber: 3
+street: "Innere Plauensche Straße"
+housenumber: 21
 phone: ""
 opening_hours: ""
 website: ""
\ No newline at end of file