diff --git a/README.md b/README.md
index 3fbffcbd..9b282ce7 100644
--- a/README.md
+++ b/README.md
@@ -162,11 +162,13 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Abfallverband Schwechat](/doc/source/umweltverbaende_at.md) / schwechat.umweltverbaende.at
 - [Abfallwirtschaft der Stadt St. Pölten](/doc/ics/st-poelten_at.md) / st-poelten.at/sonstiges/17653-abfallkalender
 - [Abfallwirtschaft Stadt Krems](/doc/source/umweltverbaende_at.md) / kremsstadt.umweltverbaende.at
+- [Absdorf](/doc/source/citiesapps_com.md) / absdorf.gv.at
 - [Afritz am See](/doc/ics/muellapp_com.md) / muellapp.com
 - [Alpbach](/doc/ics/muellapp_com.md) / muellapp.com
 - [Altenmarkt an der Triesting](/doc/source/citiesapps_com.md) / altenmarkt-triesting.gv.at
 - [Althofen](/doc/ics/muellapp_com.md) / muellapp.com
 - [Andau](/doc/source/citiesapps_com.md) / andau-gemeinde.at
+- [Andrichsfurt](/doc/source/citiesapps_com.md) / andrichsfurt.at
 - [Angath](/doc/ics/muellapp_com.md) / muellapp.com
 - [Apetlon](/doc/source/citiesapps_com.md) / gemeinde-apetlon.at
 - [App CITIES](/doc/source/citiesapps_com.md) / citiesapps.com
@@ -175,18 +177,23 @@ If your service provider is not listed, feel free to open a [source request issu
 - [AWV Neunkirchen](/doc/source/umweltverbaende_at.md) / neunkirchen.umweltverbaende.at
 - [AWV Wr. Neustadt](/doc/source/umweltverbaende_at.md) / wrneustadt.umweltverbaende.at
 - [Bad Blumau](/doc/source/citiesapps_com.md) / bad-blumau-gemeinde.at
+- [Bad Fischau-Brunn](/doc/source/citiesapps_com.md) / bad-fischau-brunn.at
 - [Bad Gleichenberg](/doc/source/citiesapps_com.md) / bad-gleichenberg.gv.at
 - [Bad Häring](/doc/ics/muellapp_com.md) / muellapp.com
 - [Bad Kleinkirchheim](/doc/ics/muellapp_com.md) / muellapp.com
 - [Bad Loipersdorf](/doc/source/citiesapps_com.md) / gemeinde.loipersdorf.at
 - [Bad Radkersburg](/doc/source/citiesapps_com.md) / bad-radkersburg.gv.at
+- [Bad Schallerbach](/doc/source/citiesapps_com.md) / bad-schallerbach.at
 - [Bad Tatzmannsdorf](/doc/source/citiesapps_com.md) / bad-tatzmannsdorf.at
 - [Bad Waltersdorf](/doc/source/citiesapps_com.md) / bad-waltersdorf.gv.at/home
 - [Baldramsdorf](/doc/ics/muellapp_com.md) / muellapp.com
+- [Behamberg](/doc/source/citiesapps_com.md) / behamberg.gv.at
 - [Berg im Drautal](/doc/ics/muellapp_com.md) / muellapp.com
 - [Berndorf bei Salzburg](/doc/ics/muellapp_com.md) / muellapp.com
 - [Bernstein](/doc/source/citiesapps_com.md) / bernstein.gv.at
 - [Bildein](/doc/source/citiesapps_com.md) / bildein.at
+- [Birkfeld](/doc/source/citiesapps_com.md) / birkfeld.at
+- [Blindenmarkt](/doc/source/citiesapps_com.md) / blindenmarkt.gv.at
 - [Brandenberg](/doc/ics/muellapp_com.md) / muellapp.com
 - [Breitenbach am Inn](/doc/ics/muellapp_com.md) / muellapp.com
 - [Breitenbrunn am Neusiedler See](/doc/source/citiesapps_com.md) / breitenbrunn.at
@@ -197,6 +204,8 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Burgau](/doc/source/citiesapps_com.md) / burgau.info
 - [Burgauberg-Neudauberg](/doc/source/citiesapps_com.md) / burgauberg-neudauberg.at
 - [Burgenländischer Müllverband](/doc/source/bmv_at.md) / bmv.at
+- [Burgschleinitz-Kühnring](/doc/source/citiesapps_com.md) / burgschleinitz-kuehnring.at
+- [Bürg-Vöstenhof](/doc/source/citiesapps_com.md) / buerg-voestenhof.at
 - [Dechantskirchen](/doc/source/citiesapps_com.md) / dechantskirchen.gv.at
 - [Dellach](/doc/ics/muellapp_com.md) / muellapp.com
 - [Dellach im Drautal](/doc/ics/muellapp_com.md) / muellapp.com
@@ -218,10 +227,12 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Eggersdorf bei Graz](/doc/source/citiesapps_com.md) / eggersdorf-graz.gv.at
 - [Eichgraben](/doc/source/citiesapps_com.md) / eichgraben.at
 - [Eisenstadt](/doc/source/citiesapps_com.md) / eisenstadt.gv.at
+- [Enzenreith](/doc/source/citiesapps_com.md) / gemeinde-enzenreith.at
 - [Eugendorf](/doc/ics/muellapp_com.md) / muellapp.com
 - [Fehring](/doc/source/citiesapps_com.md) / fehring.at
 - [Feistritz im Rosental](/doc/ics/muellapp_com.md) / muellapp.com
 - [Feistritz ob Bleiburg](/doc/source/citiesapps_com.md) / feistritz-bleiburg.gv.at
+- [Feistritztal](/doc/source/citiesapps_com.md) / feistritztal.at
 - [Feldbach](/doc/source/citiesapps_com.md) / feldbach.gv.at
 - [Feldkirchen in Kärnten](/doc/source/citiesapps_com.md) / feldkirchen.at
 - [Feldkirchen in Kärnten](/doc/ics/muellapp_com.md) / muellapp.com
@@ -230,6 +241,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Ferndorf](/doc/ics/muellapp_com.md) / muellapp.com
 - [Finkenstein am Faaker See](/doc/ics/muellapp_com.md) / muellapp.com
 - [Frankenau-Unterpullendorf](/doc/source/citiesapps_com.md) / frankenau-unterpullendorf.gv.at
+- [Frankenfels](/doc/source/citiesapps_com.md) / frankenfels.at
 - [Frauenkirchen](/doc/source/citiesapps_com.md) / frauenkirchen.at
 - [Frauenstein](/doc/ics/muellapp_com.md) / muellapp.com
 - [Freistadt](/doc/source/citiesapps_com.md) / freistadt.at
@@ -244,6 +256,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [GAUM Mistelbach](/doc/source/umweltverbaende_at.md) / mistelbach.umweltverbaende.at
 - [GDA Amstetten](/doc/ics/gda_gv_at.md) / gda.gv.at
 - [Gemeindeverband Horn](/doc/source/umweltverbaende_at.md) / horn.umweltverbaende.at
+- [Gersdorf an der Feistritz](/doc/source/citiesapps_com.md) / gersdorf.gv.at
 - [Gitschtal](/doc/source/citiesapps_com.md) / gitschtal.gv.at
 - [Gitschtal](/doc/ics/muellapp_com.md) / muellapp.com
 - [Globasnitz](/doc/ics/muellapp_com.md) / muellapp.com
@@ -260,6 +273,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Großsteinbach](/doc/source/citiesapps_com.md) / gemeinde-grosssteinbach.at
 - [Großwarasdorf](/doc/source/citiesapps_com.md) / grosswarasdorf.at
 - [Großwilfersdorf](/doc/source/citiesapps_com.md) / grosswilfersdorf.steiermark.at
+- [Grödig](/doc/source/citiesapps_com.md) / groedig.at
 - [Gutenberg](/doc/source/citiesapps_com.md) / gutenberg-stenzengreith.gv.at
 - [Guttaring](/doc/ics/muellapp_com.md) / muellapp.com
 - [GV Gmünd](/doc/source/umweltverbaende_at.md) / gmuend.umweltverbaende.at
@@ -277,6 +291,8 @@ If your service provider is not listed, feel free to open a [source request issu
 - [GVU Scheibbs](/doc/source/umweltverbaende_at.md) / scheibbs.umweltverbaende.at
 - [GVU St. Pölten](/doc/source/umweltverbaende_at.md) / stpoeltenland.umweltverbaende.at
 - [Güssing](/doc/source/citiesapps_com.md) / guessing.co.at
+- [Güttenbach](/doc/source/citiesapps_com.md) / guettenbach.at
+- [Haag am Hausruck](/doc/source/citiesapps_com.md) / haag-hausruck.at
 - [Hagenberg im Mühlkreis](/doc/source/citiesapps_com.md) / hagenberg.at
 - [Hannersdorf](/doc/source/citiesapps_com.md) / hannersdorf.at
 - [Hartberg](/doc/source/citiesapps_com.md) / hartberg.at
@@ -284,9 +300,11 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Heiligenkreuz](/doc/source/citiesapps_com.md) / heiligenkreuz.at
 - [Heiligenkreuz am Waasen](/doc/source/citiesapps_com.md) / heiligenkreuz-waasen.gv.at
 - [Heimschuh](/doc/source/citiesapps_com.md) / heimschuh.at
+- [Heldenberg](/doc/source/citiesapps_com.md) / heldenberg.gv.at
 - [Henndorf am Wallersee](/doc/source/citiesapps_com.md) / henndorf.at
 - [Henndorf am Wallersee](/doc/ics/muellapp_com.md) / muellapp.com
 - [Hermagor-Pressegger See](/doc/ics/muellapp_com.md) / muellapp.com
+- [Heugraben](/doc/source/citiesapps_com.md) / heugraben.at
 - [Hirm](/doc/source/citiesapps_com.md) / hirm.gv.at
 - [Hofstätten an der Raab](/doc/source/citiesapps_com.md) / hofstaetten.at
 - [Hopfgarten im Brixental](/doc/ics/muellapp_com.md) / muellapp.com
@@ -295,6 +313,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Hornstein](/doc/source/citiesapps_com.md) / hornstein.at
 - [Hüttenberg](/doc/source/citiesapps_com.md) / huettenberg.at
 - [Ilz](/doc/source/citiesapps_com.md) / ilz.at
+- [Ilztal](/doc/source/citiesapps_com.md) / ilztal.at
 - [infeo](/doc/source/infeo_at.md) / infeo.at
 - [Innsbrucker Kommunalbetriebe](/doc/source/infeo_at.md) / ikb.at
 - [Inzenhof](/doc/source/citiesapps_com.md) / inzenhof.at
@@ -329,6 +348,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Kundl](/doc/ics/muellapp_com.md) / muellapp.com
 - [Kössen](/doc/ics/muellapp_com.md) / muellapp.com
 - [Köstendorf](/doc/ics/muellapp_com.md) / muellapp.com
+- [Kötschach-Mauthen](/doc/source/citiesapps_com.md) / koetschach-mauthen.gv.at
 - [Kötschach-Mauthen](/doc/ics/muellapp_com.md) / muellapp.com
 - [Köttmannsdorf](/doc/ics/muellapp_com.md) / muellapp.com
 - [Laa an der Thaya](/doc/source/citiesapps_com.md) / laa.at
@@ -336,6 +356,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Lackendorf](/doc/source/citiesapps_com.md) / lackendorf.at
 - [Langau](/doc/source/citiesapps_com.md) / langau.at
 - [Langenrohr](/doc/source/citiesapps_com.md) / langenrohr.gv.at
+- [Langenzersdorf](/doc/source/citiesapps_com.md) / langenzersdorf.gv.at
 - [Leibnitz](/doc/source/citiesapps_com.md) / leibnitz.at
 - [Leithaprodersdorf](/doc/source/citiesapps_com.md) / leithaprodersdorf.at
 - [Lendorf](/doc/ics/muellapp_com.md) / muellapp.com
@@ -345,8 +366,8 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Lieboch](/doc/source/citiesapps_com.md) / lieboch.gv.at
 - [Linz AG](/doc/ics/linzag_at.md) / linzag.at
 - [Litzelsdorf](/doc/source/citiesapps_com.md) / litzelsdorf.at
-- [Lockenhaus](/doc/source/citiesapps_com.md) / lockenhaus.at
 - [Loipersbach im Burgenland](/doc/source/citiesapps_com.md) / loipersbach.info
+- [Ludersdorf - Wilfersdorf](/doc/source/citiesapps_com.md) / lu-wi.at
 - [Ludmannsdorf](/doc/ics/muellapp_com.md) / muellapp.com
 - [Lurnfeld](/doc/ics/muellapp_com.md) / muellapp.com
 - [Magdalensberg](/doc/ics/muellapp_com.md) / muellapp.com
@@ -356,10 +377,13 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Maria Saal](/doc/ics/muellapp_com.md) / muellapp.com
 - [Maria Wörth](/doc/ics/muellapp_com.md) / muellapp.com
 - [Mariasdorf](/doc/source/citiesapps_com.md) / mariasdorf.at
+- [Markt Allhau](/doc/source/citiesapps_com.md) / marktallhau.gv.at
 - [Markt Hartmannsdorf](/doc/source/citiesapps_com.md) / markthartmannsdorf.at
 - [Markt Neuhodis](/doc/source/citiesapps_com.md) / markt-neuhodis.at
 - [Markt Piesting Dreistetten](/doc/ics/piesting_at.md) / piesting.at
+- [Markt Piesting-Dreistetten](/doc/source/citiesapps_com.md) / piesting.at
 - [Marktgemeinde Edlitz](/doc/source/edlitz_at.md) / edlitz.at
+- [Marktgemeinde Lockenhaus](/doc/source/citiesapps_com.md) / lockenhaus.at
 - [Marz](/doc/source/citiesapps_com.md) / marz.gv.at
 - [Mattersburg](/doc/source/citiesapps_com.md) / mattersburg.gv.at
 - [Mattsee](/doc/ics/muellapp_com.md) / muellapp.com
@@ -380,6 +404,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Mühldorf](/doc/ics/muellapp_com.md) / muellapp.com
 - [Müll App](/doc/ics/muellapp_com.md) / muellapp.com
 - [Münster](/doc/ics/muellapp_com.md) / muellapp.com
+- [Neudau](/doc/source/citiesapps_com.md) / neudau.gv.at
 - [Neudorf bei Parndorf](/doc/source/citiesapps_com.md) / neudorfbeiparndorf.at
 - [Neudörfl](/doc/source/citiesapps_com.md) / neudoerfl.gv.at
 - [Neufeld an der Leitha](/doc/source/citiesapps_com.md) / neufeld-leitha.at
@@ -387,6 +412,8 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Neusiedl am See](/doc/source/citiesapps_com.md) / neusiedlamsee.at
 - [Neustift bei Güssing](/doc/source/citiesapps_com.md) / xn--neustift-bei-gssing-jbc.at
 - [Nickelsdorf](/doc/source/citiesapps_com.md) / nickelsdorf.gv.at
+- [Niederneukirchen](/doc/source/citiesapps_com.md) / niederneukirchen.ooe.gv.at
+- [Ober-Grafendorf](/doc/source/citiesapps_com.md) / gemeinde.ober-grafendorf.gv.at
 - [Oberdrauburg](/doc/ics/muellapp_com.md) / muellapp.com
 - [Oberndorf in Tirol](/doc/ics/muellapp_com.md) / muellapp.com
 - [Oberpullendorf](/doc/source/citiesapps_com.md) / oberpullendorf.gv.at
