diff --git a/data/blocklist.csv b/data/blocklist.csv
index 439b2ea5..6f4c2f80 100644
--- a/data/blocklist.csv
+++ b/data/blocklist.csv
@@ -1,6 +1,6 @@
 channel,ref
+AnimalPlanet.au,https://github.com/iptv-org/iptv/issues/1831
 AnimalPlanetAfrica.za,https://github.com/iptv-org/iptv/issues/1831
-AnimalPlanetAustralia.au,https://github.com/iptv-org/iptv/issues/1831
 AnimalPlanetBosniaHerzegovina.ba,https://github.com/iptv-org/iptv/issues/1831
 AnimalPlanetBrazil.br,https://github.com/iptv-org/iptv/issues/1831
 AnimalPlanetBulgaria.bg,https://github.com/iptv-org/iptv/issues/1831
@@ -31,22 +31,22 @@ Arena4.hu,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 AsianFoodNetwork.sg,https://github.com/iptv-org/iptv/issues/1831
 AsianFoodNetworkTaiwan.tw,https://github.com/iptv-org/iptv/issues/1831
 beINSports.qa,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+beINSports1.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports1.qa,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-beINSports1Australia.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports1France.fr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports1HongKong.hk,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports1MalaysiaSingapore.my,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports1Philippines.ph,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports1Thailand.th,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports1Turkey.tr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+beINSports2.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports2.qa,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-beINSports2Australia.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports2France.fr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports2HongKong.hk,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports2Thailand.th,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports2Turkey.tr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+beINSports3.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports3.qa,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-beINSports3Australia.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports3France.fr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports3Philippines.ph,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 beINSports3Thailand.th,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
@@ -100,9 +100,8 @@ DiemaSport3.bg,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl
 DiemaSport34K.bg,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 DiscoveryAsia.sg,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryAsiaTaiwan.tw,https://github.com/iptv-org/iptv/issues/1831
+DiscoveryChannel.au,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannel.it,https://github.com/iptv-org/iptv/issues/1831
-DiscoveryChannelAustralia.au,https://github.com/iptv-org/iptv/issues/1831
-DiscoveryChannelAustraliaPlus2.au,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelBelgium.be,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelBrazil.br,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelBulgaria.bg,https://github.com/iptv-org/iptv/issues/1831
@@ -132,6 +131,7 @@ DiscoveryChannelNewZealand.nz,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelNorway.no,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelPanregional.us,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelPlus1.it,https://github.com/iptv-org/iptv/issues/1831
+DiscoveryChannelPlus2.au,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelPoland.pl,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelPortugal.pt,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryChannelRomania.ro,https://github.com/iptv-org/iptv/issues/1831
@@ -196,13 +196,13 @@ DiscoveryScienceUK.uk,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryScienceUKPlus1.uk,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTheaterBrazil.br,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTheaterLatinAmerica.us,https://github.com/iptv-org/iptv/issues/1831
-DiscoveryTurboAustralia.au,https://github.com/iptv-org/iptv/issues/1831
-DiscoveryTurboAustraliaPlus2.au,https://github.com/iptv-org/iptv/issues/1831
+DiscoveryTurbo.au,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTurboBrazil.br,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTurboIndia.in,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTurboJapan.jp,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTurboNewZealand.nz,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTurboPanregional.us,https://github.com/iptv-org/iptv/issues/1831
+DiscoveryTurboPlus2.au,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTurboUK.uk,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryTurboUKPlus1.uk,https://github.com/iptv-org/iptv/issues/1831
 DiscoveryUltra.ru,https://github.com/iptv-org/iptv/issues/1831
@@ -225,6 +225,7 @@ Eleven2Belgium.be,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-
 ElevenProLeague1.be,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ElevenProLeague2.be,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ElevenProLeague3.be,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPN.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPN2.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPN2Argentina.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
@@ -240,7 +241,6 @@ ESPN4Chile.cl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.
 ESPN4North.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPN4South.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNArgentina.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNAustralia.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNCaribbean.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNChile.cl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNColombia.co,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
@@ -350,8 +350,8 @@ HGTVUK.uk,https://github.com/iptv-org/iptv/issues/1831
 HGTVUKPlus1.uk,https://github.com/iptv-org/iptv/issues/1831
 HGTVWest.us,https://github.com/iptv-org/iptv/issues/1831
 HogarHGTV.us,https://github.com/iptv-org/iptv/issues/1831
+InvestigationDiscovery.au,https://github.com/iptv-org/iptv/issues/1831
 InvestigationDiscoveryAfrica.us,https://github.com/iptv-org/iptv/issues/1831
-InvestigationDiscoveryAustralia.au,https://github.com/iptv-org/iptv/issues/1831
 InvestigationDiscoveryBrazil.br,https://github.com/iptv-org/iptv/issues/1831
 InvestigationDiscoveryCanada.ca,https://github.com/iptv-org/iptv/issues/1831
 InvestigationDiscoveryEast.us,https://github.com/iptv-org/iptv/issues/1831
@@ -586,11 +586,10 @@ TivibuSpor.tr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.
 TivibuSpor2.tr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 TivibuSpor3.tr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 TivibuSpor4.tr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+TLC.au,https://github.com/iptv-org/iptv/issues/1831
 TLCAfrica.us,https://github.com/iptv-org/iptv/issues/1831
 TLCArabia.us,https://github.com/iptv-org/iptv/issues/1831
 TLCArgentina.ar,https://github.com/iptv-org/iptv/issues/1831
-TLCAustralia.au,https://github.com/iptv-org/iptv/issues/1831
-TLCAustraliaPlus2.au,https://github.com/iptv-org/iptv/issues/1831
 TLCAustria.at,https://github.com/iptv-org/iptv/issues/1831
 TLCBalkan.us,https://github.com/iptv-org/iptv/issues/1831
 TLCBrazil.br,https://github.com/iptv-org/iptv/issues/1831
@@ -606,6 +605,7 @@ TLCNetherlands.nl,https://github.com/iptv-org/iptv/issues/1831
 TLCNewZealand.nz,https://github.com/iptv-org/iptv/issues/1831
 TLCNorway.no,https://github.com/iptv-org/iptv/issues/1831
 TLCPanregional.us,https://github.com/iptv-org/iptv/issues/1831
+TLCPlus2.au,https://github.com/iptv-org/iptv/issues/1831
 TLCPoland.pl,https://github.com/iptv-org/iptv/issues/1831
 TLCPortugal.pt,https://github.com/iptv-org/iptv/issues/1831
 TLCRomania.ro,https://github.com/iptv-org/iptv/issues/1831
@@ -638,7 +638,7 @@ TNTSportsBoxOffice2.uk,https://github.com/iptv-org/iptv/issues/6973
 TNTSportsBoxOffice2HD.uk,https://github.com/iptv-org/iptv/issues/6973
 TNTSportsBoxOfficeHD.uk,https://github.com/iptv-org/iptv/issues/6973
 TNTSportsUltimate.uk,https://github.com/iptv-org/iptv/issues/6973
-TravelChannelAustralia.au,https://github.com/iptv-org/iptv/issues/1831
+TravelChannel.au,https://github.com/iptv-org/iptv/issues/1831
 TravelChannelEast.us,https://github.com/iptv-org/iptv/issues/1831
 TravelChannelEMEA.uk,https://github.com/iptv-org/iptv/issues/1831
 TravelChannelIndia.in,https://github.com/iptv-org/iptv/issues/1831