diff --git a/content/cities/altenberg-bei-linz/_index.md b/content/cities/altenberg-bei-linz/_index.md
index 8f43b40392..5f6e00a0b6 100644
--- a/content/cities/altenberg-bei-linz/_index.md
+++ b/content/cities/altenberg-bei-linz/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Altenberg bei Linz
 url: /altenberg-bei-linz/
-latitude: 48.375
-longitude: 14.369
+latitude: 48.374
+longitude: 14.344
 ---
\ No newline at end of file
diff --git a/content/cities/au-am-leithaberge/_index.md b/content/cities/au-am-leithaberge/_index.md
index 099bc18b5b..2d13c33338 100644
--- a/content/cities/au-am-leithaberge/_index.md
+++ b/content/cities/au-am-leithaberge/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Au am Leithaberge
 url: /au-am-leithaberge/
-latitude: 47.925
-longitude: 16.556
+latitude: 47.923
+longitude: 16.559
 ---
\ No newline at end of file
diff --git a/content/cities/bad-radkersburg/sued-ost-shopping.md b/content/cities/bad-radkersburg/sued-ost-shopping.md
new file mode 100644
index 0000000000..1ae0757cd5
--- /dev/null
+++ b/content/cities/bad-radkersburg/sued-ost-shopping.md
@@ -0,0 +1,5 @@
+---
+title: "Süd Ost Shopping"
+url: /bad-radkersburg/sued-ost-shopping/
+shop: Einkaufszentrum
+---
\ No newline at end of file
diff --git a/content/cities/bad-tatzmannsdorf/_index.md b/content/cities/bad-tatzmannsdorf/_index.md
index f850953bb7..0ff3918dfe 100644
--- a/content/cities/bad-tatzmannsdorf/_index.md
+++ b/content/cities/bad-tatzmannsdorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Bad Tatzmannsdorf
 url: /bad-tatzmannsdorf/
-latitude: 47.331
-longitude: 16.229
+latitude: 47.333
+longitude: 16.23
 ---
\ No newline at end of file
diff --git a/content/cities/baden/_index.md b/content/cities/baden/_index.md
index 7a74d1227d..83519744a9 100644
--- a/content/cities/baden/_index.md
+++ b/content/cities/baden/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Baden
 url: /baden/
-latitude: 48.008
+latitude: 48.009
 longitude: 16.234
 ---
\ No newline at end of file
diff --git a/content/cities/bludenz/_index.md b/content/cities/bludenz/_index.md
index 34f985601a..57b382427d 100644
--- a/content/cities/bludenz/_index.md
+++ b/content/cities/bludenz/_index.md
@@ -2,5 +2,5 @@
 title: Bludenz
 url: /bludenz/
 latitude: 47.155
-longitude: 9.815
+longitude: 9.816
 ---
\ No newline at end of file
diff --git a/content/cities/bregenz/metzgerei-ruemmele.md b/content/cities/bregenz/metzgerei-ruemmele.md
deleted file mode 100644
index 768ec55a27..0000000000
--- a/content/cities/bregenz/metzgerei-ruemmele.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Metzgerei Rümmele"
-url: /bregenz/metzgerei-ruemmele/
-shop: Metzgerei
----
\ No newline at end of file
diff --git a/content/cities/breitenfurt-bei-wien/_index.md b/content/cities/breitenfurt-bei-wien/_index.md
index fac3c4d2d1..5668e2abfc 100644
--- a/content/cities/breitenfurt-bei-wien/_index.md
+++ b/content/cities/breitenfurt-bei-wien/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Breitenfurt bei Wien
 url: /breitenfurt-bei-wien/
-latitude: 48.135
-longitude: 16.188
+latitude: 48.136
+longitude: 16.194
 ---
\ No newline at end of file
diff --git a/content/cities/breitenfurt-bei-wien/kfz-schillhammer.md b/content/cities/breitenfurt-bei-wien/kfz-schillhammer.md
new file mode 100644
index 0000000000..ba53d92ae5
--- /dev/null
+++ b/content/cities/breitenfurt-bei-wien/kfz-schillhammer.md
@@ -0,0 +1,5 @@
+---
+title: "KFZ Schillhammer"
+url: /breitenfurt-bei-wien/kfz-schillhammer/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/eichkoegl/_index.md b/content/cities/eichkoegl/_index.md
index c6f037a579..51eca937d8 100644
--- a/content/cities/eichkoegl/_index.md
+++ b/content/cities/eichkoegl/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Eichkögl
 url: /eichkoegl/
-latitude: 47.045
-longitude: 15.798
+latitude: 47.028
+longitude: 15.79
 ---
\ No newline at end of file
diff --git a/content/cities/eisenstadt/hofer-haidaeckerstrasse.md b/content/cities/eisenstadt/hofer-haidaeckerstrasse.md
deleted file mode 100644
index 349884767b..0000000000
--- a/content/cities/eisenstadt/hofer-haidaeckerstrasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Hofer"
-url: /eisenstadt/hofer-haidaeckerstrasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/eisenstadt/hofer-mattersburger-strasse.md b/content/cities/eisenstadt/hofer-mattersburger-strasse.md
new file mode 100644
index 0000000000..eb7aa59afa
--- /dev/null
+++ b/content/cities/eisenstadt/hofer-mattersburger-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Hofer"
+url: /eisenstadt/hofer-mattersburger-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/eugendorf/_index.md b/content/cities/eugendorf/_index.md
index 23c6a5607a..9e514c18f8 100644
--- a/content/cities/eugendorf/_index.md
+++ b/content/cities/eugendorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Eugendorf
 url: /eugendorf/
-latitude: 47.864
-longitude: 13.128
+latitude: 47.861
+longitude: 13.127
 ---
\ No newline at end of file
diff --git a/content/cities/fehring/bestattung-hold.md b/content/cities/fehring/bestattung-hold.md
new file mode 100644
index 0000000000..a334351865
--- /dev/null
+++ b/content/cities/fehring/bestattung-hold.md
@@ -0,0 +1,5 @@
+---
+title: "Bestattung Hold"
+url: /fehring/bestattung-hold/
+shop: Bestattungen
+---
\ No newline at end of file
diff --git a/content/cities/fehring/bestattung-schreiner-christoph.md b/content/cities/fehring/bestattung-schreiner-christoph.md
deleted file mode 100644
index 845dde081b..0000000000
--- a/content/cities/fehring/bestattung-schreiner-christoph.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bestattung Schreiner Christoph"
-url: /fehring/bestattung-schreiner-christoph/
-shop: Bestattungen
----
\ No newline at end of file
diff --git a/content/cities/feldkirch/adeg-nofler-strasse.md b/content/cities/feldkirch/adeg-runastrasse.md
similarity index 50%
rename from content/cities/feldkirch/adeg-nofler-strasse.md
rename to content/cities/feldkirch/adeg-runastrasse.md
index 3ffb32b967..3e9a286dc4 100644
--- a/content/cities/feldkirch/adeg-nofler-strasse.md
+++ b/content/cities/feldkirch/adeg-runastrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "ADEG"
-url: /feldkirch/adeg-nofler-strasse/
+url: /feldkirch/adeg-runastrasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/feldkirch/allgaeuer-hof-gisingen.md b/content/cities/feldkirch/allgaeuer-hof-gisingen.md
new file mode 100644
index 0000000000..6c763459af
--- /dev/null
+++ b/content/cities/feldkirch/allgaeuer-hof-gisingen.md
@@ -0,0 +1,5 @@
+---
+title: "Allgäuer Hof Gisingen"
+url: /feldkirch/allgaeuer-hof-gisingen/
+shop: Hofladen
+---
\ No newline at end of file
diff --git a/content/cities/gaissau/_index.md b/content/cities/gaissau/_index.md
index 3c2595421b..6a5ab5c355 100644
--- a/content/cities/gaissau/_index.md
+++ b/content/cities/gaissau/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Gaißau
 url: /gaissau/
-latitude: 47.465
-longitude: 9.597
+latitude: 47.47
+longitude: 9.592
 ---
\ No newline at end of file
diff --git a/content/cities/geras/_index.md b/content/cities/geras/_index.md
index 1617211ab8..15df08f2dd 100644
--- a/content/cities/geras/_index.md
+++ b/content/cities/geras/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Geras
 url: /geras/
-latitude: 48.799
-longitude: 15.675
+latitude: 48.798
+longitude: 15.673
 ---
\ No newline at end of file
diff --git a/content/cities/gmunden/kia-motors-gmunden-bahnhofstrasse.md b/content/cities/gmunden/kia-motors-gmunden-bahnhofstrasse.md
new file mode 100644
index 0000000000..477472e37c
--- /dev/null
+++ b/content/cities/gmunden/kia-motors-gmunden-bahnhofstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "KIA Motors Gmunden"
+url: /gmunden/kia-motors-gmunden-bahnhofstrasse/
+shop: Autohaus
+---
\ No newline at end of file
diff --git a/content/cities/gmunden/kia-motors-gmunden-gruener-wald.md b/content/cities/gmunden/kia-motors-gmunden-gruener-wald.md
deleted file mode 100644
index 1eb601638f..0000000000
--- a/content/cities/gmunden/kia-motors-gmunden-gruener-wald.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "KIA Motors Gmunden"
-url: /gmunden/kia-motors-gmunden-gruener-wald/
-shop: Autowerkstatt
----
\ No newline at end of file
diff --git a/content/cities/gmunden/kia-motors-gmunden.md b/content/cities/gmunden/kia-motors-gmunden.md
index 0fdb780b8a..9737f01752 100644
--- a/content/cities/gmunden/kia-motors-gmunden.md
+++ b/content/cities/gmunden/kia-motors-gmunden.md
@@ -1,5 +1,5 @@
 ---
 title: "KIA Motors Gmunden"
 url: /gmunden/kia-motors-gmunden/
-shop: Autohaus
+shop: Autowerkstatt
 ---
\ No newline at end of file
diff --git a/content/cities/gratkorn/_index.md b/content/cities/gratkorn/_index.md
index 91e7e5dc18..1bcd998d69 100644
--- a/content/cities/gratkorn/_index.md
+++ b/content/cities/gratkorn/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Gratkorn
 url: /gratkorn/
-latitude: 47.134
-longitude: 15.343
+latitude: 47.137
+longitude: 15.329
 ---
\ No newline at end of file
diff --git a/content/cities/graz/billa-now-froehlichgasse.md b/content/cities/graz/billa-now-muenzgrabenstrasse.md
similarity index 52%
rename from content/cities/graz/billa-now-froehlichgasse.md
rename to content/cities/graz/billa-now-muenzgrabenstrasse.md
index 198693ca17..37f58de93a 100644
--- a/content/cities/graz/billa-now-froehlichgasse.md
+++ b/content/cities/graz/billa-now-muenzgrabenstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Billa Now"
-url: /graz/billa-now-froehlichgasse/
+url: /graz/billa-now-muenzgrabenstrasse/
 shop: Lebensmittel
 ---
\ No newline at end of file
diff --git a/content/cities/leoben/billa-draschestrasse.md b/content/cities/graz/billa-ragnitzstrasse-2.md
similarity index 52%
rename from content/cities/leoben/billa-draschestrasse.md
rename to content/cities/graz/billa-ragnitzstrasse-2.md
index 8e710b2d49..ce572de6ff 100644
--- a/content/cities/leoben/billa-draschestrasse.md
+++ b/content/cities/graz/billa-ragnitzstrasse-2.md
@@ -1,5 +1,5 @@
 ---
 title: "Billa"
-url: /leoben/billa-draschestrasse/
+url: /graz/billa-ragnitzstrasse-2/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/graz/chic-ethic-men-und-unisex.md b/content/cities/graz/chic-ethic-men-und-unisex.md
deleted file mode 100644
index 917f55fdc5..0000000000
--- a/content/cities/graz/chic-ethic-men-und-unisex.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Chic Ethic - Men & Unisex"
-url: /graz/chic-ethic-men-und-unisex/
-shop: Kleidung
----
\ No newline at end of file
diff --git a/content/cities/graz/hundm-hauptplatz.md b/content/cities/graz/hundm-am-eisernen-tor.md
similarity index 50%
rename from content/cities/graz/hundm-hauptplatz.md
rename to content/cities/graz/hundm-am-eisernen-tor.md
index cc3ce5ce34..91ab262a6b 100644
--- a/content/cities/graz/hundm-hauptplatz.md
+++ b/content/cities/graz/hundm-am-eisernen-tor.md
@@ -1,5 +1,5 @@
 ---
 title: "H&M"
-url: /graz/hundm-hauptplatz/
+url: /graz/hundm-am-eisernen-tor/
 shop: Kleidung
 ---
\ No newline at end of file
diff --git a/content/cities/graz/lidl-kossgasse.md b/content/cities/graz/lidl-kossgasse.md
deleted file mode 100644
index e5a40e97c2..0000000000
--- a/content/cities/graz/lidl-kossgasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Lidl"
-url: /graz/lidl-kossgasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/graz/lidl-liebenauer-hauptstrasse.md b/content/cities/graz/lidl-liebenauer-hauptstrasse.md
new file mode 100644
index 0000000000..1139a7ad82
--- /dev/null
+++ b/content/cities/graz/lidl-liebenauer-hauptstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Lidl"
+url: /graz/lidl-liebenauer-hauptstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/graz/oeamtc-graz-west-alte-poststrasse.md b/content/cities/graz/oeamtc-graz-west-alte-poststrasse.md
index 2c427950a2..95d2b9186f 100644
--- a/content/cities/graz/oeamtc-graz-west-alte-poststrasse.md
+++ b/content/cities/graz/oeamtc-graz-west-alte-poststrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "ÖAMTC Graz-West"
 url: /graz/oeamtc-graz-west-alte-poststrasse/
-shop: Autoteile
+shop: Autowerkstatt
 ---
\ No newline at end of file
diff --git a/content/cities/graz/oeamtc-graz-west.md b/content/cities/graz/oeamtc-graz-west.md
index 6b8a13e380..79324cc90f 100644
--- a/content/cities/graz/oeamtc-graz-west.md
+++ b/content/cities/graz/oeamtc-graz-west.md
@@ -1,5 +1,5 @@
 ---
 title: "ÖAMTC Graz-West"
 url: /graz/oeamtc-graz-west/
-shop: Autowerkstatt
+shop: Autoteile
 ---
\ No newline at end of file
diff --git a/content/cities/grosswilfersdorf/lagerhaus.md b/content/cities/grosswilfersdorf/lagerhaus.md
new file mode 100644
index 0000000000..ed6842f6a6
--- /dev/null
+++ b/content/cities/grosswilfersdorf/lagerhaus.md
@@ -0,0 +1,5 @@
+---
+title: "Lagerhaus"
+url: /grosswilfersdorf/lagerhaus/
+shop: Baumarkt
+---
\ No newline at end of file
diff --git a/content/cities/haiming/_index.md b/content/cities/haiming/_index.md
index 6a6ad77a7b..660f945b3c 100644
--- a/content/cities/haiming/_index.md
+++ b/content/cities/haiming/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Haiming
 url: /haiming/
-latitude: 47.236
-longitude: 10.862
+latitude: 47.238
+longitude: 10.86
 ---
\ No newline at end of file
diff --git a/content/cities/hall-in-tirol/k-und-k-service-gmbh.md b/content/cities/hall-in-tirol/k-und-k-service-gmbh.md
new file mode 100644
index 0000000000..c9b776d86e
--- /dev/null
+++ b/content/cities/hall-in-tirol/k-und-k-service-gmbh.md
@@ -0,0 +1,5 @@
+---
+title: "K & K Service GmbH"
+url: /hall-in-tirol/k-und-k-service-gmbh/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/hausleiten/_index.md b/content/cities/hausleiten/_index.md
index 52965addc4..624f906f04 100644
--- a/content/cities/hausleiten/_index.md
+++ b/content/cities/hausleiten/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Hausleiten
 url: /hausleiten/
-latitude: 48.394
+latitude: 48.396
 longitude: 16.102
 ---
\ No newline at end of file
diff --git a/content/cities/hofkirchen-im-muehlkreis/_index.md b/content/cities/hofkirchen-im-muehlkreis/_index.md
index aae8d72190..687736fa61 100644
--- a/content/cities/hofkirchen-im-muehlkreis/_index.md
+++ b/content/cities/hofkirchen-im-muehlkreis/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Hofkirchen im Mühlkreis
 url: /hofkirchen-im-muehlkreis/
-latitude: 48.485
-longitude: 13.807
+latitude: 48.484
+longitude: 13.804
 ---
\ No newline at end of file
diff --git a/content/cities/hohenems/_index.md b/content/cities/hohenems/_index.md
index 6fa6ed4a21..6ae5bba0eb 100644
--- a/content/cities/hohenems/_index.md
+++ b/content/cities/hohenems/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Hohenems
 url: /hohenems/
-latitude: 47.364
-longitude: 9.681
+latitude: 47.355
+longitude: 9.663
 ---
\ No newline at end of file
diff --git a/content/cities/horn/raiffeisen-lagerhaus-hollabrunn-horn.md b/content/cities/horn/raiffeisen-lagerhaus-hollabrunn-horn.md
new file mode 100644
index 0000000000..b7bcf0997a
--- /dev/null
+++ b/content/cities/horn/raiffeisen-lagerhaus-hollabrunn-horn.md
@@ -0,0 +1,5 @@
+---
+title: "Raiffeisen Lagerhaus Hollabrunn-Horn"
+url: /horn/raiffeisen-lagerhaus-hollabrunn-horn/
+shop: Landwirtschaftlich
+---
\ No newline at end of file
diff --git a/content/cities/huerm/friseur-christine.md b/content/cities/huerm/friseur-christine.md
deleted file mode 100644
index a97a930879..0000000000
--- a/content/cities/huerm/friseur-christine.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Friseur Christine"
-url: /huerm/friseur-christine/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/innsbruck/karosseriebau-aigner.md b/content/cities/innsbruck/karosseriebau-aigner.md
deleted file mode 100644
index 79179dfb7e..0000000000
--- a/content/cities/innsbruck/karosseriebau-aigner.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Karosseriebau Aigner"
-url: /innsbruck/karosseriebau-aigner/
-shop: Autowerkstatt
----
\ No newline at end of file
diff --git a/content/cities/innsbruck/spaeti-wilten-automatenshop.md b/content/cities/innsbruck/spaeti-wilten-automatenshop.md
new file mode 100644
index 0000000000..766a456ff1
--- /dev/null
+++ b/content/cities/innsbruck/spaeti-wilten-automatenshop.md
@@ -0,0 +1,5 @@
+---
+title: "Späti Wilten Automatenshop"
+url: /innsbruck/spaeti-wilten-automatenshop/
+shop: Allgemein
+---
\ No newline at end of file
diff --git a/content/cities/jenbach/_index.md b/content/cities/jenbach/_index.md
index 6fe19a0fe6..8f603a250c 100644
--- a/content/cities/jenbach/_index.md
+++ b/content/cities/jenbach/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Jenbach
 url: /jenbach/
-latitude: 47.392
-longitude: 11.775
+latitude: 47.39
+longitude: 11.773
 ---
\ No newline at end of file
diff --git a/content/cities/klagenfurt-am-woerthersee/hofer-villacher-strasse.md b/content/cities/klagenfurt-am-woerthersee/hofer-villacher-strasse.md
deleted file mode 100644
index 254420d616..0000000000
--- a/content/cities/klagenfurt-am-woerthersee/hofer-villacher-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Hofer"
-url: /klagenfurt-am-woerthersee/hofer-villacher-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/klagenfurt-am-woerthersee/hofer-waidmannsdorfer-strasse.md b/content/cities/klagenfurt-am-woerthersee/hofer-waidmannsdorfer-strasse.md
new file mode 100644
index 0000000000..0d56beaf12
--- /dev/null
+++ b/content/cities/klagenfurt-am-woerthersee/hofer-waidmannsdorfer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Hofer"
+url: /klagenfurt-am-woerthersee/hofer-waidmannsdorfer-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/korneuburg/spar-hauptplatz.md b/content/cities/korneuburg/spar-hauptplatz.md
new file mode 100644
index 0000000000..4a92fba7d7
--- /dev/null
+++ b/content/cities/korneuburg/spar-hauptplatz.md
@@ -0,0 +1,5 @@
+---
+title: "Spar"
+url: /korneuburg/spar-hauptplatz/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/korneuburg/spar-leobendorfer-strasse.md b/content/cities/korneuburg/spar-leobendorfer-strasse.md
deleted file mode 100644
index eab06b54f5..0000000000
--- a/content/cities/korneuburg/spar-leobendorfer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Spar"
-url: /korneuburg/spar-leobendorfer-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/kraubath-an-der-mur/_index.md b/content/cities/kraubath-an-der-mur/_index.md
index 806966ed13..d8a5e90421 100644
--- a/content/cities/kraubath-an-der-mur/_index.md
+++ b/content/cities/kraubath-an-der-mur/_index.md
@@ -2,5 +2,5 @@
 title: Kraubath an der Mur
 url: /kraubath-an-der-mur/
 latitude: 47.307
