diff --git a/content/cities/arnsdorf/_index.md b/content/cities/arnsdorf/_index.md
index a08b754ba4..a59b0c1b4d 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.093
+longitude: 13.989
 ---
\ No newline at end of file
diff --git a/content/cities/bautzen-budysin/headlive-kindermarkenmode-und-spielwaren.md b/content/cities/bautzen-budysin/headlive-kindermarkenmode-und-spielwaren.md
deleted file mode 100644
index b6cd612c04..0000000000
--- a/content/cities/bautzen-budysin/headlive-kindermarkenmode-und-spielwaren.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "HeaDLivE - Kindermarkenmode & Spielwaren"
-url: /bautzen-budysin/headlive-kindermarkenmode-und-spielwaren/
-shop: Spielzeug
----
\ No newline at end of file
diff --git a/content/cities/bautzen/bumueller-back.md b/content/cities/bautzen/bumueller-back.md
deleted file mode 100644
index 48f9e7f8cc..0000000000
--- a/content/cities/bautzen/bumueller-back.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bumüller Back"
-url: /bautzen/bumueller-back/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/bautzen/kichererbse.md b/content/cities/bautzen/kichererbse.md
deleted file mode 100644
index d79c51cf5b..0000000000
--- a/content/cities/bautzen/kichererbse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Kichererbse"
-url: /bautzen/kichererbse/
-shop: Lebensmittel
----
\ No newline at end of file
diff --git a/content/cities/bautzen/obst-und-gemuese.md b/content/cities/bautzen/obst-und-gemuese.md
deleted file mode 100644
index d201314bf6..0000000000
--- a/content/cities/bautzen/obst-und-gemuese.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Obst & Gemüse"
-url: /bautzen/obst-und-gemuese/
-shop: Gemüse & Obst
----
\ No newline at end of file
diff --git a/content/cities/bautzen/tabakboerse.md b/content/cities/bautzen/tabakboerse.md
new file mode 100644
index 0000000000..8b0e28a296
--- /dev/null
+++ b/content/cities/bautzen/tabakboerse.md
@@ -0,0 +1,5 @@
+---
+title: "Tabakbörse"
+url: /bautzen/tabakboerse/
+shop: Tabak
+---
\ No newline at end of file
diff --git a/content/cities/bautzen/ticket-und-more.md b/content/cities/bautzen/ticket-und-more.md
new file mode 100644
index 0000000000..324cdf3bfb
--- /dev/null
+++ b/content/cities/bautzen/ticket-und-more.md
@@ -0,0 +1,5 @@
+---
+title: "Ticket & More"
+url: /bautzen/ticket-und-more/
+shop: Reisebüro
+---
\ No newline at end of file
diff --git a/content/cities/bautzen/tupperware.md b/content/cities/bautzen/tupperware.md
new file mode 100644
index 0000000000..063e724654
--- /dev/null
+++ b/content/cities/bautzen/tupperware.md
@@ -0,0 +1,5 @@
+---
+title: "Tupperware"
+url: /bautzen/tupperware/
+shop: Haushaltsartikel
+---
\ No newline at end of file
diff --git a/content/cities/bautzen/von-edelmann.md b/content/cities/bautzen/von-edelmann.md
new file mode 100644
index 0000000000..4d48e033a5
--- /dev/null
+++ b/content/cities/bautzen/von-edelmann.md
@@ -0,0 +1,5 @@
+---
+title: "von Edelmann"
+url: /bautzen/von-edelmann/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/bautzen/womens-line.md b/content/cities/bautzen/womens-line.md
new file mode 100644
index 0000000000..caac9ca724
--- /dev/null
+++ b/content/cities/bautzen/womens-line.md
@@ -0,0 +1,5 @@
+---
+title: "Women's Line"
+url: /bautzen/womens-line/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/bautzen/yakuza-store-bautzen.md b/content/cities/bautzen/yakuza-store-bautzen.md
deleted file mode 100644
index f41e31feb6..0000000000
--- a/content/cities/bautzen/yakuza-store-bautzen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "yakuza Store Bautzen"
-url: /bautzen/yakuza-store-bautzen/
-shop: Kleidung
----
\ No newline at end of file
diff --git a/content/cities/bernstadt-auf-dem-eigen/_index.md b/content/cities/bernstadt-auf-dem-eigen/_index.md
index f9dd78ceea..7837af1745 100644
--- a/content/cities/bernstadt-auf-dem-eigen/_index.md
+++ b/content/cities/bernstadt-auf-dem-eigen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bernstadt auf dem Eigen
 url: /bernstadt-auf-dem-eigen/
-latitude: 51.047
-longitude: 14.827
+latitude: 51.049
+longitude: 14.825
 ---
\ 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/a-t-u-annaberger-strasse.md b/content/cities/chemnitz/a-t-u-leipziger-strasse.md
similarity index 50%
rename from content/cities/chemnitz/a-t-u-annaberger-strasse.md
rename to content/cities/chemnitz/a-t-u-leipziger-strasse.md
index aee5e5b440..ca8773fc3d 100644
--- a/content/cities/chemnitz/a-t-u-annaberger-strasse.md
+++ b/content/cities/chemnitz/a-t-u-leipziger-strasse.md
@@ -1,5 +1,5 @@
 ---
 title: "A.T.U"
-url: /chemnitz/a-t-u-annaberger-strasse/
+url: /chemnitz/a-t-u-leipziger-strasse/
 shop: Autowerkstatt
 ---
\ No newline at end of file
diff --git a/content/cities/chemnitz/tedi-oberfrohnaer-strasse.md b/content/cities/chemnitz/tedi-oberfrohnaer-strasse.md
deleted file mode 100644
index 740c4f8557..0000000000
--- a/content/cities/chemnitz/tedi-oberfrohnaer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 0000000000..277103a5d6
--- /dev/null
+++ b/content/cities/chemnitz/tedi-wladimir-sagorski-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "TEDi"
+url: /chemnitz/tedi-wladimir-sagorski-strasse/
+shop: Kramladen
+---
\ No newline at end of file
diff --git a/content/cities/delitzsch/_index.md b/content/cities/delitzsch/_index.md
index a3b6456a64..57e8a137d5 100644
--- a/content/cities/delitzsch/_index.md
+++ b/content/cities/delitzsch/_index.md
@@ -2,5 +2,5 @@
 title: Delitzsch
 url: /delitzsch/
 latitude: 51.523
-longitude: 12.336
+longitude: 12.337
 ---
\ No newline at end of file
diff --git a/content/cities/doberschuetz/_index.md b/content/cities/doberschuetz/_index.md
index 0c11379ba4..300a5fdbe2 100644
--- a/content/cities/doberschuetz/_index.md
+++ b/content/cities/doberschuetz/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Doberschütz
 url: /doberschuetz/
-latitude: 51.497
-longitude: 12.643
+latitude: 51.495
+longitude: 12.644
 ---
\ 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/aldi-uhlandstrasse.md b/content/cities/dresden/aldi-bulgakowstrasse.md
similarity index 51%
rename from content/cities/dresden/aldi-uhlandstrasse.md
rename to content/cities/dresden/aldi-bulgakowstrasse.md
index 689208c182..3e0a520af7 100644
--- a/content/cities/dresden/aldi-uhlandstrasse.md
+++ b/content/cities/dresden/aldi-bulgakowstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Aldi"
-url: /dresden/aldi-uhlandstrasse/
+url: /dresden/aldi-bulgakowstrasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/aleppo-aquila.md b/content/cities/dresden/aleppo-aquila.md
new file mode 100644
index 0000000000..072c3b61e2
--- /dev/null
+++ b/content/cities/dresden/aleppo-aquila.md
@@ -0,0 +1,5 @@
+---
+title: "Aleppo Aquila"
+url: /dresden/aleppo-aquila/
+shop: Bäckerei
+---
\ 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/bueroausstattung-wagner.md b/content/cities/dresden/bueroausstattung-wagner.md
new file mode 100644
index 0000000000..a11d84157b
--- /dev/null
+++ b/content/cities/dresden/bueroausstattung-wagner.md
@@ -0,0 +1,5 @@
+---
+title: "Büroausstattung Wagner"
+url: /dresden/bueroausstattung-wagner/
+shop: Möbel
+---
\ No newline at end of file
diff --git a/content/cities/dresden/handarbeiten-lange.md b/content/cities/dresden/handarbeiten-lange.md
index 00ea7d60cb..2a01d43e7d 100644
--- a/content/cities/dresden/handarbeiten-lange.md
+++ b/content/cities/dresden/handarbeiten-lange.md
@@ -1,5 +1,5 @@
 ---
 title: "Handarbeiten Lange"
 url: /dresden/handarbeiten-lange/
-shop: Textil
+shop: Wolle
 ---
\ No newline at end of file
diff --git a/content/cities/dresden/krause-hallesche-strasse.md b/content/cities/dresden/krause-hallesche-strasse.md
deleted file mode 100644
index 08355fa56c..0000000000
--- a/content/cities/dresden/krause-hallesche-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Krause"
-url: /dresden/krause-hallesche-strasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/dresden/lavie-coffee-dresden-roesterei.md b/content/cities/dresden/lavie-coffee-dresden-roesterei.md
deleted file mode 100644
index d4370680c4..0000000000
--- a/content/cities/dresden/lavie-coffee-dresden-roesterei.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "LaVie Coffee Dresden - Rösterei"
-url: /dresden/lavie-coffee-dresden-roesterei/
-shop: Kaffee
----
\ No newline at end of file
diff --git a/content/cities/dresden/technik-haus-bang-und-olufsen.md b/content/cities/dresden/technik-haus-bang-und-olufsen.md
deleted file mode 100644
index 1ac900099d..0000000000
--- a/content/cities/dresden/technik-haus-bang-und-olufsen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Technik-Haus Bang & Olufsen"
-url: /dresden/technik-haus-bang-und-olufsen/
-shop: Hifi
----
\ No newline at end of file
diff --git a/content/cities/plauen/netto-marken-discount-luetzowstrasse.md b/content/cities/freiberg/netto-marken-discount-am-rotvorwerk.md
similarity index 51%
rename from content/cities/plauen/netto-marken-discount-luetzowstrasse.md
rename to content/cities/freiberg/netto-marken-discount-am-rotvorwerk.md
index 9c4ade7655..84fa9b94fe 100644
--- a/content/cities/plauen/netto-marken-discount-luetzowstrasse.md
+++ b/content/cities/freiberg/netto-marken-discount-am-rotvorwerk.md
@@ -1,5 +1,5 @@
 ---
 title: "Netto Marken-Discount"