@@ -405,15 +432,20 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Peggau](/doc/source/citiesapps_com.md) / peggau.at
 - [Pernegg an der Mur](/doc/source/citiesapps_com.md) / pernegg.at
 - [Pernegg im Waldviertel](/doc/source/citiesapps_com.md) / pernegg.info
+- [Perschling](/doc/source/citiesapps_com.md) / perschling.at
 - [Pfarrwerfen](/doc/source/citiesapps_com.md) / gemeinde.pfarrwerfen.at
 - [Pilgersdorf](/doc/source/citiesapps_com.md) / pilgersdorf.at
 - [Pinggau](/doc/source/citiesapps_com.md) / pinggau.gv.at
 - [Pinkafeld](/doc/source/citiesapps_com.md) / pinkafeld.gv.at
+- [Pischelsdorf am Kulm](/doc/source/citiesapps_com.md) / pischelsdorf.com
 - [Podersdorf am See](/doc/source/citiesapps_com.md) / gemeindepodersdorfamsee.at
 - [Poggersdorf](/doc/source/citiesapps_com.md) / gemeinde-poggersdorf.at
 - [Poggersdorf](/doc/ics/muellapp_com.md) / muellapp.com
+- [Pottenstein](/doc/source/citiesapps_com.md) / pottenstein.at
 - [Potzneusiedl](/doc/source/citiesapps_com.md) / potzneusiedl.at
 - [Poysdorf](/doc/source/citiesapps_com.md) / poysdorf.at
+- [Pregarten](/doc/source/citiesapps_com.md) / pregarten.at
+- [Premstätten](/doc/source/citiesapps_com.md) / premstaetten.gv.at
 - [Pöchlarn](/doc/source/citiesapps_com.md) / poechlarn.at
 - [Pörtschach am Wörther See](/doc/ics/muellapp_com.md) / muellapp.com
 - [Raach am Hochgebirge](/doc/source/citiesapps_com.md) / raach.at
@@ -425,13 +457,16 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Raiding](/doc/source/citiesapps_com.md) / raiding-online.at
 - [Ramsau im Zillertal](/doc/ics/muellapp_com.md) / muellapp.com
 - [Rangersdorf](/doc/ics/muellapp_com.md) / muellapp.com
+- [Rechnitz](/doc/source/citiesapps_com.md) / rechnitz.at/de
 - [Reichenau](/doc/source/citiesapps_com.md) / reichenau.gv.at
+- [Reichenau an der Rax](/doc/source/citiesapps_com.md) / reichenau.at
 - [Reichenfels](/doc/ics/muellapp_com.md) / muellapp.com
 - [Reith im Alpbachtal](/doc/ics/muellapp_com.md) / muellapp.com
 - [Reißeck](/doc/ics/muellapp_com.md) / muellapp.com
 - [Rennweg am Katschberg](/doc/ics/muellapp_com.md) / muellapp.com
 - [Rohr bei Hartberg](/doc/source/citiesapps_com.md) / rohr-bei-hartberg.at
 - [Rohr im Burgenland](/doc/source/citiesapps_com.md) / rohr-bgld.at
+- [Rottenbach](/doc/source/citiesapps_com.md) / rottenbach.gv.at
 - [Rudersdorf](/doc/source/citiesapps_com.md) / rudersdorf.at
 - [Rust](/doc/source/citiesapps_com.md) / freistadt-rust.at
 - [Saalfelden am Steinernen Meer](/doc/source/citiesapps_com.md) / stadtmarketing-saalfelden.at/de
@@ -441,8 +476,10 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Sankt Oswald bei Plankenwarth](/doc/source/citiesapps_com.md) / sanktoswald.net
 - [Schiefling am Wörthersee](/doc/ics/muellapp_com.md) / muellapp.com
 - [Schleedorf](/doc/ics/muellapp_com.md) / muellapp.com
+- [Schlins](/doc/source/citiesapps_com.md) / schlins.at
 - [Schrattenberg](/doc/source/citiesapps_com.md) / schrattenberg.gv.at
 - [Schwadorf](/doc/source/citiesapps_com.md) / schwadorf.gv.at
+- [Schwarzenbach an der Pielach](/doc/source/citiesapps_com.md) / schwarzenbach-pielach.at
 - [Schwaz](/doc/ics/muellapp_com.md) / muellapp.com
 - [Schwoich](/doc/ics/muellapp_com.md) / muellapp.com
 - [Schäffern](/doc/source/citiesapps_com.md) / schaeffern.gv.at
@@ -461,6 +498,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [St. Andrä am Zicksee](/doc/source/citiesapps_com.md) / gemeinde-standrae.at
 - [St. Anna am Aigen](/doc/source/citiesapps_com.md) / st-anna-aigen.gv.at
 - [St. Egyden am Steinfeld](/doc/source/citiesapps_com.md) / st-egyden.at
+- [St. Florian bei Linz](/doc/source/citiesapps_com.md) / st-florian.at
 - [St. Georgen an der Leys](/doc/source/citiesapps_com.md) / stgeorgenleys.at
 - [St. Jakob im Rosental](/doc/ics/muellapp_com.md) / muellapp.com
 - [St. Jakob im Rosental](/doc/source/citiesapps_com.md) / st-jakob-rosental.gv.at
@@ -471,6 +509,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [St. Margareten im Rosental](/doc/ics/muellapp_com.md) / muellapp.com
 - [St. Margarethen an der Raab](/doc/source/citiesapps_com.md) / st-margarethen-raab.at
 - [St. Margarethen im Burgenland](/doc/source/citiesapps_com.md) / st-margarethen.at
+- [St. Martin im Innkreis](/doc/source/citiesapps_com.md) / st-martin-innkreis.ooe.gv.at
 - [St. Peter - Freienstein](/doc/source/citiesapps_com.md) / st-peter-freienstein.gv.at
 - [St. Peter am Ottersbach](/doc/source/citiesapps_com.md) / st-peter-ottersbach.gv.at
 - [St. Ruprecht an der Raab](/doc/source/citiesapps_com.md) / st.ruprecht.at
@@ -480,6 +519,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Stadtgemeinde Traiskirchen](/doc/ics/traiskirchen_gv_at.md) / traiskirchen.gv.at
 - [Stadtservice Korneuburg](/doc/source/korneuburg_stadtservice_at.md) / korneuburg.gv.at
 - [Stall](/doc/ics/muellapp_com.md) / muellapp.com
+- [Statzendorf](/doc/source/citiesapps_com.md) / statzendorf.at
 - [Stegersbach](/doc/source/citiesapps_com.md) / gemeinde.stegersbach.at
 - [Steinbrunn](/doc/source/citiesapps_com.md) / steinbrunn.at
 - [Steinfeld](/doc/ics/muellapp_com.md) / muellapp.com
@@ -488,13 +528,17 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Stiwoll](/doc/source/citiesapps_com.md) / stiwoll.at
 - [Stockenboi](/doc/ics/muellapp_com.md) / muellapp.com
 - [Stockerau](/doc/source/citiesapps_com.md) / stockerau.at
+- [Straden](/doc/source/citiesapps_com.md) / straden.gv.at
 - [Strass im Zillertal](/doc/ics/muellapp_com.md) / muellapp.com
 - [Straß in Steiermark](/doc/source/citiesapps_com.md) / strass-steiermark.gv.at
 - [Straßwalchen](/doc/ics/muellapp_com.md) / muellapp.com
+- [Stubenberg](/doc/source/citiesapps_com.md) / stubenberg.gv.at
+- [Stössing](/doc/source/citiesapps_com.md) / stoessing.gv.at
 - [Söchau](/doc/source/citiesapps_com.md) / soechau.steiermark.at
 - [Söll](/doc/ics/muellapp_com.md) / muellapp.com
 - [Tadten](/doc/source/citiesapps_com.md) / tadten.at
 - [Tattendorf](/doc/source/citiesapps_com.md) / tattendorf.at
+- [Taufkirchen an der Trattnach](/doc/source/citiesapps_com.md) / taufkirchen.at/home
 - [Techelsberg am Wörther See](/doc/ics/muellapp_com.md) / muellapp.com
 - [Thal](/doc/source/citiesapps_com.md) / thal.gv.at
 - [Tieschen](/doc/source/citiesapps_com.md) / tieschen.gv.at
@@ -511,14 +555,18 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Vasoldsberg](/doc/source/citiesapps_com.md) / vasoldsberg.gv.at
 - [Velden am Wörther See](/doc/ics/muellapp_com.md) / muellapp.com
 - [Villach](/doc/ics/muellapp_com.md) / muellapp.com
+- [Villach](/doc/source/citiesapps_com.md) / villach.at
 - [Vordernberg](/doc/source/citiesapps_com.md) / vordernberg.steiermark.at
+- [Vorderstoder](/doc/source/citiesapps_com.md) / vorderstoder.ooe.gv.at
 - [Völkermarkt](/doc/ics/muellapp_com.md) / muellapp.com
 - [Völkermarkt](/doc/source/citiesapps_com.md) / voelkermarkt.gv.at
 - [Walpersbach](/doc/source/citiesapps_com.md) / walpersbach.gv.at
+- [Wartberg ob der Aist](/doc/source/citiesapps_com.md) / wartberg-aist.at
 - [Wattens](/doc/ics/muellapp_com.md) / muellapp.com
 - [Weiden am See](/doc/source/citiesapps_com.md) / weiden-see.at
 - [Weitersfeld](/doc/source/citiesapps_com.md) / weitersfeld.gv.at
 - [Weiz](/doc/source/citiesapps_com.md) / weiz.at
+- [Weißenkirchen in der Wachau](/doc/source/citiesapps_com.md) / weissenkirchen-wachau.at
 - [Weißensee](/doc/ics/muellapp_com.md) / muellapp.com
 - [Weppersdorf](/doc/source/citiesapps_com.md) / weppersdorf.at
 - [Werfenweng](/doc/source/citiesapps_com.md) / gemeinde-werfenweng.at
@@ -528,6 +576,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Wiesmath](/doc/source/citiesapps_com.md) / wiesmath.at
 - [Wimpassing an der Leitha](/doc/source/citiesapps_com.md) / wimpassing-leitha.at
 - [Winden am See](/doc/source/citiesapps_com.md) / winden.at
+- [Winklarn](/doc/source/citiesapps_com.md) / winklarn.gv.at
 - [Winklern](/doc/ics/muellapp_com.md) / muellapp.com
 - [Wolfau](/doc/source/citiesapps_com.md) / gemeinde-wolfau.at
 - [Wolfsberg](/doc/ics/muellapp_com.md) / muellapp.com
@@ -543,6 +592,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Zellberg](/doc/ics/muellapp_com.md) / muellapp.com
 - [Zillingtal](/doc/source/citiesapps_com.md) / zillingtal.eu
 - [Zurndorf](/doc/source/citiesapps_com.md) / zurndorf.at
+- [Zwischenwasser](/doc/source/citiesapps_com.md) / zwischenwasser.at
 - [Übelbach](/doc/source/citiesapps_com.md) / uebelbach.gv.at
 </details>
 
diff --git a/custom_components/waste_collection_schedule/sources.json b/custom_components/waste_collection_schedule/sources.json
index e0c156fd..0130f7e1 100644
--- a/custom_components/waste_collection_schedule/sources.json
+++ b/custom_components/waste_collection_schedule/sources.json
@@ -684,6 +684,11 @@
       "module": "umweltverbaende_at",
       "default_params": {}
     },