-longitude: 14.935
+longitude: 14.938
 ---
\ No newline at end of file
diff --git a/content/cities/krems-an-der-donau/hofer-steiner-donaulaende.md b/content/cities/krems-an-der-donau/hofer-steiner-donaulaende.md
deleted file mode 100644
index 8152f25b6d..0000000000
--- a/content/cities/krems-an-der-donau/hofer-steiner-donaulaende.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Hofer"
-url: /krems-an-der-donau/hofer-steiner-donaulaende/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/krems-an-der-donau/hofer-wiener-strasse.md b/content/cities/krems-an-der-donau/hofer-wiener-strasse.md
new file mode 100644
index 0000000000..a045b9bf1b
--- /dev/null
+++ b/content/cities/krems-an-der-donau/hofer-wiener-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Hofer"
+url: /krems-an-der-donau/hofer-wiener-strasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/lambach/_index.md b/content/cities/lambach/_index.md
index c4de11f1f5..30bd81d12d 100644
--- a/content/cities/lambach/_index.md
+++ b/content/cities/lambach/_index.md
@@ -2,5 +2,5 @@
 title: Lambach
 url: /lambach/
 latitude: 48.091
-longitude: 13.865
+longitude: 13.875
 ---
\ No newline at end of file
diff --git a/content/cities/landeck/a1-store.md b/content/cities/landeck/a1-store.md
new file mode 100644
index 0000000000..217b70ea08
--- /dev/null
+++ b/content/cities/landeck/a1-store.md
@@ -0,0 +1,5 @@
+---
+title: "A1 Store"
+url: /landeck/a1-store/
+shop: Handy
+---
\ No newline at end of file
diff --git a/content/cities/landeck/intersport.md b/content/cities/landeck/intersport.md
new file mode 100644
index 0000000000..189431747a
--- /dev/null
+++ b/content/cities/landeck/intersport.md
@@ -0,0 +1,5 @@
+---
+title: "Intersport"
+url: /landeck/intersport/
+shop: Sport
+---
\ No newline at end of file
diff --git a/content/cities/landeck/paradisch.md b/content/cities/landeck/paradisch.md
new file mode 100644
index 0000000000..0a31e7d05a
--- /dev/null
+++ b/content/cities/landeck/paradisch.md
@@ -0,0 +1,5 @@
+---
+title: "Paradisch"
+url: /landeck/paradisch/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/landeck/weltladen.md b/content/cities/landeck/weltladen.md
new file mode 100644
index 0000000000..cd59a8802f
--- /dev/null
+++ b/content/cities/landeck/weltladen.md
@@ -0,0 +1,5 @@
+---
+title: "Weltladen"
+url: /landeck/weltladen/
+shop: Lebensmittel
+---
\ No newline at end of file
diff --git a/content/cities/latschach-ober-dem-faaker-see/_index.md b/content/cities/latschach-ober-dem-faaker-see/_index.md
index 990b8e8c89..583586b205 100644
--- a/content/cities/latschach-ober-dem-faaker-see/_index.md
+++ b/content/cities/latschach-ober-dem-faaker-see/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Latschach ober dem Faaker See
 url: /latschach-ober-dem-faaker-see/
-latitude: 46.56
-longitude: 13.919
+latitude: 46.558
+longitude: 13.925
 ---
\ No newline at end of file
diff --git a/content/cities/graz/billa-waltendorfer-guertel.md b/content/cities/leoben/billa-turmgasse.md
similarity index 50%
rename from content/cities/graz/billa-waltendorfer-guertel.md
rename to content/cities/leoben/billa-turmgasse.md
index 4c1ac2aebc..6fd56b16f3 100644
--- a/content/cities/graz/billa-waltendorfer-guertel.md
+++ b/content/cities/leoben/billa-turmgasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Billa"
-url: /graz/billa-waltendorfer-guertel/
+url: /leoben/billa-turmgasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/leopoldsdorf/_index.md b/content/cities/leopoldsdorf/_index.md
index 873c2b602b..21375f94cb 100644
--- a/content/cities/leopoldsdorf/_index.md
+++ b/content/cities/leopoldsdorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Leopoldsdorf
 url: /leopoldsdorf/
-latitude: 48.109
-longitude: 16.393
+latitude: 48.108
+longitude: 16.397
 ---
\ No newline at end of file
diff --git a/content/cities/lustenau/_index.md b/content/cities/lustenau/_index.md
index e41ed6e1f5..13b9c54f41 100644
--- a/content/cities/lustenau/_index.md
+++ b/content/cities/lustenau/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lustenau
 url: /lustenau/
-latitude: 47.433
-longitude: 9.653
+latitude: 47.429
+longitude: 9.655
 ---
\ No newline at end of file
diff --git a/content/cities/markt-hartmannsdorf/_index.md b/content/cities/markt-hartmannsdorf/_index.md
index 74211dc378..9d593e34dc 100644
--- a/content/cities/markt-hartmannsdorf/_index.md
+++ b/content/cities/markt-hartmannsdorf/_index.md
@@ -2,5 +2,5 @@
 title: Markt Hartmannsdorf
 url: /markt-hartmannsdorf/
 latitude: 47.054
-longitude: 15.842
+longitude: 15.843
 ---
\ No newline at end of file
diff --git a/content/cities/micheldorf/_index.md b/content/cities/micheldorf/_index.md
index a1c1ef5448..783be3dd0b 100644
--- a/content/cities/micheldorf/_index.md
+++ b/content/cities/micheldorf/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Micheldorf
 url: /micheldorf/
-latitude: 47.89
-longitude: 14.127
+latitude: 47.891
+longitude: 14.128
 ---
\ No newline at end of file
diff --git a/content/cities/mistelbach/_index.md b/content/cities/mistelbach/_index.md
index c0b58aac23..2aebfc8c2c 100644
--- a/content/cities/mistelbach/_index.md
+++ b/content/cities/mistelbach/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Mistelbach
 url: /mistelbach/
-latitude: 48.568
-longitude: 16.593
+latitude: 48.561
+longitude: 16.579
 ---
\ No newline at end of file
diff --git a/content/cities/mittelberg/_index.md b/content/cities/mittelberg/_index.md
index ca65749be9..140c258374 100644
--- a/content/cities/mittelberg/_index.md
+++ b/content/cities/mittelberg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Mittelberg
 url: /mittelberg/
-latitude: 47.344
-longitude: 10.167
+latitude: 47.334
+longitude: 10.162
 ---
\ No newline at end of file
diff --git a/content/cities/wien/billa-julius-tandler-platz.md b/content/cities/muenchendorf/billa.md
similarity index 50%
rename from content/cities/wien/billa-julius-tandler-platz.md
rename to content/cities/muenchendorf/billa.md
index 68c9ab7892..3f03db9454 100644
--- a/content/cities/wien/billa-julius-tandler-platz.md
+++ b/content/cities/muenchendorf/billa.md
@@ -1,5 +1,5 @@
 ---
 title: "Billa"
-url: /wien/billa-julius-tandler-platz/
+url: /muenchendorf/billa/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/muerzzuschlag/_index.md b/content/cities/muerzzuschlag/_index.md
index 6fd6e77957..4194ab0e47 100644
--- a/content/cities/muerzzuschlag/_index.md
+++ b/content/cities/muerzzuschlag/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Mürzzuschlag
 url: /muerzzuschlag/
-latitude: 47.606
-longitude: 15.673
+latitude: 47.607
+longitude: 15.671
 ---
\ No newline at end of file
diff --git a/content/cities/neulengbach/_index.md b/content/cities/neulengbach/_index.md
index 5f0d9bac01..616c36db89 100644
--- a/content/cities/neulengbach/_index.md
+++ b/content/cities/neulengbach/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Neulengbach
 url: /neulengbach/
-latitude: 48.2
+latitude: 48.192
 longitude: 15.901
 ---
\ No newline at end of file
diff --git a/content/cities/neumarkt-am-wallersee/_index.md b/content/cities/neumarkt-am-wallersee/_index.md
index 3bc9ce616b..3a3393f991 100644
--- a/content/cities/neumarkt-am-wallersee/_index.md
+++ b/content/cities/neumarkt-am-wallersee/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Neumarkt am Wallersee
 url: /neumarkt-am-wallersee/
-latitude: 47.938
-longitude: 13.223
+latitude: 47.949
+longitude: 13.226
 ---
\ No newline at end of file
diff --git a/content/cities/oberschuetzen/_index.md b/content/cities/oberschuetzen/_index.md
index ae442dbb1d..7ad4276902 100644
--- a/content/cities/oberschuetzen/_index.md
+++ b/content/cities/oberschuetzen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Oberschützen
 url: /oberschuetzen/
-latitude: 47.35
-longitude: 16.207
+latitude: 47.349
+longitude: 16.208
 ---
\ No newline at end of file
diff --git a/content/cities/obersulz/_index.md b/content/cities/obersulz/_index.md
new file mode 100644
index 0000000000..e08ee16dc1
--- /dev/null
+++ b/content/cities/obersulz/_index.md
@@ -0,0 +1,6 @@
+---
+title: Obersulz
+url: /obersulz/
+latitude: 48.504
+longitude: 16.674
+---
\ No newline at end of file
diff --git a/content/cities/obersulz/adeg.md b/content/cities/obersulz/adeg.md
new file mode 100644
index 0000000000..36030ada75
--- /dev/null
+++ b/content/cities/obersulz/adeg.md
@@ -0,0 +1,5 @@
+---
+title: "ADEG"
+url: /obersulz/adeg/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/oberwoelbling/_index.md b/content/cities/oberwoelbling/_index.md
index 2d0842db76..c11286d1da 100644
--- a/content/cities/oberwoelbling/_index.md
+++ b/content/cities/oberwoelbling/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Oberwölbling
 url: /oberwoelbling/
-latitude: 48.319
-longitude: 15.592
+latitude: 48.315
+longitude: 15.59
 ---
\ No newline at end of file
diff --git a/content/cities/perg/_index.md b/content/cities/perg/_index.md
index 2abff3a3c9..09b3048724 100644
--- a/content/cities/perg/_index.md
+++ b/content/cities/perg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Perg
 url: /perg/
-latitude: 48.251
+latitude: 48.25
 longitude: 14.635
 ---
\ No newline at end of file
diff --git a/content/cities/pregarten/_index.md b/content/cities/pregarten/_index.md
index 3412ff04e0..fabb9d2041 100644
--- a/content/cities/pregarten/_index.md
+++ b/content/cities/pregarten/_index.md
@@ -2,5 +2,5 @@
 title: Pregarten
 url: /pregarten/
 latitude: 48.355
-longitude: 14.531
+longitude: 14.53
 ---
\ No newline at end of file
diff --git a/content/cities/pressbaum/_index.md b/content/cities/pressbaum/_index.md
index 22f766c6ff..f1974e8a21 100644
--- a/content/cities/pressbaum/_index.md
+++ b/content/cities/pressbaum/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Pressbaum
 url: /pressbaum/
-latitude: 48.183
-longitude: 16.09
+latitude: 48.181
+longitude: 16.08
 ---
\ No newline at end of file
diff --git a/content/cities/reintal/_index.md b/content/cities/reintal/_index.md
new file mode 100644
index 0000000000..c6fb05fd1a
--- /dev/null
+++ b/content/cities/reintal/_index.md
@@ -0,0 +1,6 @@
+---
+title: Reintal
+url: /reintal/
+latitude: 48.7
+longitude: 16.824
+---
\ No newline at end of file
diff --git a/content/cities/reintal/adeg.md b/content/cities/reintal/adeg.md
new file mode 100644
index 0000000000..955a6468a7
--- /dev/null
+++ b/content/cities/reintal/adeg.md
@@ -0,0 +1,5 @@
+---
+title: "ADEG"
+url: /reintal/adeg/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/salzburg/billa-gaisbergstrasse.md b/content/cities/salzburg/billa-gaisbergstrasse.md
new file mode 100644
index 0000000000..32bc9d6a9d
--- /dev/null
+++ b/content/cities/salzburg/billa-gaisbergstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Billa"
+url: /salzburg/billa-gaisbergstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/salzburg/billa-klessheimer-allee.md b/content/cities/salzburg/billa-klessheimer-allee.md
deleted file mode 100644
index 641373f566..0000000000
--- a/content/cities/salzburg/billa-klessheimer-allee.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Billa"
-url: /salzburg/billa-klessheimer-allee/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/salzburg/handyshop-salzburg-millenium-mobile.md b/content/cities/salzburg/handyshop-salzburg-millenium-mobile.md
new file mode 100644
index 0000000000..a6f8fc5ac2
--- /dev/null
+++ b/content/cities/salzburg/handyshop-salzburg-millenium-mobile.md
@@ -0,0 +1,5 @@
+---
+title: "Handyshop Salzburg - Millenium Mobile"
+url: /salzburg/handyshop-salzburg-millenium-mobile/
+shop: Handy
+---
\ No newline at end of file
diff --git a/content/cities/sankt-johann-im-pongau/hansaton-hoersysteme.md b/content/cities/sankt-johann-im-pongau/hansaton-hoersysteme.md
new file mode 100644
index 0000000000..6a4b95a549
--- /dev/null
+++ b/content/cities/sankt-johann-im-pongau/hansaton-hoersysteme.md
@@ -0,0 +1,5 @@
+---
+title: "Hansaton Hörsysteme"
+url: /sankt-johann-im-pongau/hansaton-hoersysteme/
+shop: Hörgeräte
+---
\ No newline at end of file
diff --git a/content/cities/sankt-johann-im-saggautal/_index.md b/content/cities/sankt-johann-im-saggautal/_index.md
index f92ed3a21a..cba10933d4 100644
--- a/content/cities/sankt-johann-im-saggautal/_index.md
+++ b/content/cities/sankt-johann-im-saggautal/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sankt Johann im Saggautal
 url: /sankt-johann-im-saggautal/
-latitude: 46.706
-longitude: 15.402
+latitude: 46.699
+longitude: 15.401
 ---
\ No newline at end of file
diff --git a/content/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.md b/content/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.md
index 7864cecd12..4d80a78b83 100644
--- a/content/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.md
+++ b/content/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Auto Süss"
 url: /sankt-michael-im-lungau/auto-suess-murtalstrasse/
-shop: Autohaus
+shop: Autowerkstatt
 ---
\ No newline at end of file
diff --git a/content/cities/sankt-michael-im-lungau/auto-suess.md b/content/cities/sankt-michael-im-lungau/auto-suess.md
index a1144777e7..a3229755be 100644
--- a/content/cities/sankt-michael-im-lungau/auto-suess.md
+++ b/content/cities/sankt-michael-im-lungau/auto-suess.md
@@ -1,5 +1,5 @@
 ---
 title: "Auto Süss"
 url: /sankt-michael-im-lungau/auto-suess/
-shop: Autowerkstatt
+shop: Autohaus
 ---
\ No newline at end of file
diff --git a/content/cities/schwaz/hofladen-pirchnerhof.md b/content/cities/schwaz/hofladen-pirchnerhof.md
new file mode 100644
index 0000000000..ecd435a51f
--- /dev/null
+++ b/content/cities/schwaz/hofladen-pirchnerhof.md
@@ -0,0 +1,5 @@
+---
+title: "Hofladen Pirchnerhof"
+url: /schwaz/hofladen-pirchnerhof/
+shop: Hofladen
+---
\ No newline at end of file
diff --git a/content/cities/seitenstetten/_index.md b/content/cities/seitenstetten/_index.md
index ed051fa9bb..62d19febc6 100644
--- a/content/cities/seitenstetten/_index.md
+++ b/content/cities/seitenstetten/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Seitenstetten
 url: /seitenstetten/
-latitude: 48.037
-longitude: 14.652
+latitude: 48.036
+longitude: 14.653
 ---
\ No newline at end of file
diff --git a/content/cities/seyring/_index.md b/content/cities/seyring/_index.md
index 853600b5a5..c1c863185d 100644
--- a/content/cities/seyring/_index.md
+++ b/content/cities/seyring/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Seyring
 url: /seyring/
-latitude: 48.339
-longitude: 16.464
+latitude: 48.333
+longitude: 16.487
 ---
\ No newline at end of file
diff --git a/content/cities/seyring/kastlgreissler.md b/content/cities/seyring/kastlgreissler.md
new file mode 100644
index 0000000000..90193c1d09
--- /dev/null
+++ b/content/cities/seyring/kastlgreissler.md
@@ -0,0 +1,5 @@
+---
+title: "KastlGreissler"
+url: /seyring/kastlgreissler/
+shop: Lebensmittel
+---
\ No newline at end of file
diff --git a/content/cities/sieghartskirchen/_index.md b/content/cities/sieghartskirchen/_index.md
index c3c185822c..c8d0b289bf 100644
--- a/content/cities/sieghartskirchen/_index.md
+++ b/content/cities/sieghartskirchen/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sieghartskirchen
 url: /sieghartskirchen/
-latitude: 48.254
-longitude: 16.014
+latitude: 48.255
+longitude: 16.012
 ---
\ No newline at end of file
diff --git a/content/cities/sierning/_index.md b/content/cities/sierning/_index.md
index 8abcdeba80..1f417e490a 100644
--- a/content/cities/sierning/_index.md
+++ b/content/cities/sierning/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sierning
 url: /sierning/
-latitude: 48.043
-longitude: 14.308
+latitude: 48.044
+longitude: 14.309
 ---
\ No newline at end of file
diff --git a/content/cities/sipbachzell/ohg-guntendorfer.md b/content/cities/sipbachzell/ohg-guntendorfer.md
new file mode 100644
index 0000000000..019a24ac2d
--- /dev/null
+++ b/content/cities/sipbachzell/ohg-guntendorfer.md
@@ -0,0 +1,5 @@
+---
+title: "OHG Guntendorfer"
+url: /sipbachzell/ohg-guntendorfer/
+shop: Autohaus
+---
\ No newline at end of file
diff --git a/content/cities/soeding-sankt-johann/_index.md b/content/cities/soeding-sankt-johann/_index.md
index 8caa0d55ba..b9a0a9e015 100644
--- a/content/cities/soeding-sankt-johann/_index.md
+++ b/content/cities/soeding-sankt-johann/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Söding-Sankt Johann
 url: /soeding-sankt-johann/
-latitude: 47.005
-longitude: 15.263
+latitude: 47.001
+longitude: 15.239
 ---
\ No newline at end of file
diff --git a/content/cities/sommerein/_index.md b/content/cities/sommerein/_index.md
index 540082ce7f..faca0dbebc 100644
--- a/content/cities/sommerein/_index.md
+++ b/content/cities/sommerein/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Sommerein
 url: /sommerein/
-latitude: 47.991
-longitude: 16.657
+latitude: 47.996
+longitude: 16.662
 ---
\ No newline at end of file
diff --git a/content/cities/st-anton-arlberg/_index.md b/content/cities/st-anton-arlberg/_index.md
index 74b0bec27f..2f62c99dc6 100644
--- a/content/cities/st-anton-arlberg/_index.md
+++ b/content/cities/st-anton-arlberg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: St Anton/Arlberg
 url: /st-anton-arlberg/