-url: /plauen/netto-marken-discount-luetzowstrasse/
+url: /freiberg/netto-marken-discount-am-rotvorwerk/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/freiberg/netto-marken-discount-karl-kegel-strasse.md b/content/cities/freiberg/netto-marken-discount-karl-kegel-strasse.md
deleted file mode 100644
index d1a2c41a91..0000000000
--- a/content/cities/freiberg/netto-marken-discount-karl-kegel-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /freiberg/netto-marken-discount-karl-kegel-strasse/
-shop: Supermarkt
----
\ 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
deleted file mode 100644
index b9f6c4d1ff..0000000000
--- a/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 0000000000..87221eaddd
--- /dev/null
+++ b/content/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.md
@@ -0,0 +1,5 @@
+---
+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/grimma/xanocs-kuechen-grimma.md b/content/cities/grimma/xanocs-kuechen-grimma.md
new file mode 100644
index 0000000000..c5978d1be7
--- /dev/null
+++ b/content/cities/grimma/xanocs-kuechen-grimma.md
@@ -0,0 +1,5 @@
+---
+title: "xanocs Küchen Grimma"
+url: /grimma/xanocs-kuechen-grimma/
+shop: Küchen
+---
\ No newline at end of file
diff --git a/content/cities/grimma/xanocs.md b/content/cities/grimma/xanocs.md
deleted file mode 100644
index 116c76a013..0000000000
--- a/content/cities/grimma/xanocs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "xanocs"
-url: /grimma/xanocs/
-shop: Küchen
----
\ No newline at end of file
diff --git a/content/cities/heidersdorf/_index.md b/content/cities/heidersdorf/_index.md
index 1b2635548c..806d46b13b 100644
--- a/content/cities/heidersdorf/_index.md
+++ b/content/cities/heidersdorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Heidersdorf
 url: /heidersdorf/
-latitude: 50.663
-longitude: 13.417
+latitude: 50.675
+longitude: 13.422
 ---
\ No newline at end of file
diff --git a/content/cities/klipphausen/hofladen-taubenheim.md b/content/cities/klipphausen/hofladen-taubenheim.md
new file mode 100644
index 0000000000..ac04a3bb9f
--- /dev/null
+++ b/content/cities/klipphausen/hofladen-taubenheim.md
@@ -0,0 +1,5 @@
+---
+title: "Hofladen Taubenheim"
+url: /klipphausen/hofladen-taubenheim/
+shop: Bäckerei
+---
\ 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/alippi-holzhaeuser-strasse.md b/content/cities/leipzig/alippi-mockauer-strasse.md
similarity index 50%
rename from content/cities/leipzig/alippi-holzhaeuser-strasse.md
rename to content/cities/leipzig/alippi-mockauer-strasse.md
index 971acfb45b..1e6e391920 100644
--- a/content/cities/leipzig/alippi-holzhaeuser-strasse.md
+++ b/content/cities/leipzig/alippi-mockauer-strasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Alippi"
-url: /leipzig/alippi-holzhaeuser-strasse/
+url: /leipzig/alippi-mockauer-strasse/
 shop: Sanitätshaus
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/dm-lindenauer-markt.md b/content/cities/leipzig/dm-lindenauer-markt.md
new file mode 100644
index 0000000000..24fbdc13b8
--- /dev/null
+++ b/content/cities/leipzig/dm-lindenauer-markt.md
@@ -0,0 +1,5 @@
+---
+title: "dm"
+url: /leipzig/dm-lindenauer-markt/
+shop: Drogerie
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/dm-windmuehlenstrasse.md b/content/cities/leipzig/dm-windmuehlenstrasse.md
deleted file mode 100644
index 7a4f300a65..0000000000
--- a/content/cities/leipzig/dm-windmuehlenstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "dm"
-url: /leipzig/dm-windmuehlenstrasse/
-shop: Drogerie
----
\ 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/jaroll-gmbh.md b/content/cities/leipzig/jaroll-gmbh.md
new file mode 100644
index 0000000000..cef731c41b
--- /dev/null
+++ b/content/cities/leipzig/jaroll-gmbh.md
@@ -0,0 +1,5 @@
+---
+title: "JAROLL GmbH"
+url: /leipzig/jaroll-gmbh/
+shop: Allgemein
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/norma-stoetteritzer-strasse-2.md b/content/cities/leipzig/norma-stoetteritzer-strasse-2.md
deleted file mode 100644
index 8ddb30a215..0000000000
--- a/content/cities/leipzig/norma-stoetteritzer-strasse-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Norma"
-url: /leipzig/norma-stoetteritzer-strasse-2/
-shop: Allgemein
----
\ No newline at end of file
diff --git a/content/cities/leipzig/norma-stoetteritzer-strasse.md b/content/cities/leipzig/norma-stoetteritzer-strasse.md
index 0ecf3ccfe8..6d92f31c95 100644
--- a/content/cities/leipzig/norma-stoetteritzer-strasse.md
+++ b/content/cities/leipzig/norma-stoetteritzer-strasse.md
@@ -1,5 +1,5 @@
 ---
-title: "Norma"
+title: "NORMA"
 url: /leipzig/norma-stoetteritzer-strasse/
-shop: Allgemein
+shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/leipzig/perueckenstudio-bergmann.md b/content/cities/leipzig/perueckenstudio-bergmann.md
new file mode 100644
index 0000000000..0ec563be18
--- /dev/null
+++ b/content/cities/leipzig/perueckenstudio-bergmann.md
@@ -0,0 +1,5 @@
+---
+title: "Perückenstudio Bergmann"
+url: /leipzig/perueckenstudio-bergmann/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/leipzig/suay-massage.md b/content/cities/leipzig/suay-massage.md
new file mode 100644
index 0000000000..fde72dce0d
--- /dev/null
+++ b/content/cities/leipzig/suay-massage.md
@@ -0,0 +1,5 @@
+---
+title: "Suay Massage"
+url: /leipzig/suay-massage/
+shop: Massage
+---
\ No newline at end of file
diff --git a/content/cities/lichtentanne/markgrafen-getraenkemarkt.md b/content/cities/lichtentanne/markgrafen-getraenkemarkt.md
deleted file mode 100644
index 2eb14f450b..0000000000
--- a/content/cities/lichtentanne/markgrafen-getraenkemarkt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Markgrafen Getränkemarkt"
-url: /lichtentanne/markgrafen-getraenkemarkt/
-shop: Getränke
----
\ No newline at end of file
diff --git a/content/cities/loebau/wiedemann-berufsmode.md b/content/cities/loebau/wiedemann-berufsmode.md
index 9eddc79c48..d7884a0326 100644
--- a/content/cities/loebau/wiedemann-berufsmode.md
+++ b/content/cities/loebau/wiedemann-berufsmode.md
@@ -1,5 +1,5 @@
 ---
-title: "wiedemann BERUFSMODE"
+title: "wiedemann Berufsmode"
 url: /loebau/wiedemann-berufsmode/
 shop: Kleidung
 ---
\ No newline at end of file
diff --git a/content/cities/markersdorf/federn-schulze-gbr.md b/content/cities/markersdorf/federn-schulze-gbr.md
deleted file mode 100644
index dd8c01ea36..0000000000
--- a/content/cities/markersdorf/federn-schulze-gbr.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Federn-Schulze GbR"
-url: /markersdorf/federn-schulze-gbr/
-shop: Autoteile
----
\ No newline at end of file
diff --git a/content/cities/markersdorf/federn-schulze.md b/content/cities/markersdorf/federn-schulze.md
new file mode 100644
index 0000000000..9f0b278b34
--- /dev/null
+++ b/content/cities/markersdorf/federn-schulze.md
@@ -0,0 +1,5 @@
+---
+title: "Federn-Schulze"
+url: /markersdorf/federn-schulze/
+shop: Autoteile
+---
\ 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/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/neusalza-spremberg/_index.md b/content/cities/neusalza-spremberg/_index.md
index e50c63679f..0d636689ff 100644
--- a/content/cities/neusalza-spremberg/_index.md
+++ b/content/cities/neusalza-spremberg/_index.md
@@ -2,5 +2,5 @@
 title: Neusalza-Spremberg
 url: /neusalza-spremberg/
 latitude: 51.037
-longitude: 14.531
+longitude: 14.53
 ---
\ No newline at end of file
diff --git a/content/cities/niederfrohna/_index.md b/content/cities/niederfrohna/_index.md
index 22297cb3b5..8bddd49177 100644
--- a/content/cities/niederfrohna/_index.md
+++ b/content/cities/niederfrohna/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Niederfrohna
 url: /niederfrohna/
-latitude: 50.88
-longitude: 12.746
+latitude: 50.869
+longitude: 12.751
 ---
\ No newline at end of file
diff --git a/content/cities/nossen/_index.md b/content/cities/nossen/_index.md
index 7abfee6883..636c0bb875 100644
--- a/content/cities/nossen/_index.md
+++ b/content/cities/nossen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Nossen
 url: /nossen/
-latitude: 51.057
-longitude: 13.299
+latitude: 51.063
+longitude: 13.294
 ---