+    {
+      "title": "Absdorf",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Afritz am See",
       "module": "ics",
@@ -709,6 +714,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Andrichsfurt",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Angath",
       "module": "ics",
@@ -749,6 +759,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Bad Fischau-Brunn",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Bad Gleichenberg",
       "module": "citiesapps_com",
@@ -774,6 +789,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Bad Schallerbach",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Bad Tatzmannsdorf",
       "module": "citiesapps_com",
@@ -789,6 +809,11 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Behamberg",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Berg im Drautal",
       "module": "ics",
@@ -809,6 +834,16 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Birkfeld",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
+    {
+      "title": "Blindenmarkt",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Brandenberg",
       "module": "ics",
@@ -859,6 +894,16 @@
       "module": "bmv_at",
       "default_params": {}
     },
+    {
+      "title": "Burgschleinitz-K\u00fchnring",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
+    {
+      "title": "B\u00fcrg-V\u00f6stenhof",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Dechantskirchen",
       "module": "citiesapps_com",
@@ -964,6 +1009,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Enzenreith",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Eugendorf",
       "module": "ics",
@@ -984,6 +1034,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Feistritztal",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Feldbach",
       "module": "citiesapps_com",
@@ -1024,6 +1079,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Frankenfels",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Frauenkirchen",
       "module": "citiesapps_com",
@@ -1094,6 +1154,11 @@
       "module": "umweltverbaende_at",
       "default_params": {}
     },
+    {
+      "title": "Gersdorf an der Feistritz",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Gitschtal",
       "module": "citiesapps_com",
@@ -1174,6 +1239,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Gr\u00f6dig",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Gutenberg",
       "module": "citiesapps_com",
@@ -1259,6 +1329,16 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "G\u00fcttenbach",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
+    {
+      "title": "Haag am Hausruck",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Hagenberg im M\u00fchlkreis",
       "module": "citiesapps_com",
@@ -1294,6 +1374,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Heldenberg",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Henndorf am Wallersee",
       "module": "citiesapps_com",
@@ -1309,6 +1394,11 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Heugraben",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Hirm",
       "module": "citiesapps_com",
@@ -1349,6 +1439,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Ilztal",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "infeo",
       "module": "infeo_at",
@@ -1521,6 +1616,11 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "K\u00f6tschach-Mauthen",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "K\u00f6tschach-Mauthen",
       "module": "ics",
@@ -1556,6 +1656,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Langenzersdorf",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Leibnitz",
       "module": "citiesapps_com",
@@ -1602,12 +1707,12 @@
       "default_params": {}
     },
     {
-      "title": "Lockenhaus",
+      "title": "Loipersbach im Burgenland",
       "module": "citiesapps_com",
       "default_params": {}
     },
     {
-      "title": "Loipersbach im Burgenland",
+      "title": "Ludersdorf - Wilfersdorf",
       "module": "citiesapps_com",
       "default_params": {}
     },
@@ -1656,6 +1761,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Markt Allhau",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Markt Hartmannsdorf",
       "module": "citiesapps_com",
@@ -1671,11 +1781,21 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Markt Piesting-Dreistetten",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Marktgemeinde Edlitz",
       "module": "edlitz_at",
       "default_params": {}
     },
+    {
+      "title": "Marktgemeinde Lockenhaus",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Marz",
       "module": "citiesapps_com",
@@ -1776,6 +1896,11 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Neudau",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Neudorf bei Parndorf",
       "module": "citiesapps_com",
@@ -1811,6 +1936,16 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Niederneukirchen",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
+    {
+      "title": "Ober-Grafendorf",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Oberdrauburg",
       "module": "ics",
@@ -1901,6 +2036,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Perschling",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Pfarrwerfen",
       "module": "citiesapps_com",
@@ -1921,6 +2061,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Pischelsdorf am Kulm",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Podersdorf am See",
       "module": "citiesapps_com",
@@ -1936,6 +2081,11 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Pottenstein",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Potzneusiedl",
       "module": "citiesapps_com",
@@ -1946,6 +2096,16 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Pregarten",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
+    {
+      "title": "Premst\u00e4tten",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "P\u00f6chlarn",
       "module": "citiesapps_com",
@@ -2001,11 +2161,21 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Rechnitz",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Reichenau",
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Reichenau an der Rax",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Reichenfels",
       "module": "ics",
@@ -2036,6 +2206,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Rottenbach",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Rudersdorf",
       "module": "citiesapps_com",
@@ -2081,6 +2256,11 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Schlins",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Schrattenberg",
       "module": "citiesapps_com",
@@ -2091,6 +2271,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Schwarzenbach an der Pielach",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Schwaz",
       "module": "ics",
@@ -2181,6 +2366,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "St. Florian bei Linz",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "St. Georgen an der Leys",
       "module": "citiesapps_com",
@@ -2231,6 +2421,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "St. Martin im Innkreis",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "St. Peter - Freienstein",
       "module": "citiesapps_com",
@@ -2278,6 +2473,11 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Statzendorf",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Stegersbach",
       "module": "citiesapps_com",
@@ -2318,6 +2518,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Straden",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Strass im Zillertal",
       "module": "ics",
@@ -2333,6 +2538,16 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Stubenberg",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
+    {
+      "title": "St\u00f6ssing",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "S\u00f6chau",
       "module": "citiesapps_com",
@@ -2353,6 +2568,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Taufkirchen an der Trattnach",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Techelsberg am W\u00f6rther See",
       "module": "ics",
@@ -2433,11 +2653,21 @@
       "module": "ics",
       "default_params": {}
     },
+    {
+      "title": "Villach",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Vordernberg",
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Vorderstoder",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "V\u00f6lkermarkt",
       "module": "ics",
@@ -2453,6 +2683,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Wartberg ob der Aist",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Wattens",
       "module": "ics",
@@ -2473,6 +2708,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Wei\u00dfenkirchen in der Wachau",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Wei\u00dfensee",
       "module": "ics",
@@ -2518,6 +2758,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Winklarn",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Winklern",
       "module": "ics",
@@ -2593,6 +2838,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Zwischenwasser",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "\u00dcbelbach",
       "module": "citiesapps_com",
diff --git a/custom_components/waste_collection_schedule/waste_collection_schedule/service/CitiesAppsCom.py b/custom_components/waste_collection_schedule/waste_collection_schedule/service/CitiesAppsCom.py
index 5a1e0158..a6a4dfa4 100644
--- a/custom_components/waste_collection_schedule/waste_collection_schedule/service/CitiesAppsCom.py
+++ b/custom_components/waste_collection_schedule/waste_collection_schedule/service/CitiesAppsCom.py
@@ -5,14 +5,41 @@ import urllib.parse
 import requests
 
 SERVICE_MAP = [
+    {
+        "title": "Absdorf",
+        "url": "https://www.absdorf.gv.at",
+        "country": "at",
+    },
     {
         "title": "Altenmarkt an der Triesting",
         "url": "https://www.altenmarkt-triesting.gv.at",
         "country": "at",
     },
-    {"title": "Andau", "url": "https://www.andau-gemeinde.at", "country": "at"},
-    {"title": "Apetlon", "url": "https://gemeinde-apetlon.at", "country": "at"},
-    {"title": "Bad Blumau", "url": "https://bad-blumau-gemeinde.at", "country": "at"},
+    {
+        "title": "Andau",
+        "url": "https://www.andau-gemeinde.at",
+        "country": "at",
+    },
+    {
+        "title": "Andrichsfurt",
+        "url": "https://www.andrichsfurt.at",
+        "country": "at",
+    },
+    {
+        "title": "Apetlon",
+        "url": "https://gemeinde-apetlon.at",
+        "country": "at",
+    },
+    {
+        "title": "Bad Blumau",
+        "url": "https://bad-blumau-gemeinde.at",
+        "country": "at",
+    },
+    {
+        "title": "Bad Fischau-Brunn",
+        "url": "https://www.bad-fischau-brunn.at",
+        "country": "at",
+    },
     {
         "title": "Bad Gleichenberg",
         "url": "http://www.bad-gleichenberg.gv.at",
@@ -28,6 +55,11 @@ SERVICE_MAP = [
         "url": "https://www.bad-radkersburg.gv.at",
         "country": "at",
     },
+    {
+        "title": "Bad Schallerbach",
+        "url": "https://www.bad-schallerbach.at",
+        "country": "at",
+    },
     {
         "title": "Bad Tatzmannsdorf",
         "url": "http://www.bad-tatzmannsdorf.at",
@@ -38,27 +70,76 @@ SERVICE_MAP = [
         "url": "www.bad-waltersdorf.gv.at/home/",
         "country": "at",
     },
-    {"title": "Bernstein", "url": "http://www.bernstein.gv.at", "country": "at"},
-    {"title": "Bildein", "url": "http://www.bildein.at", "country": "at"},
+    {
+        "title": "Behamberg",
+        "url": "behamberg.gv.at/",
+        "country": "at",
+    },
+    {
+        "title": "Bernstein",
+        "url": "http://www.bernstein.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Bildein",
+        "url": "http://www.bildein.at",
+        "country": "at",
+    },
+    {
+        "title": "Birkfeld",
+        "url": "http://www.birkfeld.at",
+        "country": "at",
+    },
+    {
+        "title": "Blindenmarkt",
+        "url": "blindenmarkt.gv.at/",
+        "country": "at",
+    },
     {
         "title": "Breitenbrunn am Neusiedler See",
         "url": "http://www.breitenbrunn.at",
         "country": "at",
     },
-    {"title": "Breitenstein", "url": "https://www.breitenstein.at", "country": "at"},
-    {"title": "Bromberg", "url": "http://www.bromberg.at", "country": "at"},
-    {"title": "Bruckneudorf", "url": "http://www.bruckneudorf.eu", "country": "at"},
+    {
+        "title": "Breitenstein",
+        "url": "https://www.breitenstein.at",
+        "country": "at",
+    },
+    {
+        "title": "Bromberg",
+        "url": "http://www.bromberg.at",
+        "country": "at",
+    },
+    {
+        "title": "Bruckneudorf",
+        "url": "http://www.bruckneudorf.eu",
+        "country": "at",
+    },
     {
         "title": "Buch - St. Magdalena",
         "url": "http://www.buch-stmagdalena.at",
         "country": "at",
     },
-    {"title": "Burgau", "url": "https://www.burgau.info", "country": "at"},
+    {
+        "title": "Burgau",
+        "url": "https://www.burgau.info",
+        "country": "at",
+    },
     {
         "title": "Burgauberg-Neudauberg",
         "url": "http://www.burgauberg-neudauberg.at",
         "country": "at",
     },
+    {
+        "title": "Burgschleinitz-Kühnring",
+        "url": "https://burgschleinitz-kuehnring.at",
+        "country": "at",
+    },
+    {
+        "title": "Bürg-Vöstenhof",
+        "url": "http://www.buerg-voestenhof.at",
+        "country": "at",
+    },
     {
         "title": "Dechantskirchen",
         "url": "https://dechantskirchen.gv.at",
@@ -79,59 +160,171 @@ SERVICE_MAP = [
         "url": "https://www.deutschkaltenbrunn.eu",
         "country": "at",
     },
-    {"title": "Deutschkreutz", "url": "https://www.deutschkreutz.at", "country": "at"},
-    {"title": "Dobl-Zwaring", "url": "https://www.dobl-zwaring.gv.at", "country": "at"},
-    {"title": "Drasenhofen", "url": "https://www.drasenhofen.at", "country": "at"},
-    {"title": "Draßmarkt", "url": "http://www.drassmarkt.at", "country": "at"},
-    {"title": "Eberau", "url": "https://eberau.riskommunal.net", "country": "at"},
-    {"title": "Eberndorf", "url": "https://www.eberndorf.at", "country": "at"},
-    {"title": "Ebersdorf", "url": "https://www.ebersdorf.eu", "country": "at"},
-    {"title": "Eberstein", "url": "https://www.eberstein.at", "country": "at"},
+    {
+        "title": "Deutschkreutz",
+        "url": "https://www.deutschkreutz.at",
+        "country": "at",
+    },
+    {
+        "title": "Dobl-Zwaring",
+        "url": "https://www.dobl-zwaring.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Drasenhofen",
+        "url": "https://www.drasenhofen.at",
+        "country": "at",
+    },
+    {
+        "title": "Draßmarkt",
+        "url": "http://www.drassmarkt.at",
+        "country": "at",
+    },
+    {
+        "title": "Eberau",
+        "url": "https://eberau.riskommunal.net",
+        "country": "at",
+    },
+    {
+        "title": "Eberndorf",
+        "url": "https://www.eberndorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Ebersdorf",
+        "url": "https://www.ebersdorf.eu",
+        "country": "at",
+    },
+    {
+        "title": "Eberstein",
+        "url": "https://www.eberstein.at",
+        "country": "at",
+    },
     {
         "title": "Edelsbach bei Feldbach",
         "url": "http://www.edelsbach.at",
         "country": "at",
     },
-    {"title": "Eggenburg", "url": "www.eggenburg.gv.at/", "country": "at"},
+    {
+        "title": "Eggenburg",
+        "url": "www.eggenburg.gv.at/",
+        "country": "at",
+    },
     {
         "title": "Eggersdorf bei Graz",
         "url": "https://www.eggersdorf-graz.gv.at",
         "country": "at",
     },
-    {"title": "Eichgraben", "url": "www.eichgraben.at/", "country": "at"},
-    {"title": "Eisenstadt", "url": "https://www.eisenstadt.gv.at", "country": "at"},
-    {"title": "Fehring", "url": "http://www.fehring.at", "country": "at"},
+    {
+        "title": "Eichgraben",
+        "url": "www.eichgraben.at/",
+        "country": "at",
+    },
+    {
+        "title": "Eisenstadt",
+        "url": "https://www.eisenstadt.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Enzenreith",
+        "url": "https://www.gemeinde-enzenreith.at",
+        "country": "at",
+    },
+    {
+        "title": "Fehring",
+        "url": "http://www.fehring.at",
+        "country": "at",
+    },
     {
         "title": "Feistritz ob Bleiburg",
         "url": "https://feistritz-bleiburg.gv.at",
         "country": "at",
     },
-    {"title": "Feldbach", "url": "https://www.feldbach.gv.at", "country": "at"},
+    {
+        "title": "Feistritztal",
+        "url": "https://www.feistritztal.at",
+        "country": "at",
+    },
+    {
+        "title": "Feldbach",
+        "url": "https://www.feldbach.gv.at",
+        "country": "at",
+    },
     {
         "title": "Feldkirchen in Kärnten",
         "url": "https://www.feldkirchen.at",
         "country": "at",
     },
-    {"title": "Ferndorf", "url": "https://www.ferndorf.gv.at", "country": "at"},
+    {
+        "title": "Ferndorf",
+        "url": "https://www.ferndorf.gv.at",
+        "country": "at",
+    },
     {
         "title": "Frankenau-Unterpullendorf",
         "url": "https://www.frankenau-unterpullendorf.gv.at",
         "country": "at",
     },
-    {"title": "Frauenkirchen", "url": "https://www.frauenkirchen.at", "country": "at"},
-    {"title": "Freistadt", "url": "https://www.freistadt.at", "country": "at"},
-    {"title": "Fresach", "url": "https://fresach.gv.at", "country": "at"},
-    {"title": "Friedberg", "url": "https://www.friedberg.gv.at", "country": "at"},
-    {"title": "Frohnleiten", "url": "https://www.frohnleiten.com", "country": "at"},
+    {
+        "title": "Frankenfels",
+        "url": "www.frankenfels.at/",
+        "country": "at",
+    },
+    {
+        "title": "Frauenkirchen",
+        "url": "https://www.frauenkirchen.at",
+        "country": "at",
+    },
+    {
+        "title": "Freistadt",
+        "url": "https://www.freistadt.at",
+        "country": "at",
+    },
+    {
+        "title": "Fresach",
+        "url": "https://fresach.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Friedberg",
+        "url": "https://www.friedberg.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Frohnleiten",
+        "url": "https://www.frohnleiten.com",
+        "country": "at",
+    },
     {
         "title": "Fürstenfeld",
         "url": "https://www.fuerstenfeld.gv.at",
         "country": "at",
     },
-    {"title": "Gabersdorf", "url": "https://www.gabersdorf.gv.at", "country": "at"},
-    {"title": "Gattendorf", "url": "https://www.gattendorf.at", "country": "at"},
-    {"title": "Gitschtal", "url": "gitschtal.gv.at/", "country": "at"},
-    {"title": "Gols", "url": "https://www.gols.at", "country": "at"},
+    {
+        "title": "Gabersdorf",
+        "url": "https://www.gabersdorf.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Gattendorf",
+        "url": "https://www.gattendorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Gersdorf an der Feistritz",
+        "url": "https://www.gersdorf.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Gitschtal",
+        "url": "gitschtal.gv.at/",
+        "country": "at",
+    },
+    {
+        "title": "Gols",
+        "url": "https://www.gols.at",
+        "country": "at",
+    },
     {
         "title": "Grafendorf bei Hartberg",
         "url": "https://grafendorf.at",
@@ -142,8 +335,16 @@ SERVICE_MAP = [
         "url": "https://www.grafenschachen.at",
         "country": "at",
     },
-    {"title": "Grafenstein", "url": "https://grafenstein.gv.at", "country": "at"},
-    {"title": "Gratkorn", "url": "https://www.gratkorn.gv.at", "country": "at"},
+    {
+        "title": "Grafenstein",
+        "url": "https://grafenstein.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Gratkorn",
+        "url": "https://www.gratkorn.gv.at",
+        "country": "at",
+    },
     {
         "title": "Gratwein-Straßengel",
         "url": "https://gratwein-strassengel.gv.at",
@@ -164,79 +365,251 @@ SERVICE_MAP = [
         "url": "http://www.grosswilfersdorf.steiermark.at",
         "country": "at",
     },
+    {
+        "title": "Grödig",
+        "url": "www.groedig.at/",
+        "country": "at",
+    },
     {
         "title": "Gutenberg",
         "url": "https://www.gutenberg-stenzengreith.gv.at",
         "country": "at",
     },
-    {"title": "Güssing", "url": "https://www.guessing.co.at", "country": "at"},
+    {
+        "title": "Güssing",
+        "url": "https://www.guessing.co.at",
+        "country": "at",
+    },
+    {
+        "title": "Güttenbach",
+        "url": "https://www.guettenbach.at",
+        "country": "at",
+    },
+    {
+        "title": "Haag am Hausruck",
+        "url": "www.haag-hausruck.at/",
+        "country": "at",
+    },
     {
         "title": "Hagenberg im Mühlkreis",
         "url": "https://www.hagenberg.at",
         "country": "at",
     },
-    {"title": "Hannersdorf", "url": "https://www.hannersdorf.at", "country": "at"},
-    {"title": "Hartberg", "url": "https://www.hartberg.at", "country": "at"},
-    {"title": "Heiligenkreuz", "url": "https://www.heiligenkreuz.at", "country": "at"},
+    {
+        "title": "Hannersdorf",
+        "url": "https://www.hannersdorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Hartberg",
+        "url": "https://www.hartberg.at",
+        "country": "at",
+    },
+    {
+        "title": "Heiligenkreuz",
+        "url": "https://www.heiligenkreuz.at",
+        "country": "at",
+    },
     {
         "title": "Heiligenkreuz am Waasen",
         "url": "https://www.heiligenkreuz-waasen.gv.at",
         "country": "at",
     },
-    {"title": "Heimschuh", "url": "https://www.heimschuh.at", "country": "at"},
-    {"title": "Henndorf am Wallersee", "url": "www.henndorf.at/", "country": "at"},
-    {"title": "Hirm", "url": "www.hirm.gv.at/", "country": "at"},
+    {
+        "title": "Heimschuh",
+        "url": "https://www.heimschuh.at",
+        "country": "at",
+    },
+    {
+        "title": "Heldenberg",
+        "url": "https://www.heldenberg.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Henndorf am Wallersee",
+        "url": "www.henndorf.at/",
+        "country": "at",
+    },
+    {
+        "title": "Heugraben",
+        "url": "www.heugraben.at/",
+        "country": "at",
+    },
+    {
+        "title": "Hirm",
+        "url": "www.hirm.gv.at/",
+        "country": "at",
+    },
     {
         "title": "Hofstätten an der Raab",
         "url": "https://www.hofstaetten.at",
         "country": "at",
     },
-    {"title": "Horitschon", "url": "http://www.horitschon.at", "country": "at"},
-    {"title": "Horn", "url": "https://horn.gv.at", "country": "at"},
-    {"title": "Hornstein", "url": "https://www.hornstein.at", "country": "at"},
-    {"title": "Hüttenberg", "url": "https://huettenberg.at", "country": "at"},
-    {"title": "Ilz", "url": "https://www.ilz.at", "country": "at"},
-    {"title": "Inzenhof", "url": "https://www.inzenhof.at", "country": "at"},
-    {"title": "Jabing", "url": "https://www.gemeinde-jabing.at", "country": "at"},
-    {"title": "Jagerberg", "url": "http://www.jagerberg.info", "country": "at"},
-    {"title": "Kaindorf", "url": "https://www.kaindorf.at", "country": "at"},
-    {"title": "Kaisersdorf", "url": "http://www.kaisersdorf.com", "country": "at"},
+    {
+        "title": "Horitschon",
+        "url": "http://www.horitschon.at",
+        "country": "at",
+    },
+    {
+        "title": "Horn",
+        "url": "https://horn.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Hornstein",
+        "url": "https://www.hornstein.at",
+        "country": "at",
+    },
+    {
+        "title": "Hüttenberg",
+        "url": "https://huettenberg.at",
+        "country": "at",
+    },
+    {
+        "title": "Ilz",
+        "url": "https://www.ilz.at",
+        "country": "at",
+    },
+    {
+        "title": "Ilztal",
+        "url": "https://www.ilztal.at",
+        "country": "at",
+    },
+    {
+        "title": "Inzenhof",
+        "url": "https://www.inzenhof.at",
+        "country": "at",
+    },
+    {
+        "title": "Jabing",
+        "url": "https://www.gemeinde-jabing.at",
+        "country": "at",
+    },
+    {
+        "title": "Jagerberg",
+        "url": "http://www.jagerberg.info",
+        "country": "at",
+    },
+    {
+        "title": "Kaindorf",
+        "url": "https://www.kaindorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Kaisersdorf",
+        "url": "http://www.kaisersdorf.com",
+        "country": "at",
+    },
     {
         "title": "Kalsdorf bei Graz",
         "url": "https://www.kalsdorf-graz.gv.at",
         "country": "at",
     },
-    {"title": "Kapfenstein", "url": "http://www.kapfenstein.at", "country": "at"},
-    {"title": "Kemeten", "url": "https://www.kemeten.gv.at", "country": "at"},
-    {"title": "Kirchbach-Zerlach", "url": "www.kirchbach-zerlach.at/", "country": "at"},
+    {
+        "title": "Kapfenstein",
+        "url": "http://www.kapfenstein.at",
+        "country": "at",
+    },
+    {
+        "title": "Kemeten",
+        "url": "https://www.kemeten.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Kirchbach-Zerlach",
+        "url": "www.kirchbach-zerlach.at/",
+        "country": "at",
+    },
     {
         "title": "Kirchberg an der Raab",
         "url": "https://www.kirchberg-raab.gv.at",
         "country": "at",
     },
-    {"title": "Kittsee", "url": "https://www.kittsee.at", "country": "at"},
+    {
+        "title": "Kittsee",
+        "url": "https://www.kittsee.at",
+        "country": "at",
+    },
     {
         "title": "Kleinmürbisch",
         "url": "https://www.kleinmürbisch.at",
         "country": "at",
     },
-    {"title": "Klingenbach", "url": "https://klingenbach.at", "country": "at"},
-    {"title": "Klöch", "url": "https://www.kloech.com", "country": "at"},
-    {"title": "Kobersdorf", "url": "www.kobersdorf.at/index.php", "country": "at"},
-    {"title": "Kohfidisch", "url": "http://www.kohfidisch.at", "country": "at"},
-    {"title": "Korneuburg", "url": "https://www.korneuburg.gv.at", "country": "at"},
-    {"title": "Krensdorf", "url": "https://www.krensdorf.at", "country": "at"},
-    {"title": "Kuchl", "url": "www.kuchl.net/", "country": "at"},
-    {"title": "Laa an der Thaya", "url": "http://www.laa.at", "country": "at"},
+    {
+        "title": "Klingenbach",
+        "url": "https://klingenbach.at",
+        "country": "at",
+    },
+    {
+        "title": "Klöch",
+        "url": "https://www.kloech.com",
+        "country": "at",
+    },
+    {
+        "title": "Kobersdorf",
+        "url": "www.kobersdorf.at/index.php",
+        "country": "at",
+    },
+    {
+        "title": "Kohfidisch",
+        "url": "http://www.kohfidisch.at",
+        "country": "at",
+    },
+    {
+        "title": "Korneuburg",
+        "url": "https://www.korneuburg.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Kötschach-Mauthen",
+        "url": "https://koetschach-mauthen.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Krensdorf",
+        "url": "https://www.krensdorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Kuchl",
+        "url": "www.kuchl.net/",
+        "country": "at",
+    },
+    {
+        "title": "Laa an der Thaya",
+        "url": "http://www.laa.at",
+        "country": "at",
+    },
     {
         "title": "Lackenbach",
         "url": "https://www.gemeinde-lackenbach.at",
         "country": "at",
     },
-    {"title": "Lackendorf", "url": "https://www.lackendorf.at", "country": "at"},
-    {"title": "Langau", "url": "http://www.langau.at", "country": "at"},
-    {"title": "Langenrohr", "url": "https://www.langenrohr.gv.at", "country": "at"},
-    {"title": "Leibnitz", "url": "https://www.leibnitz.at", "country": "at"},
+    {
+        "title": "Lackendorf",
+        "url": "https://www.lackendorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Langau",
+        "url": "http://www.langau.at",
+        "country": "at",
+    },
+    {
+        "title": "Langenrohr",
+        "url": "https://www.langenrohr.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Langenzersdorf",
+        "url": "www.langenzersdorf.gv.at/",
+        "country": "at",
+    },
+    {
+        "title": "Leibnitz",
+        "url": "https://www.leibnitz.at",
+        "country": "at",
+    },
     {
         "title": "Leithaprodersdorf",
         "url": "http://www.leithaprodersdorf.at",
@@ -247,51 +620,131 @@ SERVICE_MAP = [
         "url": "https://www.leutschach-weinstrasse.gv.at",
         "country": "at",
     },
-    {"title": "Lieboch", "url": "https://www.lieboch.gv.at", "country": "at"},
-    {"title": "Litzelsdorf", "url": "https://www.litzelsdorf.at", "country": "at"},
-    {"title": "Lockenhaus", "url": "www.lockenhaus.at/", "country": "at"},
+    {
+        "title": "Lieboch",
+        "url": "https://www.lieboch.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Litzelsdorf",
+        "url": "https://www.litzelsdorf.at",
+        "country": "at",
+    },
     {
         "title": "Loipersbach im Burgenland",
         "url": "https://www.loipersbach.info",
         "country": "at",
     },
-    {"title": "Mariasdorf", "url": "https://www.mariasdorf.at", "country": "at"},
+    {
+        "title": "Ludersdorf - Wilfersdorf",
+        "url": "https://www.lu-wi.at",
+        "country": "at",
+    },
+    {
+        "title": "Mariasdorf",
+        "url": "https://www.mariasdorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Markt Allhau",
+        "url": "https://www.marktallhau.gv.at",
+        "country": "at",
+    },
     {
         "title": "Markt Hartmannsdorf",
         "url": "https://www.markthartmannsdorf.at",
         "country": "at",
     },
-    {"title": "Markt Neuhodis", "url": "http://www.markt-neuhodis.at", "country": "at"},
-    {"title": "Marz", "url": "https://www.marz.gv.at", "country": "at"},
-    {"title": "Mattersburg", "url": "https://www.mattersburg.gv.at", "country": "at"},
-    {"title": "Meiseldorf", "url": "https://www.meiseldorf.gv.at", "country": "at"},
-    {"title": "Melk", "url": "https://www.stadt-melk.at", "country": "at"},
+    {
+        "title": "Markt Neuhodis",
+        "url": "http://www.markt-neuhodis.at",
+        "country": "at",
+    },
+    {
+        "title": "Markt Piesting-Dreistetten",
+        "url": "https://www.piesting.at",
+        "country": "at",
+    },
+    {
+        "title": "Marktgemeinde Lockenhaus",
+        "url": "www.lockenhaus.at/",
+        "country": "at",
+    },
+    {
+        "title": "Marz",
+        "url": "https://www.marz.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Mattersburg",
+        "url": "https://www.mattersburg.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Meiseldorf",
+        "url": "https://www.meiseldorf.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Melk",
+        "url": "https://www.stadt-melk.at",
+        "country": "at",
+    },
     {
         "title": "Mettersdorf am Saßbach",
         "url": "http://www.mettersdorf.com",
         "country": "at",
     },
-    {"title": "Miesenbach", "url": "https://www.miesenbach.at", "country": "at"},
-    {"title": "Mischendorf", "url": "https://www.mischendorf.at", "country": "at"},
-    {"title": "Mistelbach", "url": "https://www.mistelbach.at", "country": "at"},
+    {
+        "title": "Miesenbach",
+        "url": "https://www.miesenbach.at",
+        "country": "at",
+    },
+    {
+        "title": "Mischendorf",
+        "url": "https://www.mischendorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Mistelbach",
+        "url": "https://www.mistelbach.at",
+        "country": "at",
+    },
     {
         "title": "Mitterdorf an der Raab",
         "url": "https://www.mitterdorf-raab.at",
         "country": "at",
     },
-    {"title": "Mureck", "url": "https://www.mureck.gv.at", "country": "at"},
-    {"title": "Mönchhof", "url": "https://www.moenchhof.at", "country": "at"},
+    {
+        "title": "Mönchhof",
+        "url": "https://www.moenchhof.at",
+        "country": "at",
+    },
     {
         "title": "Mörbisch am See",
         "url": "https://moerbisch.gv.at",
         "country": "at",
     },
+    {
+        "title": "Mureck",
+        "url": "https://www.mureck.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Neudau",
+        "url": "https://www.neudau.gv.at",
+        "country": "at",
+    },
     {
         "title": "Neudorf bei Parndorf",
         "url": "http://www.neudorfbeiparndorf.at",
         "country": "at",
     },
-    {"title": "Neudörfl", "url": "https://www.neudoerfl.gv.at", "country": "at"},
+    {
+        "title": "Neudörfl",
+        "url": "https://www.neudoerfl.gv.at",
+        "country": "at",
+    },
     {
         "title": "Neufeld an der Leitha",
         "url": "https://www.neufeld-leitha.at",
@@ -307,7 +760,21 @@ SERVICE_MAP = [
         "url": "http://www.xn--neustift-bei-gssing-jbc.at",
         "country": "at",
     },
-    {"title": "Nickelsdorf", "url": "https://www.nickelsdorf.gv.at", "country": "at"},
+    {
+        "title": "Nickelsdorf",
+        "url": "https://www.nickelsdorf.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Niederneukirchen",
+        "url": "https://www.niederneukirchen.ooe.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Ober-Grafendorf",
+        "url": "https://gemeinde.ober-grafendorf.gv.at",
+        "country": "at",
+    },
     {
         "title": "Oberpullendorf",
         "url": "https://www.oberpullendorf.gv.at",
@@ -318,56 +785,196 @@ SERVICE_MAP = [
         "url": "https://www.oberschuetzen.at",
         "country": "at",
     },
-    {"title": "Oberwart", "url": "https://www.oberwart.gv.at", "country": "at"},
-    {"title": "Oslip", "url": "http://www.oslip.at", "country": "at"},
+    {
+        "title": "Oberwart",
+        "url": "https://www.oberwart.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Oslip",
+        "url": "http://www.oslip.at",
+        "country": "at",
+    },
     {
         "title": "Ottendorf an der Rittschein",
         "url": "https://www.ottendorf-rittschein.steiermark.at",
         "country": "at",
     },
-    {"title": "Paldau", "url": "http://www.paldau.gv.at", "country": "at"},
-    {"title": "Pama", "url": "https://www.gemeinde-pama.at", "country": "at"},
-    {"title": "Pamhagen", "url": "https://www.gemeinde-pamhagen.at", "country": "at"},
-    {"title": "Parndorf", "url": "http://www.gemeinde-parndorf.at", "country": "at"},
-    {"title": "Payerbach", "url": "https://www.payerbach.at", "country": "at"},
-    {"title": "Peggau", "url": "https://peggau.at", "country": "at"},
-    {"title": "Pernegg an der Mur", "url": "http://pernegg.at", "country": "at"},
+    {
+        "title": "Paldau",
+        "url": "http://www.paldau.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Pama",
+        "url": "https://www.gemeinde-pama.at",
+        "country": "at",
+    },
+    {
+        "title": "Pamhagen",
+        "url": "https://www.gemeinde-pamhagen.at",
+        "country": "at",
+    },
+    {
+        "title": "Parndorf",
+        "url": "http://www.gemeinde-parndorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Payerbach",
+        "url": "https://www.payerbach.at",
+        "country": "at",
+    },
+    {
+        "title": "Peggau",
+        "url": "https://peggau.at",
+        "country": "at",
+    },
+    {
+        "title": "Pernegg an der Mur",
+        "url": "http://pernegg.at",
+        "country": "at",
+    },
     {
         "title": "Pernegg im Waldviertel",
         "url": "https://www.pernegg.info",
         "country": "at",
     },
+    {
+        "title": "Perschling",
+        "url": "www.perschling.at/",
+        "country": "at",
+    },
     {
         "title": "Pfarrwerfen",
         "url": "http://www.gemeinde.pfarrwerfen.at",
         "country": "at",
     },
-    {"title": "Pilgersdorf", "url": "https://www.pilgersdorf.at", "country": "at"},
-    {"title": "Pinggau", "url": "https://www.pinggau.gv.at", "country": "at"},
-    {"title": "Pinkafeld", "url": "https://www.pinkafeld.gv.at", "country": "at"},
+    {
+        "title": "Pilgersdorf",
+        "url": "https://www.pilgersdorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Pinggau",
+        "url": "https://www.pinggau.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Pinkafeld",
+        "url": "https://www.pinkafeld.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Pischelsdorf am Kulm",
+        "url": "https://www.pischelsdorf.com",
+        "country": "at",
+    },
     {
         "title": "Podersdorf am See",
         "url": "http://www.gemeindepodersdorfamsee.at",
         "country": "at",
     },
-    {"title": "Poggersdorf", "url": "https://gemeinde-poggersdorf.at", "country": "at"},
-    {"title": "Potzneusiedl", "url": "https://www.potzneusiedl.at", "country": "at"},
-    {"title": "Poysdorf", "url": "https://www.poysdorf.at", "country": "at"},
-    {"title": "Pöchlarn", "url": "https://www.poechlarn.at", "country": "at"},
-    {"title": "Raach am Hochgebirge", "url": "https://www.raach.at", "country": "at"},
-    {"title": "Raasdorf", "url": "www.raasdorf.gv.at/", "country": "at"},
-    {"title": "Radmer", "url": "https://www.radmer.at", "country": "at"},
-    {"title": "Ragnitz", "url": "https://www.ragnitz.gv.at", "country": "at"},
-    {"title": "Raiding", "url": "https://www.raiding-online.at", "country": "at"},
-    {"title": "Reichenau", "url": "https://reichenau.gv.at", "country": "at"},
+    {
+        "title": "Poggersdorf",
+        "url": "https://gemeinde-poggersdorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Pottenstein",
+        "url": "www.pottenstein.at/",
+        "country": "at",
+    },
+    {
+        "title": "Potzneusiedl",
+        "url": "https://www.potzneusiedl.at",
+        "country": "at",
+    },
+    {
+        "title": "Poysdorf",
+        "url": "https://www.poysdorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Pöchlarn",
+        "url": "https://www.poechlarn.at",
+        "country": "at",
+    },
+    {
+        "title": "Pregarten",
+        "url": "www.pregarten.at/",
+        "country": "at",
+    },
+    {
+        "title": "Premstätten",
+        "url": "www.premstaetten.gv.at/",
+        "country": "at",
+    },
+    {
+        "title": "Raach am Hochgebirge",
+        "url": "https://www.raach.at",
+        "country": "at",
+    },
+    {
+        "title": "Raasdorf",
+        "url": "www.raasdorf.gv.at/",
+        "country": "at",
+    },
+    {
+        "title": "Radmer",
+        "url": "https://www.radmer.at",
+        "country": "at",
+    },
+    {
+        "title": "Ragnitz",
+        "url": "https://www.ragnitz.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Raiding",
+        "url": "https://www.raiding-online.at",
+        "country": "at",
+    },
+    {
+        "title": "Rechnitz",
+        "url": "www.rechnitz.at/de/",
+        "country": "at",
+    },
+    {
+        "title": "Reichenau",
+        "url": "https://reichenau.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Reichenau an der Rax",
+        "url": "https://www.reichenau.at",
+        "country": "at",
+    },
     {
         "title": "Rohr bei Hartberg",
         "url": "https://www.rohr-bei-hartberg.at",
         "country": "at",
     },
-    {"title": "Rohr im Burgenland", "url": "www.rohr-bgld.at/", "country": "at"},
-    {"title": "Rudersdorf", "url": "http://www.rudersdorf.at", "country": "at"},
-    {"title": "Rust", "url": "https://www.freistadt-rust.at", "country": "at"},
+    {
+        "title": "Rohr im Burgenland",
+        "url": "www.rohr-bgld.at/",
+        "country": "at",
+    },
+    {
+        "title": "Rottenbach",
+        "url": "https://www.rottenbach.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Rudersdorf",
+        "url": "http://www.rudersdorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Rust",
+        "url": "https://www.freistadt-rust.at",
+        "country": "at",
+    },
     {
         "title": "Saalfelden am Steinernen Meer",
         "url": "www.stadtmarketing-saalfelden.at/de",
@@ -378,31 +985,61 @@ SERVICE_MAP = [
         "url": "https://www.st-georgen-stiefing.gv.at",
         "country": "at",
     },
-    {"title": "Sankt Gilgen", "url": "https://www.gemgilgen.at", "country": "at"},
+    {
+        "title": "Sankt Gilgen",
+        "url": "https://www.gemgilgen.at",
+        "country": "at",
+    },
     {
         "title": "Sankt Oswald bei Plankenwarth",
         "url": "https://www.sanktoswald.net",
         "country": "at",
     },
+    {
+        "title": "Schäffern",
+        "url": "https://www.schaeffern.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Schlins",
+        "url": "https://www.schlins.at",
+        "country": "at",
+    },
     {
         "title": "Schrattenberg",
         "url": "https://www.schrattenberg.gv.at",
         "country": "at",
     },
-    {"title": "Schwadorf", "url": "https://www.schwadorf.gv.at", "country": "at"},
-    {"title": "Schäffern", "url": "https://www.schaeffern.gv.at", "country": "at"},
     {
         "title": "Schützen am Gebirge",
         "url": "https://www.schuetzen-am-gebirge.at",
         "country": "at",
     },
+    {
+        "title": "Schwadorf",
+        "url": "https://www.schwadorf.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Schwarzenbach an der Pielach",
+        "url": "https://www.schwarzenbach-pielach.at",
+        "country": "at",
+    },
     {
         "title": "Seiersberg-Pirka",
         "url": "https://www.gemeindekurier.at",
         "country": "at",
     },
-    {"title": "Siegendorf", "url": "https://www.siegendorf.gv.at", "country": "at"},
-    {"title": "Sigleß", "url": "https://www.sigless.at", "country": "at"},
+    {
+        "title": "Siegendorf",
+        "url": "https://www.siegendorf.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Sigleß",
+        "url": "https://www.sigless.at",
+        "country": "at",
+    },
     {
         "title": "Sigmundsherberg",
         "url": "https://www.sigmundsherberg.gv.at",
@@ -413,7 +1050,16 @@ SERVICE_MAP = [
         "url": "https://www.sinabelkirchen.eu",
         "country": "at",
     },
-    {"title": "St. Andrä", "url": "https://www.st-andrae.gv.at", "country": "at"},
+    {
+        "title": "Söchau",
+        "url": "http://www.soechau.steiermark.at",
+        "country": "at",
+    },
+    {
+        "title": "St. Andrä",
+        "url": "https://www.st-andrae.gv.at",
+        "country": "at",
+    },
     {
         "title": "St. Andrä am Zicksee",
         "url": "https://www.gemeinde-standrae.at",
@@ -429,6 +1075,11 @@ SERVICE_MAP = [
         "url": "https://www.st-egyden.at",
         "country": "at",
     },
+    {
+        "title": "St. Florian bei Linz",
+        "url": "www.st-florian.at/",
+        "country": "at",
+    },
     {
         "title": "St. Georgen an der Leys",
         "url": "www.stgeorgenleys.at/",
@@ -444,7 +1095,11 @@ SERVICE_MAP = [
         "url": "http://www.st-johann-haide.gv.at",
         "country": "at",
     },
-    {"title": "St. Konrad", "url": "www.st-konrad.at/", "country": "at"},
+    {
+        "title": "St. Konrad",
+        "url": "www.st-konrad.at/",
+        "country": "at",
+    },
     {
         "title": "St. Lorenzen am Wechsel",
         "url": "https://www.st-lorenzen-wechsel.at",
@@ -460,6 +1115,11 @@ SERVICE_MAP = [
         "url": "https://www.st-margarethen.at",
         "country": "at",
     },
+    {
+        "title": "St. Martin im Innkreis",
+        "url": "https://www.st-martin-innkreis.ooe.gv.at",
+        "country": "at",
+    },
     {
         "title": "St. Peter - Freienstein",
         "url": "https://www.st-peter-freienstein.gv.at",
@@ -480,28 +1140,96 @@ SERVICE_MAP = [
         "url": "https://www.st-veit-suedsteiermark.gv.at",
         "country": "at",
     },
-    {"title": "Stegersbach", "url": "https://gemeinde.stegersbach.at", "country": "at"},
-    {"title": "Steinbrunn", "url": "https://www.steinbrunn.at", "country": "at"},
-    {"title": "Steuerberg", "url": "https://www.steuerberg.at", "country": "at"},
-    {"title": "Stinatz", "url": "http://www.stinatz.gv.at", "country": "at"},
-    {"title": "Stiwoll", "url": "https://www.stiwoll.at", "country": "at"},
-    {"title": "Stockerau", "url": "http://www.stockerau.at", "country": "at"},
+    {
+        "title": "Statzendorf",
+        "url": "https://statzendorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Stegersbach",
+        "url": "https://gemeinde.stegersbach.at",
+        "country": "at",
+    },
+    {
+        "title": "Steinbrunn",
+        "url": "https://www.steinbrunn.at",
+        "country": "at",
+    },
+    {
+        "title": "Steuerberg",
+        "url": "https://www.steuerberg.at",
+        "country": "at",
+    },
+    {
+        "title": "Stinatz",
+        "url": "http://www.stinatz.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Stiwoll",
+        "url": "https://www.stiwoll.at",
+        "country": "at",
+    },
+    {
+        "title": "Stockerau",
+        "url": "http://www.stockerau.at",
+        "country": "at",
+    },
+    {
+        "title": "Stössing",
+        "url": "https://www.stoessing.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Straden",
+        "url": "https://www.straden.gv.at",
+        "country": "at",
+    },
     {
         "title": "Straß in Steiermark",
         "url": "https://www.strass-steiermark.gv.at",
         "country": "at",
     },
     {
-        "title": "Söchau",
-        "url": "http://www.soechau.steiermark.at",
+        "title": "Stubenberg",
+        "url": "https://www.stubenberg.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Tadten",
+        "url": "https://www.tadten.at",
+        "country": "at",
+    },
+    {
+        "title": "Tattendorf",
+        "url": "https://www.tattendorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Taufkirchen an der Trattnach",
+        "url": "www.taufkirchen.at/home",
+        "country": "at",
+    },
+    {
+        "title": "Thal",
+        "url": "https://thal.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Tieschen",
+        "url": "https://www.tieschen.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Tobaj",
+        "url": "http://www.tobaj.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Tulln an der Donau",
+        "url": "https://www.tulln.at",
         "country": "at",
     },
-    {"title": "Tadten", "url": "https://www.tadten.at", "country": "at"},
-    {"title": "Tattendorf", "url": "https://www.tattendorf.at", "country": "at"},
-    {"title": "Thal", "url": "https://thal.gv.at", "country": "at"},
-    {"title": "Tieschen", "url": "https://www.tieschen.gv.at", "country": "at"},
-    {"title": "Tobaj", "url": "http://www.tobaj.gv.at", "country": "at"},
-    {"title": "Tulln an der Donau", "url": "https://www.tulln.at", "country": "at"},
     {
         "title": "Unterfrauenhaid",
         "url": "https://www.unterfrauenhaid.at",
@@ -512,57 +1240,171 @@ SERVICE_MAP = [
         "url": "https://www.unterkohlstaetten.at",
         "country": "at",
     },
-    {"title": "Unterlamm", "url": "http://www.unterlamm.gv.at", "country": "at"},
-    {"title": "Unterwart", "url": "https://www.unterwart.at", "country": "at"},
-    {"title": "Vasoldsberg", "url": "https://www.vasoldsberg.gv.at", "country": "at"},
+    {
+        "title": "Unterlamm",
+        "url": "http://www.unterlamm.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Unterwart",
+        "url": "https://www.unterwart.at",
+        "country": "at",
+    },
+    {
+        "title": "Übelbach",
+        "url": "https://www.uebelbach.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Vasoldsberg",
+        "url": "https://www.vasoldsberg.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Villach",
+        "url": "villach.at/",
+        "country": "at",
+    },
     {
         "title": "Vordernberg",
         "url": "http://www.vordernberg.steiermark.at",
         "country": "at",
     },
-    {"title": "Völkermarkt", "url": "https://voelkermarkt.gv.at", "country": "at"},
-    {"title": "Walpersbach", "url": "http://www.walpersbach.gv.at", "country": "at"},
-    {"title": "Weiden am See", "url": "https://www.weiden-see.at", "country": "at"},
-    {"title": "Weitersfeld", "url": "https://www.weitersfeld.gv.at", "country": "at"},
-    {"title": "Weiz", "url": "https://www.weiz.at", "country": "at"},
-    {"title": "Weppersdorf", "url": "https://www.weppersdorf.at", "country": "at"},
+    {
+        "title": "Vorderstoder",
+        "url": "www.vorderstoder.ooe.gv.at/",
+        "country": "at",
+    },
+    {
+        "title": "Völkermarkt",
+        "url": "https://voelkermarkt.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Walpersbach",
+        "url": "http://www.walpersbach.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Wartberg ob der Aist",
+        "url": "www.wartberg-aist.at/",
+        "country": "at",
+    },
+    {
+        "title": "Weiden am See",
+        "url": "https://www.weiden-see.at",
+        "country": "at",
+    },
+    {
+        "title": "Weißenkirchen in der Wachau",
+        "url": "https://www.weissenkirchen-wachau.at",
+        "country": "at",
+    },
+    {
+        "title": "Weitersfeld",
+        "url": "https://www.weitersfeld.gv.at",
+        "country": "at",
+    },
+    {
+        "title": "Weiz",
+        "url": "https://www.weiz.at",
+        "country": "at",
+    },
+    {
+        "title": "Weppersdorf",
+        "url": "https://www.weppersdorf.at",
+        "country": "at",
+    },
     {
         "title": "Werfenweng",
         "url": "http://www.gemeinde-werfenweng.at",
         "country": "at",
     },
-    {"title": "Wies", "url": "https://www.wies.at", "country": "at"},
-    {"title": "Wiesen", "url": "https://www.wiesen.eu", "country": "at"},
-    {"title": "Wiesfleck", "url": "https://www.gemeinde-wiesfleck.at", "country": "at"},
-    {"title": "Wiesmath", "url": "http://www.wiesmath.at", "country": "at"},
+    {
+        "title": "Wies",
+        "url": "https://www.wies.at",
+        "country": "at",
+    },
+    {
+        "title": "Wiesen",
+        "url": "https://www.wiesen.eu",
+        "country": "at",
+    },
+    {
+        "title": "Wiesfleck",
+        "url": "https://www.gemeinde-wiesfleck.at",
+        "country": "at",
+    },
+    {
+        "title": "Wiesmath",
+        "url": "http://www.wiesmath.at",
+        "country": "at",
+    },
     {
         "title": "Wimpassing an der Leitha",
         "url": "http://www.wimpassing-leitha.at",
         "country": "at",
     },
-    {"title": "Winden am See", "url": "https://www.winden.at", "country": "at"},
-    {"title": "Wolfau", "url": "https://www.gemeinde-wolfau.at", "country": "at"},
-    {"title": "Wolfsberg", "url": "https://www.wolfsberg.at", "country": "at"},
+    {
+        "title": "Winden am See",
+        "url": "https://www.winden.at",
+        "country": "at",
+    },
+    {
+        "title": "Winklarn",
+        "url": "winklarn.gv.at/",
+        "country": "at",
+    },
+    {
+        "title": "Wolfau",
+        "url": "https://www.gemeinde-wolfau.at",
+        "country": "at",
+    },
+    {
+        "title": "Wolfsberg",
+        "url": "https://www.wolfsberg.at",
+        "country": "at",
+    },
     {
         "title": "Wolkersdorf im Weinviertel",
         "url": "http://www.wolkersdorf.at",
         "country": "at",
     },
+    {
+        "title": "Wörterberg",
+        "url": "http://www.woerterberg.at",
+        "country": "at",
+    },
     {
         "title": "Wulkaprodersdorf",
         "url": "https://www.wulkaprodersdorf.at",
         "country": "at",
     },
-    {"title": "Wörterberg", "url": "http://www.woerterberg.at", "country": "at"},
-    {"title": "Zagersdorf", "url": "http://www.zagersdorf.at", "country": "at"},
+    {
+        "title": "Zagersdorf",
+        "url": "http://www.zagersdorf.at",
+        "country": "at",
+    },
     {
         "title": "Zelking-Matzleinsdorf",
         "url": "http://www.zelking-matzleinsdorf.gv.at",
         "country": "at",
     },
-    {"title": "Zillingtal", "url": "https://www.zillingtal.eu", "country": "at"},
-    {"title": "Zurndorf", "url": "https://zurndorf.at", "country": "at"},
-    {"title": "Übelbach", "url": "https://www.uebelbach.gv.at", "country": "at"},
+    {
+        "title": "Zillingtal",
+        "url": "https://www.zillingtal.eu",
+        "country": "at",
+    },
+    {
+        "title": "Zurndorf",
+        "url": "https://zurndorf.at",
+        "country": "at",
+    },
+    {
+        "title": "Zwischenwasser",
+        "url": "https://www.zwischenwasser.at",
+        "country": "at",
+    },
 ]
 
 
@@ -638,9 +1480,11 @@ class CitiesApps:
         return r.json()
 
     def get_specific_calendar(self, city_id: str, search: str) -> dict | None:
-        for calendar in self.get_garbage_calendars(city_id):
+        calendars = self.get_garbage_calendars(city_id)
+        for calendar in calendars:
             if calendar["name"].lower().strip() == search.lower().strip():
                 return calendar
+        print(f"Calendars: {[c['name'] for c in calendars]}")
         return None
 
     def get_garbage_plans(self, garbage_calendar: dict) -> list:
@@ -706,7 +1550,7 @@ class CitiesApps:
                     c["url"] for c in SERVICE_MAP if city["name"] == c["title"]
                 ][0]
             else:
-                print(f"{id+1}/{supported_len} {city['name']}")
+                print(f"{id + 1}/{supported_len} {city['name']}")
                 city_homepage = self.get_city_home_page(city)
 
             slash_index = [m.start() for m in re.finditer("/", city_homepage)]
diff --git a/doc/source/citiesapps_com.md b/doc/source/citiesapps_com.md
index eef042d6..dca736b8 100644
--- a/doc/source/citiesapps_com.md
+++ b/doc/source/citiesapps_com.md
@@ -7,17 +7,24 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 <!--Begin of service section-->
 |City|Website|
 |-|-|
+| Absdorf | [absdorf.gv.at](https://www.absdorf.gv.at) |
 | Altenmarkt an der Triesting | [altenmarkt-triesting.gv.at](https://www.altenmarkt-triesting.gv.at) |
 | Andau | [andau-gemeinde.at](https://www.andau-gemeinde.at) |
+| Andrichsfurt | [andrichsfurt.at](https://www.andrichsfurt.at) |
 | Apetlon | [gemeinde-apetlon.at](https://gemeinde-apetlon.at) |
 | Bad Blumau | [bad-blumau-gemeinde.at](https://bad-blumau-gemeinde.at) |
+| Bad Fischau-Brunn | [bad-fischau-brunn.at](https://www.bad-fischau-brunn.at) |
 | Bad Gleichenberg | [bad-gleichenberg.gv.at](http://www.bad-gleichenberg.gv.at) |
 | Bad Loipersdorf | [gemeinde.loipersdorf.at](https://gemeinde.loipersdorf.at) |
 | Bad Radkersburg | [bad-radkersburg.gv.at](https://www.bad-radkersburg.gv.at) |
+| Bad Schallerbach | [bad-schallerbach.at](https://www.bad-schallerbach.at) |
 | Bad Tatzmannsdorf | [bad-tatzmannsdorf.at](http://www.bad-tatzmannsdorf.at) |
 | Bad Waltersdorf | [bad-waltersdorf.gv.at/home](www.bad-waltersdorf.gv.at/home/) |
+| Behamberg | [behamberg.gv.at](behamberg.gv.at/) |
 | Bernstein | [bernstein.gv.at](http://www.bernstein.gv.at) |
 | Bildein | [bildein.at](http://www.bildein.at) |
+| Birkfeld | [birkfeld.at](http://www.birkfeld.at) |
+| Blindenmarkt | [blindenmarkt.gv.at](blindenmarkt.gv.at/) |
 | Breitenbrunn am Neusiedler See | [breitenbrunn.at](http://www.breitenbrunn.at) |
 | Breitenstein | [breitenstein.at](https://www.breitenstein.at) |
 | Bromberg | [bromberg.at](http://www.bromberg.at) |
@@ -25,6 +32,8 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Buch - St. Magdalena | [buch-stmagdalena.at](http://www.buch-stmagdalena.at) |
 | Burgau | [burgau.info](https://www.burgau.info) |
 | Burgauberg-Neudauberg | [burgauberg-neudauberg.at](http://www.burgauberg-neudauberg.at) |
+| Burgschleinitz-Kühnring | [burgschleinitz-kuehnring.at](https://burgschleinitz-kuehnring.at) |
+| Bürg-Vöstenhof | [buerg-voestenhof.at](http://www.buerg-voestenhof.at) |
 | Dechantskirchen | [dechantskirchen.gv.at](https://dechantskirchen.gv.at) |
 | Deutsch Goritz | [deutsch-goritz.at](https://www.deutsch-goritz.at) |
 | Deutsch Jahrndorf | [deutsch-jahrndorf.at](https://www.deutsch-jahrndorf.at) |
@@ -42,12 +51,15 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Eggersdorf bei Graz | [eggersdorf-graz.gv.at](https://www.eggersdorf-graz.gv.at) |
 | Eichgraben | [eichgraben.at](www.eichgraben.at/) |
 | Eisenstadt | [eisenstadt.gv.at](https://www.eisenstadt.gv.at) |
+| Enzenreith | [gemeinde-enzenreith.at](https://www.gemeinde-enzenreith.at) |
 | Fehring | [fehring.at](http://www.fehring.at) |
 | Feistritz ob Bleiburg | [feistritz-bleiburg.gv.at](https://feistritz-bleiburg.gv.at) |
+| Feistritztal | [feistritztal.at](https://www.feistritztal.at) |
 | Feldbach | [feldbach.gv.at](https://www.feldbach.gv.at) |
 | Feldkirchen in Kärnten | [feldkirchen.at](https://www.feldkirchen.at) |
 | Ferndorf | [ferndorf.gv.at](https://www.ferndorf.gv.at) |
 | Frankenau-Unterpullendorf | [frankenau-unterpullendorf.gv.at](https://www.frankenau-unterpullendorf.gv.at) |
+| Frankenfels | [frankenfels.at](www.frankenfels.at/) |
 | Frauenkirchen | [frauenkirchen.at](https://www.frauenkirchen.at) |
 | Freistadt | [freistadt.at](https://www.freistadt.at) |
 | Fresach | [fresach.gv.at](https://fresach.gv.at) |
@@ -56,6 +68,7 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Fürstenfeld | [fuerstenfeld.gv.at](https://www.fuerstenfeld.gv.at) |
 | Gabersdorf | [gabersdorf.gv.at](https://www.gabersdorf.gv.at) |
 | Gattendorf | [gattendorf.at](https://www.gattendorf.at) |
+| Gersdorf an der Feistritz | [gersdorf.gv.at](https://www.gersdorf.gv.at) |
 | Gitschtal | [gitschtal.gv.at](gitschtal.gv.at/) |
 | Gols | [gols.at](https://www.gols.at) |
 | Grafendorf bei Hartberg | [grafendorf.at](https://grafendorf.at) |
@@ -66,15 +79,20 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Großsteinbach | [gemeinde-grosssteinbach.at](www.gemeinde-grosssteinbach.at/) |
 | Großwarasdorf | [grosswarasdorf.at](https://www.grosswarasdorf.at) |
 | Großwilfersdorf | [grosswilfersdorf.steiermark.at](http://www.grosswilfersdorf.steiermark.at) |
+| Grödig | [groedig.at](www.groedig.at/) |
 | Gutenberg | [gutenberg-stenzengreith.gv.at](https://www.gutenberg-stenzengreith.gv.at) |
 | Güssing | [guessing.co.at](https://www.guessing.co.at) |
+| Güttenbach | [guettenbach.at](https://www.guettenbach.at) |
+| Haag am Hausruck | [haag-hausruck.at](www.haag-hausruck.at/) |
 | Hagenberg im Mühlkreis | [hagenberg.at](https://www.hagenberg.at) |
 | Hannersdorf | [hannersdorf.at](https://www.hannersdorf.at) |
 | Hartberg | [hartberg.at](https://www.hartberg.at) |
 | Heiligenkreuz | [heiligenkreuz.at](https://www.heiligenkreuz.at) |
 | Heiligenkreuz am Waasen | [heiligenkreuz-waasen.gv.at](https://www.heiligenkreuz-waasen.gv.at) |
 | Heimschuh | [heimschuh.at](https://www.heimschuh.at) |
+| Heldenberg | [heldenberg.gv.at](https://www.heldenberg.gv.at) |
 | Henndorf am Wallersee | [henndorf.at](www.henndorf.at/) |
+| Heugraben | [heugraben.at](www.heugraben.at/) |
 | Hirm | [hirm.gv.at](www.hirm.gv.at/) |
 | Hofstätten an der Raab | [hofstaetten.at](https://www.hofstaetten.at) |
 | Horitschon | [horitschon.at](http://www.horitschon.at) |
@@ -82,6 +100,7 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Hornstein | [hornstein.at](https://www.hornstein.at) |
 | Hüttenberg | [huettenberg.at](https://huettenberg.at) |
 | Ilz | [ilz.at](https://www.ilz.at) |
+| Ilztal | [ilztal.at](https://www.ilztal.at) |
 | Inzenhof | [inzenhof.at](https://www.inzenhof.at) |
 | Jabing | [gemeinde-jabing.at](https://www.gemeinde-jabing.at) |
 | Jagerberg | [jagerberg.info](http://www.jagerberg.info) |
@@ -101,21 +120,26 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Korneuburg | [korneuburg.gv.at](https://www.korneuburg.gv.at) |
 | Krensdorf | [krensdorf.at](https://www.krensdorf.at) |
 | Kuchl | [kuchl.net](www.kuchl.net/) |
+| Kötschach-Mauthen | [koetschach-mauthen.gv.at](https://koetschach-mauthen.gv.at) |
 | Laa an der Thaya | [laa.at](http://www.laa.at) |
 | Lackenbach | [gemeinde-lackenbach.at](https://www.gemeinde-lackenbach.at) |
 | Lackendorf | [lackendorf.at](https://www.lackendorf.at) |
 | Langau | [langau.at](http://www.langau.at) |
 | Langenrohr | [langenrohr.gv.at](https://www.langenrohr.gv.at) |
+| Langenzersdorf | [langenzersdorf.gv.at](www.langenzersdorf.gv.at/) |
 | Leibnitz | [leibnitz.at](https://www.leibnitz.at) |
 | Leithaprodersdorf | [leithaprodersdorf.at](http://www.leithaprodersdorf.at) |
 | Leutschach an der Weinstraße | [leutschach-weinstrasse.gv.at](https://www.leutschach-weinstrasse.gv.at) |
 | Lieboch | [lieboch.gv.at](https://www.lieboch.gv.at) |
 | Litzelsdorf | [litzelsdorf.at](https://www.litzelsdorf.at) |
-| Lockenhaus | [lockenhaus.at](www.lockenhaus.at/) |
 | Loipersbach im Burgenland | [loipersbach.info](https://www.loipersbach.info) |
+| Ludersdorf - Wilfersdorf | [lu-wi.at](https://www.lu-wi.at) |
 | Mariasdorf | [mariasdorf.at](https://www.mariasdorf.at) |
+| Markt Allhau | [marktallhau.gv.at](https://www.marktallhau.gv.at) |
 | Markt Hartmannsdorf | [markthartmannsdorf.at](https://www.markthartmannsdorf.at) |
 | Markt Neuhodis | [markt-neuhodis.at](http://www.markt-neuhodis.at) |
+| Markt Piesting-Dreistetten | [piesting.at](https://www.piesting.at) |
+| Marktgemeinde Lockenhaus | [lockenhaus.at](www.lockenhaus.at/) |
 | Marz | [marz.gv.at](https://www.marz.gv.at) |
 | Mattersburg | [mattersburg.gv.at](https://www.mattersburg.gv.at) |
 | Meiseldorf | [meiseldorf.gv.at](https://www.meiseldorf.gv.at) |
@@ -128,12 +152,15 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Mureck | [mureck.gv.at](https://www.mureck.gv.at) |
 | Mönchhof | [moenchhof.at](https://www.moenchhof.at) |
 | Mörbisch am See | [moerbisch.gv.at](https://moerbisch.gv.at) |
+| Neudau | [neudau.gv.at](https://www.neudau.gv.at) |
 | Neudorf bei Parndorf | [neudorfbeiparndorf.at](http://www.neudorfbeiparndorf.at) |
 | Neudörfl | [neudoerfl.gv.at](https://www.neudoerfl.gv.at) |
 | Neufeld an der Leitha | [neufeld-leitha.at](https://www.neufeld-leitha.at) |
 | Neusiedl am See | [neusiedlamsee.at](https://www.neusiedlamsee.at) |
 | Neustift bei Güssing | [xn--neustift-bei-gssing-jbc.at](http://www.xn--neustift-bei-gssing-jbc.at) |
 | Nickelsdorf | [nickelsdorf.gv.at](https://www.nickelsdorf.gv.at) |
+| Niederneukirchen | [niederneukirchen.ooe.gv.at](https://www.niederneukirchen.ooe.gv.at) |
+| Ober-Grafendorf | [gemeinde.ober-grafendorf.gv.at](https://gemeinde.ober-grafendorf.gv.at) |
 | Oberpullendorf | [oberpullendorf.gv.at](https://www.oberpullendorf.gv.at) |
 | Oberschützen | [oberschuetzen.at](https://www.oberschuetzen.at) |
 | Oberwart | [oberwart.gv.at](https://www.oberwart.gv.at) |
@@ -147,31 +174,41 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Peggau | [peggau.at](https://peggau.at) |
 | Pernegg an der Mur | [pernegg.at](http://pernegg.at) |
 | Pernegg im Waldviertel | [pernegg.info](https://www.pernegg.info) |
+| Perschling | [perschling.at](www.perschling.at/) |
 | Pfarrwerfen | [gemeinde.pfarrwerfen.at](http://www.gemeinde.pfarrwerfen.at) |
 | Pilgersdorf | [pilgersdorf.at](https://www.pilgersdorf.at) |
 | Pinggau | [pinggau.gv.at](https://www.pinggau.gv.at) |
 | Pinkafeld | [pinkafeld.gv.at](https://www.pinkafeld.gv.at) |
+| Pischelsdorf am Kulm | [pischelsdorf.com](https://www.pischelsdorf.com) |
 | Podersdorf am See | [gemeindepodersdorfamsee.at](http://www.gemeindepodersdorfamsee.at) |
 | Poggersdorf | [gemeinde-poggersdorf.at](https://gemeinde-poggersdorf.at) |
+| Pottenstein | [pottenstein.at](www.pottenstein.at/) |
 | Potzneusiedl | [potzneusiedl.at](https://www.potzneusiedl.at) |
 | Poysdorf | [poysdorf.at](https://www.poysdorf.at) |
+| Pregarten | [pregarten.at](www.pregarten.at/) |
+| Premstätten | [premstaetten.gv.at](www.premstaetten.gv.at/) |
 | Pöchlarn | [poechlarn.at](https://www.poechlarn.at) |
 | Raach am Hochgebirge | [raach.at](https://www.raach.at) |
 | Raasdorf | [raasdorf.gv.at](www.raasdorf.gv.at/) |
 | Radmer | [radmer.at](https://www.radmer.at) |
 | Ragnitz | [ragnitz.gv.at](https://www.ragnitz.gv.at) |
 | Raiding | [raiding-online.at](https://www.raiding-online.at) |
+| Rechnitz | [rechnitz.at/de](www.rechnitz.at/de/) |
 | Reichenau | [reichenau.gv.at](https://reichenau.gv.at) |
+| Reichenau an der Rax | [reichenau.at](https://www.reichenau.at) |
 | Rohr bei Hartberg | [rohr-bei-hartberg.at](https://www.rohr-bei-hartberg.at) |
 | Rohr im Burgenland | [rohr-bgld.at](www.rohr-bgld.at/) |
+| Rottenbach | [rottenbach.gv.at](https://www.rottenbach.gv.at) |
 | Rudersdorf | [rudersdorf.at](http://www.rudersdorf.at) |
 | Rust | [freistadt-rust.at](https://www.freistadt-rust.at) |
 | Saalfelden am Steinernen Meer | [stadtmarketing-saalfelden.at/de](www.stadtmarketing-saalfelden.at/de) |
 | Sankt Georgen an der Stiefing | [st-georgen-stiefing.gv.at](https://www.st-georgen-stiefing.gv.at) |
 | Sankt Gilgen | [gemgilgen.at](https://www.gemgilgen.at) |
 | Sankt Oswald bei Plankenwarth | [sanktoswald.net](https://www.sanktoswald.net) |
+| Schlins | [schlins.at](https://www.schlins.at) |
 | Schrattenberg | [schrattenberg.gv.at](https://www.schrattenberg.gv.at) |
 | Schwadorf | [schwadorf.gv.at](https://www.schwadorf.gv.at) |
+| Schwarzenbach an der Pielach | [schwarzenbach-pielach.at](https://www.schwarzenbach-pielach.at) |
 | Schäffern | [schaeffern.gv.at](https://www.schaeffern.gv.at) |
 | Schützen am Gebirge | [schuetzen-am-gebirge.at](https://www.schuetzen-am-gebirge.at) |
 | Seiersberg-Pirka | [gemeindekurier.at](https://www.gemeindekurier.at) |
@@ -183,6 +220,7 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | St. Andrä am Zicksee | [gemeinde-standrae.at](https://www.gemeinde-standrae.at) |
 | St. Anna am Aigen | [st-anna-aigen.gv.at](http://www.st-anna-aigen.gv.at) |
 | St. Egyden am Steinfeld | [st-egyden.at](https://www.st-egyden.at) |
+| St. Florian bei Linz | [st-florian.at](www.st-florian.at/) |
 | St. Georgen an der Leys | [stgeorgenleys.at](www.stgeorgenleys.at/) |
 | St. Jakob im Rosental | [st-jakob-rosental.gv.at](www.st-jakob-rosental.gv.at/) |
 | St. Johann in der Haide | [st-johann-haide.gv.at](http://www.st-johann-haide.gv.at) |
@@ -190,20 +228,26 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | St. Lorenzen am Wechsel | [st-lorenzen-wechsel.at](https://www.st-lorenzen-wechsel.at) |
 | St. Margarethen an der Raab | [st-margarethen-raab.at](https://www.st-margarethen-raab.at) |
 | St. Margarethen im Burgenland | [st-margarethen.at](https://www.st-margarethen.at) |
+| St. Martin im Innkreis | [st-martin-innkreis.ooe.gv.at](https://www.st-martin-innkreis.ooe.gv.at) |
 | St. Peter - Freienstein | [st-peter-freienstein.gv.at](https://www.st-peter-freienstein.gv.at) |
 | St. Peter am Ottersbach | [st-peter-ottersbach.gv.at](http://www.st-peter-ottersbach.gv.at) |
 | St. Ruprecht an der Raab | [st.ruprecht.at](https://www.st.ruprecht.at) |
 | St. Veit in der Südsteiermark | [st-veit-suedsteiermark.gv.at](https://www.st-veit-suedsteiermark.gv.at) |
+| Statzendorf | [statzendorf.at](https://statzendorf.at) |
 | Stegersbach | [gemeinde.stegersbach.at](https://gemeinde.stegersbach.at) |
 | Steinbrunn | [steinbrunn.at](https://www.steinbrunn.at) |
 | Steuerberg | [steuerberg.at](https://www.steuerberg.at) |
 | Stinatz | [stinatz.gv.at](http://www.stinatz.gv.at) |
 | Stiwoll | [stiwoll.at](https://www.stiwoll.at) |
 | Stockerau | [stockerau.at](http://www.stockerau.at) |
+| Straden | [straden.gv.at](https://www.straden.gv.at) |
 | Straß in Steiermark | [strass-steiermark.gv.at](https://www.strass-steiermark.gv.at) |
+| Stubenberg | [stubenberg.gv.at](https://www.stubenberg.gv.at) |
+| Stössing | [stoessing.gv.at](https://www.stoessing.gv.at) |
 | Söchau | [soechau.steiermark.at](http://www.soechau.steiermark.at) |
 | Tadten | [tadten.at](https://www.tadten.at) |
 | Tattendorf | [tattendorf.at](https://www.tattendorf.at) |
+| Taufkirchen an der Trattnach | [taufkirchen.at/home](www.taufkirchen.at/home) |
 | Thal | [thal.gv.at](https://thal.gv.at) |
 | Tieschen | [tieschen.gv.at](https://www.tieschen.gv.at) |
 | Tobaj | [tobaj.gv.at](http://www.tobaj.gv.at) |
@@ -213,12 +257,16 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Unterlamm | [unterlamm.gv.at](http://www.unterlamm.gv.at) |
 | Unterwart | [unterwart.at](https://www.unterwart.at) |
 | Vasoldsberg | [vasoldsberg.gv.at](https://www.vasoldsberg.gv.at) |
+| Villach | [villach.at](villach.at/) |
 | Vordernberg | [vordernberg.steiermark.at](http://www.vordernberg.steiermark.at) |
+| Vorderstoder | [vorderstoder.ooe.gv.at](www.vorderstoder.ooe.gv.at/) |
 | Völkermarkt | [voelkermarkt.gv.at](https://voelkermarkt.gv.at) |
 | Walpersbach | [walpersbach.gv.at](http://www.walpersbach.gv.at) |
+| Wartberg ob der Aist | [wartberg-aist.at](www.wartberg-aist.at/) |
 | Weiden am See | [weiden-see.at](https://www.weiden-see.at) |
 | Weitersfeld | [weitersfeld.gv.at](https://www.weitersfeld.gv.at) |
 | Weiz | [weiz.at](https://www.weiz.at) |
+| Weißenkirchen in der Wachau | [weissenkirchen-wachau.at](https://www.weissenkirchen-wachau.at) |
 | Weppersdorf | [weppersdorf.at](https://www.weppersdorf.at) |
 | Werfenweng | [gemeinde-werfenweng.at](http://www.gemeinde-werfenweng.at) |
 | Wies | [wies.at](https://www.wies.at) |
@@ -227,6 +275,7 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Wiesmath | [wiesmath.at](http://www.wiesmath.at) |
 | Wimpassing an der Leitha | [wimpassing-leitha.at](http://www.wimpassing-leitha.at) |
 | Winden am See | [winden.at](https://www.winden.at) |
+| Winklarn | [winklarn.gv.at](winklarn.gv.at/) |
 | Wolfau | [gemeinde-wolfau.at](https://www.gemeinde-wolfau.at) |
 | Wolfsberg | [wolfsberg.at](https://www.wolfsberg.at) |
 | Wolkersdorf im Weinviertel | [wolkersdorf.at](http://www.wolkersdorf.at) |
@@ -236,6 +285,7 @@ Support for schedules provided by [App CITIES](https://citiesapps.com), serving
 | Zelking-Matzleinsdorf | [zelking-matzleinsdorf.gv.at](http://www.zelking-matzleinsdorf.gv.at) |
 | Zillingtal | [zillingtal.eu](https://www.zillingtal.eu) |
 | Zurndorf | [zurndorf.at](https://zurndorf.at) |
+| Zwischenwasser | [zwischenwasser.at](https://www.zwischenwasser.at) |
 | Übelbach | [uebelbach.gv.at](https://www.uebelbach.gv.at) |
 <!--End of service section-->
 
diff --git a/info.md b/info.md
index 4606a923..062182ac 100644
--- a/info.md
+++ b/info.md
@@ -17,7 +17,7 @@ Waste collection schedules from service provider web sites are updated daily, de
 | Generic | ICS / iCal files |
 | Static | User-defined dates or repeating date patterns |<!--Begin of country section-->
 | Australia | Adelaide Hills Council, Adelaide Plains Council, Alexandrina Council, App Backend of My Local Services, Armadale (Western Australia), Australian Capital Territory (ACT), Banyule City Council, Baw Baw Shire Council, Bayside City Council, Bega Valley Shire Council, Belmont City Council, Berri Barmera Council, Blacktown City Council (NSW), Blue Mountains City Council, Brisbane City Council, Burwood City Council, Campbelltown City Council, Campbelltown City Council (NSW), Cardinia Shire Council, City of Adelaide, City of Ballarat, City of Burnside, City of Canada Bay Council, City of Charles Sturt, City of Cockburn, City of Darebin, City of Greater Geelong, City of Kingston, City of Mitcham, City of Mount Gambier, City of Norwood Payneham and St Peters, City of Onkaparinga, City of Onkaparinga Council, City of Port Adelaide Enfield, City of Prospect, City of Ryde (NSW), City of Salisbury, City of Wanneroo, City of West Torrens, City of Whyalla, Clare and Gilbert Valleys Council, Coorong District Council, Council of Copper Coast, Cowra Council, Cumberland Council (NSW), District Council of Barunga West, District Council of Ceduna, District Council of Cleve, District Council of Elliston, District Council of Loxton Waikerie, District Council of Mount Barker, District Council of Mount Remarkable, District Council of Robe, District Council of Streaky Bay, Forbes Shire Council, Frankston City Council, Gold Coast City Council, Gwydir Shire Council, Hobsons Bay City Council, Hornsby Shire Council, Hume City Council, Impact Apps, Inner West Council (NSW), Ipswich City Council, Knox City Council, Ku-ring-gai Council, Lake Macquarie City Council, Light Regional Council, Lithgow City Council, Livingstone Shire Council, Loddon Shire Council, Logan City Council, Macedon Ranges Shire Council, Mansfield Shire Council, Maribyrnong Council, Maroondah City Council, Melton City Council, Merri-bek City Council, Mid Murray Council, Moira Shire Council, Moree Plains Shire Council, Moreton Bay, Mosman Council, Naracoorte Lucindale Council, Nillumbik Shire Council, North Adelaide Waste Management Authority, Northern Areas Council, Penrith City Council, Port Adelaide Enfield, South Australia, Port Augusta City Council, Port Macquarie Hastings Council, Port Pirie Regional Council, Port Stephens Council, Queanbeyan-Palerang Regional Council, RecycleSmart, Redland City Council (QLD), Regional Council of Goyder, Renmark Paringa Council, Rural City of Murray Bridge, Shellharbour City Council, Singleton Council, Snowy Valleys Council, South Burnett Regional Council, Southern Mallee District Council, Stirling, Stonnington City Council, The Flinders Ranges Council, The Hawkesbury City Council, Sydney, The Hills Shire Council, Sydney, Town of Victoria Park, Town of Walkerville, Townsville, Unley City Council (SA), Wakefield Regional Council, Wellington Shire Council, Whitehorse City Counfil, Whittlesea City Council, Wollondilly Shire Council, Wollongong City Council, Wyndham City Council, Melbourne, Yankalilla District Council, Yarra Ranges Council, Yorke Peninsula Council |
-| Austria | Abfallverband Hollabrunn, Abfallverband Korneuburg, Abfallverband Schwechat, Abfallwirtschaft der Stadt St. Pölten, Abfallwirtschaft Stadt Krems, Afritz am See, Alpbach, Altenmarkt an der Triesting, Althofen, Andau, Angath, Apetlon, App CITIES, Arnoldstein, Aschau im Zillertal, AWV Neunkirchen, AWV Wr. Neustadt, Bad Blumau, Bad Gleichenberg, Bad Häring, Bad Kleinkirchheim, Bad Loipersdorf, Bad Radkersburg, Bad Tatzmannsdorf, Bad Waltersdorf, Baldramsdorf, Berg im Drautal, Berndorf bei Salzburg, Bernstein, Bildein, Brandenberg, Breitenbach am Inn, Breitenbrunn am Neusiedler See, Breitenstein, Bromberg, Bruckneudorf, Buch - St. Magdalena, Burgau, Burgauberg-Neudauberg, Burgenländischer Müllverband, Dechantskirchen, Dellach, Dellach im Drautal, Deutsch Goritz, Deutsch Jahrndorf, Deutsch Kaltenbrunn, Deutschkreutz, Die NÖ Umweltverbände, Dobl-Zwaring, Drasenhofen, Draßmarkt, Ebenthal in Kärnten, Eberau, Eberndorf, Ebersdorf, Eberstein, Edelsbach bei Feldbach, Eggenburg, Eggersdorf bei Graz, Eichgraben, Eisenstadt, Eugendorf, Fehring, Feistritz im Rosental, Feistritz ob Bleiburg, Feldbach, Feldkirchen in Kärnten, Feldkirchen in Kärnten, Ferlach, Ferndorf, Ferndorf, Finkenstein am Faaker See, Frankenau-Unterpullendorf, Frauenkirchen, Frauenstein, Freistadt, Fresach, Friedberg, Frohnleiten, Fürstenfeld, Gabersdorf, GABL, Gattendorf, GAUL Laa an der Thaya, GAUM Mistelbach, GDA Amstetten, Gemeindeverband Horn, Gitschtal, Gitschtal, Globasnitz, Gmünd in Kärnten, Gols, Grafendorf bei Hartberg, Grafenschachen, Grafenstein, Grafenstein, Gratkorn, Gratwein-Straßengel, Greifenburg, Großkirchheim, Großsteinbach, Großwarasdorf, Großwilfersdorf, Gutenberg, Guttaring, GV Gmünd, GV Krems, GV Zwettl, GVA Baden, GVA Baden, GVA Lilienfeld, GVA Mödling, GVA Tulln, GVA Waidhofen/Thaya, GVU Bezirk Gänserndorf, GVU Melk, GVU Scheibbs, GVU Scheibbs, GVU St. Pölten, Güssing, Hagenberg im Mühlkreis, Hannersdorf, Hartberg, Heiligenblut am Großglockner, Heiligenkreuz, Heiligenkreuz am Waasen, Heimschuh, Henndorf am Wallersee, Henndorf am Wallersee, Hermagor-Pressegger See, Hirm, Hofstätten an der Raab, Hopfgarten im Brixental, Horitschon, Horn, Hornstein, Hüttenberg, Ilz, infeo, Innsbrucker Kommunalbetriebe, Inzenhof, Irschen, Jabing, Jagerberg, Kaindorf, Kaisersdorf, Kalsdorf bei Graz, Kapfenstein, Kemeten, Keutschach am See, Kirchbach, Kirchbach-Zerlach, Kirchberg an der Raab, Kirchbichl, Kirchdorf in Tirol, Kittsee, Klagenfurt am Wörthersee, Kleblach-Lind, Kleinmürbisch, Klingenbach, Klosterneuburg, Klöch, Kobersdorf, Kohfidisch, Korneuburg, Krems in Kärnten, Krensdorf, Krumpendorf am Wörthersee, Kuchl, Kundl, Kössen, Köstendorf, Kötschach-Mauthen, Köttmannsdorf, Laa an der Thaya, Lackenbach, Lackendorf, Langau, Langenrohr, Leibnitz, Leithaprodersdorf, Lendorf, Leoben, Lesachtal, Leutschach an der Weinstraße, Lieboch, Linz AG, Litzelsdorf, Lockenhaus, Loipersbach im Burgenland, Ludmannsdorf, Lurnfeld, Magdalensberg, Mallnitz, Malta, Maria Rain, Maria Saal, Maria Wörth, Mariasdorf, Markt Hartmannsdorf, Markt Neuhodis, Markt Piesting Dreistetten, Marktgemeinde Edlitz, Marz, Mattersburg, Mattsee, Mayer Recycling, Meiseldorf, Melk, Mettersdorf am Saßbach, Miesenbach, Millstatt, Mischendorf, Mistelbach, Mitterdorf an der Raab, Moosburg, Mureck, Mönchhof, Mörbisch am See, Mörtschach, Mühldorf, Müll App, Münster, Neudorf bei Parndorf, Neudörfl, Neufeld an der Leitha, Neumarkt am Wallersee, Neusiedl am See, Neustift bei Güssing, Nickelsdorf, Oberdrauburg, Oberndorf in Tirol, Oberpullendorf, Oberschützen, Obertrum am See, Oberwart, Oslip, Ottendorf an der Rittschein, Ottobrunn, Paldau, Pama, Pamhagen, Parndorf, Paternion, Payerbach, Peggau, Pernegg an der Mur, Pernegg im Waldviertel, Pfarrwerfen, Pilgersdorf, Pinggau, Pinkafeld, Podersdorf am See, Poggersdorf, Poggersdorf, Potzneusiedl, Poysdorf, Pöchlarn, Pörtschach am Wörther See, Raach am Hochgebirge, Raasdorf, Radenthein, Radfeld, Radmer, Ragnitz, Raiding, Ramsau im Zillertal, Rangersdorf, Reichenau, Reichenfels, Reith im Alpbachtal, Reißeck, Rennweg am Katschberg, Rohr bei Hartberg, Rohr im Burgenland, Rudersdorf, Rust, Saalfelden am Steinernen Meer, Sachsenburg, Sankt Georgen an der Stiefing, Sankt Gilgen, Sankt Oswald bei Plankenwarth, Schiefling am Wörthersee, Schleedorf, Schrattenberg, Schwadorf, Schwaz, Schwoich, Schäffern, Schützen am Gebirge, Seeboden, Seeham, Seekirchen am Wallersee, Seiersberg-Pirka, Siegendorf, Sigleß, Sigmundsherberg, Sinabelkirchen, Spittal an der Drau, St. Andrä, St. Andrä, St. Andrä am Zicksee, St. Anna am Aigen, St. Egyden am Steinfeld, St. Georgen an der Leys, St. Jakob im Rosental, St. Jakob im Rosental, St. Johann in der Haide, St. Johann in Tirol, St. Konrad, St. Lorenzen am Wechsel, St. Margareten im Rosental, St. Margarethen an der Raab, St. Margarethen im Burgenland, St. Peter - Freienstein, St. Peter am Ottersbach, St. Ruprecht an der Raab, St. Symvaro, St. Veit in der Südsteiermark, Stadt Salzburg, Stadtgemeinde Traiskirchen, Stadtservice Korneuburg, Stall, Stegersbach, Steinbrunn, Steinfeld, Steuerberg, Stinatz, Stiwoll, Stockenboi, Stockerau, Strass im Zillertal, Straß in Steiermark, Straßwalchen, Söchau, Söll, Tadten, Tattendorf, Techelsberg am Wörther See, Thal, Tieschen, Tobaj, Trebesing, Treffen am Ossiacher See, Tulln an der Donau, Umweltprofis, Umweltv, Unterfrauenhaid, Unterkohlstätten, Unterlamm, Unterwart, Vasoldsberg, Velden am Wörther See, Villach, Vordernberg, Völkermarkt, Völkermarkt, Walpersbach, Wattens, Weiden am See, Weitersfeld, Weiz, Weißensee, Weppersdorf, Werfenweng, Wies, Wiesen, Wiesfleck, Wiesmath, Wimpassing an der Leitha, Winden am See, Winklern, Wolfau, Wolfsberg, Wolfsberg, Wolkersdorf im Weinviertel, WSZ Moosburg, Wulkaprodersdorf, Wörterberg, Zagersdorf, Zelking-Matzleinsdorf, Zell, Zell am Ziller, Zellberg, Zillingtal, Zurndorf, Übelbach |
+| Austria | Abfallverband Hollabrunn, Abfallverband Korneuburg, Abfallverband Schwechat, Abfallwirtschaft der Stadt St. Pölten, Abfallwirtschaft Stadt Krems, Absdorf, Afritz am See, Alpbach, Altenmarkt an der Triesting, Althofen, Andau, Andrichsfurt, Angath, Apetlon, App CITIES, Arnoldstein, Aschau im Zillertal, AWV Neunkirchen, AWV Wr. Neustadt, Bad Blumau, Bad Fischau-Brunn, Bad Gleichenberg, Bad Häring, Bad Kleinkirchheim, Bad Loipersdorf, Bad Radkersburg, Bad Schallerbach, Bad Tatzmannsdorf, Bad Waltersdorf, Baldramsdorf, Behamberg, Berg im Drautal, Berndorf bei Salzburg, Bernstein, Bildein, Birkfeld, Blindenmarkt, Brandenberg, Breitenbach am Inn, Breitenbrunn am Neusiedler See, Breitenstein, Bromberg, Bruckneudorf, Buch - St. Magdalena, Burgau, Burgauberg-Neudauberg, Burgenländischer Müllverband, Burgschleinitz-Kühnring, Bürg-Vöstenhof, Dechantskirchen, Dellach, Dellach im Drautal, Deutsch Goritz, Deutsch Jahrndorf, Deutsch Kaltenbrunn, Deutschkreutz, Die NÖ Umweltverbände, Dobl-Zwaring, Drasenhofen, Draßmarkt, Ebenthal in Kärnten, Eberau, Eberndorf, Ebersdorf, Eberstein, Edelsbach bei Feldbach, Eggenburg, Eggersdorf bei Graz, Eichgraben, Eisenstadt, Enzenreith, Eugendorf, Fehring, Feistritz im Rosental, Feistritz ob Bleiburg, Feistritztal, Feldbach, Feldkirchen in Kärnten, Feldkirchen in Kärnten, Ferlach, Ferndorf, Ferndorf, Finkenstein am Faaker See, Frankenau-Unterpullendorf, Frankenfels, Frauenkirchen, Frauenstein, Freistadt, Fresach, Friedberg, Frohnleiten, Fürstenfeld, Gabersdorf, GABL, Gattendorf, GAUL Laa an der Thaya, GAUM Mistelbach, GDA Amstetten, Gemeindeverband Horn, Gersdorf an der Feistritz, Gitschtal, Gitschtal, Globasnitz, Gmünd in Kärnten, Gols, Grafendorf bei Hartberg, Grafenschachen, Grafenstein, Grafenstein, Gratkorn, Gratwein-Straßengel, Greifenburg, Großkirchheim, Großsteinbach, Großwarasdorf, Großwilfersdorf, Grödig, Gutenberg, Guttaring, GV Gmünd, GV Krems, GV Zwettl, GVA Baden, GVA Baden, GVA Lilienfeld, GVA Mödling, GVA Tulln, GVA Waidhofen/Thaya, GVU Bezirk Gänserndorf, GVU Melk, GVU Scheibbs, GVU Scheibbs, GVU St. Pölten, Güssing, Güttenbach, Haag am Hausruck, Hagenberg im Mühlkreis, Hannersdorf, Hartberg, Heiligenblut am Großglockner, Heiligenkreuz, Heiligenkreuz am Waasen, Heimschuh, Heldenberg, Henndorf am Wallersee, Henndorf am Wallersee, Hermagor-Pressegger See, Heugraben, Hirm, Hofstätten an der Raab, Hopfgarten im Brixental, Horitschon, Horn, Hornstein, Hüttenberg, Ilz, Ilztal, infeo, Innsbrucker Kommunalbetriebe, Inzenhof, Irschen, Jabing, Jagerberg, Kaindorf, Kaisersdorf, Kalsdorf bei Graz, Kapfenstein, Kemeten, Keutschach am See, Kirchbach, Kirchbach-Zerlach, Kirchberg an der Raab, Kirchbichl, Kirchdorf in Tirol, Kittsee, Klagenfurt am Wörthersee, Kleblach-Lind, Kleinmürbisch, Klingenbach, Klosterneuburg, Klöch, Kobersdorf, Kohfidisch, Korneuburg, Krems in Kärnten, Krensdorf, Krumpendorf am Wörthersee, Kuchl, Kundl, Kössen, Köstendorf, Kötschach-Mauthen, Kötschach-Mauthen, Köttmannsdorf, Laa an der Thaya, Lackenbach, Lackendorf, Langau, Langenrohr, Langenzersdorf, Leibnitz, Leithaprodersdorf, Lendorf, Leoben, Lesachtal, Leutschach an der Weinstraße, Lieboch, Linz AG, Litzelsdorf, Loipersbach im Burgenland, Ludersdorf - Wilfersdorf, Ludmannsdorf, Lurnfeld, Magdalensberg, Mallnitz, Malta, Maria Rain, Maria Saal, Maria Wörth, Mariasdorf, Markt Allhau, Markt Hartmannsdorf, Markt Neuhodis, Markt Piesting Dreistetten, Markt Piesting-Dreistetten, Marktgemeinde Edlitz, Marktgemeinde Lockenhaus, Marz, Mattersburg, Mattsee, Mayer Recycling, Meiseldorf, Melk, Mettersdorf am Saßbach, Miesenbach, Millstatt, Mischendorf, Mistelbach, Mitterdorf an der Raab, Moosburg, Mureck, Mönchhof, Mörbisch am See, Mörtschach, Mühldorf, Müll App, Münster, Neudau, Neudorf bei Parndorf, Neudörfl, Neufeld an der Leitha, Neumarkt am Wallersee, Neusiedl am See, Neustift bei Güssing, Nickelsdorf, Niederneukirchen, Ober-Grafendorf, Oberdrauburg, Oberndorf in Tirol, Oberpullendorf, Oberschützen, Obertrum am See, Oberwart, Oslip, Ottendorf an der Rittschein, Ottobrunn, Paldau, Pama, Pamhagen, Parndorf, Paternion, Payerbach, Peggau, Pernegg an der Mur, Pernegg im Waldviertel, Perschling, Pfarrwerfen, Pilgersdorf, Pinggau, Pinkafeld, Pischelsdorf am Kulm, Podersdorf am See, Poggersdorf, Poggersdorf, Pottenstein, Potzneusiedl, Poysdorf, Pregarten, Premstätten, Pöchlarn, Pörtschach am Wörther See, Raach am Hochgebirge, Raasdorf, Radenthein, Radfeld, Radmer, Ragnitz, Raiding, Ramsau im Zillertal, Rangersdorf, Rechnitz, Reichenau, Reichenau an der Rax, Reichenfels, Reith im Alpbachtal, Reißeck, Rennweg am Katschberg, Rohr bei Hartberg, Rohr im Burgenland, Rottenbach, Rudersdorf, Rust, Saalfelden am Steinernen Meer, Sachsenburg, Sankt Georgen an der Stiefing, Sankt Gilgen, Sankt Oswald bei Plankenwarth, Schiefling am Wörthersee, Schleedorf, Schlins, Schrattenberg, Schwadorf, Schwarzenbach an der Pielach, Schwaz, Schwoich, Schäffern, Schützen am Gebirge, Seeboden, Seeham, Seekirchen am Wallersee, Seiersberg-Pirka, Siegendorf, Sigleß, Sigmundsherberg, Sinabelkirchen, Spittal an der Drau, St. Andrä, St. Andrä, St. Andrä am Zicksee, St. Anna am Aigen, St. Egyden am Steinfeld, St. Florian bei Linz, St. Georgen an der Leys, St. Jakob im Rosental, St. Jakob im Rosental, St. Johann in der Haide, St. Johann in Tirol, St. Konrad, St. Lorenzen am Wechsel, St. Margareten im Rosental, St. Margarethen an der Raab, St. Margarethen im Burgenland, St. Martin im Innkreis, St. Peter - Freienstein, St. Peter am Ottersbach, St. Ruprecht an der Raab, St. Symvaro, St. Veit in der Südsteiermark, Stadt Salzburg, Stadtgemeinde Traiskirchen, Stadtservice Korneuburg, Stall, Statzendorf, Stegersbach, Steinbrunn, Steinfeld, Steuerberg, Stinatz, Stiwoll, Stockenboi, Stockerau, Straden, Strass im Zillertal, Straß in Steiermark, Straßwalchen, Stubenberg, Stössing, Söchau, Söll, Tadten, Tattendorf, Taufkirchen an der Trattnach, Techelsberg am Wörther See, Thal, Tieschen, Tobaj, Trebesing, Treffen am Ossiacher See, Tulln an der Donau, Umweltprofis, Umweltv, Unterfrauenhaid, Unterkohlstätten, Unterlamm, Unterwart, Vasoldsberg, Velden am Wörther See, Villach, Villach, Vordernberg, Vorderstoder, Völkermarkt, Völkermarkt, Walpersbach, Wartberg ob der Aist, Wattens, Weiden am See, Weitersfeld, Weiz, Weißenkirchen in der Wachau, Weißensee, Weppersdorf, Werfenweng, Wies, Wiesen, Wiesfleck, Wiesmath, Wimpassing an der Leitha, Winden am See, Winklarn, Winklern, Wolfau, Wolfsberg, Wolfsberg, Wolkersdorf im Weinviertel, WSZ Moosburg, Wulkaprodersdorf, Wörterberg, Zagersdorf, Zelking-Matzleinsdorf, Zell, Zell am Ziller, Zellberg, Zillingtal, Zurndorf, Zwischenwasser, Übelbach |
 | Belgium | Hygea, Limburg.net, Recycle! |
 | Canada | Aurora (ON), Calgary (AB), Calgary, AB, City of Edmonton, AB, City of Greater Sudbury, ON, City of Nanaimo, City of Peterborough, ON, City of Vancouver, County of Simcoe, ON, CURBit St. John's, Halifax, NS, Kawartha Lakes (ON), London (ON), Montreal (QC), Niagara Region, Orillia, Ontario, Ottawa, Canada, Region of Waterloo, RM of Morris, MB, Strathcona County, ON, Toronto (ON), Vaughan (ON), Waste Wise APPS, Winnipeg (MB) |
 | Czech Republic | Praha, Rudna u Prahy |