-latitude: 47.144
-longitude: 10.301
+latitude: 47.127
+longitude: 10.213
 ---
\ No newline at end of file
diff --git a/content/cities/st-johann-in-tirol/schmidts.md b/content/cities/st-johann-in-tirol/schmidts.md
index ebff340cf1..66853d3788 100644
--- a/content/cities/st-johann-in-tirol/schmidts.md
+++ b/content/cities/st-johann-in-tirol/schmidts.md
@@ -1,5 +1,5 @@
 ---
-title: "SCHMIDT'S"
+title: "Schmidt's"
 url: /st-johann-in-tirol/schmidts/
 shop: Eisenwaren
 ---
\ No newline at end of file
diff --git a/content/cities/st-marienkirchen-an-der-polsenz/_index.md b/content/cities/st-marienkirchen-an-der-polsenz/_index.md
index d928ffa7a5..c87c7f7ce8 100644
--- a/content/cities/st-marienkirchen-an-der-polsenz/_index.md
+++ b/content/cities/st-marienkirchen-an-der-polsenz/_index.md
@@ -1,6 +1,6 @@
 ---
 title: St. Marienkirchen an der Polsenz
 url: /st-marienkirchen-an-der-polsenz/
-latitude: 48.254
-longitude: 13.97
+latitude: 48.263
+longitude: 13.93
 ---
\ No newline at end of file
diff --git a/content/cities/st-poelten/goendle-engelbert-laimer-strasse.md b/content/cities/st-poelten/goendle-engelbert-laimer-strasse.md
new file mode 100644
index 0000000000..e4356d187a
--- /dev/null
+++ b/content/cities/st-poelten/goendle-engelbert-laimer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Göndle"
+url: /st-poelten/goendle-engelbert-laimer-strasse/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/st-poelten/personalshop.md b/content/cities/st-poelten/personalshop.md
new file mode 100644
index 0000000000..54fa269d26
--- /dev/null
+++ b/content/cities/st-poelten/personalshop.md
@@ -0,0 +1,5 @@
+---
+title: "Personalshop"
+url: /st-poelten/personalshop/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/st-poelten/relax.md b/content/cities/st-poelten/relax.md
deleted file mode 100644
index 327a9dde88..0000000000
--- a/content/cities/st-poelten/relax.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Relax"
-url: /st-poelten/relax/
-shop: Kosmetik
----
\ No newline at end of file
diff --git a/content/cities/steinaweg/_index.md b/content/cities/steinaweg/_index.md
index 4743137c5d..e38c198a5f 100644
--- a/content/cities/steinaweg/_index.md
+++ b/content/cities/steinaweg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Steinaweg
 url: /steinaweg/
-latitude: 48.367
-longitude: 15.598
+latitude: 48.368
+longitude: 15.595
 ---
\ No newline at end of file
diff --git a/content/cities/steyregg/_index.md b/content/cities/steyregg/_index.md
index bb7f07d8a2..83f9983d3b 100644
--- a/content/cities/steyregg/_index.md
+++ b/content/cities/steyregg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Steyregg
 url: /steyregg/
-latitude: 48.285
-longitude: 14.37
+latitude: 48.284
+longitude: 14.355
 ---
\ No newline at end of file
diff --git a/content/cities/telfs/baguette-anton-auer-strasse.md b/content/cities/telfs/baguette-anton-auer-strasse.md
new file mode 100644
index 0000000000..9fed2bfc69
--- /dev/null
+++ b/content/cities/telfs/baguette-anton-auer-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "Baguette"
+url: /telfs/baguette-anton-auer-strasse/
+shop: Bäckerei
+---
\ No newline at end of file
diff --git a/content/cities/telfs/baguette-michael-seeber-strasse.md b/content/cities/telfs/baguette-michael-seeber-strasse.md
deleted file mode 100644
index b9d2afecf7..0000000000
--- a/content/cities/telfs/baguette-michael-seeber-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Baguette"
-url: /telfs/baguette-michael-seeber-strasse/
-shop: Bäckerei
----
\ No newline at end of file
diff --git a/content/cities/tribuswinkel/_index.md b/content/cities/tribuswinkel/_index.md
index 94341afff6..058eeb0326 100644
--- a/content/cities/tribuswinkel/_index.md
+++ b/content/cities/tribuswinkel/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Tribuswinkel
 url: /tribuswinkel/
-latitude: 47.991
-longitude: 16.277
+latitude: 47.999
+longitude: 16.271
 ---
\ No newline at end of file
diff --git a/content/cities/unzmarkt-frauenburg/_index.md b/content/cities/unzmarkt-frauenburg/_index.md
index d2f77b97f7..6bfda148b5 100644
--- a/content/cities/unzmarkt-frauenburg/_index.md
+++ b/content/cities/unzmarkt-frauenburg/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Unzmarkt-Frauenburg
 url: /unzmarkt-frauenburg/
-latitude: 47.199
-longitude: 14.447
+latitude: 47.198
+longitude: 14.445
 ---
\ No newline at end of file
diff --git a/content/cities/voelkermarkt/billa-klagenfurter-strasse.md b/content/cities/voelkermarkt/billa-klagenfurter-strasse.md
deleted file mode 100644
index 800c941eb5..0000000000
--- a/content/cities/voelkermarkt/billa-klagenfurter-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Billa"
-url: /voelkermarkt/billa-klagenfurter-strasse/
-shop: Supermarkt
----
\ No newline at end of file
diff --git a/content/cities/voelkermarkt/billa-umfahrungsstrasse.md b/content/cities/voelkermarkt/billa-umfahrungsstrasse.md
new file mode 100644
index 0000000000..3c3abc151c
--- /dev/null
+++ b/content/cities/voelkermarkt/billa-umfahrungsstrasse.md
@@ -0,0 +1,5 @@
+---
+title: "Billa"
+url: /voelkermarkt/billa-umfahrungsstrasse/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/weiz/die-neuen-gleisdorfer-strasse-2.md b/content/cities/weiz/die-neuen-gleisdorfer-strasse-2.md
index dbcae1b5fa..9c5a348904 100644
--- a/content/cities/weiz/die-neuen-gleisdorfer-strasse-2.md
+++ b/content/cities/weiz/die-neuen-gleisdorfer-strasse-2.md
@@ -1,5 +1,5 @@
 ---
 title: "Die Neuen"
 url: /weiz/die-neuen-gleisdorfer-strasse-2/
-shop: Allgemein
+shop: Fliesen
 ---
\ No newline at end of file
diff --git a/content/cities/weiz/die-neuen-gleisdorfer-strasse.md b/content/cities/weiz/die-neuen-gleisdorfer-strasse.md
index d90545fe2f..8aae6f5ba2 100644
--- a/content/cities/weiz/die-neuen-gleisdorfer-strasse.md
+++ b/content/cities/weiz/die-neuen-gleisdorfer-strasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Die Neuen"
 url: /weiz/die-neuen-gleisdorfer-strasse/
-shop: Badezimmer
+shop: Allgemein
 ---
\ No newline at end of file
diff --git a/content/cities/weiz/die-neuen.md b/content/cities/weiz/die-neuen.md
index 7549461d23..2ac031e759 100644
--- a/content/cities/weiz/die-neuen.md
+++ b/content/cities/weiz/die-neuen.md
@@ -1,5 +1,5 @@
 ---
 title: "Die Neuen"
 url: /weiz/die-neuen/
-shop: Fliesen
+shop: Badezimmer
 ---
\ No newline at end of file
diff --git a/content/cities/wenns/_index.md b/content/cities/wenns/_index.md
index 120aaff423..cc1a6db1a9 100644
--- a/content/cities/wenns/_index.md
+++ b/content/cities/wenns/_index.md
@@ -2,5 +2,5 @@
 title: Wenns
 url: /wenns/
 latitude: 47.168
-longitude: 10.731
+longitude: 10.732
 ---
\ No newline at end of file
diff --git a/content/cities/wenns/friseursalon-helga.md b/content/cities/wenns/friseursalon-helga.md
deleted file mode 100644
index 60be5fbd04..0000000000
--- a/content/cities/wenns/friseursalon-helga.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Friseursalon Helga"
-url: /wenns/friseursalon-helga/
-shop: Friseur
----
\ No newline at end of file
diff --git a/content/cities/wenns/kfz-werkstaette-mike.md b/content/cities/wenns/kfz-werkstaette-mike.md
new file mode 100644
index 0000000000..a2d086bf62
--- /dev/null
+++ b/content/cities/wenns/kfz-werkstaette-mike.md
@@ -0,0 +1,5 @@
+---
+title: "Kfz-Werkstätte Mike"
+url: /wenns/kfz-werkstaette-mike/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/wenns/spar.md b/content/cities/wenns/spar.md
new file mode 100644
index 0000000000..625a0cf571
--- /dev/null
+++ b/content/cities/wenns/spar.md
@@ -0,0 +1,5 @@
+---
+title: "Spar"
+url: /wenns/spar/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/wernstein-am-inn/_index.md b/content/cities/wernstein-am-inn/_index.md
index 136ae34c54..3cea862f55 100644
--- a/content/cities/wernstein-am-inn/_index.md
+++ b/content/cities/wernstein-am-inn/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Wernstein am Inn
 url: /wernstein-am-inn/
-latitude: 48.511
+latitude: 48.514
 longitude: 13.461
 ---
\ No newline at end of file
diff --git a/content/cities/wien/_index.md b/content/cities/wien/_index.md
index f53d0aab94..669368ac85 100644
--- a/content/cities/wien/_index.md
+++ b/content/cities/wien/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Wien
 url: /wien/
-latitude: 48.191
-longitude: 16.28
+latitude: 48.223
+longitude: 16.313
 ---
\ No newline at end of file
diff --git a/content/cities/wien/autohaus-hetzendorf.md b/content/cities/wien/autohaus-hetzendorf.md
new file mode 100644
index 0000000000..0913e29718
--- /dev/null
+++ b/content/cities/wien/autohaus-hetzendorf.md
@@ -0,0 +1,5 @@
+---
+title: "Autohaus Hetzendorf"
+url: /wien/autohaus-hetzendorf/
+shop: Autowerkstatt
+---
\ No newline at end of file
diff --git a/content/cities/wien/bauhaus-bergmillergasse.md b/content/cities/wien/bauhaus-bergmillergasse.md
new file mode 100644
index 0000000000..8e3ae77637
--- /dev/null
+++ b/content/cities/wien/bauhaus-bergmillergasse.md
@@ -0,0 +1,5 @@
+---
+title: "Bauhaus"
+url: /wien/bauhaus-bergmillergasse/
+shop: Baumarkt
+---
\ No newline at end of file
diff --git a/content/cities/wien/bauhaus-hirschstettner-strasse.md b/content/cities/wien/bauhaus-hirschstettner-strasse.md
deleted file mode 100644
index 90eafd9265..0000000000
--- a/content/cities/wien/bauhaus-hirschstettner-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Bauhaus"
-url: /wien/bauhaus-hirschstettner-strasse/
-shop: Baumarkt
----
\ No newline at end of file
diff --git a/content/cities/wien/bhs.md b/content/cities/wien/bhs.md
deleted file mode 100644
index 1a0118207a..0000000000
--- a/content/cities/wien/bhs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "BHS"
-url: /wien/bhs/
-shop: Sport
----
\ No newline at end of file
diff --git a/content/cities/wien/billa-bruenner-strasse-3.md b/content/cities/wien/billa-bruenner-strasse-3.md
new file mode 100644
index 0000000000..ec64e716ee
--- /dev/null
+++ b/content/cities/wien/billa-bruenner-strasse-3.md
@@ -0,0 +1,5 @@
+---
+title: "Billa"
+url: /wien/billa-bruenner-strasse-3/
+shop: Supermarkt
+---
\ No newline at end of file
diff --git a/content/cities/wien/billa-plus-julius-meinl-gasse.md b/content/cities/wien/billa-plus-amalienstrasse.md
similarity index 51%
rename from content/cities/wien/billa-plus-julius-meinl-gasse.md
rename to content/cities/wien/billa-plus-amalienstrasse.md
index 8885a3fcaf..935a1f8942 100644
--- a/content/cities/wien/billa-plus-julius-meinl-gasse.md
+++ b/content/cities/wien/billa-plus-amalienstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Billa Plus"
-url: /wien/billa-plus-julius-meinl-gasse/
+url: /wien/billa-plus-amalienstrasse/
 shop: Supermarkt
 ---
\ No newline at end of file
diff --git a/content/cities/wien/d-b-gebrauchtwagen.md b/content/cities/wien/d-b-gebrauchtwagen.md
deleted file mode 100644
index 4798145029..0000000000
--- a/content/cities/wien/d-b-gebrauchtwagen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "D.B. Gebrauchtwagen"
-url: /wien/d-b-gebrauchtwagen/
-shop: Autohaus
----
\ No newline at end of file
diff --git a/content/cities/wien/dm-lerchenfelder-strasse.md b/content/cities/wien/dm-lerchenfelder-strasse.md
new file mode 100644
index 0000000000..c8ede89902
--- /dev/null
+++ b/content/cities/wien/dm-lerchenfelder-strasse.md
@@ -0,0 +1,5 @@
+---
+title: "dm"
+url: /wien/dm-lerchenfelder-strasse/
+shop: Drogerie
+---
\ No newline at end of file
diff --git a/content/cities/wien/edelglas.md b/content/cities/wien/edelglas.md
new file mode 100644
index 0000000000..a682390d03
--- /dev/null
+++ b/content/cities/wien/edelglas.md
@@ -0,0 +1,5 @@
+---
+title: "Edelglas"
+url: /wien/edelglas/
+shop: Kunst
+---
\ No newline at end of file
diff --git a/content/cities/wien/fat-fox.md b/content/cities/wien/fat-fox.md
new file mode 100644
index 0000000000..174ea2ff2a
--- /dev/null
+++ b/content/cities/wien/fat-fox.md
@@ -0,0 +1,5 @@
+---
+title: "Fat Fox"
+url: /wien/fat-fox/
+shop: Tattoo
+---
\ No newline at end of file
diff --git a/content/cities/wien/hair-design-richard.md b/content/cities/wien/hair-design-richard.md
new file mode 100644
index 0000000000..6c20a875a0
--- /dev/null
+++ b/content/cities/wien/hair-design-richard.md
@@ -0,0 +1,5 @@
+---
+title: "Hair design Richard"
+url: /wien/hair-design-richard/
+shop: Friseur
+---
\ No newline at end of file
diff --git a/content/cities/wien/hans-wagner.md b/content/cities/wien/hans-wagner.md
deleted file mode 100644
index 5f94594d1e..0000000000
--- a/content/cities/wien/hans-wagner.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Hans Wagner"
-url: /wien/hans-wagner/
-shop: Massage
----
\ No newline at end of file
diff --git a/content/cities/wien/humana-2.md b/content/cities/wien/humana-2.md
new file mode 100644
index 0000000000..b28d485a4a
--- /dev/null
+++ b/content/cities/wien/humana-2.md
@@ -0,0 +1,5 @@
+---
+title: "Humana"
+url: /wien/humana-2/
+shop: Gebrauchtwaren
+---
\ No newline at end of file
diff --git a/content/cities/wien/humana-favoritenstrasse-2.md b/content/cities/wien/humana-favoritenstrasse-2.md
deleted file mode 100644
index 0ad4ac0c60..0000000000
--- a/content/cities/wien/humana-favoritenstrasse-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Humana"
-url: /wien/humana-favoritenstrasse-2/
-shop: Kleidung
----
\ No newline at end of file
diff --git a/content/cities/wien/humana-favoritenstrasse.md b/content/cities/wien/humana-favoritenstrasse.md
index 4caeaeb66c..2201a6a223 100644
--- a/content/cities/wien/humana-favoritenstrasse.md
+++ b/content/cities/wien/humana-favoritenstrasse.md
@@ -1,5 +1,5 @@
 ---
 title: "Humana"
 url: /wien/humana-favoritenstrasse/
-shop: Gebrauchtwaren
+shop: Kleidung
 ---
\ No newline at end of file
diff --git a/content/cities/wien/kaukas.md b/content/cities/wien/kaukas.md
new file mode 100644
index 0000000000..78cda45177
--- /dev/null
+++ b/content/cities/wien/kaukas.md
@@ -0,0 +1,5 @@
+---
+title: "Kaukas"
+url: /wien/kaukas/
+shop: Teppiche
+---
\ No newline at end of file
diff --git a/content/cities/wien/komolka-mariahilfer-strasse.md b/content/cities/wien/komolka-mariahilfer-strasse.md
deleted file mode 100644
index 31dea6009e..0000000000
--- a/content/cities/wien/komolka-mariahilfer-strasse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Komolka"
-url: /wien/komolka-mariahilfer-strasse/
-shop: Textil
----
\ No newline at end of file
diff --git a/content/cities/wien/lauf-und-kauf.md b/content/cities/wien/lauf-und-kauf.md
deleted file mode 100644
index 5bcc3c9b6e..0000000000
--- a/content/cities/wien/lauf-und-kauf.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Lauf & Kauf"
-url: /wien/lauf-und-kauf/
-shop: Dorfladen
----
\ No newline at end of file
diff --git a/content/cities/wien/maxis-markt.md b/content/cities/wien/maxis-markt.md
deleted file mode 100644
index aa5fed8fa6..0000000000
--- a/content/cities/wien/maxis-markt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Maxis Markt"
-url: /wien/maxis-markt/
-shop: Lebensmittel
----
\ No newline at end of file
diff --git a/content/cities/wien/mjam-market.md b/content/cities/wien/mjam-market.md
new file mode 100644
index 0000000000..9d55f353a2
--- /dev/null
+++ b/content/cities/wien/mjam-market.md
@@ -0,0 +1,5 @@
+---
+title: "mjam market"
+url: /wien/mjam-market/
+shop: Lebensmittel
+---
\ No newline at end of file
diff --git a/content/cities/wien/moda-woow.md b/content/cities/wien/moda-woow.md
new file mode 100644
index 0000000000..7c74e87a1c
--- /dev/null
+++ b/content/cities/wien/moda-woow.md
@@ -0,0 +1,5 @@
+---
+title: "Moda Woow"
+url: /wien/moda-woow/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/wien/modart-gallery.md b/content/cities/wien/modart-gallery.md
new file mode 100644
index 0000000000..4bf597f14f
--- /dev/null
+++ b/content/cities/wien/modart-gallery.md
@@ -0,0 +1,5 @@
+---
+title: "Modart Gallery"
+url: /wien/modart-gallery/
+shop: Kleidung
+---
\ No newline at end of file
diff --git a/content/cities/wien/o-books.md b/content/cities/wien/o-books.md
new file mode 100644
index 0000000000..1aacbb4cab
--- /dev/null
+++ b/content/cities/wien/o-books.md
@@ -0,0 +1,5 @@
+---
+title: "o*books"
+url: /wien/o-books/
+shop: Bücher
+---
\ No newline at end of file
diff --git a/content/cities/wien/obi-hadikgasse.md b/content/cities/wien/obi-schadinagasse.md
similarity index 53%
rename from content/cities/wien/obi-hadikgasse.md
rename to content/cities/wien/obi-schadinagasse.md
index bc4397d8e7..ec782781bc 100644
--- a/content/cities/wien/obi-hadikgasse.md
+++ b/content/cities/wien/obi-schadinagasse.md
@@ -1,5 +1,5 @@
 ---
 title: "OBI"
-url: /wien/obi-hadikgasse/
+url: /wien/obi-schadinagasse/
 shop: Baumarkt
 ---