\ No newline at end of file
diff --git a/content/cities/olbernhau/netto-marken-discount-blumenauer-strasse.md b/content/cities/olbernhau/netto-marken-discount-blumenauer-strasse.md
new file mode 100644
index 0000000000..cb74bb6de9
--- /dev/null
+++ b/content/cities/olbernhau/netto-marken-discount-blumenauer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /olbernhau/netto-marken-discount-blumenauer-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/olbernhau/netto-marken-discount-thomas-mann-strasse.md b/content/cities/olbernhau/netto-marken-discount-thomas-mann-strasse.md
deleted file mode 100644
index 4344f26d12..0000000000
--- a/content/cities/olbernhau/netto-marken-discount-thomas-mann-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /olbernhau/netto-marken-discount-thomas-mann-strasse/
-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
new file mode 100644
index 0000000000..31c5adc335
--- /dev/null
+++ b/content/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /ottendorf-okrilla/netto-marken-discount-gaswerkstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.md b/content/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.md
deleted file mode 100644
index 12d4080a1e..0000000000
--- a/content/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Netto Marken-Discount"
-url: /ottendorf-okrilla/netto-marken-discount-poststrasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/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/plauen/bipedo-barfussschuhe.md b/content/cities/plauen/bipedo-barfussschuhe.md
new file mode 100644
index 0000000000..5afe927fd6
--- /dev/null
+++ b/content/cities/plauen/bipedo-barfussschuhe.md
@@ -0,0 +1,5 @@
+---
+title: "Bipedo Barfußschuhe"
+url: /plauen/bipedo-barfussschuhe/
+shop: Schuhe
+---
\ No newline at end of file
diff --git a/content/cities/plauen/drogerie-und-geschenkeshop.md b/content/cities/plauen/drogerie-und-geschenkeshop.md
new file mode 100644
index 0000000000..bca9d142cd
--- /dev/null
+++ b/content/cities/plauen/drogerie-und-geschenkeshop.md
@@ -0,0 +1,5 @@
+---
+title: "Drogerie und Geschenkeshop"
+url: /plauen/drogerie-und-geschenkeshop/
+shop: Andenken
+---
\ No newline at end of file
diff --git a/content/cities/plauen/netto-marken-discount-pausaer-strasse.md b/content/cities/plauen/netto-marken-discount-pausaer-strasse.md
new file mode 100644
index 0000000000..339e5ba7b2
--- /dev/null
+++ b/content/cities/plauen/netto-marken-discount-pausaer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Netto Marken-Discount"
+url: /plauen/netto-marken-discount-pausaer-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/plauen/presse-und-buch-schmitt-und-hahn.md b/content/cities/plauen/presse-und-buch-schmitt-und-hahn.md
new file mode 100644
index 0000000000..eacdbefb47
--- /dev/null
+++ b/content/cities/plauen/presse-und-buch-schmitt-und-hahn.md
@@ -0,0 +1,5 @@
+---
+title: "Presse & Buch Schmitt & Hahn"
+url: /plauen/presse-und-buch-schmitt-und-hahn/
+shop: Bücher
+---
\ No newline at end of file
diff --git a/content/cities/plauen/tee-aus-aller-welt-am-rathaus.md b/content/cities/plauen/tee-aus-aller-welt-am-rathaus.md
new file mode 100644
index 0000000000..e74d03468e
--- /dev/null
+++ b/content/cities/plauen/tee-aus-aller-welt-am-rathaus.md
@@ -0,0 +1,5 @@
+---
+title: "Tee aus aller Welt am Rathaus"
+url: /plauen/tee-aus-aller-welt-am-rathaus/
+shop: Tee
+---
\ No newline at end of file
diff --git a/content/cities/pockau-lengefeld/modenhaus-gerhard-reupert.md b/content/cities/pockau-lengefeld/modenhaus-gerhard-reupert.md
index 73c467c349..ec6371c636 100644
--- a/content/cities/pockau-lengefeld/modenhaus-gerhard-reupert.md
+++ b/content/cities/pockau-lengefeld/modenhaus-gerhard-reupert.md
@@ -1,5 +1,5 @@
 ---
 title: "Modenhaus Gerhard Reupert"
 url: /pockau-lengefeld/modenhaus-gerhard-reupert/
-shop: Modehaus
+shop: Kleidung
 ---
\ No newline at end of file
diff --git a/content/cities/schoeneck-vogtl/_index.md b/content/cities/schoeneck-vogtl/_index.md
index 633bed1dba..516197c054 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.396
+longitude: 12.338
 ---
\ 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/seelitz/sh-tuning-gmbh.md b/content/cities/seelitz/sh-tuning-gmbh.md
new file mode 100644
index 0000000000..37b39674fc
--- /dev/null
+++ b/content/cities/seelitz/sh-tuning-gmbh.md
@@ -0,0 +1,5 @@
+---
+title: "SH-Tuning GmbH"
+url: /seelitz/sh-tuning-gmbh/
+shop: Motorrad
+---
\ No newline at end of file
diff --git a/content/cities/seelitz/sh-tuning-kfz-teile-richard-schlimpert.md b/content/cities/seelitz/sh-tuning-kfz-teile-richard-schlimpert.md
deleted file mode 100644
index e53c70ba3f..0000000000
--- a/content/cities/seelitz/sh-tuning-kfz-teile-richard-schlimpert.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "SH-Tuning - KFZ-Teile Richard Schlimpert"
-url: /seelitz/sh-tuning-kfz-teile-richard-schlimpert/
-shop: Motorrad
----
\ No newline at end of file
diff --git a/content/cities/sehmatal/_index.md b/content/cities/sehmatal/_index.md
index 5b4ecb1759..752ce51087 100644
--- a/content/cities/sehmatal/_index.md
+++ b/content/cities/sehmatal/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sehmatal
 url: /sehmatal/
-latitude: 50.481
-longitude: 12.974
+latitude: 50.485
+longitude: 12.975
 ---
\ No newline at end of file
diff --git a/content/cities/stolpen/baeckerei-petzold.md b/content/cities/stolpen/baeckerei-petzold.md
deleted file mode 100644
index 9c97031b35..0000000000
--- a/content/cities/stolpen/baeckerei-petzold.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bäckerei Petzold"
-url: /stolpen/baeckerei-petzold/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/thermalbad-wiesenbad/_index.md b/content/cities/thermalbad-wiesenbad/_index.md
index b61d672821..084f04e490 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.61
-longitude: 12.992
+latitude: 50.611
+longitude: 13.02
 ---
\ No newline at end of file
diff --git a/content/cities/thiendorf/_index.md b/content/cities/thiendorf/_index.md
index 39eb616aef..86b0aed75a 100644
--- a/content/cities/thiendorf/_index.md
+++ b/content/cities/thiendorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Thiendorf
 url: /thiendorf/
-latitude: 51.295
-longitude: 13.734
+latitude: 51.342
+longitude: 13.768
 ---
\ No newline at end of file
diff --git a/content/cities/zwickau/4rad-kombinat-gmbh.md b/content/cities/zwickau/4rad-kombinat-gmbh.md
new file mode 100644
index 0000000000..6079e6c30a
--- /dev/null
+++ b/content/cities/zwickau/4rad-kombinat-gmbh.md
@@ -0,0 +1,5 @@
+---
+title: "4Rad Kombinat GmbH"
+url: /zwickau/4rad-kombinat-gmbh/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/zwickau/auto-service-ullmann.md b/content/cities/zwickau/auto-service-ullmann.md
deleted file mode 100644
index 3b5570d77e..0000000000
--- a/content/cities/zwickau/auto-service-ullmann.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Auto-Service Ullmann"
-url: /zwickau/auto-service-ullmann/
-shop: Autowerkstatt
----
\ 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
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/content/cities/zwickau/heike-ihle-friseursalon.md b/content/cities/zwickau/heike-ihle-friseursalon.md
deleted file mode 100644
index 773d75425b..0000000000
--- a/content/cities/zwickau/heike-ihle-friseursalon.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Heike Ihle Friseursalon"
-url: /zwickau/heike-ihle-friseursalon/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/zwickau/klier-aeussere-dresdner-strasse.md b/content/cities/zwickau/klier-aeussere-dresdner-strasse.md
new file mode 100644
index 0000000000..2c8fb50bd7
--- /dev/null
+++ b/content/cities/zwickau/klier-aeussere-dresdner-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Klier"
+url: /zwickau/klier-aeussere-dresdner-strasse/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/zwickau/klier-aeussere-schneeberger-strasse.md b/content/cities/zwickau/klier-aeussere-schneeberger-strasse.md
deleted file mode 100644
index c93b768247..0000000000
--- a/content/cities/zwickau/klier-aeussere-schneeberger-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Klier"
-url: /zwickau/klier-aeussere-schneeberger-strasse/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/zwickau/kosmetikstudio-andrea.md b/content/cities/zwickau/kosmetikstudio-andrea.md
deleted file mode 100644
index 40442a32f6..0000000000
--- a/content/cities/zwickau/kosmetikstudio-andrea.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Kosmetikstudio Andrea"
-url: /zwickau/kosmetikstudio-andrea/
-shop: Kosmetik
----
\ No newline at end of file
diff --git a/content/cities/zwickau/madlens-naildesign.md b/content/cities/zwickau/madlens-naildesign.md
deleted file mode 100644
index 7fa587f657..0000000000
--- a/content/cities/zwickau/madlens-naildesign.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Madlens naildesign"
-url: /zwickau/madlens-naildesign/
-shop: Kosmetik
----
\ No newline at end of file
diff --git a/content/cities/zwickau/pretty-nails.md b/content/cities/zwickau/pretty-nails.md
new file mode 100644
index 0000000000..31ba02efa8
--- /dev/null
+++ b/content/cities/zwickau/pretty-nails.md
@@ -0,0 +1,5 @@
+---
+title: "Pretty Nails"
+url: /zwickau/pretty-nails/
+shop: Kosmetik
+---
\ No newline at end of file
diff --git a/content/cities/zwickau/richter-erzgebirge.md b/content/cities/zwickau/richter-erzgebirge.md
deleted file mode 100644
index cd9213e071..0000000000
--- a/content/cities/zwickau/richter-erzgebirge.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Richter Erzgebirge"
-url: /zwickau/richter-erzgebirge/
-shop: Metzgerei
----
\ No newline at end of file
diff --git a/data/cities/aue-bad-schlema/hammer.yml b/data/cities/aue-bad-schlema/hammer.yml
index 49196cb6cd..44a2c5d544 100644
--- a/data/cities/aue-bad-schlema/hammer.yml
+++ b/data/cities/aue-bad-schlema/hammer.yml
@@ -8,4 +8,4 @@ street: "Auer Straße"
 housenumber: 40
 phone: ""
 opening_hours: ""
-website: "www.hammer-zuhause.de"
\ No newline at end of file
+website: "https://www.hammer-zuhause.de"
\ No newline at end of file
diff --git a/data/cities/bautzen-budysin/headlive-kindermarkenmode-und-spielwaren.yml b/data/cities/bautzen-budysin/headlive-kindermarkenmode-und-spielwaren.yml
deleted file mode 100644
index ecd098c74b..0000000000
--- a/data/cities/bautzen-budysin/headlive-kindermarkenmode-und-spielwaren.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 10115023929
-type: node
-latitude: 51.18177
-longitude: 14.42723
-postcode: "02625"
-city: Bautzen - Budyšin
-street: "Buttermarkt"
-housenumber: 1
-phone: "+4915229775158"
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/bautzen-budysin/juwelier-scholze.yml b/data/cities/bautzen-budysin/juwelier-scholze.yml
index 8c05bd1e79..24bafc1fd4 100644
--- a/data/cities/bautzen-budysin/juwelier-scholze.yml
+++ b/data/cities/bautzen-budysin/juwelier-scholze.yml
@@ -7,5 +7,5 @@ city: Bautzen - Budyšin
 street: "Reichenstraße"
 housenumber: 8
 phone: "+49359149770"
-opening_hours: ""
+opening_hours: "Mo-Fr 09:00-17:00; Sa 09:00-12:00"
 website: "https://www.juwelierscholze.de/"
\ No newline at end of file
diff --git a/data/cities/bautzen/modeatelier-schafflik.yml b/data/cities/bautzen/modeatelier-schafflik.yml
index 5d3fadeb56..93d28c3171 100644
--- a/data/cities/bautzen/modeatelier-schafflik.yml
+++ b/data/cities/bautzen/modeatelier-schafflik.yml
@@ -7,5 +7,5 @@ city: Bautzen
 street: "Reichenstraße"
 housenumber: 22
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Fr 10:00-19:00; Sa 10:00-15:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/bautzen/no1-mode-express.yml b/data/cities/bautzen/no1-mode-express.yml
index 6720ce2ae7..923c21942b 100644
--- a/data/cities/bautzen/no1-mode-express.yml
+++ b/data/cities/bautzen/no1-mode-express.yml
@@ -7,5 +7,5 @@ city: Bautzen
 street: "Reichenstraße"
 housenumber: 15
 phone: ""
