diff --git a/data/blocklist.csv b/data/blocklist.csv
index 28ed732a..56402fe3 100644
--- a/data/blocklist.csv
+++ b/data/blocklist.csv
@@ -269,33 +269,38 @@ ElevenSports4Portugal.pt,https://github.com/github/dmca/blob/master/2020/09/2020
 ElevenSports5Portugal.pt,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ElevenSports6Portugal.pt,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ElevenSportsUSA.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2Africa.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2AmericaLatina.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2Andino.us,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
+ESPN2Africa.za,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN2Andes.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPN2Australia.au,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2Brasil.br,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPN2Caribbean.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2Colombia.co,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2Nederland.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2US.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2Venezuela.ve,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN2West.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN3AmericaLatina.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN3Andino.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN3Nederland.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN3Norte.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN3Sur.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPN4Nederland.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNAfrica.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNAmericaLatina.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN2Chile.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN2Mexico.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN2Netherlands.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN2North.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN2Peru.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN2South.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN3Andes.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN3Argentina.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN3Brazil.br,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN3Netherlands.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN3North.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN4.br,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN4Chile.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN4North.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPN4South.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNAfrica.za,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
 ESPNBasesLoaded.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNBrasil.br,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNBrazil.br,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNBuzzerBeater.us,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
+ESPNChile.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNClassic.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNClassicCanada.ca,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNClassicUSA.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNClassicEurope.uk,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNCollegeExtra1.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNCollegeExtra2.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNCollegeExtra3.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
@@ -304,23 +309,19 @@ ESPNCollegeExtra5.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-
 ESPNCollegeExtra6.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNCollegeExtra7.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNCollegeExtra8.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNColombia.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNDeportes.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNDos.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNDosMexico.mx,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNews.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNExtraAmericaLatina.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNExtraBrasil.br,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNInternational.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNMexico.mx,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNNederland.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNNews.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNPacificRim.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNPlus.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNPolo.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNExtraBrazil.br,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNExtraNorth.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNExtraSouth.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNGoalLine.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNMexico.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNNetherlands.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNNorth.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNPeru.ar,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 ESPNU.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNUS.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNUWest.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
-ESPNWest.us,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
+ESPNUltraHD.nl,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
 Eurosport1.fr,https://github.com/iptv-org/iptv/issues/1831
 Eurosport1Danmark.dk,https://github.com/iptv-org/iptv/issues/1831
 Eurosport1Finland.fi,https://github.com/iptv-org/iptv/issues/1831