\ No newline at end of file
diff --git a/content/cities/wien/peaches.md b/content/cities/wien/peaches.md
new file mode 100644
index 0000000000..ef0f39f9b6
--- /dev/null
+++ b/content/cities/wien/peaches.md
@@ -0,0 +1,5 @@
+---
+title: "peaches"
+url: /wien/peaches/
+shop: Leerstehend
+---
\ No newline at end of file
diff --git a/content/cities/wien/rosa-hofkirchner.md b/content/cities/wien/rosa-hofkirchner.md
deleted file mode 100644
index d36a09b127..0000000000
--- a/content/cities/wien/rosa-hofkirchner.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Rosa Hofkirchner"
-url: /wien/rosa-hofkirchner/
-shop: Elektronik
----
\ No newline at end of file
diff --git a/content/cities/wien/sos-augenoptik-altgasse.md b/content/cities/wien/sos-augenoptik-altgasse.md
new file mode 100644
index 0000000000..82ae923c96
--- /dev/null
+++ b/content/cities/wien/sos-augenoptik-altgasse.md
@@ -0,0 +1,5 @@
+---
+title: "SOS Augenoptik"
+url: /wien/sos-augenoptik-altgasse/
+shop: Optiker
+---
\ No newline at end of file
diff --git a/content/cities/wien/sos-augenoptik.md b/content/cities/wien/sos-augenoptik.md
index dda287c3ba..23270a2e40 100644
--- a/content/cities/wien/sos-augenoptik.md
+++ b/content/cities/wien/sos-augenoptik.md
@@ -1,5 +1,5 @@
 ---
-title: "SOS Augenoptik"
+title: "sos Augenoptik"
 url: /wien/sos-augenoptik/
 shop: Optiker
 ---
\ No newline at end of file
diff --git a/content/cities/wien/tuewi-hofladen.md b/content/cities/wien/tuewi-hofladen.md
new file mode 100644
index 0000000000..9a40a2c613
--- /dev/null
+++ b/content/cities/wien/tuewi-hofladen.md
@@ -0,0 +1,5 @@
+---
+title: "TüWi Hofladen"
+url: /wien/tuewi-hofladen/
+shop: Hofladen
+---
\ No newline at end of file
diff --git a/content/cities/wiesmath/_index.md b/content/cities/wiesmath/_index.md
index 84daf80e6c..2a40f146e1 100644
--- a/content/cities/wiesmath/_index.md
+++ b/content/cities/wiesmath/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Wiesmath
 url: /wiesmath/
-latitude: 47.623
-longitude: 16.287
+latitude: 47.616
+longitude: 16.288
 ---
\ No newline at end of file
diff --git a/content/cities/wolfern/_index.md b/content/cities/wolfern/_index.md
index 97a79bfb1f..6e8c85c236 100644
--- a/content/cities/wolfern/_index.md
+++ b/content/cities/wolfern/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Wolfern
 url: /wolfern/
-latitude: 48.098
-longitude: 14.367
+latitude: 48.075
+longitude: 14.391
 ---
\ No newline at end of file
diff --git a/content/cities/ybbs-an-der-donau/_index.md b/content/cities/ybbs-an-der-donau/_index.md
index da5680cbe3..ec43b09bdb 100644
--- a/content/cities/ybbs-an-der-donau/_index.md
+++ b/content/cities/ybbs-an-der-donau/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Ybbs an der Donau
 url: /ybbs-an-der-donau/
-latitude: 48.177
-longitude: 15.083
+latitude: 48.178
+longitude: 15.081
 ---
\ No newline at end of file
diff --git a/content/cities/zwischenwasser/kaesehof.md b/content/cities/zwischenwasser/kaesehof.md
new file mode 100644
index 0000000000..436b51a53c
--- /dev/null
+++ b/content/cities/zwischenwasser/kaesehof.md
@@ -0,0 +1,5 @@
+---
+title: "Käsehof"
+url: /zwischenwasser/kaesehof/
+shop: Hofladen
+---
\ No newline at end of file
diff --git a/data/cities/altmuenster/baeckerei-reingruber.yml b/data/cities/altmuenster/baeckerei-reingruber.yml
index 9e8d387667..0fcd3914a6 100644
--- a/data/cities/altmuenster/baeckerei-reingruber.yml
+++ b/data/cities/altmuenster/baeckerei-reingruber.yml
@@ -4,7 +4,7 @@ latitude: 47.89548
 longitude: 13.71465
 postcode: "4814"
 city: Altmünster
-street: Reindlmühl
+street: ""
 housenumber: "5"
 phone: ""
 opening_hours: ""
diff --git a/data/cities/attersee/bienenhof-attersee.yml b/data/cities/attersee/bienenhof-attersee.yml
index ac7f852734..48f6f56e1f 100644
--- a/data/cities/attersee/bienenhof-attersee.yml
+++ b/data/cities/attersee/bienenhof-attersee.yml
@@ -4,7 +4,7 @@ latitude: 47.92039
 longitude: 13.52367
 postcode: "4864"
 city: Attersee
-street: Neuhofen
+street: ""
 housenumber: "5"
 phone: ""
 opening_hours: ""
diff --git a/data/cities/bad-radkersburg/sued-ost-shopping.yml b/data/cities/bad-radkersburg/sued-ost-shopping.yml
new file mode 100644
index 0000000000..8fffb3636b
--- /dev/null
+++ b/data/cities/bad-radkersburg/sued-ost-shopping.yml
@@ -0,0 +1,11 @@
+id: 466035349
+type: node
+latitude: 46.69054
+longitude: 15.9811
+postcode: "8490"
+city: Bad Radkersburg
+street: Halbenrainerstraße
+housenumber: 11-13
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/bischofshofen/trafik-bundesstrasse.yml b/data/cities/bischofshofen/trafik-bundesstrasse.yml
index b41c1b22ae..ed3ffe2ad3 100644
--- a/data/cities/bischofshofen/trafik-bundesstrasse.yml
+++ b/data/cities/bischofshofen/trafik-bundesstrasse.yml
@@ -1,7 +1,7 @@
 id: 2358463428
 type: node
-latitude: 47.39521
-longitude: 13.22008
+latitude: 47.39515
+longitude: 13.21994
 postcode: "5500"
 city: Bischofshofen
 street: Bundesstraße
diff --git a/data/cities/bregenz/metzgerei-ruemmele.yml b/data/cities/bregenz/metzgerei-ruemmele.yml
deleted file mode 100644
index a78413aff5..0000000000
--- a/data/cities/bregenz/metzgerei-ruemmele.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2446201713
-type: node
-latitude: 47.50278
-longitude: 9.73032
-postcode: "6900"
-city: Bregenz
-street: Mehrerauer Straße
-housenumber: 24a
-phone: ""
-opening_hours: Mo-Su
-website: ""
diff --git a/data/cities/bregenz/wolford-factory-outlet.yml b/data/cities/bregenz/wolford-factory-outlet.yml
index 834fc1c2da..073a447e1c 100644
--- a/data/cities/bregenz/wolford-factory-outlet.yml
+++ b/data/cities/bregenz/wolford-factory-outlet.yml
@@ -1,7 +1,7 @@
 id: 242500580
 type: node
-latitude: 47.49538
-longitude: 9.71479
+latitude: 47.49539
+longitude: 9.7148
 postcode: "6900"
 city: Bregenz
 street: Wolfordstraße
diff --git a/data/cities/breitenfurt-bei-wien/kfz-schillhammer.yml b/data/cities/breitenfurt-bei-wien/kfz-schillhammer.yml
new file mode 100644
index 0000000000..194145b450
--- /dev/null
+++ b/data/cities/breitenfurt-bei-wien/kfz-schillhammer.yml
@@ -0,0 +1,11 @@
+id: 3735430442
+type: node
+latitude: 48.13593
+longitude: 16.19415
+postcode: "2384"
+city: Breitenfurt bei Wien
+street: Hauptstraße
+housenumber: "109"
+phone: +43 2239 2171
+opening_hours: Mo-Th 07:15-12:00,12:30-16:00; Fr 07:15-12:45
+website: https://www.kfz-schillhammer.at/
diff --git a/data/cities/buers/hervis.yml b/data/cities/buers/hervis.yml
index fcd8b98c47..8e7350f0fa 100644
--- a/data/cities/buers/hervis.yml
+++ b/data/cities/buers/hervis.yml
@@ -7,5 +7,5 @@ city: Bürs
 street: Almteilweg
 housenumber: "1"
 phone: ""
-opening_hours: Mo-Th 09:00-19:30; Fr 09:00-21:00; Sa 08:30-18:00
+opening_hours: Mo-Th 09:00-19:00; Fr 09:00-20:00; Sa 09:00-18:00
 website: https://www.hervis.at/
diff --git a/data/cities/eisenstadt/hofer-haidaeckerstrasse.yml b/data/cities/eisenstadt/hofer-haidaeckerstrasse.yml
deleted file mode 100644
index bb2e96a172..0000000000
--- a/data/cities/eisenstadt/hofer-haidaeckerstrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 144198186
-type: node
-latitude: 47.82545
-longitude: 16.53095
-postcode: "7000"
-city: Eisenstadt
-street: Haidäckerstraße
-housenumber: "4"
-phone: ""
-opening_hours: Mo-Fr 07:15-19:30; Sa 07:15-18:00
-website: ""
diff --git a/data/cities/eisenstadt/hofer-mattersburger-strasse.yml b/data/cities/eisenstadt/hofer-mattersburger-strasse.yml
new file mode 100644
index 0000000000..e4323b773b
--- /dev/null
+++ b/data/cities/eisenstadt/hofer-mattersburger-strasse.yml
@@ -0,0 +1,11 @@
+id: 141250981
+type: node
+latitude: 47.82948
+longitude: 16.52329
+postcode: "7000"
+city: Eisenstadt
+street: Mattersburger Straße
+housenumber: "35"
+phone: ""
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+website: ""
diff --git a/data/cities/eisenstadt/hofer.yml b/data/cities/eisenstadt/hofer.yml
index e4323b773b..bb2e96a172 100644
--- a/data/cities/eisenstadt/hofer.yml
+++ b/data/cities/eisenstadt/hofer.yml
@@ -1,11 +1,11 @@
-id: 141250981
+id: 144198186
 type: node
-latitude: 47.82948
-longitude: 16.52329
+latitude: 47.82545
+longitude: 16.53095
 postcode: "7000"
 city: Eisenstadt
-street: Mattersburger Straße
-housenumber: "35"
+street: Haidäckerstraße
+housenumber: "4"
 phone: ""
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+opening_hours: Mo-Fr 07:15-19:30; Sa 07:15-18:00
 website: ""
diff --git a/data/cities/fehring/bestattung-hold.yml b/data/cities/fehring/bestattung-hold.yml
new file mode 100644
index 0000000000..d22ae30066
--- /dev/null
+++ b/data/cities/fehring/bestattung-hold.yml
@@ -0,0 +1,11 @@
+id: 3821274629
+type: node
+latitude: 46.94002
+longitude: 16.00846
+postcode: "8350"
+city: Fehring
+street: Fürstenfelderstraße
+housenumber: "4"
+phone: +43 3155 2226
+opening_hours: 24/7
+website: http://www.bestattung-hold.at
diff --git a/data/cities/fehring/bestattung-schreiner-christoph.yml b/data/cities/fehring/bestattung-schreiner-christoph.yml
deleted file mode 100644
index 0aaedb93d0..0000000000
--- a/data/cities/fehring/bestattung-schreiner-christoph.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3821274629
-type: node
-latitude: 46.93453
-longitude: 16.00885
-postcode: "8350"
-city: Fehring
-street: Annengasse
-housenumber: "4"
-phone: ""
-opening_hours: ""
-website: http://www.schreiner-fehring.at
diff --git a/data/cities/feldbach/nkd.yml b/data/cities/feldbach/nkd.yml
index 9c7aa8d019..eb631dc38c 100644
--- a/data/cities/feldbach/nkd.yml
+++ b/data/cities/feldbach/nkd.yml
@@ -1,7 +1,7 @@
 id: 3903328405
 type: node
-latitude: 46.95044
-longitude: 15.89173
+latitude: 46.9504
+longitude: 15.89143
 postcode: "8330"
 city: Feldbach
 street: Gleichenberger Straße
diff --git a/data/cities/feldkirch/adeg-nofler-strasse.yml b/data/cities/feldkirch/adeg-nofler-strasse.yml
deleted file mode 100644
index 84347a1062..0000000000
--- a/data/cities/feldkirch/adeg-nofler-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 27780678
-type: node
-latitude: 47.25685
-longitude: 9.58687
-postcode: "6800"
-city: Feldkirch
-street: Nofler Straße
-housenumber: "34"
-phone: "+43552274951"
-opening_hours: Mo-Fr 07:30-19:00; Sa 07:30-17:00
-website: https://www.adeg.at/services/maerkte-oeffnungszeiten/adeg-moosbrugger
diff --git a/data/cities/feldkirch/adeg-runastrasse.yml b/data/cities/feldkirch/adeg-runastrasse.yml
new file mode 100644
index 0000000000..198b223347
--- /dev/null
+++ b/data/cities/feldkirch/adeg-runastrasse.yml
@@ -0,0 +1,11 @@
+id: 25310633
+type: node
+latitude: 47.26049
+longitude: 9.59934
+postcode: "6800"
+city: Feldkirch
+street: Runastraße
+housenumber: "8"
+phone: +43 5522 70528
+opening_hours: Mo-Fr 07:30-19:00; Sa 07:30-17:00
+website: https://www.adeg.at
diff --git a/data/cities/feldkirch/adeg.yml b/data/cities/feldkirch/adeg.yml
index 198b223347..84347a1062 100644
--- a/data/cities/feldkirch/adeg.yml
+++ b/data/cities/feldkirch/adeg.yml
@@ -1,11 +1,11 @@
-id: 25310633
+id: 27780678
 type: node
-latitude: 47.26049
-longitude: 9.59934
+latitude: 47.25685
+longitude: 9.58687
 postcode: "6800"
 city: Feldkirch
-street: Runastraße
-housenumber: "8"
-phone: +43 5522 70528
+street: Nofler Straße
+housenumber: "34"
+phone: "+43552274951"
 opening_hours: Mo-Fr 07:30-19:00; Sa 07:30-17:00
-website: https://www.adeg.at
+website: https://www.adeg.at/services/maerkte-oeffnungszeiten/adeg-moosbrugger
diff --git a/data/cities/feldkirch/allgaeuer-hof-gisingen.yml b/data/cities/feldkirch/allgaeuer-hof-gisingen.yml
new file mode 100644
index 0000000000..df01396584
--- /dev/null
+++ b/data/cities/feldkirch/allgaeuer-hof-gisingen.yml
@@ -0,0 +1,11 @@
+id: 12232458410
+type: node
+latitude: 47.26682
+longitude: 9.59566
+postcode: "6800"
+city: Feldkirch
+street: Ketschelenstraße
+housenumber: "66"
+phone: ""
+opening_hours: ""
+website: https://www.allgaeuer.at/
diff --git a/data/cities/gmunden/kia-motors-gmunden-bahnhofstrasse.yml b/data/cities/gmunden/kia-motors-gmunden-bahnhofstrasse.yml
new file mode 100644
index 0000000000..2de446881f
--- /dev/null
+++ b/data/cities/gmunden/kia-motors-gmunden-bahnhofstrasse.yml
@@ -0,0 +1,11 @@
+id: 8327552210
+type: node
+latitude: 47.92609
+longitude: 13.78563
+postcode: "4810"
+city: Gmunden
+street: Bahnhofstraße
+housenumber: "77"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/gmunden/kia-motors-gmunden-gruener-wald.yml b/data/cities/gmunden/kia-motors-gmunden-gruener-wald.yml
deleted file mode 100644
index 45c2ed7d63..0000000000
--- a/data/cities/gmunden/kia-motors-gmunden-gruener-wald.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8319877650
-type: node
-latitude: 47.92581
-longitude: 13.7854
-postcode: "4810"
-city: Gmunden
-street: Grüner Wald
-housenumber: "3"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/gmunden/kia-motors-gmunden.yml b/data/cities/gmunden/kia-motors-gmunden.yml
index 2de446881f..45c2ed7d63 100644
--- a/data/cities/gmunden/kia-motors-gmunden.yml
+++ b/data/cities/gmunden/kia-motors-gmunden.yml
@@ -1,11 +1,11 @@
-id: 8327552210
+id: 8319877650
 type: node
-latitude: 47.92609
-longitude: 13.78563
+latitude: 47.92581
+longitude: 13.7854
 postcode: "4810"
 city: Gmunden
-street: Bahnhofstraße
-housenumber: "77"
+street: Grüner Wald
+housenumber: "3"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/graz/billa-now-froehlichgasse.yml b/data/cities/graz/billa-now-froehlichgasse.yml
deleted file mode 100644
index 894f3001f0..0000000000
--- a/data/cities/graz/billa-now-froehlichgasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 87936628
-type: node
-latitude: 47.05596
-longitude: 15.44849
-postcode: "8010"
-city: Graz
-street: Fröhlichgasse
-housenumber: "45"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/graz/billa-now-muenzgrabenstrasse.yml b/data/cities/graz/billa-now-muenzgrabenstrasse.yml
new file mode 100644
index 0000000000..a2f70dbff7
--- /dev/null
+++ b/data/cities/graz/billa-now-muenzgrabenstrasse.yml
@@ -0,0 +1,12 @@
+id: 85666879
+type: node
+latitude: 47.05694
+longitude: 15.45361
+postcode: "8010"
+city: Graz
+street: Münzgrabenstraße
+housenumber: "121"
+phone: ""
+opening_hours: Mo-Fr 05:00-24:00; Sa,Su 06:00-24:00; PH 07:00-24:00; Dez 24 07:00-18:00b
+    Dez 31 07:00-20:00
+website: ""
diff --git a/data/cities/graz/billa-now.yml b/data/cities/graz/billa-now.yml
index a2f70dbff7..894f3001f0 100644
--- a/data/cities/graz/billa-now.yml
+++ b/data/cities/graz/billa-now.yml
@@ -1,12 +1,11 @@
-id: 85666879
+id: 87936628
 type: node
-latitude: 47.05694
-longitude: 15.45361
+latitude: 47.05596
+longitude: 15.44849
 postcode: "8010"
 city: Graz
-street: Münzgrabenstraße
-housenumber: "121"
+street: Fröhlichgasse
+housenumber: "45"
 phone: ""
-opening_hours: Mo-Fr 05:00-24:00; Sa,Su 06:00-24:00; PH 07:00-24:00; Dez 24 07:00-18:00b
-    Dez 31 07:00-20:00
+opening_hours: ""
 website: ""
diff --git a/data/cities/graz/billa-ragnitzstrasse-2.yml b/data/cities/graz/billa-ragnitzstrasse-2.yml
new file mode 100644
index 0000000000..944c44cc32
--- /dev/null
+++ b/data/cities/graz/billa-ragnitzstrasse-2.yml
@@ -0,0 +1,11 @@
+id: 84584348
+type: node
+latitude: 47.07754
+longitude: 15.49434
+postcode: "8047"
+city: Graz
+street: Ragnitzstraße
+housenumber: "149"
+phone: +43 316 337820
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+website: https://www.billa.at
diff --git a/data/cities/graz/billa-ragnitzstrasse.yml b/data/cities/graz/billa-ragnitzstrasse.yml
index 944c44cc32..6f76af7fe2 100644
--- a/data/cities/graz/billa-ragnitzstrasse.yml
+++ b/data/cities/graz/billa-ragnitzstrasse.yml
@@ -1,11 +1,11 @@
-id: 84584348
+id: 33054365
 type: node
-latitude: 47.07754
-longitude: 15.49434
+latitude: 47.07875
+longitude: 15.47296
 postcode: "8047"
 city: Graz
 street: Ragnitzstraße
-housenumber: "149"
-phone: +43 316 337820
+housenumber: 12-14
+phone: ""
 opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
-website: https://www.billa.at
+website: ""
diff --git a/data/cities/graz/billa-waltendorfer-guertel.yml b/data/cities/graz/billa-waltendorfer-guertel.yml
deleted file mode 100644
index b657d3b7b3..0000000000
--- a/data/cities/graz/billa-waltendorfer-guertel.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 31611256
-type: node
-latitude: 47.06301
-longitude: 15.4581
-postcode: "8010"
-city: Graz
-street: Waltendorfer Gürtel
-housenumber: "10"
-phone: ""
-opening_hours: Mo-Fr 07:00-19:15; Sa 07:15-18:00
-website: ""
diff --git a/data/cities/graz/billa.yml b/data/cities/graz/billa.yml
index 6f76af7fe2..b657d3b7b3 100644
--- a/data/cities/graz/billa.yml
+++ b/data/cities/graz/billa.yml
@@ -1,11 +1,11 @@
-id: 33054365
+id: 31611256
 type: node