-opening_hours: ""
+opening_hours: "Mo-Fr 09:30-18:00; Sa 10:00-15:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/bautzen/oekumenischer-domladen.yml b/data/cities/bautzen/oekumenischer-domladen.yml
index 59a1df912f..674ec74493 100644
--- a/data/cities/bautzen/oekumenischer-domladen.yml
+++ b/data/cities/bautzen/oekumenischer-domladen.yml
@@ -7,5 +7,5 @@ city: Bautzen
 street: "An den Fleischbänken"
 housenumber: 5
 phone: "+49 3591 594184"
-opening_hours: ""
+opening_hours: "Tu 14:00-18:00; Th 10:00-12:00,14:00-18:00"
 website: "http://www.domladen-bautzen.de/kontakt.html"
\ No newline at end of file
diff --git a/data/cities/bautzen/bumueller-back.yml b/data/cities/bautzen/tabakboerse.yml
similarity index 54%
rename from data/cities/bautzen/bumueller-back.yml
rename to data/cities/bautzen/tabakboerse.yml
index 4c26d78faf..1e8aa28351 100644
--- a/data/cities/bautzen/bumueller-back.yml
+++ b/data/cities/bautzen/tabakboerse.yml
@@ -6,6 +6,6 @@ postcode: "02625"
 city: Bautzen
 street: "Reichenstraße"
 housenumber: 27
-phone: "+49 3591 275749"
-opening_hours: "Mo-Fr 07:00-18:00; Sa 07:00-14:00"
-website: "http://www.bumueller-back.de/"
\ No newline at end of file
+phone: ""
+opening_hours: "Mo-Fr 09:00-13:00; Sa 09:00-12:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/bautzen/ticket-und-more.yml b/data/cities/bautzen/ticket-und-more.yml
new file mode 100644
index 0000000000..1b1b662668
--- /dev/null
+++ b/data/cities/bautzen/ticket-und-more.yml
@@ -0,0 +1,11 @@
+id: 7156038171
+type: node
+latitude: 51.17344
+longitude: 14.42898
+postcode: "02625"
+city: Bautzen
+street: "Rathenauplatz"
+housenumber: 1
+phone: ""
+opening_hours: "Mo-Fr 07:00-18:00; Sa 08:00-13:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/bautzen/kichererbse.yml b/data/cities/bautzen/tupperware.yml
similarity index 54%
rename from data/cities/bautzen/kichererbse.yml
rename to data/cities/bautzen/tupperware.yml
index 21595a73fb..29ce29cf33 100644
--- a/data/cities/bautzen/kichererbse.yml
+++ b/data/cities/bautzen/tupperware.yml
@@ -6,6 +6,6 @@ postcode: "02625"
 city: Bautzen
 street: "Hauensteingasse"
 housenumber: 1
-phone: "+49 3591 44861"
-opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-12:30"
-website: "http://kichererbse-bautzen.de"
\ No newline at end of file
+phone: ""
+opening_hours: "Tu-Th 10:00-18:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/bautzen/yakuza-store-bautzen.yml b/data/cities/bautzen/von-edelmann.yml
similarity index 75%
rename from data/cities/bautzen/yakuza-store-bautzen.yml
rename to data/cities/bautzen/von-edelmann.yml
index 0ad7c30dfd..e23728bd49 100644
--- a/data/cities/bautzen/yakuza-store-bautzen.yml
+++ b/data/cities/bautzen/von-edelmann.yml
@@ -7,5 +7,5 @@ city: Bautzen
 street: "Reichenstraße"
 housenumber: 23
 phone: ""
-opening_hours: ""
+opening_hours: "Tu-Th 10:00-14:00; Fr 12:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/bautzen/obst-und-gemuese.yml b/data/cities/bautzen/womens-line.yml
similarity index 75%
rename from data/cities/bautzen/obst-und-gemuese.yml
rename to data/cities/bautzen/womens-line.yml
index 64c96a6c95..321a59adca 100644
--- a/data/cities/bautzen/obst-und-gemuese.yml
+++ b/data/cities/bautzen/womens-line.yml
@@ -7,5 +7,5 @@ city: Bautzen
 street: "Reichenstraße"
 housenumber: 
 phone: ""
-opening_hours: "Mo-Fr 08:00-18:00; Sa 08:00-14:00"
+opening_hours: "Mo-Fr 11:00-18:00; Sa 10:00-13:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/a-t-u-annaberger-strasse.yml b/data/cities/chemnitz/a-t-u-annaberger-strasse.yml
deleted file mode 100644
index b52392b3f8..0000000000
--- a/data/cities/chemnitz/a-t-u-annaberger-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 74916163
-type: way
-latitude: 50.81764
-longitude: 12.9156
-postcode: "09120"
-city: Chemnitz
-street: "Annaberger Straße"
-housenumber: 103
-phone: ""
-opening_hours: "Mo-Fr 07:30-18:30; Sa 08:00-16:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/a-t-u-leipziger-strasse.yml b/data/cities/chemnitz/a-t-u-leipziger-strasse.yml
new file mode 100644
index 0000000000..4e285364a2
--- /dev/null
+++ b/data/cities/chemnitz/a-t-u-leipziger-strasse.yml
@@ -0,0 +1,11 @@
+id: 94885331
+type: way
+latitude: 50.85396
+longitude: 12.88382
+postcode: "09114"
+city: Chemnitz
+street: "Leipziger Straße"
+housenumber: 154
+phone: ""
+opening_hours: "Mo-Fr 07:30-18:30; Sa 08:00-16:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/chemnitz/a-t-u.yml b/data/cities/chemnitz/a-t-u.yml
index 4e285364a2..b52392b3f8 100644
--- a/data/cities/chemnitz/a-t-u.yml
+++ b/data/cities/chemnitz/a-t-u.yml
@@ -1,11 +1,11 @@
-id: 94885331
+id: 74916163
 type: way
-latitude: 50.85396
-longitude: 12.88382
-postcode: "09114"
+latitude: 50.81764
+longitude: 12.9156
+postcode: "09120"
 city: Chemnitz
-street: "Leipziger Straße"
-housenumber: 154
+street: "Annaberger Straße"
+housenumber: 103
 phone: ""
 opening_hours: "Mo-Fr 07:30-18:30; Sa 08:00-16:00"
 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
deleted file mode 100644
index 131c1f057b..0000000000
--- a/data/cities/chemnitz/tedi-oberfrohnaer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 0000000000..1f6a48fe9a
--- /dev/null
+++ b/data/cities/chemnitz/tedi-wladimir-sagorski-strasse.yml
@@ -0,0 +1,11 @@
+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 1f6a48fe9a..131c1f057b 100644
--- a/data/cities/chemnitz/tedi.yml
+++ b/data/cities/chemnitz/tedi.yml
@@ -1,10 +1,10 @@
-id: 5408488002
+id: 5367452070
 type: node
-latitude: 50.79575
-longitude: 12.88959
-postcode: "09122"
+latitude: 50.82626
+longitude: 12.8326
+postcode: "09117"
 city: Chemnitz
-street: "Wladimir-Sagorski-Straße"
+street: "Oberfrohnaer Straße"
 housenumber: 
 phone: ""
 opening_hours: ""
diff --git a/data/cities/doebeln/aldi.yml b/data/cities/doebeln/aldi.yml
index b05e3702f4..b1448a57c1 100644
--- a/data/cities/doebeln/aldi.yml
+++ b/data/cities/doebeln/aldi.yml
@@ -1,7 +1,7 @@
 id: 95691493
 type: way
-latitude: 51.13324
-longitude: 13.09609
+latitude: 51.13359
+longitude: 13.09664
 postcode: "04720"
 city: Döbeln
 street: "Grimmaische Straße"
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/aldi-bulgakowstrasse.yml b/data/cities/dresden/aldi-bulgakowstrasse.yml
new file mode 100644
index 0000000000..06219b6d2a
--- /dev/null
+++ b/data/cities/dresden/aldi-bulgakowstrasse.yml
@@ -0,0 +1,11 @@
+id: 24559074
+type: way
+latitude: 51.01928
+longitude: 13.73574
+postcode: "01217"
+city: Dresden
+street: "Bulgakowstraße"
+housenumber: 7
+phone: ""
+opening_hours: "Mo-Sa 07:00-21:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/aldi-uhlandstrasse.yml b/data/cities/dresden/aldi-uhlandstrasse.yml
deleted file mode 100644
index 740635e47e..0000000000
--- a/data/cities/dresden/aldi-uhlandstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 22992229
-type: way
-latitude: 51.03628
-longitude: 13.73981
-postcode: "01069"
-city: Dresden
-street: "Uhlandstraße"
-housenumber: 5
-phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/aldi.yml b/data/cities/dresden/aldi.yml
index 06219b6d2a..740635e47e 100644
--- a/data/cities/dresden/aldi.yml
+++ b/data/cities/dresden/aldi.yml
@@ -1,11 +1,11 @@
-id: 24559074
+id: 22992229
 type: way
-latitude: 51.01928
-longitude: 13.73574
-postcode: "01217"
+latitude: 51.03628
+longitude: 13.73981
+postcode: "01069"
 city: Dresden
-street: "Bulgakowstraße"
-housenumber: 7
+street: "Uhlandstraße"
+housenumber: 5
 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/krause-hallesche-strasse.yml b/data/cities/dresden/aleppo-aquila.yml
similarity index 100%
rename from data/cities/dresden/krause-hallesche-strasse.yml
rename to data/cities/dresden/aleppo-aquila.yml
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/bueroausstattung-wagner.yml b/data/cities/dresden/bueroausstattung-wagner.yml
new file mode 100644
index 0000000000..ed0282aa72
--- /dev/null
+++ b/data/cities/dresden/bueroausstattung-wagner.yml
@@ -0,0 +1,11 @@
+id: 11690604164
+type: node
+latitude: 51.04064
+longitude: 13.78145
+postcode: "01309"
+city: Dresden
+street: "Bertolt-Brecht-Allee"
+housenumber: 24
+phone: ""
+opening_hours: "Mo-Fr 08:30-16:30"
+website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/kaufland-reicker-strasse.yml b/data/cities/dresden/kaufland-reicker-strasse.yml
index e5feae74af..678f516bb2 100644
--- a/data/cities/dresden/kaufland-reicker-strasse.yml
+++ b/data/cities/dresden/kaufland-reicker-strasse.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Reicker Straße"
 housenumber: 60
 phone: "+49 351 287940"