-latitude: 47.07875
-longitude: 15.47296
-postcode: "8047"
+latitude: 47.06301
+longitude: 15.4581
+postcode: "8010"
 city: Graz
-street: Ragnitzstraße
-housenumber: 12-14
+street: Waltendorfer Gürtel
+housenumber: "10"
 phone: ""
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+opening_hours: Mo-Fr 07:00-19:15; Sa 07:15-18:00
 website: ""
diff --git a/data/cities/graz/chic-ethic-men-und-unisex.yml b/data/cities/graz/chic-ethic-men-und-unisex.yml
deleted file mode 100644
index faebf86020..0000000000
--- a/data/cities/graz/chic-ethic-men-und-unisex.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6331586443
-type: node
-latitude: 47.07038
-longitude: 15.44276
-postcode: "8010"
-city: Graz
-street: Bürgergasse
-housenumber: "11"
-phone: ""
-opening_hours: Tu-Fr 10:00-18:00; Sa 10:00-17:00
-website: ""
diff --git a/data/cities/graz/hundm-am-eisernen-tor.yml b/data/cities/graz/hundm-am-eisernen-tor.yml
new file mode 100644
index 0000000000..4e4d599a84
--- /dev/null
+++ b/data/cities/graz/hundm-am-eisernen-tor.yml
@@ -0,0 +1,11 @@
+id: 852798119
+type: node
+latitude: 47.06855
+longitude: 15.44134
+postcode: "8010"
+city: Graz
+street: Am Eisernen Tor
+housenumber: "11"
+phone: +43 800 6655900
+opening_hours: Mo -Fr 09:00-19:00; Sa 09:00-18:00
+website: https://www.hm.com/at/
diff --git a/data/cities/graz/hundm-hauptplatz.yml b/data/cities/graz/hundm-hauptplatz.yml
deleted file mode 100644
index 3bea10639b..0000000000
--- a/data/cities/graz/hundm-hauptplatz.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 847359599
-type: node
-latitude: 47.07135
-longitude: 15.4375
-postcode: "8010"
-city: Graz
-street: Hauptplatz
-housenumber: "10"
-phone: +43 800 6655900
-opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-18:00
-website: http://www.hm.com/at
diff --git a/data/cities/graz/hundm.yml b/data/cities/graz/hundm.yml
index 4e4d599a84..3bea10639b 100644
--- a/data/cities/graz/hundm.yml
+++ b/data/cities/graz/hundm.yml
@@ -1,11 +1,11 @@
-id: 852798119
+id: 847359599
 type: node
-latitude: 47.06855
-longitude: 15.44134
+latitude: 47.07135
+longitude: 15.4375
 postcode: "8010"
 city: Graz
-street: Am Eisernen Tor
-housenumber: "11"
+street: Hauptplatz
+housenumber: "10"
 phone: +43 800 6655900
-opening_hours: Mo -Fr 09:00-19:00; Sa 09:00-18:00
-website: https://www.hm.com/at/
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-18:00
+website: http://www.hm.com/at
diff --git a/data/cities/graz/lidl-kossgasse.yml b/data/cities/graz/lidl-kossgasse.yml
deleted file mode 100644
index 481f096466..0000000000
--- a/data/cities/graz/lidl-kossgasse.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-id: 85899383
-type: node
-latitude: 47.06454
-longitude: 15.46228
-postcode: "8010"
-city: Graz
-street: Koßgasse
-housenumber: "10"
-phone: ""
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00;Dec 24 07:00-13:00;Dec 31 07:00-15:00;
-    Su,Ph off
-website: ""
diff --git a/data/cities/graz/lidl-liebenauer-hauptstrasse.yml b/data/cities/graz/lidl-liebenauer-hauptstrasse.yml
new file mode 100644
index 0000000000..2a5b916710
--- /dev/null
+++ b/data/cities/graz/lidl-liebenauer-hauptstrasse.yml
@@ -0,0 +1,11 @@
+id: 84584414
+type: node
+latitude: 47.034
+longitude: 15.46326
+postcode: "8041"
+city: Graz
+street: Liebenauer Hauptstraße
+housenumber: "164"
+phone: ""
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+website: ""
diff --git a/data/cities/graz/lidl.yml b/data/cities/graz/lidl.yml
index 2a5b916710..481f096466 100644
--- a/data/cities/graz/lidl.yml
+++ b/data/cities/graz/lidl.yml
@@ -1,11 +1,12 @@
-id: 84584414
+id: 85899383
 type: node
-latitude: 47.034
-longitude: 15.46326
-postcode: "8041"
+latitude: 47.06454
+longitude: 15.46228
+postcode: "8010"
 city: Graz
-street: Liebenauer Hauptstraße
-housenumber: "164"
+street: Koßgasse
+housenumber: "10"
 phone: ""
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00;Dec 24 07:00-13:00;Dec 31 07:00-15:00;
+    Su,Ph off
 website: ""
diff --git a/data/cities/graz/oeamtc-graz-west-alte-poststrasse.yml b/data/cities/graz/oeamtc-graz-west-alte-poststrasse.yml
index d8b405fa23..89c331c1cf 100644
--- a/data/cities/graz/oeamtc-graz-west-alte-poststrasse.yml
+++ b/data/cities/graz/oeamtc-graz-west-alte-poststrasse.yml
@@ -1,11 +1,11 @@
-id: 3578416207
+id: 3578416208
 type: node
-latitude: 47.06604
-longitude: 15.41177
+latitude: 47.0662
+longitude: 15.41221
 postcode: "8020"
 city: Graz
 street: Alte Poststraße
 housenumber: "161"
 phone: ""
-opening_hours: ""
+opening_hours: 24/7
 website: ""
diff --git a/data/cities/graz/oeamtc-graz-west.yml b/data/cities/graz/oeamtc-graz-west.yml
index 89c331c1cf..d8b405fa23 100644
--- a/data/cities/graz/oeamtc-graz-west.yml
+++ b/data/cities/graz/oeamtc-graz-west.yml
@@ -1,11 +1,11 @@
-id: 3578416208
+id: 3578416207
 type: node
-latitude: 47.0662
-longitude: 15.41221
+latitude: 47.06604
+longitude: 15.41177
 postcode: "8020"
 city: Graz
 street: Alte Poststraße
 housenumber: "161"
 phone: ""
-opening_hours: 24/7
+opening_hours: ""
 website: ""
diff --git a/data/cities/graz/schnittig-olga-rudel-zeynek-gasse.yml b/data/cities/graz/schnittig-olga-rudel-zeynek-gasse.yml
index 1c14c125bb..aadeb87672 100644
--- a/data/cities/graz/schnittig-olga-rudel-zeynek-gasse.yml
+++ b/data/cities/graz/schnittig-olga-rudel-zeynek-gasse.yml
@@ -8,4 +8,4 @@ street: Olga-Rudel-Zeynek-Gasse
 housenumber: "4"
 phone: +43 316 25 27 94
 opening_hours: Tu-Th 09:00-18:00; Fr 09:00-19:00; Sa 08:00-13:00; Su,Mo off
-website: http://schnittig.at/graz-greencity/
+website: https://schnittig.at/graz-greencity/
diff --git a/data/cities/grosswilfersdorf/lagerhaus.yml b/data/cities/grosswilfersdorf/lagerhaus.yml
new file mode 100644
index 0000000000..c0902bdf6e
--- /dev/null
+++ b/data/cities/grosswilfersdorf/lagerhaus.yml
@@ -0,0 +1,11 @@
+id: 411720315
+type: node
+latitude: 47.07705
+longitude: 15.99635
+postcode: "8263"
+city: Großwilfersdorf
+street: ""
+housenumber: "240"
+phone: ""
+opening_hours: Mo-Fr 08:00-12:00, 13:30-17:00; Sa 08:00-12:00
+website: https://lagerhaus.at/thermenland
diff --git a/data/cities/hall-in-tirol/k-und-k-service-gmbh.yml b/data/cities/hall-in-tirol/k-und-k-service-gmbh.yml
new file mode 100644
index 0000000000..de72ff3adf
--- /dev/null
+++ b/data/cities/hall-in-tirol/k-und-k-service-gmbh.yml
@@ -0,0 +1,11 @@
+id: 935565083
+type: node
+latitude: 47.28076
+longitude: 11.48414
+postcode: "6060"
+city: Hall in Tirol
+street: Kasernenweg
+housenumber: 56a
+phone: "+4368110475800"
+opening_hours: ""
+website: https://www.kk-service-gmbh.at/
diff --git a/data/cities/horn/raiffeisen-lagerhaus-hollabrunn-horn.yml b/data/cities/horn/raiffeisen-lagerhaus-hollabrunn-horn.yml
new file mode 100644
index 0000000000..12d7022c1b
--- /dev/null
+++ b/data/cities/horn/raiffeisen-lagerhaus-hollabrunn-horn.yml
@@ -0,0 +1,11 @@
+id: 12229819972
+type: node
+latitude: 48.6661
+longitude: 15.66915
+postcode: "3580"
+city: Horn
+street: Bahnstraße
+housenumber: "32"
+phone: ""
+opening_hours: ""
+website: https://lagerhaus.at/
diff --git a/data/cities/huerm/friseur-christine.yml b/data/cities/huerm/friseur-christine.yml
deleted file mode 100644
index bb3b245025..0000000000
--- a/data/cities/huerm/friseur-christine.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 489042064
-type: node
-latitude: 48.15635
-longitude: 15.41241
-postcode: "3383"
-city: Hürm
-street: Marktstraße
-housenumber: "1"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/imst/somi.yml b/data/cities/imst/somi.yml
index 4aab2e9699..b07b0fd730 100644
--- a/data/cities/imst/somi.yml
+++ b/data/cities/imst/somi.yml
@@ -7,5 +7,5 @@ city: Imst
 street: Dr. Carl-Pfeiffenberger-Straße
 housenumber: "4"
 phone: +43 (0) 650 9240080
-opening_hours: 'Di: 10:00-13:00Uhr, Mi: 15:00-18:00Uhr, Do: 10:00-13:00Uhr'
+opening_hours: Tu,Th 10:00-13:00; We 15:00-18:00
 website: ""
diff --git a/data/cities/innsbruck/cunda-2.yml b/data/cities/innsbruck/cunda-2.yml
index fdcfb543db..3bbcb79977 100644
--- a/data/cities/innsbruck/cunda-2.yml
+++ b/data/cities/innsbruck/cunda-2.yml
@@ -1,7 +1,7 @@
-id: 4532845118
+id: 1322725174
 type: node
-latitude: 47.26461
-longitude: 11.37362
+latitude: 47.26464
+longitude: 11.37393
 postcode: "6020"
 city: Innsbruck
 street: ""
diff --git a/data/cities/innsbruck/hofer-hoettinger-au.yml b/data/cities/innsbruck/hofer-hoettinger-au.yml
index 7491fe6b20..4fe427e4db 100644
--- a/data/cities/innsbruck/hofer-hoettinger-au.yml
+++ b/data/cities/innsbruck/hofer-hoettinger-au.yml
@@ -1,7 +1,7 @@
-id: 587759692
+id: 1322725183
 type: node
-latitude: 47.2643
-longitude: 11.37386
+latitude: 47.26445
+longitude: 11.37338
 postcode: "6020"
 city: Innsbruck
 street: Höttinger Au
diff --git a/data/cities/innsbruck/karosseriebau-aigner.yml b/data/cities/innsbruck/karosseriebau-aigner.yml
deleted file mode 100644
index e2838396a9..0000000000
--- a/data/cities/innsbruck/karosseriebau-aigner.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 47129502
-type: node
-latitude: 47.26806
-longitude: 11.42612
-postcode: "6020"
-city: Innsbruck
-street: Langer Weg
-housenumber: "20"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/innsbruck/spaeti-wilten-automatenshop.yml b/data/cities/innsbruck/spaeti-wilten-automatenshop.yml
new file mode 100644
index 0000000000..8a47356fd0
--- /dev/null
+++ b/data/cities/innsbruck/spaeti-wilten-automatenshop.yml
@@ -0,0 +1,11 @@
+id: 4447226672
+type: node
+latitude: 47.25972
+longitude: 11.39628
+postcode: "6020"
+city: Innsbruck
+street: Leopoldstraße
+housenumber: 28a
+phone: ""
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/kirchham/toyota-hochreiter.yml b/data/cities/kirchham/toyota-hochreiter.yml
index c5920fbaf3..8936750816 100644
--- a/data/cities/kirchham/toyota-hochreiter.yml
+++ b/data/cities/kirchham/toyota-hochreiter.yml
@@ -4,7 +4,7 @@ latitude: 47.97496
 longitude: 13.89927
 postcode: "4656"
 city: Kirchham
-street: Kirchham
+street: ""
 housenumber: "9"
 phone: ""
 opening_hours: ""
diff --git a/data/cities/klagenfurt-am-woerthersee/hofer-villacher-strasse.yml b/data/cities/klagenfurt-am-woerthersee/hofer-villacher-strasse.yml
deleted file mode 100644
index 35ad325072..0000000000
--- a/data/cities/klagenfurt-am-woerthersee/hofer-villacher-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 92317755
-type: node
-latitude: 46.61957
-longitude: 14.27656
-postcode: "9020"
-city: Klagenfurt am Wörthersee
-street: Villacher Straße
-housenumber: "181"
-phone: ""
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
-website: ""
diff --git a/data/cities/klagenfurt-am-woerthersee/hofer-waidmannsdorfer-strasse.yml b/data/cities/klagenfurt-am-woerthersee/hofer-waidmannsdorfer-strasse.yml
new file mode 100644
index 0000000000..7ca0d7cd2f
--- /dev/null
+++ b/data/cities/klagenfurt-am-woerthersee/hofer-waidmannsdorfer-strasse.yml
@@ -0,0 +1,11 @@
+id: 83385358
+type: node
+latitude: 46.60808
+longitude: 14.29172
+postcode: "9020"
+city: Klagenfurt am Wörthersee
+street: Waidmannsdorfer Straße
+housenumber: "135"
+phone: +43 (463) 261145
+opening_hours: Mo-Fr 07:15-19:30; Sa 07:15-18:00
+website: ""
diff --git a/data/cities/klagenfurt-am-woerthersee/hofer.yml b/data/cities/klagenfurt-am-woerthersee/hofer.yml
index 7ca0d7cd2f..35ad325072 100644
--- a/data/cities/klagenfurt-am-woerthersee/hofer.yml
+++ b/data/cities/klagenfurt-am-woerthersee/hofer.yml
@@ -1,11 +1,11 @@
-id: 83385358
+id: 92317755
 type: node
-latitude: 46.60808
-longitude: 14.29172
+latitude: 46.61957
+longitude: 14.27656
 postcode: "9020"
 city: Klagenfurt am Wörthersee
-street: Waidmannsdorfer Straße
-housenumber: "135"
-phone: +43 (463) 261145
-opening_hours: Mo-Fr 07:15-19:30; Sa 07:15-18:00
+street: Villacher Straße
+housenumber: "181"
+phone: ""
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
 website: ""
diff --git a/data/cities/korneuburg/spar-hauptplatz.yml b/data/cities/korneuburg/spar-hauptplatz.yml
new file mode 100644
index 0000000000..3d72c703b5
--- /dev/null
+++ b/data/cities/korneuburg/spar-hauptplatz.yml
@@ -0,0 +1,11 @@
+id: 435851674
+type: node
+latitude: 48.34459
+longitude: 16.33361
+postcode: "2100"
+city: Korneuburg
+street: Hauptplatz
+housenumber: 6-7
+phone: +43 2262 73289
+opening_hours: Mo-Fr 07:15-19:30; Sa 07:50-18:00; Su,PH off
+website: ""
diff --git a/data/cities/korneuburg/spar-leobendorfer-strasse.yml b/data/cities/korneuburg/spar-leobendorfer-strasse.yml
deleted file mode 100644
index c12a2aba3c..0000000000
--- a/data/cities/korneuburg/spar-leobendorfer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 435332752
-type: node
-latitude: 48.35066
-longitude: 16.33053
-postcode: "2100"
-city: Korneuburg
-street: Leobendorfer Straße
-housenumber: "25"
-phone: +43 2262 72284
-opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00; Su,PH off
-website: ""
diff --git a/data/cities/korneuburg/spar.yml b/data/cities/korneuburg/spar.yml
index 3d72c703b5..c12a2aba3c 100644
--- a/data/cities/korneuburg/spar.yml
+++ b/data/cities/korneuburg/spar.yml
@@ -1,11 +1,11 @@
-id: 435851674
+id: 435332752
 type: node
-latitude: 48.34459
-longitude: 16.33361
+latitude: 48.35066
+longitude: 16.33053
 postcode: "2100"
 city: Korneuburg
-street: Hauptplatz
-housenumber: 6-7
-phone: +43 2262 73289
-opening_hours: Mo-Fr 07:15-19:30; Sa 07:50-18:00; Su,PH off
+street: Leobendorfer Straße
+housenumber: "25"
+phone: +43 2262 72284
+opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00; Su,PH off
 website: ""
diff --git a/data/cities/krems-an-der-donau/hofer-steiner-donaulaende.yml b/data/cities/krems-an-der-donau/hofer-steiner-donaulaende.yml
deleted file mode 100644
index 37f1929286..0000000000
--- a/data/cities/krems-an-der-donau/hofer-steiner-donaulaende.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 62186921
-type: node
-latitude: 48.4042
-longitude: 15.59067
-postcode: "3500"
-city: Krems an der Donau
-street: Steiner Donaulände
-housenumber: "3"
-phone: +43 5 7030 36007
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00; Su off
-website: https://www.hofer.at/
diff --git a/data/cities/krems-an-der-donau/hofer-wiener-strasse.yml b/data/cities/krems-an-der-donau/hofer-wiener-strasse.yml
new file mode 100644
index 0000000000..d12843aa9e
--- /dev/null
+++ b/data/cities/krems-an-der-donau/hofer-wiener-strasse.yml
@@ -0,0 +1,11 @@
+id: 46129635
+type: node
+latitude: 48.41778
+longitude: 15.62725
+postcode: "3500"
+city: Krems an der Donau
+street: Wiener Straße
+housenumber: 126-128
+phone: +43 570 303 600 9
+opening_hours: ""
+website: https://www.hofer.at
diff --git a/data/cities/krems-an-der-donau/hofer.yml b/data/cities/krems-an-der-donau/hofer.yml
index d12843aa9e..37f1929286 100644
--- a/data/cities/krems-an-der-donau/hofer.yml
+++ b/data/cities/krems-an-der-donau/hofer.yml
@@ -1,11 +1,11 @@
-id: 46129635
+id: 62186921
 type: node
-latitude: 48.41778
-longitude: 15.62725
+latitude: 48.4042
+longitude: 15.59067
 postcode: "3500"
 city: Krems an der Donau
-street: Wiener Straße
-housenumber: 126-128
-phone: +43 570 303 600 9
-opening_hours: ""
-website: https://www.hofer.at
+street: Steiner Donaulände
+housenumber: "3"
+phone: +43 5 7030 36007
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00; Su off
+website: https://www.hofer.at/
diff --git a/data/cities/laakirchen/kofler-pool.yml b/data/cities/laakirchen/kofler-pool.yml
index 7ea2b3cbb9..4c51be0914 100644
--- a/data/cities/laakirchen/kofler-pool.yml
+++ b/data/cities/laakirchen/kofler-pool.yml
@@ -4,7 +4,7 @@ latitude: 47.95366
 longitude: 13.8189
 postcode: "4664"
 city: Laakirchen
-street: Oberweis
+street: ""
 housenumber: 3a
 phone: +43 660 50 42 019
 opening_hours: ""
diff --git a/data/cities/laakirchen/kreative-blumerei.yml b/data/cities/laakirchen/kreative-blumerei.yml
index 9f8ce6b4ca..3492301581 100644
--- a/data/cities/laakirchen/kreative-blumerei.yml
+++ b/data/cities/laakirchen/kreative-blumerei.yml
@@ -4,7 +4,7 @@ latitude: 47.9541
 longitude: 13.81901
 postcode: "4664"
 city: Laakirchen
-street: Oberweis
+street: ""
 housenumber: "3"
 phone: ""
 opening_hours: Mo-Fr 08:00-18:00, Sa 9:00-13:00
diff --git a/data/cities/landeck/a1-store.yml b/data/cities/landeck/a1-store.yml
new file mode 100644
index 0000000000..2a97394b21
--- /dev/null
+++ b/data/cities/landeck/a1-store.yml
@@ -0,0 +1,11 @@
+id: 12235081553
+type: node
+latitude: 47.13974
+longitude: 10.56625
+postcode: "6500"
+city: Landeck
+street: Malserstraße
+housenumber: "52"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/landeck/intersport.yml b/data/cities/landeck/intersport.yml
new file mode 100644
index 0000000000..857487e0fb
--- /dev/null
+++ b/data/cities/landeck/intersport.yml
@@ -0,0 +1,11 @@
+id: 7714144916
+type: node
+latitude: 47.13953
+longitude: 10.56627
+postcode: "6500"
+city: Landeck
+street: Malserstraße
+housenumber: "50"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/landeck/paradisch.yml b/data/cities/landeck/paradisch.yml
new file mode 100644
index 0000000000..1792a95183
--- /dev/null
+++ b/data/cities/landeck/paradisch.yml
@@ -0,0 +1,11 @@
+id: 12235081556
+type: node
+latitude: 47.13965
+longitude: 10.56597
+postcode: "6500"
+city: Landeck
+street: Malserstraße
+housenumber: "41"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/landeck/weltladen.yml b/data/cities/landeck/weltladen.yml
new file mode 100644
index 0000000000..953bfd05ee
--- /dev/null
+++ b/data/cities/landeck/weltladen.yml
@@ -0,0 +1,11 @@
+id: 12235081555
+type: node
+latitude: 47.13978
+longitude: 10.56625
+postcode: "6500"
+city: Landeck
+street: Malserstraße
+housenumber: "52"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/leoben/billa-draschestrasse.yml b/data/cities/leoben/billa-draschestrasse.yml
deleted file mode 100644
index 7fde1fbec5..0000000000
--- a/data/cities/leoben/billa-draschestrasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 87724015
-type: node
-latitude: 47.38361
-longitude: 15.09885
-postcode: ""
-city: Leoben
-street: Draschestraße
-housenumber: "5"
-phone: ""
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
-website: ""
diff --git a/data/cities/leoben/billa-turmgasse.yml b/data/cities/leoben/billa-turmgasse.yml
new file mode 100644
index 0000000000..bf0217021c
--- /dev/null
+++ b/data/cities/leoben/billa-turmgasse.yml
@@ -0,0 +1,11 @@
+id: 82642266
+type: node
+latitude: 47.36042
+longitude: 15.09636
+postcode: "8700"
+city: Leoben
+street: Turmgasse
+housenumber: "21"
+phone: ""
+opening_hours: Mo-Fr 06:45-19:00; Sa 07:15-18:00
+website: ""
diff --git a/data/cities/leoben/billa.yml b/data/cities/leoben/billa.yml
index bf0217021c..7fde1fbec5 100644
--- a/data/cities/leoben/billa.yml
+++ b/data/cities/leoben/billa.yml
@@ -1,11 +1,11 @@
-id: 82642266
+id: 87724015
 type: node
-latitude: 47.36042
-longitude: 15.09636
-postcode: "8700"
+latitude: 47.38361
+longitude: 15.09885
+postcode: ""
 city: Leoben
-street: Turmgasse
-housenumber: "21"
+street: Draschestraße
+housenumber: "5"
 phone: ""
-opening_hours: Mo-Fr 06:45-19:00; Sa 07:15-18:00
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
 website: ""
diff --git a/data/cities/linz/roswithas-frisurenstudio.yml b/data/cities/linz/roswithas-frisurenstudio.yml
index ef825fbbf1..8f52dfd411 100644
--- a/data/cities/linz/roswithas-frisurenstudio.yml
+++ b/data/cities/linz/roswithas-frisurenstudio.yml
@@ -7,5 +7,5 @@ city: Linz
 street: Freistädter Straße
 housenumber: "287"
 phone: "+43732244926"
-opening_hours: Di,Mi,Fr 09:00-18:00; Do 09:00-19:00; Sa 09:00-13:00
+opening_hours: Tu,We,Fr 09:00-18:00; Th 09:00-19:00; Sa 09:00-13:00
 website: ""
diff --git a/data/cities/muenchendorf/billa.yml b/data/cities/muenchendorf/billa.yml
new file mode 100644
index 0000000000..741cf2a1d7
--- /dev/null
+++ b/data/cities/muenchendorf/billa.yml
@@ -0,0 +1,11 @@
+id: 84470285
+type: node
+latitude: 48.03362
+longitude: 16.37982
+postcode: "2482"
+city: Münchendorf
+street: Wienerstraße
+housenumber: "3"
+phone: ""
+opening_hours: Mo-Fr 07:15-19:30; Sa 07:15-18:00
+website: ""
diff --git a/data/cities/neustift-im-stubaital/auto-hofer.yml b/data/cities/neustift-im-stubaital/auto-hofer.yml
index 4e9fed9616..3302a33d07 100644
--- a/data/cities/neustift-im-stubaital/auto-hofer.yml
+++ b/data/cities/neustift-im-stubaital/auto-hofer.yml
@@ -7,5 +7,5 @@ city: Neustift im Stubaital
 street: Gewerbezone
 housenumber: "10"
 phone: +43 5226 26610
-opening_hours: ""
+opening_hours: Mo-Th 08:00-12:00,13:00-17:00; Fr 08:00-12:00,13:00-15:30
 website: ""
diff --git a/data/cities/obernzell/netto-marken-discount.yml b/data/cities/obernzell/netto-marken-discount.yml
index 679fef9092..26d66eca8b 100644
--- a/data/cities/obernzell/netto-marken-discount.yml
+++ b/data/cities/obernzell/netto-marken-discount.yml
@@ -8,4 +8,4 @@ street: Passauer Straße
 housenumber: "9"
 phone: ""
 opening_hours: Mo-Sa 07:00-20:00
-website: ""
+website: https://www.netto-online.de/filialen/Obernzell/Passauer-Str-9/1379/
diff --git a/data/cities/obersulz/adeg.yml b/data/cities/obersulz/adeg.yml
new file mode 100644
index 0000000000..c44ad3617d
--- /dev/null
+++ b/data/cities/obersulz/adeg.yml
@@ -0,0 +1,11 @@
+id: 12224298351
+type: node
+latitude: 48.50384
+longitude: 16.67429
+postcode: "2224"
+city: Obersulz
+street: ""
+housenumber: "31"
+phone: ""
+opening_hours: Mo,Tu,Th,Fr 06:30-12:00,16:00-18:00; We,Sa 06:30-12:00
+website: ""
diff --git a/data/cities/rankweil/keckeis-gerold.yml b/data/cities/rankweil/keckeis-gerold.yml
index 2a41f7e5f9..6659a498d2 100644
--- a/data/cities/rankweil/keckeis-gerold.yml
+++ b/data/cities/rankweil/keckeis-gerold.yml
@@ -1,7 +1,7 @@
 id: 9923018409
 type: node
-latitude: 47.29153
-longitude: 9.61924
+latitude: 47.29134
+longitude: 9.61936
 postcode: "6830"
 city: Rankweil
 street: Riedstraße
diff --git a/data/cities/reintal/adeg.yml b/data/cities/reintal/adeg.yml
new file mode 100644
index 0000000000..eca57b3af1
--- /dev/null
+++ b/data/cities/reintal/adeg.yml
@@ -0,0 +1,11 @@
+id: 12224186967
+type: node
+latitude: 48.70041
+longitude: 16.82403
+postcode: "2276"
+city: Reintal
+street: Rein
+housenumber: "33"
+phone: ""
+opening_hours: Mo,We 07:00-12:00,15:00-18:00; Tu,Th-Sa 07:00-12:00; Fr 07:00-18:00
+website: ""
diff --git a/data/cities/salzburg/billa-gaisbergstrasse.yml b/data/cities/salzburg/billa-gaisbergstrasse.yml
new file mode 100644
index 0000000000..2da04ad721
--- /dev/null
+++ b/data/cities/salzburg/billa-gaisbergstrasse.yml
@@ -0,0 +1,11 @@
+id: 579727441
+type: node
+latitude: 47.80161
+longitude: 13.06671
+postcode: "5020"
+city: Salzburg
+street: Gaisbergstraße
+housenumber: 11A
+phone: ""
+opening_hours: Mo-Fr 07:15-19:00; Sa 07:15-18:00
+website: ""
diff --git a/data/cities/salzburg/billa-klessheimer-allee.yml b/data/cities/salzburg/billa-klessheimer-allee.yml
deleted file mode 100644
index e9a691d71d..0000000000
--- a/data/cities/salzburg/billa-klessheimer-allee.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 529683770
-type: node
-latitude: 47.81156
-longitude: 13.00622
-postcode: "5020"
-city: Salzburg
-street: Kleßheimer Allee
-housenumber: "90"
-phone: ""
-opening_hours: Mo-Fr 07:15-19:30, Sa 07:15-18:00
-website: ""
diff --git a/data/cities/salzburg/billa.yml b/data/cities/salzburg/billa.yml
index 2da04ad721..e9a691d71d 100644
--- a/data/cities/salzburg/billa.yml
+++ b/data/cities/salzburg/billa.yml
@@ -1,11 +1,11 @@
-id: 579727441
+id: 529683770
 type: node
-latitude: 47.80161
-longitude: 13.06671
+latitude: 47.81156
+longitude: 13.00622
 postcode: "5020"
 city: Salzburg
-street: Gaisbergstraße
-housenumber: 11A
+street: Kleßheimer Allee
+housenumber: "90"
 phone: ""
-opening_hours: Mo-Fr 07:15-19:00; Sa 07:15-18:00
+opening_hours: Mo-Fr 07:15-19:30, Sa 07:15-18:00
 website: ""
diff --git a/data/cities/salzburg/handyshop-salzburg-millenium-mobile.yml b/data/cities/salzburg/handyshop-salzburg-millenium-mobile.yml
new file mode 100644
index 0000000000..7c33fc7ca2
--- /dev/null
+++ b/data/cities/salzburg/handyshop-salzburg-millenium-mobile.yml
@@ -0,0 +1,11 @@
+id: 12231801950
+type: node
+latitude: 47.81092
+longitude: 13.04001
+postcode: "5020"
+city: Salzburg
+street: Saint-Julien-Straße
+housenumber: "15"
+phone: "+43662248959"
+opening_hours: Mo-Fr 09:00-18:00
+website: ""
diff --git a/data/cities/sankt-johann-im-pongau/hansaton-hoersysteme.yml b/data/cities/sankt-johann-im-pongau/hansaton-hoersysteme.yml
new file mode 100644
index 0000000000..2c00368b87
--- /dev/null
+++ b/data/cities/sankt-johann-im-pongau/hansaton-hoersysteme.yml
@@ -0,0 +1,11 @@
+id: 5421041767
+type: node
+latitude: 47.35028
+longitude: 13.20486
+postcode: "5600"
+city: Sankt Johann im Pongau
+street: Hauptstraße
+housenumber: "15"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.yml b/data/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.yml
index f375d22aa5..81bd64c272 100644
--- a/data/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.yml
+++ b/data/cities/sankt-michael-im-lungau/auto-suess-murtalstrasse.yml
@@ -1,7 +1,7 @@
-id: 2289036664
+id: 2289083038
 type: node
-latitude: 47.09579
-longitude: 13.63522
+latitude: 47.09578
+longitude: 13.63508
 postcode: ""
 city: Sankt Michael im Lungau
 street: Murtalstraße
diff --git a/data/cities/sankt-michael-im-lungau/auto-suess.yml b/data/cities/sankt-michael-im-lungau/auto-suess.yml
index 81bd64c272..f375d22aa5 100644
--- a/data/cities/sankt-michael-im-lungau/auto-suess.yml
+++ b/data/cities/sankt-michael-im-lungau/auto-suess.yml
@@ -1,7 +1,7 @@
-id: 2289083038
+id: 2289036664
 type: node
-latitude: 47.09578
-longitude: 13.63508
+latitude: 47.09579
+longitude: 13.63522
 postcode: ""
 city: Sankt Michael im Lungau
 street: Murtalstraße
diff --git a/data/cities/schlierbach/baeckerei-goessweiner.yml b/data/cities/schlierbach/baeckerei-goessweiner.yml
index 1177003a10..2c50c86878 100644
--- a/data/cities/schlierbach/baeckerei-goessweiner.yml
+++ b/data/cities/schlierbach/baeckerei-goessweiner.yml
@@ -7,5 +7,5 @@ city: Schlierbach
 street: Landstraße
 housenumber: "27"
 phone: ""
-opening_hours: ""
+opening_hours: Mo-Sa 05:00-12:00
 website: ""
diff --git a/data/cities/schwaz/hofladen-pirchnerhof.yml b/data/cities/schwaz/hofladen-pirchnerhof.yml
new file mode 100644
index 0000000000..0d2c407344
--- /dev/null
+++ b/data/cities/schwaz/hofladen-pirchnerhof.yml
@@ -0,0 +1,11 @@
+id: 12238445586
+type: node
+latitude: 47.35335
+longitude: 11.71928
+postcode: "6130"
+city: Schwaz
+street: Unterer Feldweg
+housenumber: "1"
+phone: ""
+opening_hours: Fr 07:00-17:00
+website: https://www.pirchnerhof-schwaz.at/
diff --git a/data/cities/seyring/kastlgreissler.yml b/data/cities/seyring/kastlgreissler.yml
new file mode 100644
index 0000000000..ae5d191747
--- /dev/null
+++ b/data/cities/seyring/kastlgreissler.yml
@@ -0,0 +1,11 @@
+id: 8939487665
+type: node
+latitude: 48.33285
+longitude: 16.48698
+postcode: "2201"
+city: Seyring
+street: Rechte Dorfstraße
+housenumber: ""
+phone: ""
+opening_hours: 24/7
+website: https://www.kastlgreissler.com/
diff --git a/data/cities/sipbachzell/ohg-guntendorfer.yml b/data/cities/sipbachzell/ohg-guntendorfer.yml
new file mode 100644
index 0000000000..298c157204
--- /dev/null
+++ b/data/cities/sipbachzell/ohg-guntendorfer.yml
@@ -0,0 +1,11 @@
+id: 161645812
+type: node
+latitude: 48.10404
+longitude: 14.0772
+postcode: "4621"
+city: Sipbachzell
+street: ""
+housenumber: "7"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/st-gallenkirch/sport-harry.yml b/data/cities/st-gallenkirch/sport-harry.yml
index 5f3d2288e5..4ad28cc466 100644
--- a/data/cities/st-gallenkirch/sport-harry.yml
+++ b/data/cities/st-gallenkirch/sport-harry.yml
@@ -7,5 +7,5 @@ city: St. Gallenkirch
 street: Montafonerstraße
 housenumber: "7"
 phone: +43 5557 21097
-opening_hours: Mo-Fr, Su 14:00-18:30; Sa 09:00-12:00, 14:00-18:30
-website: https://www.sportharry.at/en
+opening_hours: Mo-Fr 09:00-12:00, 14:00-18:00; Sa 09:00-13:00
+website: https://www.sportharry.at/
diff --git a/data/cities/st-johann-in-tirol/schmidts.yml b/data/cities/st-johann-in-tirol/schmidts.yml
index 7a585bab36..8bf6d945a4 100644
--- a/data/cities/st-johann-in-tirol/schmidts.yml
+++ b/data/cities/st-johann-in-tirol/schmidts.yml
@@ -8,4 +8,4 @@ street: Fieberbrunnerstraße
 housenumber: "20"
 phone: "+435352627560"
 opening_hours: Mo-Fr 07:30-12:00,13:00-18:00; Sa 08:00-12:00
-website: https://www.schmidts.at/page/standort
+website: https://www.schmidts.at/
diff --git a/data/cities/st-leonhard-im-pitztal/intersport.yml b/data/cities/st-leonhard-im-pitztal/intersport.yml
index 35119d68e9..0bbbc5d93f 100644
--- a/data/cities/st-leonhard-im-pitztal/intersport.yml
+++ b/data/cities/st-leonhard-im-pitztal/intersport.yml
@@ -8,4 +8,4 @@ street: Mandarfen
 housenumber: "82"
 phone: ""
 opening_hours: ""
-website: ""
+website: https://www.sport-huter.at/
diff --git a/data/cities/st-poelten/goendle-engelbert-laimer-strasse.yml b/data/cities/st-poelten/goendle-engelbert-laimer-strasse.yml
new file mode 100644
index 0000000000..962d7d7ba6
--- /dev/null
+++ b/data/cities/st-poelten/goendle-engelbert-laimer-strasse.yml
@@ -0,0 +1,11 @@
+id: 712450510
+type: node
+latitude: 48.21682
+longitude: 15.65271
+postcode: "3100"
+city: St. Pölten
+street: Engelbert Laimer-Straße
+housenumber: "3"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/st-poelten/personalshop.yml b/data/cities/st-poelten/personalshop.yml
new file mode 100644
index 0000000000..281ff7e146
--- /dev/null
+++ b/data/cities/st-poelten/personalshop.yml
@@ -0,0 +1,11 @@
+id: 12231534782
+type: node
+latitude: 48.21596
+longitude: 15.65235
+postcode: "3100"
+city: St. Pölten
+street: Wiener Straße
+housenumber: "213"
+phone: ""
+opening_hours: Mo-Fr 09:00-18:00; Sa 09:00-14:00
+website: ""
diff --git a/data/cities/st-poelten/relax.yml b/data/cities/st-poelten/relax.yml
deleted file mode 100644
index c9abb425ed..0000000000
--- a/data/cities/st-poelten/relax.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-id: 1672769702
-type: node
-latitude: 48.20465
-longitude: 15.62923
-postcode: "3100"
-city: St. Pölten
-street: Wiener Straße
-housenumber: "43"
-phone: ""
-opening_hours: Tu-Fr 08:30-12:30; Tu 13:30-19:00; We-Th 13:30-16:30; Fr 13:30-17:30;
-    Sa 08:00-12:00
-website: https://www.relax-studio.at
diff --git a/data/cities/steinbach-am-attersee/bmw-grasmann.yml b/data/cities/steinbach-am-attersee/bmw-grasmann.yml
index 2706ba51a3..178db8733d 100644
--- a/data/cities/steinbach-am-attersee/bmw-grasmann.yml
+++ b/data/cities/steinbach-am-attersee/bmw-grasmann.yml
@@ -4,7 +4,7 @@ latitude: 47.84102
 longitude: 13.54712
 postcode: "4853"
 city: Steinbach am Attersee
-street: Seefeld
+street: ""
 housenumber: "9"
 phone: ""
 opening_hours: ""
diff --git a/data/cities/steinbach-am-attersee/kate-und-kon.yml b/data/cities/steinbach-am-attersee/kate-und-kon.yml
index b442d0a997..3f161bb31c 100644
--- a/data/cities/steinbach-am-attersee/kate-und-kon.yml
+++ b/data/cities/steinbach-am-attersee/kate-und-kon.yml
@@ -4,7 +4,7 @@ latitude: 47.81346
 longitude: 13.54815
 postcode: "4853"
 city: Steinbach am Attersee
-street: Forstamt
+street: ""
 housenumber: "12"
 phone: ""
 opening_hours: Mo-Fr 08:00-18:00; Sa-Su, PH off
diff --git a/data/cities/steyr/zellinger.yml b/data/cities/steyr/zellinger.yml
index 281c520dcf..0449b39214 100644
--- a/data/cities/steyr/zellinger.yml
+++ b/data/cities/steyr/zellinger.yml
@@ -7,5 +7,5 @@ city: Steyr
 street: Enge Gasse
 housenumber: "13"
 phone: ""