-opening_hours: "Mo-Su 07:00-22:00"
+opening_hours: "Mo-Sa 07:00-22:00; PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/lavie-coffee-dresden-roesterei.yml b/data/cities/dresden/lavie-coffee-dresden-roesterei.yml
deleted file mode 100644
index 533edab128..0000000000
--- a/data/cities/dresden/lavie-coffee-dresden-roesterei.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1256677212
-type: node
-latitude: 51.04927
-longitude: 13.73432
-postcode: "01067"
-city: Dresden
-street: "Wallstraße"
-housenumber: 11
-phone: "+49 172 350 05 08"
-opening_hours: "Mo-Sa 11:00-20:00"
-website: "https://laviecoffee.de"
\ No newline at end of file
diff --git a/data/cities/dresden/meggy.yml b/data/cities/dresden/meggy.yml
index 75164899d6..f66ee0f48e 100644
--- a/data/cities/dresden/meggy.yml
+++ b/data/cities/dresden/meggy.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Altenberger Straße"
 housenumber: 29
 phone: "+49 351 3158395"
-opening_hours: "Mo,Tu,Th,Fr 08:00-17:00"
+opening_hours: "Mo,Tu,Th,Fr 08:00-18:00"
 website: "https://www.meggy-dresden.de/"
\ No newline at end of file
diff --git a/data/cities/dresden/obstbau-ruediger.yml b/data/cities/dresden/obstbau-ruediger.yml
index 28b9eed173..7dfec10372 100644
--- a/data/cities/dresden/obstbau-ruediger.yml
+++ b/data/cities/dresden/obstbau-ruediger.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Pillnitzer Landstraße"
 housenumber: 301
 phone: ""
-opening_hours: "Mo-Sa 09:00-19:00; Su,PH 10:00-18:00"
+opening_hours: "Mo-We 09:00-18:00; Th,Fr 09:00-19:00; Sa 09:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/pro-med.yml b/data/cities/dresden/pro-med.yml
index 4ff7778a10..3ed735b0e7 100644
--- a/data/cities/dresden/pro-med.yml
+++ b/data/cities/dresden/pro-med.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Pfotenhauerstraße"
 housenumber: 43
 phone: ""
-opening_hours: ""
+opening_hours: "Mo,Tu 09:00-16:00; We,Fr 09:00-13:00; Th 10:00-18:00"
 website: "https://www.promed-verbindet.de/"
\ No newline at end of file
diff --git a/data/cities/dresden/technik-haus-bang-und-olufsen.yml b/data/cities/dresden/technik-haus-bang-und-olufsen.yml
deleted file mode 100644
index cedc2ffd37..0000000000
--- a/data/cities/dresden/technik-haus-bang-und-olufsen.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2449011572
-type: node
-latitude: 51.06137
-longitude: 13.74175
-postcode: "01097"
-city: Dresden
-street: "Königstraße"
-housenumber: 9
-phone: ""
-opening_hours: "Mo-Fr 10:00-18:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/dresden/vorwerk-podemus.yml b/data/cities/dresden/vorwerk-podemus.yml
index 01cf49ec22..14deab95ad 100644
--- a/data/cities/dresden/vorwerk-podemus.yml
+++ b/data/cities/dresden/vorwerk-podemus.yml
@@ -7,5 +7,5 @@ city: Dresden
 street: "Winterbergstraße"
 housenumber: 31a
 phone: ""
-opening_hours: "Mo-Fr 08:00-19:00;Sa 08:00-16:00"
+opening_hours: "Mo-Fr 08:00-19:00; Sa 08:00-16:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.yml b/data/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.yml
index 11aa5b2eed..b3a89291cf 100644
--- a/data/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.yml
+++ b/data/cities/falkenstein-vogtl/foerdertechnik-bernd-ficker.yml
@@ -1,7 +1,7 @@
-id: 463842854
+id: 463842855
 type: way
-latitude: 50.48369
-longitude: 12.36881
+latitude: 50.48362
+longitude: 12.36871
 postcode: "08223"
 city: Falkenstein/Vogtl.
 street: "Rathenaustraße"
diff --git a/data/cities/freiberg/netto-chemnitzer-strasse.yml b/data/cities/freiberg/netto-chemnitzer-strasse.yml
index 762b7d97ba..c07e1f96f1 100644
--- a/data/cities/freiberg/netto-chemnitzer-strasse.yml
+++ b/data/cities/freiberg/netto-chemnitzer-strasse.yml
@@ -7,5 +7,5 @@ city: Freiberg
 street: "Chemnitzer Straße"
 housenumber: 85
 phone: ""
-opening_hours: "Mo-Sa 08:00-20:00"
+opening_hours: "Mo-Sa 08:00-20:00,07:00-20:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/freiberg/netto-marken-discount-am-rotvorwerk.yml b/data/cities/freiberg/netto-marken-discount-am-rotvorwerk.yml
new file mode 100644
index 0000000000..ed7d20874a
--- /dev/null
+++ b/data/cities/freiberg/netto-marken-discount-am-rotvorwerk.yml
@@ -0,0 +1,11 @@
+id: 601533217
+type: node
+latitude: 50.88045
+longitude: 13.32558
+postcode: "09599"
+city: Freiberg
+street: "Am Rotvorwerk"
+housenumber: 8
+phone: "+49 37322 80944"
+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/freiberg/netto-marken-discount-karl-kegel-strasse.yml b/data/cities/freiberg/netto-marken-discount-karl-kegel-strasse.yml
deleted file mode 100644
index 6f1febce74..0000000000
--- a/data/cities/freiberg/netto-marken-discount-karl-kegel-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 600204688
-type: node
-latitude: 50.90383
-longitude: 13.32824
-postcode: "09599"
-city: Freiberg
-street: "Karl-Kegel-Straße"
-housenumber: 69
-phone: ""
-opening_hours: "Mo-Sa 07:00-21:00; PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/freiberg/netto-marken-discount.yml b/data/cities/freiberg/netto-marken-discount.yml
index ed7d20874a..6f1febce74 100644
--- a/data/cities/freiberg/netto-marken-discount.yml
+++ b/data/cities/freiberg/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 601533217
+id: 600204688
 type: node
-latitude: 50.88045
-longitude: 13.32558
+latitude: 50.90383
+longitude: 13.32824
 postcode: "09599"
 city: Freiberg
-street: "Am Rotvorwerk"
-housenumber: 8
-phone: "+49 37322 80944"
-opening_hours: "Mo-Sa 07:00-20:00"
-website: "https://www.netto-online.de"
\ No newline at end of file
+street: "Karl-Kegel-Straße"
+housenumber: 69
+phone: ""
+opening_hours: "Mo-Sa 07:00-21:00; PH off"
+website: ""
\ No newline at end of file
diff --git a/data/cities/geithain/edeka.yml b/data/cities/geithain/edeka.yml
index 1f33585aa0..4bd7944cd0 100644
--- a/data/cities/geithain/edeka.yml
+++ b/data/cities/geithain/edeka.yml
@@ -7,5 +7,5 @@ city: Geithain
 street: "Peniger Straße"
 housenumber: 3
 phone: ""
-opening_hours: "Mo-Sa 07:00-20: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/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.yml b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.yml
deleted file mode 100644
index 4f217f6822..0000000000
--- a/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-an-der-frauenkirche.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 0000000000..2ade819f79
--- /dev/null
+++ b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger-lausitzer-strasse.yml
@@ -0,0 +1,11 @@
+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 2ade819f79..4f217f6822 100644
--- a/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger.yml
+++ b/data/cities/goerlitz/friseur-haarstudio-cornelia-effenberger.yml
@@ -1,11 +1,11 @@
-id: 11243321899
+id: 11233674997
 type: node
-latitude: 51.17014
-longitude: 14.9784
-postcode: "02828"
+latitude: 51.15262
+longitude: 14.98849
+postcode: "02826"
 city: Görlitz
-street: "Lausitzer Straße"
-housenumber: 20
-phone: "+49 3581 429649"
+street: "An der Frauenkirche"
+housenumber: 12
+phone: "+49 3581 879081"
 opening_hours: ""
-website: "http://www.ce-haarstudio.de/"
\ No newline at end of file
+website: ""
\ No newline at end of file
diff --git a/data/cities/goerlitz/zuckerwerk-und-rebensaft.yml b/data/cities/goerlitz/zuckerwerk-und-rebensaft.yml
index 404b2a7655..84f14e4519 100644
--- a/data/cities/goerlitz/zuckerwerk-und-rebensaft.yml
+++ b/data/cities/goerlitz/zuckerwerk-und-rebensaft.yml
@@ -7,5 +7,5 @@ city: Görlitz
 street: "Obermarkt"
 housenumber: 8
 phone: ""
-opening_hours: "Mo-Fr 10:00-17:00; Sa 10:00-13:00"
+opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-13:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/grimma/xanocs.yml b/data/cities/grimma/xanocs-kuechen-grimma.yml
similarity index 75%
rename from data/cities/grimma/xanocs.yml
rename to data/cities/grimma/xanocs-kuechen-grimma.yml
index 18c49d2804..bcae42a2ff 100644
--- a/data/cities/grimma/xanocs.yml
+++ b/data/cities/grimma/xanocs-kuechen-grimma.yml
@@ -8,4 +8,4 @@ street: "Am Weinberg"
 housenumber: 1
 phone: ""
 opening_hours: "Mo-Fr 10:00-18:00; Sa 10:00-16:00; Su,PH off"
-website: ""
\ No newline at end of file
+website: "https://xanocs.com/kuechenstudios/kuechenstudio-grimma/"
\ No newline at end of file
diff --git a/data/cities/klipphausen/hofladen-taubenheim.yml b/data/cities/klipphausen/hofladen-taubenheim.yml
new file mode 100644
index 0000000000..45a2cfe63d
--- /dev/null
+++ b/data/cities/klipphausen/hofladen-taubenheim.yml
@@ -0,0 +1,11 @@
+id: 11282030975
+type: node
+latitude: 51.09753
+longitude: 13.47259
+postcode: "01665"
+city: Klipphausen
+street: "Hauptstraße"
+housenumber: 12
+phone: "035245/70381"
+opening_hours: "Sa 07:00-12:00; Mo-Fr 07:00-18:00"
+website: "https://pfarrgut-taubenheim.de/hofl.php"
\ No newline at end of file
diff --git a/data/cities/leipzig/alippi-holzhaeuser-strasse.yml b/data/cities/leipzig/alippi-holzhaeuser-strasse.yml
deleted file mode 100644
index efd8fa08cd..0000000000
--- a/data/cities/leipzig/alippi-holzhaeuser-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8330610911
-type: node
-latitude: 51.31909
-longitude: 12.41915
-postcode: "04299"
-city: Leipzig
-street: "Holzhäuser Straße"
-housenumber: 67
-phone: ""
-opening_hours: "Mo,Tu,Th 09:00-12:30, We,Fr 09:00-14:00, Mo,Tu,Th 13:30-18:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/alippi-mockauer-strasse.yml b/data/cities/leipzig/alippi-mockauer-strasse.yml
new file mode 100644
index 0000000000..58e0d8afb7
--- /dev/null
+++ b/data/cities/leipzig/alippi-mockauer-strasse.yml
@@ -0,0 +1,11 @@
+id: 8215080625
+type: node
+latitude: 51.3756
+longitude: 12.41198
+postcode: "04357"
+city: Leipzig
+street: "Mockauer Straße"
+housenumber: 123
+phone: "+49 341 6010024"
+opening_hours: "Mo-We 08:00-12:00,13:00-17:00; Th 08:00-12:00,13:00-18:00; Fr 08:00-14:00; PH off"
+website: "https://www.alippi.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/alippi.yml b/data/cities/leipzig/alippi.yml
index 58e0d8afb7..efd8fa08cd 100644
--- a/data/cities/leipzig/alippi.yml
+++ b/data/cities/leipzig/alippi.yml
@@ -1,11 +1,11 @@
-id: 8215080625
+id: 8330610911
 type: node
-latitude: 51.3756
-longitude: 12.41198
-postcode: "04357"
+latitude: 51.31909
+longitude: 12.41915
+postcode: "04299"
 city: Leipzig
-street: "Mockauer Straße"
-housenumber: 123
-phone: "+49 341 6010024"
-opening_hours: "Mo-We 08:00-12:00,13:00-17:00; Th 08:00-12:00,13:00-18:00; Fr 08:00-14:00; PH off"
-website: "https://www.alippi.de"
\ No newline at end of file
+street: "Holzhäuser Straße"
+housenumber: 67
+phone: ""
+opening_hours: "Mo,Tu,Th 09:00-12:30, We,Fr 09:00-14:00, Mo,Tu,Th 13:30-18:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/chiropraktik-fuer-pferde-und-hunde.yml b/data/cities/leipzig/chiropraktik-fuer-pferde-und-hunde.yml
index b2491347fb..dc01b9eaba 100644
--- a/data/cities/leipzig/chiropraktik-fuer-pferde-und-hunde.yml
+++ b/data/cities/leipzig/chiropraktik-fuer-pferde-und-hunde.yml
@@ -8,4 +8,4 @@ street: "Weißestraße"
 housenumber: 34
 phone: ""
 opening_hours: "nach Vereinbarung"
-website: ""
\ No newline at end of file
+website: "http://chiropferdhund.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/dm-lindenauer-markt.yml b/data/cities/leipzig/dm-lindenauer-markt.yml
new file mode 100644
index 0000000000..6653fa919a
--- /dev/null
+++ b/data/cities/leipzig/dm-lindenauer-markt.yml
@@ -0,0 +1,11 @@
+id: 696589361
+type: node
+latitude: 51.33741
+longitude: 12.33445
+postcode: "04177"
+city: Leipzig
+street: "Lindenauer Markt"
+housenumber: 12
+phone: ""
+opening_hours: "Mo-Fr 08:00-20:00; Sa 09:00-20:00"
+website: "https://www.dm.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/dm-windmuehlenstrasse.yml b/data/cities/leipzig/dm-windmuehlenstrasse.yml
deleted file mode 100644
index 671db8f31e..0000000000
--- a/data/cities/leipzig/dm-windmuehlenstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 670232663
-type: node
-latitude: 51.33143
-longitude: 12.3807
-postcode: "04107"
-city: Leipzig
-street: "Windmühlenstraße"
-housenumber: 37
-phone: ""
-opening_hours: "Mo-Fr 09:00-20:00; Sa 09:00-18:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/dm.yml b/data/cities/leipzig/dm.yml
index 6653fa919a..671db8f31e 100644
--- a/data/cities/leipzig/dm.yml
+++ b/data/cities/leipzig/dm.yml
@@ -1,11 +1,11 @@
-id: 696589361
+id: 670232663
 type: node
-latitude: 51.33741
-longitude: 12.33445
-postcode: "04177"
+latitude: 51.33143
+longitude: 12.3807
+postcode: "04107"
 city: Leipzig
-street: "Lindenauer Markt"
-housenumber: 12
+street: "Windmühlenstraße"
+housenumber: 37
 phone: ""
-opening_hours: "Mo-Fr 08:00-20:00; Sa 09:00-20:00"
-website: "https://www.dm.de/"
\ No newline at end of file
+opening_hours: "Mo-Fr 09:00-20:00; Sa 09:00-18:00"
+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/jaroll-gmbh.yml b/data/cities/leipzig/jaroll-gmbh.yml
new file mode 100644
index 0000000000..94cc3aa874
--- /dev/null
+++ b/data/cities/leipzig/jaroll-gmbh.yml
@@ -0,0 +1,11 @@
+id: 11685232157
+type: node
+latitude: 51.34114
+longitude: 12.40864
+postcode: "04315"
+city: Leipzig
+street: "Juliusstraße"
+housenumber: 
+phone: "+49 341 69911300"
+opening_hours: ""
+website: "https://www.jaroll.de/"
\ No newline at end of file
diff --git a/data/cities/leipzig/konsum-leipzig-eisenbahnstrasse.yml b/data/cities/leipzig/konsum-leipzig-eisenbahnstrasse.yml
index d1eb740241..a61b33f406 100644
--- a/data/cities/leipzig/konsum-leipzig-eisenbahnstrasse.yml
+++ b/data/cities/leipzig/konsum-leipzig-eisenbahnstrasse.yml
@@ -1,7 +1,7 @@
 id: 870910179
 type: node
 latitude: 51.34567
-longitude: 12.40533
+longitude: 12.40531
 postcode: "04315"
 city: Leipzig
 street: "Eisenbahnstraße"
diff --git a/data/cities/leipzig/maec-geiz.yml b/data/cities/leipzig/maec-geiz.yml
index 156017f43e..e84c5a50a6 100644
--- a/data/cities/leipzig/maec-geiz.yml
+++ b/data/cities/leipzig/maec-geiz.yml
@@ -1,7 +1,7 @@
 id: 870910210
 type: node
 latitude: 51.3457
-longitude: 12.40495
+longitude: 12.40486
 postcode: "04315"
 city: Leipzig
 street: "Eisenbahnstraße"
diff --git a/data/cities/leipzig/metzger-franz.yml b/data/cities/leipzig/metzger-franz.yml
index a2777b26f3..fad03113b5 100644
--- a/data/cities/leipzig/metzger-franz.yml
+++ b/data/cities/leipzig/metzger-franz.yml
@@ -7,5 +7,5 @@ city: Leipzig
 street: "Konradstraße"
 housenumber: 52
 phone: "+49 341 6891151"
-opening_hours: "Mo-Fr 08:00-17:00; Sa 08:00-11:00"
+opening_hours: "We-Fr 10:00-16:00; Sa 08:00-11:00; Mo,Tu off"
 website: "https://www.metzger-franz.de"
\ No newline at end of file
diff --git a/data/cities/leipzig/norma-stoetteritzer-strasse-2.yml b/data/cities/leipzig/norma-stoetteritzer-strasse-2.yml
deleted file mode 100644
index caa7a2320f..0000000000
--- a/data/cities/leipzig/norma-stoetteritzer-strasse-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 123342615
-type: way
-latitude: 51.32526
-longitude: 12.40882
-postcode: "04317"
-city: Leipzig
-street: "Stötteritzer Straße"
-housenumber: 38
-phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
-website: "https://www.norma-online.de/de/angebote/?mode=6"
\ No newline at end of file
diff --git a/data/cities/leipzig/norma-stoetteritzer-strasse.yml b/data/cities/leipzig/norma-stoetteritzer-strasse.yml
index 40a428840c..caa7a2320f 100644
--- a/data/cities/leipzig/norma-stoetteritzer-strasse.yml
+++ b/data/cities/leipzig/norma-stoetteritzer-strasse.yml
@@ -1,11 +1,11 @@
-id: 10542656323
-type: node
-latitude: 51.3252
-longitude: 12.40879
+id: 123342615
+type: way
+latitude: 51.32526
+longitude: 12.40882
 postcode: "04317"
 city: Leipzig
 street: "Stötteritzer Straße"
 housenumber: 38
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00; PH,Su off"
-website: ""
\ No newline at end of file
+opening_hours: "Mo-Sa 07:00-20:00"
+website: "https://www.norma-online.de/de/angebote/?mode=6"
\ No newline at end of file
diff --git a/data/cities/leipzig/perueckenstudio-bergmann.yml b/data/cities/leipzig/perueckenstudio-bergmann.yml
new file mode 100644
index 0000000000..05beff1a20
--- /dev/null
+++ b/data/cities/leipzig/perueckenstudio-bergmann.yml
@@ -0,0 +1,11 @@
+id: 983379179
+type: node
+latitude: 51.34305
+longitude: 12.36387
+postcode: "04109"
+city: Leipzig
+street: "Jahnallee"
+housenumber: 6
+phone: ""
+opening_hours: "Mo-Fr 10:00-13:00,14:00-18:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/leipzig/suay-massage.yml b/data/cities/leipzig/suay-massage.yml
new file mode 100644
index 0000000000..f813cb1f02
--- /dev/null
+++ b/data/cities/leipzig/suay-massage.yml
@@ -0,0 +1,11 @@
+id: 11685798418
+type: node
+latitude: 51.32556
+longitude: 12.34124
+postcode: "04229"
+city: Leipzig
+street: "Holbeinstraße"
+housenumber: 27
+phone: ""
+opening_hours: ""
+website: "https://suay-massage.de/"
\ No newline at end of file
diff --git a/data/cities/lichtentanne/markgrafen-getraenkemarkt.yml b/data/cities/lichtentanne/markgrafen-getraenkemarkt.yml
deleted file mode 100644
index 4d5f346fe9..0000000000
--- a/data/cities/lichtentanne/markgrafen-getraenkemarkt.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1127592372
-type: node
-latitude: 50.69872
-longitude: 12.4143
-postcode: "08115"
-city: Lichtentanne
-street: "Bahnhofstraße"
-housenumber: 9a
-phone: ""
-opening_hours: "Mo-Fr 10:00-18:00; Sa 09:00-12:00; Su,PH off"
-website: ""
\ No newline at end of file
diff --git a/data/cities/loebau/ines-schuhmoden.yml b/data/cities/loebau/ines-schuhmoden.yml
index bfb5ce4564..abaa831788 100644
--- a/data/cities/loebau/ines-schuhmoden.yml
+++ b/data/cities/loebau/ines-schuhmoden.yml
@@ -7,5 +7,5 @@ city: Löbau
 street: "Nicolaistraße"
 housenumber: 7
 phone: ""
-opening_hours: "Mo-Fr 09:30-17:00; Sa 10:00-12:00; Su off"
+opening_hours: "Mo-Fr 09:30-13:30, Sa 10:00-12:00; Su off, Mo-Fr 14:00-18:00"
 website: "https://www.inesschuhmoden.de/"