-opening_hours: ""
+opening_hours: Mo-Tu,Th-Fr 08:30-17:30; We 08:30-14:00; Sa 08:00-12:00; Su,PH off
 website: https://www.zellinger.at/
diff --git a/data/cities/telfs/baguette-anton-auer-strasse.yml b/data/cities/telfs/baguette-anton-auer-strasse.yml
new file mode 100644
index 0000000000..ceacc5e703
--- /dev/null
+++ b/data/cities/telfs/baguette-anton-auer-strasse.yml
@@ -0,0 +1,11 @@
+id: 7005692750
+type: node
+latitude: 47.30356
+longitude: 11.07155
+postcode: "6410"
+city: Telfs
+street: Anton-Auer-Straße
+housenumber: "29"
+phone: +43 50322 926172
+opening_hours: Mo-Sa 08:00-17:00; PH off
+website: https://www.baguette.at/handel/baguette/telfs-anton-auer-strasse-29.html
diff --git a/data/cities/telfs/baguette-michael-seeber-strasse.yml b/data/cities/telfs/baguette-michael-seeber-strasse.yml
deleted file mode 100644
index 6dd35697b3..0000000000
--- a/data/cities/telfs/baguette-michael-seeber-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7004606841
-type: node
-latitude: 47.30458
-longitude: 11.07798
-postcode: "6410"
-city: Telfs
-street: Michael-Seeber-Straße
-housenumber: "3"
-phone: ""
-opening_hours: Mo-Sa 07:30-17:00; PH off
-website: https://www.baguette.at/handel/baguette/telfs-michael-seeber-strasse-3.html
diff --git a/data/cities/telfs/baguette.yml b/data/cities/telfs/baguette.yml
index ceacc5e703..6dd35697b3 100644
--- a/data/cities/telfs/baguette.yml
+++ b/data/cities/telfs/baguette.yml
@@ -1,11 +1,11 @@
-id: 7005692750
+id: 7004606841
 type: node
-latitude: 47.30356
-longitude: 11.07155
+latitude: 47.30458
+longitude: 11.07798
 postcode: "6410"
 city: Telfs
-street: Anton-Auer-Straße
-housenumber: "29"
-phone: +43 50322 926172
-opening_hours: Mo-Sa 08:00-17:00; PH off
-website: https://www.baguette.at/handel/baguette/telfs-anton-auer-strasse-29.html
+street: Michael-Seeber-Straße
+housenumber: "3"
+phone: ""
+opening_hours: Mo-Sa 07:30-17:00; PH off
+website: https://www.baguette.at/handel/baguette/telfs-michael-seeber-strasse-3.html
diff --git a/data/cities/timelkam/oeamtc.yml b/data/cities/timelkam/oeamtc.yml
index 32161bc9a2..70c26d9020 100644
--- a/data/cities/timelkam/oeamtc.yml
+++ b/data/cities/timelkam/oeamtc.yml
@@ -1,10 +1,10 @@
 id: 192499306
 type: node
-latitude: 48.00202
-longitude: 13.62476
+latitude: 48.00203
+longitude: 13.62493
 postcode: "4850"
 city: Timelkam
-street: Straß
+street: ""
 housenumber: "22"
 phone: ""
 opening_hours: ""
diff --git a/data/cities/treffen-am-ossiacher-see/spar.yml b/data/cities/treffen-am-ossiacher-see/spar.yml
index 0cd714369e..cf75409ce1 100644
--- a/data/cities/treffen-am-ossiacher-see/spar.yml
+++ b/data/cities/treffen-am-ossiacher-see/spar.yml
@@ -1,7 +1,7 @@
 id: 115848024
 type: node
-latitude: 46.66555
-longitude: 13.86054
+latitude: 46.66511
+longitude: 13.86133
 postcode: "9521"
 city: Treffen am Ossiacher See
 street: Sparstraße
diff --git a/data/cities/ungenach/baeckerei-lebersorger.yml b/data/cities/ungenach/baeckerei-lebersorger.yml
index c860286834..a0ad3e4a70 100644
--- a/data/cities/ungenach/baeckerei-lebersorger.yml
+++ b/data/cities/ungenach/baeckerei-lebersorger.yml
@@ -4,7 +4,7 @@ latitude: 48.04735
 longitude: 13.62337
 postcode: "4841"
 city: Ungenach
-street: Ungenach
+street: ""
 housenumber: "70"
 phone: ""
 opening_hours: ""
diff --git a/data/cities/ungenach/hemetsberger.yml b/data/cities/ungenach/hemetsberger.yml
index 65ddda47dd..c655aef87c 100644
--- a/data/cities/ungenach/hemetsberger.yml
+++ b/data/cities/ungenach/hemetsberger.yml
@@ -4,7 +4,7 @@ latitude: 48.04641
 longitude: 13.61201
 postcode: "4841"
 city: Ungenach
-street: Ungenach
+street: ""
 housenumber: "17"
 phone: ""
 opening_hours: ""
diff --git a/data/cities/voelkermarkt/billa-klagenfurter-strasse.yml b/data/cities/voelkermarkt/billa-klagenfurter-strasse.yml
deleted file mode 100644
index 38479ead42..0000000000
--- a/data/cities/voelkermarkt/billa-klagenfurter-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4546305691
-type: node
-latitude: 46.66057
-longitude: 14.61857
-postcode: "9100"
-city: Völkermarkt
-street: Klagenfurter Straße
-housenumber: "38"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/voelkermarkt/billa-umfahrungsstrasse.yml b/data/cities/voelkermarkt/billa-umfahrungsstrasse.yml
new file mode 100644
index 0000000000..eb82fea40d
--- /dev/null
+++ b/data/cities/voelkermarkt/billa-umfahrungsstrasse.yml
@@ -0,0 +1,11 @@
+id: 4546406489
+type: node
+latitude: 46.6627
+longitude: 14.63153
+postcode: "9100"
+city: Völkermarkt
+street: Umfahrungsstraße
+housenumber: 22-24
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/voelkermarkt/billa.yml b/data/cities/voelkermarkt/billa.yml
index eb82fea40d..38479ead42 100644
--- a/data/cities/voelkermarkt/billa.yml
+++ b/data/cities/voelkermarkt/billa.yml
@@ -1,11 +1,11 @@
-id: 4546406489
+id: 4546305691
 type: node
-latitude: 46.6627
-longitude: 14.63153
+latitude: 46.66057
+longitude: 14.61857
 postcode: "9100"
 city: Völkermarkt
-street: Umfahrungsstraße
-housenumber: 22-24
+street: Klagenfurter Straße
+housenumber: "38"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/weiz/die-neuen-gleisdorfer-strasse-2.yml b/data/cities/weiz/die-neuen-gleisdorfer-strasse-2.yml
index 4d4a0d9c60..c6f309f2d2 100644
--- a/data/cities/weiz/die-neuen-gleisdorfer-strasse-2.yml
+++ b/data/cities/weiz/die-neuen-gleisdorfer-strasse-2.yml
@@ -1,4 +1,4 @@
-id: 6654745827
+id: 6654654589
 type: node
 latitude: 47.20855
 longitude: 15.63226
diff --git a/data/cities/weiz/die-neuen-gleisdorfer-strasse.yml b/data/cities/weiz/die-neuen-gleisdorfer-strasse.yml
index e147ad9418..4d4a0d9c60 100644
--- a/data/cities/weiz/die-neuen-gleisdorfer-strasse.yml
+++ b/data/cities/weiz/die-neuen-gleisdorfer-strasse.yml
@@ -1,4 +1,4 @@
-id: 6654730312
+id: 6654745827
 type: node
 latitude: 47.20855
 longitude: 15.63226
diff --git a/data/cities/weiz/die-neuen.yml b/data/cities/weiz/die-neuen.yml
index c6f309f2d2..e147ad9418 100644
--- a/data/cities/weiz/die-neuen.yml
+++ b/data/cities/weiz/die-neuen.yml
@@ -1,4 +1,4 @@
-id: 6654654589
+id: 6654730312
 type: node
 latitude: 47.20855
 longitude: 15.63226
diff --git a/data/cities/wenns/friseursalon-helga.yml b/data/cities/wenns/friseursalon-helga.yml
deleted file mode 100644
index 7a6240775c..0000000000
--- a/data/cities/wenns/friseursalon-helga.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 155541871
-type: node
-latitude: 47.16784
-longitude: 10.73122
-postcode: "6473"
-city: Wenns
-street: Oberdorf
-housenumber: "209"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/wenns/kfz-werkstaette-mike.yml b/data/cities/wenns/kfz-werkstaette-mike.yml
new file mode 100644
index 0000000000..dbf36f8a55
--- /dev/null
+++ b/data/cities/wenns/kfz-werkstaette-mike.yml
@@ -0,0 +1,11 @@
+id: 177572395
+type: node
+latitude: 47.1716
+longitude: 10.73344
+postcode: "6473"
+city: Wenns
+street: Unterdorf
+housenumber: "101"
+phone: ""
+opening_hours: ""
+website: https://www.kfz-mike.at/
diff --git a/data/cities/wenns/spar.yml b/data/cities/wenns/spar.yml
new file mode 100644
index 0000000000..f82fbd5843
--- /dev/null
+++ b/data/cities/wenns/spar.yml
@@ -0,0 +1,11 @@
+id: 95660057
+type: node
+latitude: 47.16807
+longitude: 10.73152
+postcode: "6473"
+city: Wenns
+street: Unterdorf
+housenumber: "6"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/wien/d-b-gebrauchtwagen.yml b/data/cities/wien/autohaus-hetzendorf.yml
similarity index 69%
rename from data/cities/wien/d-b-gebrauchtwagen.yml
rename to data/cities/wien/autohaus-hetzendorf.yml
index 1c790fb1e4..cacd420a0f 100644
--- a/data/cities/wien/d-b-gebrauchtwagen.yml
+++ b/data/cities/wien/autohaus-hetzendorf.yml
@@ -6,6 +6,6 @@ postcode: "1120"
 city: Wien
 street: Hetzendorfer Straße
 housenumber: "1"
-phone: ""
-opening_hours: Mo-Fr 08:00-12:00, 13:00-18:00 Sa 08:0-12:00
+phone: +43 1 802 03 26
+opening_hours: Mo-Fr 08:00-18:00; Sa 08:00-15:00; Su,PH off
 website: https://www.autohaus-hetzendorf.at/
diff --git a/data/cities/wien/babe-handels-gmbh.yml b/data/cities/wien/babe-handels-gmbh.yml
index 38b51528db..d9d0a619c7 100644
--- a/data/cities/wien/babe-handels-gmbh.yml
+++ b/data/cities/wien/babe-handels-gmbh.yml
@@ -1,7 +1,7 @@
 id: 4883303585
 type: node
-latitude: 48.21171
-longitude: 16.31726
+latitude: 48.21172
+longitude: 16.31713
 postcode: "1160"
 city: Wien
 street: Thaliastraße
diff --git a/data/cities/wien/bauhaus-bergmillergasse.yml b/data/cities/wien/bauhaus-bergmillergasse.yml
new file mode 100644
index 0000000000..5ddd5a81a9
--- /dev/null
+++ b/data/cities/wien/bauhaus-bergmillergasse.yml
@@ -0,0 +1,11 @@
+id: 28739508
+type: node
+latitude: 48.20079
+longitude: 16.25333
+postcode: "1140"
+city: Wien
+street: Bergmillergasse
+housenumber: "12"
+phone: +43 1 9147666
+opening_hours: Mo-Fr 07:30-19:30; Sa 07:30-18:00; Su,PH off
+website: ""
diff --git a/data/cities/wien/bauhaus-hirschstettner-strasse.yml b/data/cities/wien/bauhaus-hirschstettner-strasse.yml
deleted file mode 100644
index 3d28409a56..0000000000
--- a/data/cities/wien/bauhaus-hirschstettner-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 23046580
-type: node
-latitude: 48.23734
-longitude: 16.45858
-postcode: "1220"
-city: Wien
-street: Hirschstettner Straße
-housenumber: "54"
-phone: +43 1 2855486
-opening_hours: ""
-website: https://www.bauhaus.at/
diff --git a/data/cities/wien/bauhaus.yml b/data/cities/wien/bauhaus.yml
index 5ddd5a81a9..3d28409a56 100644
--- a/data/cities/wien/bauhaus.yml
+++ b/data/cities/wien/bauhaus.yml
@@ -1,11 +1,11 @@
-id: 28739508
+id: 23046580
 type: node
-latitude: 48.20079
-longitude: 16.25333
-postcode: "1140"
+latitude: 48.23734
+longitude: 16.45858
+postcode: "1220"
 city: Wien
-street: Bergmillergasse
-housenumber: "12"
-phone: +43 1 9147666
-opening_hours: Mo-Fr 07:30-19:30; Sa 07:30-18:00; Su,PH off
-website: ""
+street: Hirschstettner Straße
+housenumber: "54"
+phone: +43 1 2855486
+opening_hours: ""
+website: https://www.bauhaus.at/
diff --git a/data/cities/wien/bhs.yml b/data/cities/wien/bhs.yml
deleted file mode 100644
index a786b04745..0000000000
--- a/data/cities/wien/bhs.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5282492648
-type: node
-latitude: 48.19383
-longitude: 16.38906
-postcode: "1030"
-city: Wien
-street: Rennweg
-housenumber: "38"
-phone: ""
-opening_hours: ""
-website: https://www.roller-bhs.at/
diff --git a/data/cities/wien/billa-bruenner-strasse-2.yml b/data/cities/wien/billa-bruenner-strasse-2.yml
index 988989931d..07fc737ed5 100644
--- a/data/cities/wien/billa-bruenner-strasse-2.yml
+++ b/data/cities/wien/billa-bruenner-strasse-2.yml
@@ -1,11 +1,11 @@
-id: 414212507
+id: 246175056
 type: node
-latitude: 48.26821
-longitude: 16.40224
+latitude: 48.29322
+longitude: 16.41725
 postcode: "1210"
 city: Wien
 street: Brünner Straße
-housenumber: 57D
+housenumber: ""
 phone: ""
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+opening_hours: Mo-Fr 07:15-19:30; Sa 07:15-18:00
 website: ""
diff --git a/data/cities/wien/billa-bruenner-strasse-3.yml b/data/cities/wien/billa-bruenner-strasse-3.yml
new file mode 100644
index 0000000000..988989931d
--- /dev/null
+++ b/data/cities/wien/billa-bruenner-strasse-3.yml
@@ -0,0 +1,11 @@
+id: 414212507
+type: node
+latitude: 48.26821
+longitude: 16.40224
+postcode: "1210"
+city: Wien
+street: Brünner Straße
+housenumber: 57D
+phone: ""
+opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00
+website: ""
diff --git a/data/cities/wien/billa-bruenner-strasse.yml b/data/cities/wien/billa-bruenner-strasse.yml
index 07fc737ed5..342f6b8eca 100644
--- a/data/cities/wien/billa-bruenner-strasse.yml
+++ b/data/cities/wien/billa-bruenner-strasse.yml
@@ -1,11 +1,11 @@
-id: 246175056
+id: 83450050
 type: node
-latitude: 48.29322
-longitude: 16.41725
+latitude: 48.278
+longitude: 16.40996
 postcode: "1210"
 city: Wien
 street: Brünner Straße
 housenumber: ""
 phone: ""
-opening_hours: Mo-Fr 07:15-19:30; Sa 07:15-18:00
+opening_hours: Mo-Fr 07:45-19:40
 website: ""
diff --git a/data/cities/wien/billa-julius-tandler-platz.yml b/data/cities/wien/billa-julius-tandler-platz.yml
deleted file mode 100644
index 0d361c7d58..0000000000
--- a/data/cities/wien/billa-julius-tandler-platz.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 146311391
-type: node
-latitude: 48.22623
-longitude: 16.36074
-postcode: "1090"
-city: Wien
-street: Julius-Tandler-Platz
-housenumber: "3"
-phone: +43 1 3156847
-opening_hours: 06:00-22:00; Dec 07 06:00-20:00; Dec 08 off
-website: https://www.billa.at/
diff --git a/data/cities/wien/billa-kliebergasse.yml b/data/cities/wien/billa-kliebergasse.yml
index 71959bc10e..c19812c513 100644
--- a/data/cities/wien/billa-kliebergasse.yml
+++ b/data/cities/wien/billa-kliebergasse.yml
@@ -7,5 +7,5 @@ city: Wien
 street: Kliebergasse
 housenumber: "2"
 phone: +43 1 9611521
-opening_hours: Mo-Fr 07:40-20:00; Sa 07:40-18:00; Su,PH off
+opening_hours: Mo-Fr 07:00-19:15; Sa 07:15-18:00; Su,PH off
 website: https://www.billa.at/
diff --git a/data/cities/wien/billa-plus-amalienstrasse.yml b/data/cities/wien/billa-plus-amalienstrasse.yml
new file mode 100644
index 0000000000..4d7558f681
--- /dev/null
+++ b/data/cities/wien/billa-plus-amalienstrasse.yml
@@ -0,0 +1,11 @@
+id: 43749523
+type: node
+latitude: 48.1911
+longitude: 16.27995
+postcode: "1130"
+city: Wien
+street: Amalienstraße
+housenumber: 65-67
+phone: ""
+opening_hours: Mo-Fr 07:15-19:30,Sa 07:15-18:00
+website: https://www.billa.at
diff --git a/data/cities/wien/billa-plus-julius-meinl-gasse.yml b/data/cities/wien/billa-plus-julius-meinl-gasse.yml
deleted file mode 100644
index 371419781e..0000000000
--- a/data/cities/wien/billa-plus-julius-meinl-gasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 126462305
-type: node
-latitude: 48.22274
-longitude: 16.31339
-postcode: "1160"
-city: Wien
-street: Julius-Meinl-Gasse
-housenumber: "9"
-phone: ""
-opening_hours: Mo-Fr 07:40 - 20:00, Sa 07:40 - 18:00
-website: https://www.billa.at
diff --git a/data/cities/wien/billa-plus.yml b/data/cities/wien/billa-plus.yml
index 4d7558f681..371419781e 100644
--- a/data/cities/wien/billa-plus.yml
+++ b/data/cities/wien/billa-plus.yml
@@ -1,11 +1,11 @@
-id: 43749523
+id: 126462305
 type: node
-latitude: 48.1911
-longitude: 16.27995
-postcode: "1130"
+latitude: 48.22274
+longitude: 16.31339
+postcode: "1160"
 city: Wien
-street: Amalienstraße
-housenumber: 65-67
+street: Julius-Meinl-Gasse
+housenumber: "9"
 phone: ""
-opening_hours: Mo-Fr 07:15-19:30,Sa 07:15-18:00
+opening_hours: Mo-Fr 07:40 - 20:00, Sa 07:40 - 18:00
 website: https://www.billa.at
diff --git a/data/cities/wien/billa.yml b/data/cities/wien/billa.yml
index 342f6b8eca..0d361c7d58 100644
--- a/data/cities/wien/billa.yml
+++ b/data/cities/wien/billa.yml
@@ -1,11 +1,11 @@
-id: 83450050
+id: 146311391
 type: node
-latitude: 48.278
-longitude: 16.40996
-postcode: "1210"
+latitude: 48.22623
+longitude: 16.36074
+postcode: "1090"
 city: Wien
-street: Brünner Straße
-housenumber: ""
-phone: ""
-opening_hours: Mo-Fr 07:45-19:40
-website: ""
+street: Julius-Tandler-Platz
+housenumber: "3"
+phone: +43 1 3156847
+opening_hours: 06:00-22:00; Dec 07 06:00-20:00; Dec 08 off
+website: https://www.billa.at/
diff --git a/data/cities/wien/buchhandlung-volksoper.yml b/data/cities/wien/buchhandlung-volksoper.yml
index 2bf06d4987..3f2c268f5c 100644
--- a/data/cities/wien/buchhandlung-volksoper.yml
+++ b/data/cities/wien/buchhandlung-volksoper.yml
@@ -1,7 +1,7 @@
 id: 10761353287
 type: node