\ No newline at end of file
diff --git a/data/cities/loebau/rossmann.yml b/data/cities/loebau/rossmann.yml
index 3cbaa67fff..d95885f234 100644
--- a/data/cities/loebau/rossmann.yml
+++ b/data/cities/loebau/rossmann.yml
@@ -1,7 +1,7 @@
 id: 4941945694
 type: node
-latitude: 51.09886
-longitude: 14.66818
+latitude: 51.09875
+longitude: 14.6682
 postcode: "02708"
 city: Löbau
 street: "Sachsenstraße"
diff --git a/data/cities/loebau/thalia.yml b/data/cities/loebau/thalia.yml
index 3d606797c8..d4d1112552 100644
--- a/data/cities/loebau/thalia.yml
+++ b/data/cities/loebau/thalia.yml
@@ -7,5 +7,5 @@ city: Löbau
 street: "Bahnhofstraße"
 housenumber: 16
 phone: "+49 3585 404615"
-opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-12:00"
+opening_hours: "Mo-Fr 09:00-18:00; Sa 09:00-12:00; Su,PH off"
 website: "https://www.thalia.de/shop/home/filialen/showDetails/5686/"
\ No newline at end of file
diff --git a/data/cities/markersdorf/federn-schulze-gbr.yml b/data/cities/markersdorf/federn-schulze.yml
similarity index 100%
rename from data/cities/markersdorf/federn-schulze-gbr.yml
rename to data/cities/markersdorf/federn-schulze.yml
diff --git a/data/cities/meerane/netto-marken-discount-glauchauer-strasse.yml b/data/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.yml
similarity index 55%
rename from data/cities/meerane/netto-marken-discount-glauchauer-strasse.yml
rename to data/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.yml
index 1dd979c058..135b212c13 100644
--- a/data/cities/meerane/netto-marken-discount-glauchauer-strasse.yml
+++ b/data/cities/meerane/netto-marken-discount-rosa-luxemburg-strasse.yml
@@ -1,11 +1,11 @@
-id: 204014436
+id: 198862495
 type: way
-latitude: 50.84339
-longitude: 12.47835
+latitude: 50.85433
+longitude: 12.45871
 postcode: "08393"
 city: Meerane
-street: "Glauchauer Straße"
-housenumber: 12a
+street: "Rosa-Luxemburg-Straße"
+housenumber: 24
 phone: ""
 opening_hours: "Mo-Sa 07:00-20:00"
 website: "https://www.netto-online.de/"
\ No newline at end of file
diff --git a/data/cities/meerane/netto-marken-discount.yml b/data/cities/meerane/netto-marken-discount.yml
index 135b212c13..1dd979c058 100644
--- a/data/cities/meerane/netto-marken-discount.yml
+++ b/data/cities/meerane/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 198862495
+id: 204014436
 type: way
-latitude: 50.85433
-longitude: 12.45871
+latitude: 50.84339
+longitude: 12.47835
 postcode: "08393"
 city: Meerane
-street: "Rosa-Luxemburg-Straße"
-housenumber: 24
+street: "Glauchauer Straße"
+housenumber: 12a
 phone: ""
 opening_hours: "Mo-Sa 07:00-20:00"
 website: "https://www.netto-online.de/"
\ No newline at end of file
diff --git a/data/cities/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/olbernhau/netto-marken-discount-thomas-mann-strasse.yml b/data/cities/olbernhau/netto-marken-discount-blumenauer-strasse.yml
similarity index 52%
rename from data/cities/olbernhau/netto-marken-discount-thomas-mann-strasse.yml
rename to data/cities/olbernhau/netto-marken-discount-blumenauer-strasse.yml
index 4ca29a9d89..d45a3985f8 100644
--- a/data/cities/olbernhau/netto-marken-discount-thomas-mann-strasse.yml
+++ b/data/cities/olbernhau/netto-marken-discount-blumenauer-strasse.yml
@@ -1,11 +1,11 @@
-id: 273664659
+id: 263371377
 type: way
-latitude: 50.65693
-longitude: 13.33752
+latitude: 50.66217
+longitude: 13.32681
 postcode: "09526"
 city: Olbernhau
-street: "Thomas-Mann-Straße"
-housenumber: 2
+street: "Blumenauer Straße"
+housenumber: 17a
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00; Su,PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/olbernhau/netto-marken-discount.yml b/data/cities/olbernhau/netto-marken-discount.yml
index d45a3985f8..4ca29a9d89 100644
--- a/data/cities/olbernhau/netto-marken-discount.yml
+++ b/data/cities/olbernhau/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 263371377
+id: 273664659
 type: way
-latitude: 50.66217
-longitude: 13.32681
+latitude: 50.65693
+longitude: 13.33752
 postcode: "09526"
 city: Olbernhau
-street: "Blumenauer Straße"
-housenumber: 17a
+street: "Thomas-Mann-Straße"
+housenumber: 2
 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-poststrasse.yml b/data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
similarity index 54%
rename from data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.yml
rename to data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
index 8f17488f43..90f9356aa9 100644
--- a/data/cities/ottendorf-okrilla/netto-marken-discount-poststrasse.yml
+++ b/data/cities/ottendorf-okrilla/netto-marken-discount-gaswerkstrasse.yml
@@ -1,11 +1,11 @@
-id: 37412283
+id: 28621035
 type: way
-latitude: 51.18517
-longitude: 13.82957
+latitude: 51.1782
+longitude: 13.8244
 postcode: "01458"
 city: Ottendorf-Okrilla
-street: "Poststraße"
-housenumber: 1c
+street: "Gaswerkstraße"
+housenumber: 2a
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/ottendorf-okrilla/netto-marken-discount.yml b/data/cities/ottendorf-okrilla/netto-marken-discount.yml
index 90f9356aa9..8f17488f43 100644
--- a/data/cities/ottendorf-okrilla/netto-marken-discount.yml
+++ b/data/cities/ottendorf-okrilla/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 28621035
+id: 37412283
 type: way
-latitude: 51.1782
-longitude: 13.8244
+latitude: 51.18517
+longitude: 13.82957
 postcode: "01458"
 city: Ottendorf-Okrilla
-street: "Gaswerkstraße"
-housenumber: 2a
+street: "Poststraße"
+housenumber: 1c
 phone: ""
 opening_hours: "Mo-Sa 07:00-21:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/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/bipedo-barfussschuhe.yml b/data/cities/plauen/bipedo-barfussschuhe.yml
new file mode 100644
index 0000000000..dd828ed5ad
--- /dev/null
+++ b/data/cities/plauen/bipedo-barfussschuhe.yml
@@ -0,0 +1,11 @@
+id: 11688701357
+type: node
+latitude: 50.49481
+longitude: 12.1345
+postcode: "08523"
+city: Plauen
+street: "Marktstraße"
+housenumber: "
+phone: ""
+opening_hours: "Mo-Fr 10:00-17:30; Samstag 10:00-15:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/plauen/drogerie-und-geschenkeshop.yml b/data/cities/plauen/drogerie-und-geschenkeshop.yml
new file mode 100644
index 0000000000..06956d434e
--- /dev/null
+++ b/data/cities/plauen/drogerie-und-geschenkeshop.yml
@@ -0,0 +1,11 @@
+id: 2600625109
+type: node
+latitude: 50.50551
+longitude: 12.12982
+postcode: "08525"
+city: Plauen
+street: "Rathenauplatz"
+housenumber: 2A
+phone: "+493741 225250"
+opening_hours: "Mo-Fr 08:00-18:00; Sa 08:00-12:00"
+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
deleted file mode 100644
index 06bed4f4be..0000000000
--- a/data/cities/plauen/netto-marken-discount-luetzowstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 0000000000..24b6ba5349
--- /dev/null
+++ b/data/cities/plauen/netto-marken-discount-pausaer-strasse.yml
@@ -0,0 +1,11 @@
+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 24b6ba5349..06bed4f4be 100644
--- a/data/cities/plauen/netto-marken-discount.yml
+++ b/data/cities/plauen/netto-marken-discount.yml
@@ -1,11 +1,11 @@
-id: 105448777
+id: 126186852
 type: way
-latitude: 50.50813
-longitude: 12.12772
-postcode: "08525"
+latitude: 50.49403
+longitude: 12.09675
+postcode: "08523"
 city: Plauen
-street: "Pausaer Straße"
-housenumber: 15
+street: "Lützowstraße"
+housenumber: 1
 phone: ""
-opening_hours: "Mo-Sa 07:00-20:00"
-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/plauen/presse-und-buch-schmitt-und-hahn.yml b/data/cities/plauen/presse-und-buch-schmitt-und-hahn.yml
new file mode 100644
index 0000000000..f139e0dac5
--- /dev/null
+++ b/data/cities/plauen/presse-und-buch-schmitt-und-hahn.yml
@@ -0,0 +1,11 @@
+id: 2600625113
+type: node
+latitude: 50.50544
+longitude: 12.13
+postcode: "08525"
+city: Plauen
+street: "Rathenauplatz"
+housenumber: 2
+phone: "+493741 1469654"
+opening_hours: "Mo-Fr 05:30-19:00; Sa 07:00-19:00; Su,Ph 08:00-19:00"
+website: ""
\ No newline at end of file
diff --git a/data/cities/plauen/tee-aus-aller-welt-am-rathaus.yml b/data/cities/plauen/tee-aus-aller-welt-am-rathaus.yml
new file mode 100644
index 0000000000..ed43351183
--- /dev/null
+++ b/data/cities/plauen/tee-aus-aller-welt-am-rathaus.yml
@@ -0,0 +1,11 @@
+id: 11690062743
+type: node
+latitude: 50.4948
+longitude: 12.13454
+postcode: "08523"
+city: Plauen
+street: "Marktstraße"
+housenumber: 4
+phone: "+493741223007"
+opening_hours: "Mo-Fr 10:00-17:00; Sa 10:100-13:00"
+website: "https://www.teewelt-plauen.de/"
\ No newline at end of file
diff --git a/data/cities/pockau-lengefeld/modenhaus-gerhard-reupert.yml b/data/cities/pockau-lengefeld/modenhaus-gerhard-reupert.yml
index 572398f0bf..acad00190b 100644
--- a/data/cities/pockau-lengefeld/modenhaus-gerhard-reupert.yml
+++ b/data/cities/pockau-lengefeld/modenhaus-gerhard-reupert.yml
@@ -6,6 +6,6 @@ postcode: "09514"
 city: Pockau-Lengefeld
 street: "Freiberger Straße"
 housenumber: 2