-latitude: 48.2241
-longitude: 16.35022
+latitude: 48.22405
+longitude: 16.35026
 postcode: "1090"
 city: Wien
 street: Währinger Straße
diff --git a/data/cities/wien/dm-lerchenfelder-strasse.yml b/data/cities/wien/dm-lerchenfelder-strasse.yml
new file mode 100644
index 0000000000..ad7fc1fd96
--- /dev/null
+++ b/data/cities/wien/dm-lerchenfelder-strasse.yml
@@ -0,0 +1,11 @@
+id: 12224212296
+type: node
+latitude: 48.20626
+longitude: 16.35034
+postcode: ""
+city: Wien
+street: Lerchenfelder Straße
+housenumber: "37"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/wien/edelglas.yml b/data/cities/wien/edelglas.yml
new file mode 100644
index 0000000000..412ad64b00
--- /dev/null
+++ b/data/cities/wien/edelglas.yml
@@ -0,0 +1,11 @@
+id: 12241790628
+type: node
+latitude: 48.18749
+longitude: 16.41916
+postcode: "1030"
+city: Wien
+street: Erdbergstraße
+housenumber: 216A/2
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/wien/rosa-hofkirchner.yml b/data/cities/wien/fat-fox.yml
similarity index 55%
rename from data/cities/wien/rosa-hofkirchner.yml
rename to data/cities/wien/fat-fox.yml
index bfbe6b8eca..83a9a7e6ab 100644
--- a/data/cities/wien/rosa-hofkirchner.yml
+++ b/data/cities/wien/fat-fox.yml
@@ -6,6 +6,6 @@ postcode: "1150"
 city: Wien
 street: Kellinggasse
 housenumber: "9"
-phone: +43 1 893671 8
-opening_hours: Mo-Fr 08:00-12:30,14:00-17:00
-website: https://www.hofkirchner.at/
+phone: ""
+opening_hours: ""
+website: https://fatfoxtattoo.at/
diff --git a/data/cities/wien/hair-design-richard.yml b/data/cities/wien/hair-design-richard.yml
new file mode 100644
index 0000000000..93d330e750
--- /dev/null
+++ b/data/cities/wien/hair-design-richard.yml
@@ -0,0 +1,11 @@
+id: 1439080728
+type: node
+latitude: 48.20981
+longitude: 16.32963
+postcode: "1160"
+city: Wien
+street: Thaliastraße
+housenumber: "47"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/wien/hans-wagner.yml b/data/cities/wien/hans-wagner.yml
deleted file mode 100644
index 3459768cfd..0000000000
--- a/data/cities/wien/hans-wagner.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7217017330
-type: node
-latitude: 48.18594
-longitude: 16.33206
-postcode: "1150"
-city: Wien
-street: Storchengasse
-housenumber: "17"
-phone: "+436642402505"
-opening_hours: '"Termine nach tel. Vereinbarung"'
-website: ""
diff --git a/data/cities/wien/humana-2.yml b/data/cities/wien/humana-2.yml
new file mode 100644
index 0000000000..ec32afa3b3
--- /dev/null
+++ b/data/cities/wien/humana-2.yml
@@ -0,0 +1,11 @@
+id: 256669574
+type: node
+latitude: 48.20633
+longitude: 16.34919
+postcode: "1070"
+city: Wien
+street: ""
+housenumber: "45"
+phone: ""
+opening_hours: Mo-Fr 10:00-19:00; Sa 10:00-18:00
+website: ""
diff --git a/data/cities/wien/humana-favoritenstrasse-2.yml b/data/cities/wien/humana-favoritenstrasse-2.yml
deleted file mode 100644
index 633a3ec33d..0000000000
--- a/data/cities/wien/humana-favoritenstrasse-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 11359890331
-type: node
-latitude: 48.196
-longitude: 16.36836
-postcode: "1040"
-city: Wien
-street: Favoritenstraße
-housenumber: 4-6
-phone: "+436642666317"
-opening_hours: Mo-Fr 09:00-18:30; Sa 09:30-16:00
-website: ""
diff --git a/data/cities/wien/humana-favoritenstrasse.yml b/data/cities/wien/humana-favoritenstrasse.yml
index 94a46bbe74..633a3ec33d 100644
--- a/data/cities/wien/humana-favoritenstrasse.yml
+++ b/data/cities/wien/humana-favoritenstrasse.yml
@@ -1,11 +1,11 @@
-id: 243734499
+id: 11359890331
 type: node
-latitude: 48.18824
-longitude: 16.3732
+latitude: 48.196
+longitude: 16.36836
 postcode: "1040"
 city: Wien
 street: Favoritenstraße
-housenumber: "39"
-phone: +43 1 5442187
-opening_hours: Mo-Fr 09:00-19:00; Sa 10:00-16:00
-website: https://humana.at/stores/storesuebersicht/
+housenumber: 4-6
+phone: "+436642666317"
+opening_hours: Mo-Fr 09:00-18:30; Sa 09:30-16:00
+website: ""
diff --git a/data/cities/wien/humana.yml b/data/cities/wien/humana.yml
index ec32afa3b3..94a46bbe74 100644
--- a/data/cities/wien/humana.yml
+++ b/data/cities/wien/humana.yml
@@ -1,11 +1,11 @@
-id: 256669574
+id: 243734499
 type: node
-latitude: 48.20633
-longitude: 16.34919
-postcode: "1070"
+latitude: 48.18824
+longitude: 16.3732
+postcode: "1040"
 city: Wien
-street: ""
-housenumber: "45"
-phone: ""
-opening_hours: Mo-Fr 10:00-19:00; Sa 10:00-18:00
-website: ""
+street: Favoritenstraße
+housenumber: "39"
+phone: +43 1 5442187
+opening_hours: Mo-Fr 09:00-19:00; Sa 10:00-16:00
+website: https://humana.at/stores/storesuebersicht/
diff --git a/data/cities/wien/ikea-europaplatz.yml b/data/cities/wien/ikea-europaplatz.yml
index 76e0ac95c9..84009feb31 100644
--- a/data/cities/wien/ikea-europaplatz.yml
+++ b/data/cities/wien/ikea-europaplatz.yml
@@ -1,7 +1,7 @@
 id: 52495764
 type: node
-latitude: 48.19604
-longitude: 16.33785
+latitude: 48.19607
+longitude: 16.33787
 postcode: "1150"
 city: Wien
 street: Europaplatz
diff --git a/data/cities/wien/kaukas.yml b/data/cities/wien/kaukas.yml
new file mode 100644
index 0000000000..18ec3747fb
--- /dev/null
+++ b/data/cities/wien/kaukas.yml
@@ -0,0 +1,11 @@
+id: 10121481917
+type: node
+latitude: 48.20182
+longitude: 16.36733
+postcode: "1010"
+city: Wien
+street: Operngasse
+housenumber: 14-16
+phone: +43 1 587 14 86
+opening_hours: Mo-Fr 09:00-18:00; Sa 10:00-17:00
+website: https://www.kaukas.at/
diff --git a/data/cities/wien/komolka-mariahilfer-strasse.yml b/data/cities/wien/komolka-mariahilfer-strasse.yml
deleted file mode 100644
index 8223861f8e..0000000000
--- a/data/cities/wien/komolka-mariahilfer-strasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3393279319
-type: node
-latitude: 48.1991
-longitude: 16.35169
-postcode: "1070"
-city: Wien
-street: Mariahilfer Straße
-housenumber: "58"
-phone: "004315237184"
-opening_hours: Mo-Sa 09:30-18:00
-website: ""
diff --git a/data/cities/wien/komolka.yml b/data/cities/wien/komolka.yml
index 687569e744..8223861f8e 100644
--- a/data/cities/wien/komolka.yml
+++ b/data/cities/wien/komolka.yml
@@ -1,11 +1,11 @@
-id: 1990746318
+id: 3393279319
 type: node
-latitude: 48.17519
-longitude: 16.37359
-postcode: "1100"
+latitude: 48.1991
+longitude: 16.35169
+postcode: "1070"
 city: Wien
-street: Laxenburger Straße
-housenumber: "73"
-phone: "004316030122"
-opening_hours: Mo-Fr 09:30-18:00
-website: https://www.komolka.at/
+street: Mariahilfer Straße
+housenumber: "58"
+phone: "004315237184"
+opening_hours: Mo-Sa 09:30-18:00
+website: ""
diff --git a/data/cities/wien/konecny-optik-og.yml b/data/cities/wien/konecny-optik-og.yml
index 9f7e95f980..706a653c76 100644
--- a/data/cities/wien/konecny-optik-og.yml
+++ b/data/cities/wien/konecny-optik-og.yml
@@ -1,7 +1,7 @@
 id: 4568238668
 type: node
-latitude: 48.18937
-longitude: 16.30438
+latitude: 48.18932
+longitude: 16.30436
 postcode: "1140"
 city: Wien
 street: Nisselgasse
diff --git a/data/cities/wien/lauf-und-kauf.yml b/data/cities/wien/lauf-und-kauf.yml
deleted file mode 100644
index 444ee5cfe2..0000000000
--- a/data/cities/wien/lauf-und-kauf.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 872404529
-type: node
-latitude: 48.18683
-longitude: 16.3289
-postcode: "1150"
-city: Wien
-street: Sechshauser Straße
-housenumber: "53"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/wien/mila-minimarkt.yml b/data/cities/wien/mila-minimarkt.yml
index a6bfe1106b..cdc3323f85 100644
--- a/data/cities/wien/mila-minimarkt.yml
+++ b/data/cities/wien/mila-minimarkt.yml
@@ -1,11 +1,11 @@
 id: 9578972805
 type: node
-latitude: 48.21068
-longitude: 16.33076
-postcode: "1160"
+latitude: 48.17885
+longitude: 16.33196
+postcode: "1120"
 city: Wien
-street: Haberlgasse
-housenumber: "58"
-phone: ""
-opening_hours: Fr 09:00-19:00; Sa 08:00-18:00; PH off
-website: https://www.mila.wien/de/
+street: Krichbaumgasse
+housenumber: "25"
+phone: +43 670 202 63 68
+opening_hours: Di:15:00-19:00; Fr:09:00-19:00; Sa:08:00-16:00
+website: https://www.mila.wien/
diff --git a/data/cities/wien/maxis-markt.yml b/data/cities/wien/mjam-market.yml
similarity index 68%
rename from data/cities/wien/maxis-markt.yml
rename to data/cities/wien/mjam-market.yml
index 0b07b22466..f5aa567ab3 100644
--- a/data/cities/wien/maxis-markt.yml
+++ b/data/cities/wien/mjam-market.yml
@@ -7,5 +7,5 @@ city: Wien
 street: Sechshauser Straße
 housenumber: "88"
 phone: ""
-opening_hours: Mo-Fr 09:00-21:00; Sa 09:00-18:00
+opening_hours: '"ist ein Online Shop. von hier aus wird nur geliefert."'
 website: ""
diff --git a/data/cities/wien/moda-woow.yml b/data/cities/wien/moda-woow.yml
new file mode 100644
index 0000000000..f4731b054e
--- /dev/null
+++ b/data/cities/wien/moda-woow.yml
@@ -0,0 +1,11 @@
+id: 916277782
+type: node
+latitude: 48.17571
+longitude: 16.37414
+postcode: "1100"
+city: Wien
+street: Quellenstraße
+housenumber: "82"
+phone: ""
+opening_hours: Mo-Fr 09:00-19:30; Sa 09:30-19:00; Su,PH off
+website: ""
diff --git a/data/cities/wien/modart-gallery.yml b/data/cities/wien/modart-gallery.yml
new file mode 100644
index 0000000000..304a37155f
--- /dev/null
+++ b/data/cities/wien/modart-gallery.yml
@@ -0,0 +1,11 @@
+id: 10121479546
+type: node
+latitude: 48.2011
+longitude: 16.36689
+postcode: "1010"
+city: Wien
+street: Friedrichstraße
+housenumber: "8"
+phone: +43 1 585 44 67
+opening_hours: Mo-Fr 10:00-19:00; Sa 10:00-17:00; Su,PH off
+website: ""
diff --git a/data/cities/wien/o-books.yml b/data/cities/wien/o-books.yml
new file mode 100644
index 0000000000..612134ad0d
--- /dev/null
+++ b/data/cities/wien/o-books.yml
@@ -0,0 +1,11 @@
+id: 12238788174
+type: node
+latitude: 48.22533
+longitude: 16.39269
+postcode: "1020"
+city: Wien
+street: Bruno-Marek-Allee
+housenumber: 24/1
+phone: "+436764067319"
+opening_hours: Mo-Fr 09:00-19:00; Sa 09:00-17:00
+website: https://www.o-books.at/
diff --git a/data/cities/wien/obi-hadikgasse.yml b/data/cities/wien/obi-hadikgasse.yml
deleted file mode 100644
index cb9bf6734a..0000000000
--- a/data/cities/wien/obi-hadikgasse.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 26410666
-type: node
-latitude: 48.19266
-longitude: 16.28217
-postcode: "1140"
-city: Wien
-street: Hadikgasse
-housenumber: "184"
-phone: ""
-opening_hours: Mo-Fr 07:30-19:00; Sa 07:30-18:00
-website: https://www.obi.at/baumarkt/wien-hadikgasse/
diff --git a/data/cities/wien/obi-schadinagasse.yml b/data/cities/wien/obi-schadinagasse.yml
new file mode 100644
index 0000000000..05f6bb951b
--- /dev/null
+++ b/data/cities/wien/obi-schadinagasse.yml
@@ -0,0 +1,11 @@
+id: 13710823
+type: node
+latitude: 48.2233
+longitude: 16.32009
+postcode: "1170"
+city: Wien
+street: Schadinagasse
+housenumber: 7-9
+phone: +43 148 90179
+opening_hours: Mo-Fr 07:00-19:20; Sa 07:40-18:00
+website: https://www.obi.at/baumarkt/wien-17-bez/
diff --git a/data/cities/wien/obi.yml b/data/cities/wien/obi.yml
index 05f6bb951b..cb9bf6734a 100644
--- a/data/cities/wien/obi.yml
+++ b/data/cities/wien/obi.yml
@@ -1,11 +1,11 @@
-id: 13710823
+id: 26410666
 type: node
-latitude: 48.2233
-longitude: 16.32009
-postcode: "1170"
+latitude: 48.19266
+longitude: 16.28217
+postcode: "1140"
 city: Wien
-street: Schadinagasse
-housenumber: 7-9
-phone: +43 148 90179
-opening_hours: Mo-Fr 07:00-19:20; Sa 07:40-18:00
-website: https://www.obi.at/baumarkt/wien-17-bez/
+street: Hadikgasse
+housenumber: "184"
+phone: ""
+opening_hours: Mo-Fr 07:30-19:00; Sa 07:30-18:00
+website: https://www.obi.at/baumarkt/wien-hadikgasse/
diff --git a/data/cities/wien/peaches.yml b/data/cities/wien/peaches.yml
new file mode 100644
index 0000000000..af35517fa5
--- /dev/null
+++ b/data/cities/wien/peaches.yml
@@ -0,0 +1,11 @@
+id: 10121439972
+type: node
+latitude: 48.20122
+longitude: 16.36701
+postcode: "1010"
+city: Wien
+street: Friedrichstraße
+housenumber: "8"
+phone: ""
+opening_hours: ""
+website: https://peaches.at/
diff --git a/data/cities/wien/radbande-expositur.yml b/data/cities/wien/radbande-expositur.yml
index f68cc7c0d7..2da80180da 100644
--- a/data/cities/wien/radbande-expositur.yml
+++ b/data/cities/wien/radbande-expositur.yml
@@ -7,5 +7,5 @@ city: Wien
 street: Ilgplatz
 housenumber: "2"
 phone: +43 664 1968484
-opening_hours: Tu-Fr 09:00-13:00,14:00-18:30
+opening_hours: Mo,Sa 10:00-14:00; Tu-Fr 09:00-13:00,14:00-19:00
 website: https://radbande.at/
diff --git a/data/cities/wien/sos-augenoptik-altgasse.yml b/data/cities/wien/sos-augenoptik-altgasse.yml
new file mode 100644
index 0000000000..4ff030c2b8
--- /dev/null
+++ b/data/cities/wien/sos-augenoptik-altgasse.yml
@@ -0,0 +1,11 @@
+id: 3662728927
+type: node
+latitude: 48.1856
+longitude: 16.29865
+postcode: "1130"
+city: Wien
+street: Altgasse
+housenumber: "20"
+phone: ""
+opening_hours: Mo-Fr 09:00-13:00,14:00-18:00, Sa 09:00-13:00
+website: ""
diff --git a/data/cities/wien/sos-augenoptik.yml b/data/cities/wien/sos-augenoptik.yml
index 4ff030c2b8..2782968440 100644
--- a/data/cities/wien/sos-augenoptik.yml
+++ b/data/cities/wien/sos-augenoptik.yml
@@ -1,11 +1,11 @@
-id: 3662728927
+id: 2337070761
 type: node
-latitude: 48.1856
-longitude: 16.29865
-postcode: "1130"
+latitude: 48.18866
+longitude: 16.30406
+postcode: "1140"
 city: Wien
-street: Altgasse
-housenumber: "20"
+street: Nisselgasse
+housenumber: "7"
 phone: ""
-opening_hours: Mo-Fr 09:00-13:00,14:00-18:00, Sa 09:00-13:00
+opening_hours: ""
 website: ""
diff --git a/data/cities/wien/trafik-5.yml b/data/cities/wien/trafik-5.yml
index 01f987b8ea..877816d346 100644
--- a/data/cities/wien/trafik-5.yml
+++ b/data/cities/wien/trafik-5.yml
@@ -1,7 +1,7 @@
-id: 2526139375
+id: 2526240470
 type: node
-latitude: 48.19638
-longitude: 16.4055
+latitude: 48.19712
+longitude: 16.40289
 postcode: "1030"
 city: Wien
 street: ""
diff --git a/data/cities/wien/trafik-6.yml b/data/cities/wien/trafik-6.yml
index 877816d346..01f987b8ea 100644
--- a/data/cities/wien/trafik-6.yml
+++ b/data/cities/wien/trafik-6.yml
@@ -1,7 +1,7 @@
-id: 2526240470
+id: 2526139375
 type: node
-latitude: 48.19712
-longitude: 16.40289
+latitude: 48.19638
+longitude: 16.4055
 postcode: "1030"
 city: Wien
 street: ""
diff --git a/data/cities/wien/tuewi-hofladen.yml b/data/cities/wien/tuewi-hofladen.yml
new file mode 100644
index 0000000000..67518e9971
--- /dev/null
+++ b/data/cities/wien/tuewi-hofladen.yml
@@ -0,0 +1,11 @@
+id: 4530145086
+type: node
+latitude: 48.23761
+longitude: 16.33479
+postcode: "1190"
+city: Wien
+street: Peter-Jordan-Straße
+housenumber: "76"
+phone: "+431476542008"
+opening_hours: Mo-Fr 15:00-22:00
+website: https://tuewi.action.at/
diff --git a/data/cities/wien/vollgut.yml b/data/cities/wien/vollgut.yml
index b68c3edac1..d2f6efc29d 100644
--- a/data/cities/wien/vollgut.yml
+++ b/data/cities/wien/vollgut.yml
@@ -1,7 +1,7 @@
 id: 11603168920
 type: node
-latitude: 48.18954
-longitude: 16.30447
+latitude: 48.18938
+longitude: 16.3044
 postcode: "1140"
 city: Wien
 street: Nisselgasse
diff --git a/data/cities/zwischenwasser/kaesehof.yml b/data/cities/zwischenwasser/kaesehof.yml
new file mode 100644
index 0000000000..f5817cf427
--- /dev/null
+++ b/data/cities/zwischenwasser/kaesehof.yml
@@ -0,0 +1,11 @@
+id: 12232680263
+type: node
+latitude: 47.28032
+longitude: 9.66322
+postcode: "6835"
+city: Zwischenwasser
+street: Daliebis
+housenumber: "11"
+phone: ""
+opening_hours: Fr 16:00-19:00; Sa 09:00-12:00
+website: ""