-phone: ""
-opening_hours: ""
+phone: "+49373672738"
+opening_hours: "Mo-Fr 09:00-18:00, Sa 09:00-11:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/seelitz/sh-tuning-kfz-teile-richard-schlimpert.yml b/data/cities/seelitz/sh-tuning-gmbh.yml
similarity index 70%
rename from data/cities/seelitz/sh-tuning-kfz-teile-richard-schlimpert.yml
rename to data/cities/seelitz/sh-tuning-gmbh.yml
index 41a7add26c..f2776ae809 100644
--- a/data/cities/seelitz/sh-tuning-kfz-teile-richard-schlimpert.yml
+++ b/data/cities/seelitz/sh-tuning-gmbh.yml
@@ -1,7 +1,7 @@
-id: 6416911457
-type: node
-latitude: 51.06265
-longitude: 12.84909
+id: 70081465
+type: way
+latitude: 51.06272
+longitude: 12.84948
 postcode: "09306"
 city: Seelitz
 street: "Geringswalder Straße"
diff --git a/data/cities/stolpen/baeckerei-petzold.yml b/data/cities/stolpen/baeckerei-petzold.yml
deleted file mode 100644
index 9f366508d7..0000000000
--- a/data/cities/stolpen/baeckerei-petzold.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1020274899
-type: node
-latitude: 51.05075
-longitude: 14.08925
-postcode: "01833"
-city: Stolpen
-street: "Schützenhausstraße"
-housenumber: 9
-phone: ""
-opening_hours: "Mo-Sa 07:00-19:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/stolpen/getraenkescheune.yml b/data/cities/stolpen/getraenkescheune.yml
index c01f2766f4..687421bcf5 100644
--- a/data/cities/stolpen/getraenkescheune.yml
+++ b/data/cities/stolpen/getraenkescheune.yml
@@ -1,7 +1,7 @@
 id: 768086899
 type: node
-latitude: 51.05134
-longitude: 14.08718
+latitude: 51.05128
+longitude: 14.08719
 postcode: "01833"
 city: Stolpen
 street: "An den Stadtscheunen"
diff --git a/data/cities/zittau/lidl.yml b/data/cities/zittau/lidl.yml
index 94b6134e25..480d0ab0ec 100644
--- a/data/cities/zittau/lidl.yml
+++ b/data/cities/zittau/lidl.yml
@@ -1,7 +1,7 @@
-id: 500869135
-type: node
-latitude: 50.88646
-longitude: 14.80183
+id: 41062958
+type: way
+latitude: 50.88642
+longitude: 14.80224
 postcode: "02763"
 city: Zittau
 street: "Kantstraße"
diff --git a/data/cities/zittau/rewe.yml b/data/cities/zittau/rewe.yml
index 642b8e4c0e..e3beb9d96e 100644
--- a/data/cities/zittau/rewe.yml
+++ b/data/cities/zittau/rewe.yml
@@ -1,11 +1,11 @@
-id: 208787452
-type: node
-latitude: 50.88754
-longitude: 14.80028
+id: 435449020
+type: way
+latitude: 50.88823
+longitude: 14.80025
 postcode: "02763"
 city: Zittau
 street: "Hochwaldstraße"
 housenumber: 20
 phone: "+49 3583 68900"
-opening_hours: "Mo-Sa 06:00-22:00"
+opening_hours: "Mo-Sa 06:00-22:00; PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/zittau/toom-baumarkt.yml b/data/cities/zittau/toom-baumarkt.yml
index 823a00c908..26fc33a35c 100644
--- a/data/cities/zittau/toom-baumarkt.yml
+++ b/data/cities/zittau/toom-baumarkt.yml
@@ -7,5 +7,5 @@ city: Zittau
 street: "Hochwaldstraße"
 housenumber: 20
 phone: ""
-opening_hours: "Mo-Th,Sa 08:00-20:00; Fr 08:00-22:00"
+opening_hours: "Mo-Th,Sa 08:00-20:00; Fr 08:00-22:00; PH off"
 website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/auto-service-ullmann.yml b/data/cities/zwickau/4rad-kombinat-gmbh.yml
similarity index 67%
rename from data/cities/zwickau/auto-service-ullmann.yml
rename to data/cities/zwickau/4rad-kombinat-gmbh.yml
index aea074bbb4..f99d47ebdd 100644
--- a/data/cities/zwickau/auto-service-ullmann.yml
+++ b/data/cities/zwickau/4rad-kombinat-gmbh.yml
@@ -6,6 +6,6 @@ postcode: "08058"
 city: Zwickau
 street: "Franz-Mehring-Straße"
 housenumber: 174
-phone: "+49 375 213521"
-opening_hours: "Mo-Fr 07:00-18:00, Sa 09:00-12:00"
+phone: ""
+opening_hours: "Mo-Fr 07:00-17:00"
 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
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
diff --git a/data/cities/zwickau/fressnapf-schubertstrasse.yml b/data/cities/zwickau/fressnapf-schubertstrasse.yml
index c3dada5116..74738e321b 100644
--- a/data/cities/zwickau/fressnapf-schubertstrasse.yml
+++ b/data/cities/zwickau/fressnapf-schubertstrasse.yml
@@ -6,6 +6,6 @@ postcode: "08058"
 city: Zwickau
 street: "Schubertstraße"
 housenumber: 1
-phone: "+49 375 3032035"
+phone: ""
 opening_hours: "Mo-Fr 09:00-19:00, Sa 09:00-18:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/klier-aeussere-dresdner-strasse.yml b/data/cities/zwickau/klier-aeussere-dresdner-strasse.yml
new file mode 100644
index 0000000000..7d35b6de5c
--- /dev/null
+++ b/data/cities/zwickau/klier-aeussere-dresdner-strasse.yml
@@ -0,0 +1,11 @@
+id: 3713880398
+type: node
+latitude: 50.71963
+longitude: 12.52172
+postcode: "08066"
+city: Zwickau
+street: "Äußere Dresdner Straße"
+housenumber: 25
+phone: ""
+opening_hours: ""
+website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/klier-aeussere-schneeberger-strasse.yml b/data/cities/zwickau/klier-aeussere-schneeberger-strasse.yml
deleted file mode 100644
index a59f360065..0000000000
--- a/data/cities/zwickau/klier-aeussere-schneeberger-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3712776216
-type: node
-latitude: 50.70615
-longitude: 12.49595
-postcode: "08056"
-city: Zwickau
-street: "Äußere Schneeberger Straße"
-housenumber: 100
-phone: "+49 375 2309871"
-opening_hours: "Mo-Sa 08:00-20:00"
-website: "https://www.klier.de/"
\ No newline at end of file
diff --git a/data/cities/zwickau/klier.yml b/data/cities/zwickau/klier.yml
index 7d35b6de5c..a59f360065 100644
--- a/data/cities/zwickau/klier.yml
+++ b/data/cities/zwickau/klier.yml
@@ -1,11 +1,11 @@
-id: 3713880398
+id: 3712776216
 type: node
-latitude: 50.71963
-longitude: 12.52172
-postcode: "08066"
+latitude: 50.70615
+longitude: 12.49595
+postcode: "08056"
 city: Zwickau
-street: "Äußere Dresdner Straße"
-housenumber: 25
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
+street: "Äußere Schneeberger Straße"
+housenumber: 100
+phone: "+49 375 2309871"
+opening_hours: "Mo-Sa 08:00-20:00"
+website: "https://www.klier.de/"
\ No newline at end of file
diff --git a/data/cities/zwickau/kosmetikstudio-andrea.yml b/data/cities/zwickau/kosmetikstudio-andrea.yml
deleted file mode 100644
index acacf9238b..0000000000
--- a/data/cities/zwickau/kosmetikstudio-andrea.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5225255155
-type: node
-latitude: 50.72335
-longitude: 12.49685
-postcode: "08056"
-city: Zwickau
-street: "Bosestraße"
-housenumber: 55
-phone: ""
-opening_hours: "Mo,Tu 08:00-18:30, We 08:00-15:00, Th 08:30-14:00"
-website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/madlens-naildesign.yml b/data/cities/zwickau/madlens-naildesign.yml
deleted file mode 100644
index fdb664d77b..0000000000
--- a/data/cities/zwickau/madlens-naildesign.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4713156738
-type: node
-latitude: 50.72229
-longitude: 12.49718
-postcode: "08056"
-city: Zwickau
-street: "Max-Pechstein-Straße"
-housenumber: 4
-phone: ""
-opening_hours: "nach Vereinbarung"
-website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/naehkram-kuettler.yml b/data/cities/zwickau/naehkram-kuettler.yml
index 604cefa430..5358b49c39 100644
--- a/data/cities/zwickau/naehkram-kuettler.yml
+++ b/data/cities/zwickau/naehkram-kuettler.yml
@@ -6,6 +6,6 @@ postcode: "08056"
 city: Zwickau
 street: "Max-Pechstein-Straße"
 housenumber: 8
-phone: "+49 375 28349910"
+phone: ""
 opening_hours: "Mo,Tu,Th 10:00-17:00"
 website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/heike-ihle-friseursalon.yml b/data/cities/zwickau/pretty-nails.yml
similarity index 82%
rename from data/cities/zwickau/heike-ihle-friseursalon.yml
rename to data/cities/zwickau/pretty-nails.yml
index 403dec21c0..864ffe2d20 100644
--- a/data/cities/zwickau/heike-ihle-friseursalon.yml
+++ b/data/cities/zwickau/pretty-nails.yml
@@ -7,5 +7,5 @@ city: Zwickau
 street: "Leipziger Straße"
 housenumber: 16
 phone: ""
-opening_hours: "Tu-Fr 08:00-18:00"
+opening_hours: "nach Vereinbarung"
 website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/richter-erzgebirge.yml b/data/cities/zwickau/richter-erzgebirge.yml
deleted file mode 100644
index 1755b45720..0000000000
--- a/data/cities/zwickau/richter-erzgebirge.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 10652480953
-type: node
-latitude: 50.74637
-longitude: 12.48511
-postcode: "08058"
-city: Zwickau
-street: "Schubertstrasse"
-housenumber: 105
-phone: "+493752703860"
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/zwickau/trampler-und-kollhof-funktechnische-werkstaette-tv-service.yml b/data/cities/zwickau/trampler-und-kollhof-funktechnische-werkstaette-tv-service.yml
index 0a31fd1b67..e30fe8ccc3 100644
--- a/data/cities/zwickau/trampler-und-kollhof-funktechnische-werkstaette-tv-service.yml
+++ b/data/cities/zwickau/trampler-und-kollhof-funktechnische-werkstaette-tv-service.yml
@@ -6,6 +6,6 @@ postcode: "08056"
 city: Zwickau
 street: "Max-Pechstein-Straße"
 housenumber: 8
-phone: "+49 375 213538"
+phone: ""
 opening_hours: "Mo-Fr 09:00-12:00, We 13:00-15:00, Mo,Tu,Th,Fr 13:00-18:00"
 website: ""
\ No newline at end of file