diff --git a/sites/allente.se/allente.se_dk.channels.xml b/sites/allente.se/allente.se_dk.channels.xml
index 5dda4d9b..b4c5b2b2 100644
--- a/sites/allente.se/allente.se_dk.channels.xml
+++ b/sites/allente.se/allente.se_dk.channels.xml
@@ -15,7 +15,7 @@
     <channel lang="da" xmltv_id="CNNInternationalEurope.us" site_id="dk#0033">CNN International Europe</channel>
     <channel lang="da" xmltv_id="DisneyChannelScandinavia.uk" site_id="dk#0037">Disney Channel Scandinavia</channel>
     <channel lang="da" xmltv_id="DisneyJuniorScandinavia.uk" site_id="dk#0307">Disney Junior Scandinavia</channel>
-    <channel lang="da" xmltv_id="Dk4.dk" site_id="dk#0376">DK 4</channel>
+    <channel lang="da" xmltv_id="dk4.dk" site_id="dk#0376">DK 4</channel>
     <channel lang="da" xmltv_id="DR1.dk" site_id="dk#452">DR 1</channel>
     <channel lang="da" xmltv_id="DR2.dk" site_id="dk#0051">DR 2</channel>
     <channel lang="da" xmltv_id="DRRamasjang.dk" site_id="dk#0048">DR Ramasjang</channel>
diff --git a/sites/cgates.lt/cgates.lt_lt.channels.xml b/sites/cgates.lt/cgates.lt_lt.channels.xml
index 8b3029ee..1fac97b2 100644
--- a/sites/cgates.lt/cgates.lt_lt.channels.xml
+++ b/sites/cgates.lt/cgates.lt_lt.channels.xml
@@ -18,18 +18,18 @@
     <channel lang="lt" xmltv_id="CNNInternationalEurope.us" site_id="cnn-international">CNN International</channel>
     <channel lang="lt" xmltv_id="CurrentTimeTV.cz" site_id="nastojashcheje-vremya">Nastojashcheje Vremya</channel>
     <channel lang="lt" xmltv_id="Dacha.ua" site_id="dacha">Dacha</channel>
-    <channel lang="lt" xmltv_id="DocuBoxHD.us" site_id="docubox-hd">DocuBox HD</channel>
+    <channel lang="lt" xmltv_id="DocuBoxHD.nl" site_id="docubox-hd">DocuBox HD</channel>
     <channel lang="lt" xmltv_id="DzukijosTV.lt" site_id="dzukijos-tv">Dzūkijos TV</channel>
     <channel lang="lt" xmltv_id="Eurochannel.us" site_id="eurochannel">Eurochannel</channel>
     <channel lang="lt" xmltv_id="EuronewsRussian.fr" site_id="euronews-2">Euronews RU</channel>
     <channel lang="lt" xmltv_id="ExtremeSportsChannel.nl" site_id="extreme-sports">Extreme Sports</channel>
-    <channel lang="lt" xmltv_id="FastFunBoxHD.us" site_id="fastfun-box-hd">Fast&amp;Fun Box HD</channel>
+    <channel lang="lt" xmltv_id="FastFunBoxHD.nl" site_id="fastfun-box-hd">Fast&amp;Fun Box HD</channel>
     <channel lang="lt" xmltv_id="FightSports.us" site_id="fight-sports-hd">Fight Sports HD</channel>
-    <channel lang="lt" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="filmbox-arthouse">FilmBox ArtHouse</channel>
+    <channel lang="lt" xmltv_id="FilmBoxArthouse.nl" site_id="filmbox-arthouse">FilmBox ArtHouse</channel>
     <channel lang="lt" xmltv_id="FilmUADrama.ua" site_id="film-ua-drama">Film UA Drama</channel>
     <channel lang="lt" xmltv_id="Filmzone.ee" site_id="filmzone">FilmZone</channel>
     <channel lang="lt" xmltv_id="FilmzonePlus.ee" site_id="filmzone-hd">FilmZone+ HD</channel>
-    <channel lang="lt" xmltv_id="GametoonHD.us" site_id="game-toon-hd">Game Toon HD</channel>
+    <channel lang="lt" xmltv_id="GametoonHD.nl" site_id="game-toon-hd">Game Toon HD</channel>
     <channel lang="lt" xmltv_id="GulliGirl.ru" site_id="gulli-girl">Gulli Girl</channel>
     <channel lang="lt" xmltv_id="InterPlus.ua" site_id="inter-plus">Inter+</channel>
     <channel lang="lt" xmltv_id="KidZoneTV.ee" site_id="kidzone-tv">KidZone TV</channel>
@@ -54,8 +54,8 @@
     <channel lang="lt" xmltv_id="TV1000WorldKino.se" site_id="tv-1000-world-kino">TV 1000 World Kino</channel>
     <channel lang="lt" xmltv_id="TV1HD.lt" site_id="tv1-hd">TV1 HD</channel>
     <channel lang="lt" xmltv_id="TV3HDLithuania.lt" site_id="tv3-hd">TV3 HD</channel>
-    <channel lang="lt" xmltv_id="TV3Sport.lv" site_id="viasat-sport-baltic-hd">TV3 Sport HD</channel>
-    <channel lang="lt" xmltv_id="TV3Sport2.lv" site_id="tvplay-sports-plus-hd">TV3 Sport 2 HD</channel>
+    <channel lang="lt" xmltv_id="TV3Sport.uk" site_id="viasat-sport-baltic-hd">TV3 Sport HD</channel>
+    <channel lang="lt" xmltv_id="TV3Sport2.uk" site_id="tvplay-sports-plus-hd">TV3 Sport 2 HD</channel>
     <channel lang="lt" xmltv_id="TV3SportOpenHD.uk" site_id="tv3-sport-open-hd">TV3 Sport Open HD</channel>
     <channel lang="lt" xmltv_id="TV6HDLithuania.lt" site_id="tv6-hd">TV6 HD</channel>
     <channel lang="lt" xmltv_id="TV8HDLithuania.lt" site_id="tv8-hd">TV8 HD</channel>
diff --git a/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml b/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
index b6adcfca..cc38d353 100644
--- a/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
+++ b/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
@@ -64,7 +64,7 @@
     <channel lang="tr" xmltv_id="Eurosport2.fr" site_id="82">Eurosport 2</channel>
     <channel lang="tr" xmltv_id="FashionTVHDEurope.fr" site_id="74">FashionTV HD Europe</channel>
     <channel lang="tr" xmltv_id="FBTV.tr" site_id="55">FB TV</channel>
-    <channel lang="tr" xmltv_id="FoxTurkey.us" site_id="18">Fox Türkiye</channel>
+    <channel lang="tr" xmltv_id="FoxTurkey.tr" site_id="18">Fox Türkiye</channel>
     <channel lang="tr" xmltv_id="France24English.fr" site_id="285">France 24 English</channel>
     <channel lang="tr" xmltv_id="GSTV.tr" site_id="250">GS TV</channel>
     <channel lang="tr" xmltv_id="HaberGlobal.tr" site_id="520">Haber Global</channel>
diff --git a/sites/directv.com.ar/directv.com.ar_ar.channels.xml b/sites/directv.com.ar/directv.com.ar_ar.channels.xml
index af828f9f..53330441 100644
--- a/sites/directv.com.ar/directv.com.ar_ar.channels.xml
+++ b/sites/directv.com.ar/directv.com.ar_ar.channels.xml
@@ -190,7 +190,7 @@
     <channel lang="es" xmltv_id="PlayboyTVLatinAmerica.us" site_id="464#PBTV">Playboy TV</channel>
     <channel lang="es" xmltv_id="QuieroMusicaenmiIdioma.ar" site_id="269#QMMI">Quiero Música en mi Idioma</channel>
     <channel lang="es" xmltv_id="QuieroMusicaenmiIdiomaHD.ar" site_id="1269#QMMIHD">Quiero Mi Musica en Mi Idioma HD</channel>
-    <channel lang="es" xmltv_id="RCNNuestraTeleInternacionalAmerica.co" site_id="775#NTEL">RCN Nuestra Tele</channel>
+    <channel lang="es" xmltv_id="RCNNuestraTeleInternacional.co" site_id="775#NTEL">RCN Nuestra Tele</channel>
     <channel lang="es" xmltv_id="RTPiAmerica.pt" site_id="778#RTPI">RTP Internacional</channel>
     <channel lang="es" xmltv_id="RaiItaliaAmerica.it" site_id="766#RAI">RAI International</channel>
     <channel lang="es" xmltv_id="SmithsonianChannelHDLatinAmerica.us" site_id="1747#SMTHHD">Smithsonian Channel HD</channel>
diff --git a/sites/directv.com.uy/directv.com.uy_uy.channels.xml b/sites/directv.com.uy/directv.com.uy_uy.channels.xml
index a034584a..9263d59b 100644
--- a/sites/directv.com.uy/directv.com.uy_uy.channels.xml
+++ b/sites/directv.com.uy/directv.com.uy_uy.channels.xml
@@ -152,7 +152,7 @@
     <channel lang="es" xmltv_id="PXSportsHD.mx" site_id="1639#PXSHD">PX Sports HD</channel>
     <channel lang="es" xmltv_id="QuieroMusicaenmiIdioma.ar" site_id="269#QMMI">Quiero Música en mi Idioma</channel>
     <channel lang="es" xmltv_id="RaiItaliaAmerica.it" site_id="766#RAI">RAI International </channel>
-    <channel lang="es" xmltv_id="RCNNuestraTeleInternacionalAmerica.co" site_id="775#NTEL">RCN Nuestra Tele</channel>
+    <channel lang="es" xmltv_id="RCNNuestraTeleInternacional.co" site_id="775#NTEL">RCN Nuestra Tele</channel>
     <channel lang="es" xmltv_id="RTPiAmerica.pt" site_id="778#RTPI">RTP Internacional</channel>
     <channel lang="es" xmltv_id="SmithsonianChannelHDLatinAmerica.us" site_id="1747#SMTHHD">Smithsonian Channel HD</channel>
     <channel lang="es" xmltv_id="SonyChannelHDSouth.us" site_id="208#SONYHD">Sony Entertainment HD</channel>
diff --git a/sites/directv.com/directv.com_us.channels.xml b/sites/directv.com/directv.com_us.channels.xml
index d015615e..b5124a39 100644
--- a/sites/directv.com/directv.com_us.channels.xml
+++ b/sites/directv.com/directv.com_us.channels.xml
@@ -247,7 +247,7 @@
     <channel lang="en" xmltv_id="RaiItaliaAmerica.it" site_id="2021">Rai Italia Nord America</channel>
     <channel lang="en" xmltv_id="RaiNews24.it" site_id="2022">Rai News 24</channel>
     <channel lang="en" xmltv_id="RaiWorldPremium.it" site_id="2023">Rai World Premium</channel>
-    <channel lang="en" xmltv_id="RCNNuestraTeleInternacionalColombia.co" site_id="416">RCN Nuestra Tele Internacional</channel>
+    <channel lang="en" xmltv_id="RCNNuestraTeleInternacional.co" site_id="416">RCN Nuestra Tele Internacional</channel>
     <channel lang="en" xmltv_id="RealityKingsTV.us" site_id="594">Reality Kings TV</channel>
     <channel lang="en" xmltv_id="Reelz.us" site_id="238">Reelz</channel>
     <channel lang="en" xmltv_id="Revolt.us" site_id="384">Revolt</channel>
diff --git a/sites/dishtv.in/dishtv.in_in.channels.xml b/sites/dishtv.in/dishtv.in_in.channels.xml
index 856b0ca1..9c5296c2 100644
--- a/sites/dishtv.in/dishtv.in_in.channels.xml
+++ b/sites/dishtv.in/dishtv.in_in.channels.xml
@@ -12,7 +12,7 @@
     <channel lang="en" xmltv_id="ABPAsmita.in" site_id="10000000039940000">ABP Asmita</channel>
     <channel lang="en" xmltv_id="ABPGanga.in" site_id="10000000065480000">ABP Ganga</channel>
     <channel lang="en" xmltv_id="ABPMajha.in" site_id="10000000002020000">ABP Majha</channel>
-    <channel lang="en" xmltv_id="ABPNewsIndia.in" site_id="10000000000180000">ABP News India</channel>
+    <channel lang="en" xmltv_id="ABPNews.in" site_id="10000000000180000">ABP News India</channel>
     <channel lang="en" xmltv_id="AlankarTV.in" site_id="10000000029250000">Alankar TV</channel>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="10000000053730000">Aljazeera English</channel>
     <channel lang="en" xmltv_id="Andpictures.in" site_id="10000000024300000">&amp; pictures</channel>
@@ -108,7 +108,7 @@
     <channel lang="en" xmltv_id="DisneyInternationalHD.in" site_id="10000000054020000">Disney International HD</channel>
     <channel lang="en" xmltv_id="DisneyJuniorIndia.in" site_id="10000000012870000">Disney Junior India</channel>
     <channel lang="en" xmltv_id="DrShuddhi.in" site_id="10000000075990141">Dr Shuddhi</channel>
-    <channel lang="en" xmltv_id="DY36.in" site_id="10000000006050000">DY 36</channel>
+    <channel lang="en" xmltv_id="DY365.in" site_id="10000000006050000">DY 36</channel>
     <channel lang="en" xmltv_id="Enterr10Movies.in" site_id="10000000002130000">Enterr 10 Movies</channel>
     <channel lang="en" xmltv_id="EpicTV.in" site_id="10000000026390000">Epic TV</channel>
     <channel lang="en" xmltv_id="ETNow.in" site_id="10000000005240000">ET Now</channel>
diff --git a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
index 1c208dea..29763c22 100644
--- a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
+++ b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
@@ -27,18 +27,18 @@
     <channel lang="tr" xmltv_id="DiziSmartMax.tr" site_id="58d29bb0eefad3db9c606278">DiziSmart Max</channel>
     <channel lang="tr" xmltv_id="DiziSmartPremium.tr" site_id="58d29bb0eefad3db9c60625a">DiziSmart Premium</channel>
     <channel lang="tr" xmltv_id="DMAXTurkey.tr" site_id="58d29bb0eefad3db9c606282">DMAX Türkiye</channel>
-    <channel lang="tr" xmltv_id="DocuBoxHD.us" site_id="58d29bb0eefad3db9c6062be">DocuBox HD</channel>
+    <channel lang="tr" xmltv_id="DocuBoxHD.nl" site_id="58d29bb0eefad3db9c6062be">DocuBox HD</channel>
     <channel lang="tr" xmltv_id="EuroD.tr" site_id="59dcbfdccfef0b4d80a4974a">Euro D</channel>
     <channel lang="tr" xmltv_id="Eurosport1.fr" site_id="58d29bb0eefad3db9c6062aa">Eurosport 1</channel>
     <channel lang="tr" xmltv_id="Eurosport2.fr" site_id="58d29bb0eefad3db9c606281">Eurosport 2</channel>
     <channel lang="tr" xmltv_id="FashionTVHDEurope.fr" site_id="59dca3b2cfef0b4d80a47b77">FashionTV HD Europe</channel>
-    <channel lang="tr" xmltv_id="FastFunBoxHD.us" site_id="58d29bb0eefad3db9c6062bf">Fast &amp; FunBox HD</channel>
+    <channel lang="tr" xmltv_id="FastFunBoxHD.nl" site_id="58d29bb0eefad3db9c6062bf">Fast &amp; FunBox HD</channel>
     <channel lang="tr" xmltv_id="FBTV.tr" site_id="58d29bb0eefad3db9c606235">FB TV</channel>
-    <channel lang="tr" xmltv_id="FightBoxHD.us" site_id="58d29bb0eefad3db9c6062b4">FightBox HD</channel>
-    <channel lang="tr" xmltv_id="FilmBoxTurkey.us" site_id="58d29bb0eefad3db9c6062ba">FilmBox Türkiye</channel>
+    <channel lang="tr" xmltv_id="FightBoxHD.nl" site_id="58d29bb0eefad3db9c6062b4">FightBox HD</channel>
+    <channel lang="tr" xmltv_id="FilmBoxTurkey.tr" site_id="58d29bb0eefad3db9c6062ba">FilmBox Türkiye</channel>
     <channel lang="tr" xmltv_id="FlashTV.tr" site_id="6163ee3dcfef0b1593d572b0">Flash TV</channel>
     <channel lang="tr" xmltv_id="FoxCrimeTurkey.us" site_id="58d29bb0eefad3db9c606268">Fox Crime Türkiye</channel>
-    <channel lang="tr" xmltv_id="FoxTurkey.us" site_id="58d29bb0eefad3db9c6062a0">Fox Türkiye</channel>
+    <channel lang="tr" xmltv_id="FoxTurkey.tr" site_id="58d29bb0eefad3db9c6062a0">Fox Türkiye</channel>
     <channel lang="tr" xmltv_id="FXTurkey.us" site_id="58d29bb0eefad3db9c606269">FX Türkiye</channel>
     <channel lang="tr" xmltv_id="HaberGlobal.tr" site_id="5bac7dedcfef0b02fac035fd">Haber Global</channel>
     <channel lang="tr" xmltv_id="Haberturk.tr" site_id="58d29bb0eefad3db9c60629d">Habertürk</channel>
diff --git a/sites/gatotv.com/gatotv.com_co.channels.xml b/sites/gatotv.com/gatotv.com_co.channels.xml
index 9603bfa0..68b944ad 100644
--- a/sites/gatotv.com/gatotv.com_co.channels.xml
+++ b/sites/gatotv.com/gatotv.com_co.channels.xml
@@ -36,7 +36,7 @@
     <channel lang="es" xmltv_id="NTN24.co" site_id="ntn24_nuestra_tele_noticias">NTN 24</channel>
     <channel lang="es" xmltv_id="ParamountNetworkPanregional.us" site_id="paramount_channel_colombia">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="RCNNovelas.co" site_id="rcn_novelas">RCN Novelas</channel>
-    <channel lang="es" xmltv_id="RCNTV.co" site_id="rcn_colombia">RCN TV</channel>
+    <channel lang="es" xmltv_id="CanalRCN.co" site_id="rcn_colombia">RCN TV</channel>
     <channel lang="es" xmltv_id="SenalColombia.co" site_id="senal_colombia">Señal Colombia</channel>
     <channel lang="es" xmltv_id="SpacePanregional.us" site_id="space_colombia">Space Sur</channel>
     <channel lang="es" xmltv_id="StarLifePanregional.us" site_id="star_life_colombia">Star Life Latin</channel>
diff --git a/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml b/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml
index 01064e6f..b4a9f3fe 100644
--- a/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml
+++ b/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml
@@ -128,7 +128,7 @@
     <channel lang="en" xmltv_id="Grandeish.us" site_id="PlutoTV/us#60fafef7c2440500071266e0">Grande-ish</channel>
     <channel lang="en" xmltv_id="Gunsmoke.us" site_id="PlutoTV/us#60f75771dfc72a00071fd0e0">Gunsmoke</channel>
     <channel lang="en" xmltv_id="HappyDays.us" site_id="PlutoTV/us#5f7794162a4559000781fc12">Happy Days</channel>
-    <channel lang="en" xmltv_id="HeartlandEast.us" site_id="PlutoTV/us#61f07513227feb00073ee6bc">Heartland</channel>
+    <channel lang="en" xmltv_id="HeartlandEastern.us" site_id="PlutoTV/us#61f07513227feb00073ee6bc">Heartland</channel>
     <channel lang="en" xmltv_id="HellsKitchenenespanol.us" site_id="PlutoTV/us#60492b2794116800073e32dc">Hell&apos;s Kitchen en español</channel>
     <channel lang="en" xmltv_id="IGN.us" site_id="PlutoTV/us#561c5f613286e48904fb2677">IGN</channel>
     <channel lang="en" xmltv_id="ImpactWrestling.us" site_id="PlutoTV/us#59b722526996084038c01e1b">IMPACT Wrestling</channel>
diff --git a/sites/knr.gl/knr.gl_gl.channels.xml b/sites/knr.gl/knr.gl_gl.channels.xml
index f07bc45a..613fa396 100644
--- a/sites/knr.gl/knr.gl_gl.channels.xml
+++ b/sites/knr.gl/knr.gl_gl.channels.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="knr.gl">
   <channels>
-    <channel lang="kl" xmltv_id="KNRTV.gl" site_id="#">KNR TV</channel>
+    <channel lang="kl" xmltv_id="KNR1.gl" site_id="#">KNR TV</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/kplus.vn/kplus.vn_vn.channels.xml b/sites/kplus.vn/kplus.vn_vn.channels.xml
index bc0fb9e6..e73d9c5d 100644
--- a/sites/kplus.vn/kplus.vn_vn.channels.xml
+++ b/sites/kplus.vn/kplus.vn_vn.channels.xml
@@ -6,7 +6,7 @@
     <channel lang="vi" xmltv_id="CartoonNetworkVietnam.vn" site_id="7063">CARTOON NETWORK</channel>
     <channel lang="vi" xmltv_id="DiscoveryChannelVietnam.vn" site_id="7057">DISCOVERY CHANNEL</channel>
     <channel lang="vi" xmltv_id="VTVCab1.vn" site_id="4508">VTVCab1-GIAITRITV</channel>
-    <channel lang="vi" xmltv_id="HBOHDVietnam.vn" site_id="7035">HBO HD</channel>
+    <channel lang="vi" xmltv_id="HBOAsia.sg" site_id="7035">HBO HD</channel>
     <channel lang="vi" xmltv_id="HTV7.vn" site_id="4550">HTV7</channel>
     <channel lang="vi" xmltv_id="HTV9.vn" site_id="4638">HTV9</channel>
     <channel lang="vi" xmltv_id="KBSWorld.kr" site_id="7054">KBS WORLD</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
index a050c586..70831009 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
@@ -2,7 +2,7 @@
 <site site="m.tv.sms.cz">
   <channels>
     <channel lang="cz" xmltv_id="0porMovistarPlus.es" site_id="Cero">#0</channel>
-    <channel lang="cz" xmltv_id="360TuneBox.us" site_id="360TuneBox">360 Tune Box</channel>
+    <channel lang="cz" xmltv_id="360TuneBox.nl" site_id="360TuneBox">360 Tune Box</channel>
     <channel lang="cz" xmltv_id="3sat.de" site_id="3SAT">3sat</channel>
     <channel lang="cz" xmltv_id="4FunDance.pl" site_id="4Fun+Dance">4 Fun Dance</channel>
     <channel lang="cz" xmltv_id="4FunKids.pl" site_id="4Fun+Kids">4 Fun Kids</channel>
@@ -101,7 +101,7 @@
     <channel lang="cz" xmltv_id="DisneyChannelCzechRepublic.cz" site_id="Disney+Channel">Disney Channel</channel>
     <channel lang="cz" xmltv_id="DisneyJuniorCzechRepublic.cz" site_id="Disney+Junior">Disney Junior</channel>
     <channel lang="cz" xmltv_id="DMSat.rs" site_id="DM+Sat">DM Sat</channel>
-    <channel lang="cz" xmltv_id="DocuBoxHD.us" site_id="DocuBox+HD">DocuBox HD</channel>
+    <channel lang="cz" xmltv_id="DocuBoxHD.nl" site_id="DocuBox+HD">DocuBox HD</channel>
     <channel lang="cz" xmltv_id="DomaCroatia.hr" site_id="Doma+TV">Doma Hrvatska</channel>
     <channel lang="cz" xmltv_id="DomKino.ru" site_id="Dom+Kino">Dom Kino</channel>
     <channel lang="cz" xmltv_id="DomKinoPremium.ru" site_id="Dom+Kino+Premium">Dom Kino Premium International</channel>
@@ -120,8 +120,8 @@
     <channel lang="cz" xmltv_id="EnglishClubTV.uk" site_id="English+Club+TV">English Club TV</channel>
     <channel lang="cz" xmltv_id="EnterFilm.ua" site_id="Enter+Film">Enter Film</channel>
     <channel lang="cz" xmltv_id="EpicDrama.se" site_id="Epic+Drama">Epic Drama</channel>
-    <channel lang="cz" xmltv_id="EroxHD.us" site_id="Erox+HD">Erox HD</channel>
-    <channel lang="cz" xmltv_id="EroxxxHD.us" site_id="Eroxxx+HD">Eroxxx HD</channel>
+    <channel lang="cz" xmltv_id="EroxHD.nl" site_id="Erox+HD">Erox HD</channel>
+    <channel lang="cz" xmltv_id="EroxxxHD.nl" site_id="Eroxxx+HD">Eroxxx HD</channel>
     <channel lang="cz" xmltv_id="EskaTV.pl" site_id="Eska+TV">Eska TV</channel>
     <channel lang="cz" xmltv_id="Eurochannel.us" site_id="Eurochannel">Eurochannel</channel>
     <channel lang="cz" xmltv_id="EuronewsEnglish.fr" site_id="Euronews">EuroNews English</channel>
@@ -132,22 +132,22 @@
     <channel lang="cz" xmltv_id="EWTNEurope.us" site_id="EWTN">EWTN Europe</channel>
     <channel lang="cz" xmltv_id="ExtasyTV.cz" site_id="Extasy">Extasy TV</channel>
     <channel lang="cz" xmltv_id="ExtremeSportsChannel.nl" site_id="Extreme+Sports">Extreme Sports Channel</channel>
-    <channel lang="cz" xmltv_id="FashionBoxHD.us" site_id="FashionBox+HD">FashionBox HD</channel>
+    <channel lang="cz" xmltv_id="FashionBoxHD.nl" site_id="FashionBox+HD">FashionBox HD</channel>
     <channel lang="cz" xmltv_id="FashionTVEurope.fr" site_id="FashionTV">FashionTV Europe</channel>
     <channel lang="cz" xmltv_id="FashionTVHDEurope.fr" site_id="FashionTV+HD">FashionTV HD Europe</channel>
-    <channel lang="cz" xmltv_id="FastFunBoxHD.us" site_id="Fast%26Funbox+HD">Fast &amp; FunBox HD</channel>
+    <channel lang="cz" xmltv_id="FastFunBoxHD.nl" site_id="Fast%26Funbox+HD">Fast &amp; FunBox HD</channel>
     <channel lang="cz" xmltv_id="FEM3.hu" site_id="FEM3">Fem 3</channel>
-    <channel lang="cz" xmltv_id="FightBoxHD.us" site_id="FightBox">FightBox HD</channel>
+    <channel lang="cz" xmltv_id="FightBoxHD.nl" site_id="FightBox">FightBox HD</channel>
     <channel lang="cz" xmltv_id="Film4.hu" site_id="Film+4">Film 4</channel>
-    <channel lang="cz" xmltv_id="FilmBoxAction.us" site_id="Filmbox+Action+%28pl%29">FilmBox Action</channel>
-    <channel lang="cz" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="FilmBox+Arthouse">FilmBox Arthouse Worldwide</channel>
-    <channel lang="cz" xmltv_id="FilmBoxCentralEurope.us" site_id="Filmbox">FilmBox Central Europe</channel>
-    <channel lang="cz" xmltv_id="FilmBoxExtraHDCzechiaHungary.hu" site_id="Filmbox+Extra+HD">FilmBox Extra HD Czechia &amp; Hungary</channel>
+    <channel lang="cz" xmltv_id="FilmBoxAction.nl" site_id="Filmbox+Action+%28pl%29">FilmBox Action</channel>
+    <channel lang="cz" xmltv_id="FilmBoxArthouse.nl" site_id="FilmBox+Arthouse">FilmBox Arthouse Worldwide</channel>
+    <channel lang="cz" xmltv_id="FilmBoxCzechRepublicSlovakia.cz" site_id="Filmbox">FilmBox Central Europe</channel>
+    <channel lang="cz" xmltv_id="FilmBoxExtraHDCzechRepublicSlovakia.cz" site_id="Filmbox+Extra+HD">FilmBox Extra HD Czechia &amp; Hungary</channel>
     <channel lang="cz" xmltv_id="FilmBoxExtraHDPoland.pl" site_id="Filmbox+Extra+HD+%28pl%29">FilmBox Extra HD Polska</channel>
-    <channel lang="cz" xmltv_id="FilmBoxFamily.us" site_id="Filmbox+Family">FilmBox Family</channel>
-    <channel lang="cz" xmltv_id="FilmBoxPremiumCzechia.us" site_id="Filmbox+Premium">FilmBox Premium Czechia</channel>
-    <channel lang="cz" xmltv_id="FilmBoxPremiumPoland.pl" site_id="Filmbox+Premium+%28pl%29">FilmBox Premium Polska</channel>
-    <channel lang="cz" xmltv_id="FilmBoxStarsCzechia.us" site_id="Filmbox+Stars">FilmBox Stars Czechia</channel>
+    <channel lang="cz" xmltv_id="FilmBoxFamily.nl" site_id="Filmbox+Family">FilmBox Family</channel>
+    <channel lang="cz" xmltv_id="FilmBoxPremiumHDCzechRepublicSlovakia.cz" site_id="Filmbox+Premium">FilmBox Premium Czechia</channel>
+    <!-- <channel lang="cz" xmltv_id="FilmBoxPremiumPoland.pl" site_id="Filmbox+Premium+%28pl%29">FilmBox Premium Polska</channel> -->
+    <channel lang="cz" xmltv_id="FilmBoxStarsCzechRepublicSlovakia.cz" site_id="Filmbox+Stars">FilmBox Stars Czechia</channel>
     <channel lang="cz" xmltv_id="FilmCafeHungary.hu" site_id="Film+Caf%E9">Film Café Hungary</channel>
     <channel lang="cz" xmltv_id="FilmEurope.cz" site_id="Film+Europe">Film Europe</channel>
     <channel lang="cz" xmltv_id="FilmEuropePlus.cz" site_id="Film+Europe+%2B">Film Europe +</channel>
@@ -165,7 +165,7 @@
     <channel lang="cz" xmltv_id="France3.fr" site_id="France3">France 3</channel>
     <channel lang="cz" xmltv_id="FuelTV.us" site_id="Fuel">Fuel TV</channel>
     <channel lang="cz" xmltv_id="Galaxy4.hu" site_id="Galaxy">Galaxy 4</channel>
-    <channel lang="cz" xmltv_id="GametoonHD.us" site_id="Gametoon+HD+%28hr%29">Gametoon</channel>
+    <channel lang="cz" xmltv_id="GametoonHD.nl" site_id="Gametoon+HD+%28hr%29">Gametoon</channel>
     <channel lang="cz" xmltv_id="GinxeSportsTVInternational.uk" site_id="Ginx">Ginx eSports TV International</channel>
     <channel lang="cz" xmltv_id="GoldTV.pl" site_id="Gold+TV">Gold TV</channel>
     <channel lang="cz" xmltv_id="GolfChannelCzechia.us" site_id="Golf+Channel">Golf Channel Czechia</channel>
diff --git a/sites/magticom.ge/magticom.ge_ge.channels.xml b/sites/magticom.ge/magticom.ge_ge.channels.xml
index a15288ac..40c84727 100644
--- a/sites/magticom.ge/magticom.ge_ge.channels.xml
+++ b/sites/magticom.ge/magticom.ge_ge.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="ka" xmltv_id="1TV.ge" site_id="3">1 TV</channel>
     <channel lang="ka" xmltv_id="2TV.ge" site_id="167">2 TV</channel>
-    <channel lang="en" xmltv_id="360TuneBox.us" site_id="264">360 Tune Box</channel>
+    <channel lang="en" xmltv_id="360TuneBox.nl" site_id="264">360 Tune Box</channel>
     <channel lang="ru" xmltv_id="A1.ru" site_id="219">A1</channel>
     <channel lang="ru" xmltv_id="A2.ru" site_id="156">A2</channel>
     <channel lang="ka" xmltv_id="AbkhaziaHD.ge" site_id="73">Abkhazia HD</channel>
@@ -12,7 +12,7 @@
     <channel lang="ka" xmltv_id="AjaraTV.ge" site_id="27">Ajara TV</channel>
     <channel lang="ru" xmltv_id="AmediaHit.ru" site_id="76">Amedia Hit</channel>
     <channel lang="ru" xmltv_id="AmediaPremium.ru" site_id="122">Amedia Premium</channel>
-    <channel lang="ru" xmltv_id="Armenia1TV.am" site_id="84">Armenia 1 TV</channel>
+    <channel lang="ru" xmltv_id="1TV.am" site_id="84">Armenia 1 TV</channel>
     <channel lang="ru" xmltv_id="Avto24.ru" site_id="294">Avto 24</channel>
     <channel lang="ru" xmltv_id="AzTV.az" site_id="101">Az TV</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="284">BBC World News Europe</channel>
@@ -27,21 +27,21 @@
     <channel lang="ka" xmltv_id="Dardimandi.ge" site_id="199">Dardimandi</channel>
     <channel lang="ru" xmltv_id="DaVinci.de" site_id="225">Da Vinci</channel>
     <channel lang="ru" xmltv_id="DiscoveryScienceRussia.ru" site_id="46">Discovery Science Rossiya</channel>
-    <channel lang="ru" xmltv_id="DocuBoxHD.us" site_id="262">DocuBox HD</channel>
+    <channel lang="ru" xmltv_id="DocuBoxHD.nl" site_id="262">DocuBox HD</channel>
     <channel lang="ru" xmltv_id="Domashniy.ru" site_id="1336">Domashniy</channel>
     <channel lang="ru" xmltv_id="DomKino.ru" site_id="185">Dom Kino</channel>
     <channel lang="ru" xmltv_id="DomKinoPremium.ru" site_id="269">Dom Kino Premium</channel>
     <channel lang="ru" xmltv_id="DTXRussia.ru" site_id="45">DTX Rossiya</channel>
     <channel lang="ru" xmltv_id="DuckTVSD.sk" site_id="251">Duck TV SD</channel>
     <channel lang="ka" xmltv_id="EnkiBenki.ge" site_id="83">Enki Benki</channel>
-    <channel lang="ka" xmltv_id="EroxHD.us" site_id="2">Erox HD</channel>
+    <channel lang="ka" xmltv_id="EroxHD.nl" site_id="2">Erox HD</channel>
     <channel lang="ka" xmltv_id="Ertsulovneba.ge" site_id="72">Ertsulovneba</channel>
     <channel lang="ru" xmltv_id="EuronewsRussian.fr" site_id="52">EuroNews Russkiy</channel>
     <channel lang="ru" xmltv_id="Evrokino.ru" site_id="19">Evrokino</channel>
-    <channel lang="en" xmltv_id="FashionBoxHD.us" site_id="272">FashionBox HD</channel>
-    <channel lang="ru" xmltv_id="FastFunBoxHD.us" site_id="267">Fast &amp; FunBox HD</channel>
-    <channel lang="ru" xmltv_id="FightBoxHD.us" site_id="252">FightBox HD</channel>
-    <channel lang="ru" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="254">FilmBox Arthouse Worldwide</channel>
+    <channel lang="en" xmltv_id="FashionBoxHD.nl" site_id="272">FashionBox HD</channel>
+    <channel lang="ru" xmltv_id="FastFunBoxHD.nl" site_id="267">Fast &amp; FunBox HD</channel>
+    <channel lang="ru" xmltv_id="FightBoxHD.nl" site_id="252">FightBox HD</channel>
+    <channel lang="ru" xmltv_id="FilmBoxArthouse.nl" site_id="254">FilmBox Arthouse Worldwide</channel>
     <channel lang="ru" xmltv_id="FilmBoxRussia.ru" site_id="253">FilmBox Russia</channel>
     <channel lang="ka" xmltv_id="Formula.ge" site_id="63000">Formula</channel>
     <channel lang="ru" xmltv_id="FoxRussia.ru" site_id="39">Fox Russia</channel>
diff --git a/sites/meo.pt/meo.pt_pt.channels.xml b/sites/meo.pt/meo.pt_pt.channels.xml
index e05dd2a9..071ef7d0 100644
--- a/sites/meo.pt/meo.pt_pt.channels.xml
+++ b/sites/meo.pt/meo.pt_pt.channels.xml
@@ -57,7 +57,7 @@
     <channel lang="pt" xmltv_id="DiscoveryChannelPortugal.pt" site_id="DISCV">Discovery Channel</channel>
     <channel lang="pt" xmltv_id="DisneyChannelPortugal.pt" site_id="DISNY">Disney Channel</channel>
     <channel lang="pt" xmltv_id="DisneyJuniorPortugal.pt" site_id="DISNYJ">Disney Junior</channel>
-    <channel lang="pt" xmltv_id="Dizi.us" site_id="DIZI">Dizi</channel>
+    <channel lang="pt" xmltv_id="Dizi.nl" site_id="DIZI">Dizi</channel>
     <channel lang="pt" xmltv_id="DogTV.us" site_id="DOGTV">Dog TV</channel>
     <channel lang="pt" xmltv_id="DWDeutsch.de" site_id="DWTVA">DW Deutsch</channel>
     <channel lang="pt" xmltv_id="DWEnglish.de" site_id="DW-TV">DW English</channel>
@@ -88,7 +88,7 @@
     <channel lang="pt" xmltv_id="France5.fr" site_id="FR5HD">France 5</channel>
     <channel lang="pt" xmltv_id="FuelTV.us" site_id="FUELTV">Fuel TV</channel>
     <channel lang="pt" xmltv_id="GaliciaTVEuropa.es" site_id="TVGAL">Galicia TV</channel>
-    <channel lang="pt" xmltv_id="GametoonHD.us" site_id="GAMET">Gametoon</channel>
+    <channel lang="pt" xmltv_id="GametoonHD.nl" site_id="GAMET">Gametoon</channel>
     <channel lang="pt" xmltv_id="GloboNews.br" site_id="GNEWS">Globo News</channel>
     <channel lang="pt" xmltv_id="HistoriaPortugal.pt" site_id="HIST">História</channel>
     <channel lang="pt" xmltv_id="HOTTV.pt" site_id="HOT">Hot</channel>
diff --git a/sites/mi.tv/mi.tv_co.channels.xml b/sites/mi.tv/mi.tv_co.channels.xml
index 3f0c820c..3b8bafb9 100644
--- a/sites/mi.tv/mi.tv_co.channels.xml
+++ b/sites/mi.tv/mi.tv_co.channels.xml
@@ -24,7 +24,7 @@
     <channel lang="es" xmltv_id="HBOHDLatinAmerica.us" site_id="co#hbo-hd-este">HBO HD Este</channel>
     <channel lang="es" xmltv_id="InvestigationDiscoveryHDPanregional.us" site_id="co#discovery-id-hd">Investigation Discovery HD</channel>
     <channel lang="es" xmltv_id="MTVLive.uk" site_id="co#mtv-live-hd">MTV Live HD</channel>
-    <channel lang="es" xmltv_id="RCNTV.co" site_id="co#canal-rcn-hd">RCN TV HD</channel>
+    <channel lang="es" xmltv_id="CanalRCN.co" site_id="co#canal-rcn-hd">RCN TV HD</channel>
     <channel lang="es" xmltv_id="SonyChannelCentralAmerica.us" site_id="co#sony">Sony Channel</channel>
     <channel lang="es" xmltv_id="StarAction.us" site_id="co#fox-action">Star Action</channel>
     <channel lang="es" xmltv_id="StarChannelColombia.co" site_id="co#fox">Star Channel</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index c6ec380d..8ef2af26 100644
--- a/sites/mncvision.id/mncvision.id_id-id.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-id.channels.xml
@@ -25,7 +25,7 @@
     <channel lang="id" xmltv_id="CelestialMoviesIndonesia.id" site_id="20">Celestial Movies Indonesia</channel>
     <channel lang="id" xmltv_id="CGTN.cn" site_id="353">CGTN</channel>
     <channel lang="id" xmltv_id="CGTNDocumentary.cn" site_id="205">CGTN Documentary</channel>
-    <channel lang="id" xmltv_id="CinemaxIndonesia.id" site_id="8">Cinemax Asia</channel>
+    <channel lang="id" xmltv_id="CinemaxAsia.sg" site_id="8">Cinemax Asia</channel>
     <channel lang="id" xmltv_id="CNA.sg" site_id="330">CNA</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="337">CNBC</channel>
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN</channel>
@@ -40,7 +40,7 @@
     <channel lang="id" xmltv_id="Galaxy.id" site_id="13">Galaxy</channel>
     <channel lang="id" xmltv_id="GalaxyPremium.id" site_id="12">Galaxy Premium</channel>
     <channel lang="id" xmltv_id="GTV.id" site_id="81">GTV</channel>
-    <channel lang="id" xmltv_id="HBOIndonesia.id" site_id="7">HBO</channel>
+    <channel lang="id" xmltv_id="HBOAsia.sg" site_id="7">HBO</channel>
     <channel lang="id" xmltv_id="HBOFamilyAsia.sg" site_id="9">HBO Family</channel>
     <channel lang="id" xmltv_id="HBOHitsAsia.sg" site_id="10">HBO Hits</channel>
     <channel lang="id" xmltv_id="HBOSignatureAsia.sg" site_id="6">HBO Signature</channel>
diff --git a/sites/movistarplus.es/movistarplus.es_es.channels.xml b/sites/movistarplus.es/movistarplus.es_es.channels.xml
index 2c638698..2c693402 100644
--- a/sites/movistarplus.es/movistarplus.es_es.channels.xml
+++ b/sites/movistarplus.es/movistarplus.es_es.channels.xml
@@ -154,7 +154,7 @@
     <channel lang="es" xmltv_id="Odisea.es" site_id="ODISEA">Odisea</channel>
     <channel lang="es" xmltv_id="ParamountChannelSpain.es" site_id="PARCH">Paramount Channel España</channel>
     <channel lang="es" xmltv_id="PlayboyTVIberia.us" site_id="PBOY">Playboy TV Iberia</channel>
-    <channel lang="es" xmltv_id="RCNNuestraTeleInternacionalColombia.co" site_id="COLOMB">RCN Nuestra Tele Internacional</channel>
+    <channel lang="es" xmltv_id="RCNNuestraTeleInternacional.co" site_id="COLOMB">RCN Nuestra Tele Internacional</channel>
     <channel lang="es" xmltv_id="RealMadridTV.es" site_id="REALM">Real Madrid TV Español</channel>
     <channel lang="es" xmltv_id="SkyNewsInternational.uk" site_id="SKYNW">Sky News International</channel>
     <channel lang="es" xmltv_id="SolMusica.es" site_id="SOLMUS">Sol Música</channel>
diff --git a/sites/mtel.ba/mtel.ba_ba.channels.xml b/sites/mtel.ba/mtel.ba_ba.channels.xml
index ae2d8104..7845966e 100644
--- a/sites/mtel.ba/mtel.ba_ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba_ba.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="bs" xmltv_id="24KitchenSerbia.rs" site_id="505#153">24 Kitchen</channel>
     <channel lang="bs" xmltv_id="101TV.rs" site_id="077#428">101 TV</channel>
-    <channel lang="bs" xmltv_id="360TuneBox.us" site_id="602#169">360 Tune Box</channel>
+    <channel lang="bs" xmltv_id="360TuneBox.nl" site_id="602#169">360 Tune Box</channel>
     <channel lang="bs" xmltv_id="AdultChannel1.rs" site_id="913#376">Adult Channel 1</channel>
     <channel lang="bs" xmltv_id="AdultChannel2.rs" site_id="914#377">Adult Channel 2</channel>
     <channel lang="bs" xmltv_id="AdultChannel3.rs" site_id="915#378">Adult Channel 3</channel>
@@ -44,9 +44,9 @@
     <channel lang="bs" xmltv_id="DexyTV.rs" site_id="211#405">Dexy TV</channel>
     <channel lang="bs" xmltv_id="DiscoveryChannelSerbia.rs" site_id="130#123">Discovery Channel Srbija</channel>
     <channel lang="bs" xmltv_id="DiscoveryScience.us" site_id="411#444">Discovery Science</channel>
-    <channel lang="bs" xmltv_id="Dizi.us" site_id="061#391">Dizi</channel>
+    <channel lang="bs" xmltv_id="Dizi.nl" site_id="061#391">Dizi</channel>
     <channel lang="bs" xmltv_id="DMSat.rs" site_id="145#199">DM Sat</channel>
-    <channel lang="bs" xmltv_id="DocuBoxHD.us" site_id="418#140">DocuBox HD</channel>
+    <channel lang="bs" xmltv_id="DocuBoxHD.nl" site_id="418#140">DocuBox HD</channel>
     <channel lang="bs" xmltv_id="DoxTV.hr" site_id="089#404">Dox TV</channel>
     <channel lang="bs" xmltv_id="DTXEastEurope.us" site_id="120#445">DTX East Europe</channel>
     <channel lang="bs" xmltv_id="EGMelody.rs" site_id="611#365">EG Melody</channel>
@@ -57,15 +57,15 @@
     <channel lang="bs" xmltv_id="Erotic4.rs" site_id="905#184">Erotic 4</channel>
     <channel lang="bs" xmltv_id="Erotic7.rs" site_id="908#189">Erotic 7</channel>
     <channel lang="bs" xmltv_id="Erotic8.rs" site_id="909#191">Erotic 8</channel>
-    <channel lang="bs" xmltv_id="EroxHD.us" site_id="900#175">Erox HD</channel>
-    <channel lang="bs" xmltv_id="EroxxxHD.us" site_id="901#177">Eroxxx HD</channel>
+    <channel lang="bs" xmltv_id="EroxHD.nl" site_id="900#175">Erox HD</channel>
+    <channel lang="bs" xmltv_id="EroxxxHD.nl" site_id="901#177">Eroxxx HD</channel>
     <channel lang="bs" xmltv_id="ExtremeSportsChannel.nl" site_id="125#270">Extreme Sports Channel</channel>
     <channel lang="bs" xmltv_id="EXYUMelody.rs" site_id="621#367">EX YU Melody</channel>
     <channel lang="bs" xmltv_id="FashionTVEurope.fr" site_id="075#439">FashionTV Europe</channel>
-    <channel lang="bs" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="088#124">FilmBox Arthouse Worldwide</channel>
-    <channel lang="bs" xmltv_id="FilmBoxExtraHDAdria.us" site_id="325#120">FilmBox Extra HD Adria</channel>
-    <channel lang="bs" xmltv_id="FilmBoxPremiumAdria.us" site_id="326#286">FilmBox Premium Adria</channel>
-    <channel lang="bs" xmltv_id="FilmBoxStarsAdria.us" site_id="330#122">FilmBox Stars Adria</channel>
+    <channel lang="bs" xmltv_id="FilmBoxArthouse.nl" site_id="088#124">FilmBox Arthouse Worldwide</channel>
+    <channel lang="bs" xmltv_id="FilmBoxExtraHDBulgaria.bg" site_id="325#120">FilmBox Extra HD Adria</channel>
+    <!-- <channel lang="bs" xmltv_id="FilmBoxPremiumAdria.us" site_id="326#286">FilmBox Premium Adria</channel> -->
+    <channel lang="bs" xmltv_id="FilmBoxStarsBulgaria.bg" site_id="330#122">FilmBox Stars Adria</channel>
     <channel lang="bs" xmltv_id="FilmKlub.rs" site_id="056#163">Film Klub</channel>
     <channel lang="bs" xmltv_id="FolkMelody.rs" site_id="639#368">Folk Melody</channel>
     <channel lang="bs" xmltv_id="FoodNetworkEMEA.us" site_id="503#443">Food Network EMEA</channel>
diff --git a/sites/mts.rs/mts.rs_rs.channels.xml b/sites/mts.rs/mts.rs_rs.channels.xml
index e42ee7ea..9c44daec 100644
--- a/sites/mts.rs/mts.rs_rs.channels.xml
+++ b/sites/mts.rs/mts.rs_rs.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="sr" xmltv_id="24KitchenSerbia.rs" site_id="264#624">24 Kitchen</channel>
     <channel lang="sr" xmltv_id="101TV.rs" site_id="504#759">101 TV</channel>
-    <channel lang="sr" xmltv_id="360TuneBox.us" site_id="480#606">360 Tune Box</channel>
+    <channel lang="sr" xmltv_id="360TuneBox.nl" site_id="480#606">360 Tune Box</channel>
     <channel lang="sr" xmltv_id="A1TV.me" site_id="653#335">A1 TV</channel>
     <channel lang="sr" xmltv_id="AgroTV.rs" site_id="126#147">Agro TV</channel>
     <channel lang="sr" xmltv_id="AlJazeeraBalkans.qa" site_id="654#25">Aljazeera Balkans</channel>
@@ -56,9 +56,9 @@
     <channel lang="sr" xmltv_id="DiscoveryChannelSerbia.rs" site_id="350#123">Discovery Channel Srbija</channel>
     <channel lang="sr" xmltv_id="DiscoveryScience.us" site_id="322#806">Discovery Science</channel>
     <channel lang="sr" xmltv_id="DisneyChannelPoland.pl" site_id="413#326">Disney Channel Polska</channel>
-    <channel lang="sr" xmltv_id="Dizi.us" site_id="165#599">Dizi</channel>
+    <channel lang="sr" xmltv_id="Dizi.nl" site_id="165#599">Dizi</channel>
     <channel lang="sr" xmltv_id="DMSat.rs" site_id="464#199">DM Sat</channel>
-    <channel lang="sr" xmltv_id="DocuBoxHD.us" site_id="359#140">DocuBox HD</channel>
+    <channel lang="sr" xmltv_id="DocuBoxHD.nl" site_id="359#140">DocuBox HD</channel>
     <channel lang="sr" xmltv_id="DoxTV.hr" site_id="128#660">Dox TV</channel>
     <channel lang="sr" xmltv_id="DTXEastEurope.us" site_id="322#804">DTX East Europe</channel>
     <channel lang="sr" xmltv_id="DuckTVSD.sk" site_id="403#324">Duck TV SD</channel>
@@ -74,17 +74,17 @@
     <channel lang="sr" xmltv_id="Eurosport2.fr" site_id="316#59">Eurosport 2</channel>
     <channel lang="sr" xmltv_id="ExtremeSportsChannel.nl" site_id="317#289">Extreme Sports Channel</channel>
     <channel lang="sr" xmltv_id="FaceTV.ba" site_id="655#820">Face TV</channel>
-    <channel lang="sr" xmltv_id="FashionBoxHD.us" site_id="265#603">FashionBox HD</channel>
+    <channel lang="sr" xmltv_id="FashionBoxHD.nl" site_id="265#603">FashionBox HD</channel>
     <channel lang="sr" xmltv_id="FashionTVEurope.fr" site_id="274#162">Fashion TV Europe</channel>
-    <channel lang="sr" xmltv_id="FastFunBoxHD.us" site_id="316#605">Fast &amp; FunBox HD</channel>
+    <channel lang="sr" xmltv_id="FastFunBoxHD.nl" site_id="316#605">Fast &amp; FunBox HD</channel>
     <channel lang="sr" xmltv_id="FederalnaTV.ba" site_id="656#831">Federalna TV</channel>
-    <channel lang="sr" xmltv_id="FightBoxHD.us" site_id="325#604">FightBox HD</channel>
+    <channel lang="sr" xmltv_id="FightBoxHD.nl" site_id="325#604">FightBox HD</channel>
     <channel lang="sr" xmltv_id="FightNetwork.ca" site_id="323#586">Fight Network</channel>
     <channel lang="sr" xmltv_id="Film4.hu" site_id="685#756">Film 4</channel>
-    <channel lang="sr" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="239#124">FilmBox Arthouse Worldwide</channel>
-    <channel lang="sr" xmltv_id="FilmBoxExtraHDAdria.us" site_id="238#120">FilmBox Extra HD Adria</channel>
-    <channel lang="sr" xmltv_id="FilmBoxPremiumAdria.us" site_id="236#390">FilmBox Premium Adria</channel>
-    <channel lang="sr" xmltv_id="FilmBoxStarsAdria.us" site_id="237#122">FilmBox Stars Adria</channel>
+    <channel lang="sr" xmltv_id="FilmBoxArthouse.nl" site_id="239#124">FilmBox Arthouse Worldwide</channel>
+    <channel lang="sr" xmltv_id="FilmBoxExtraHDBulgaria.bg" site_id="238#120">FilmBox Extra HD Adria</channel>
+    <!-- <channel lang="sr" xmltv_id="FilmBoxPremiumAdria.us" site_id="236#390">FilmBox Premium Adria</channel> -->
+    <channel lang="sr" xmltv_id="FilmBoxStarsBulgaria.bg" site_id="237#122">FilmBox Stars Adria</channel>
     <channel lang="sr" xmltv_id="FilmKlub.rs" site_id="129#163">Film Klub</channel>
     <channel lang="sr" xmltv_id="FilmKlubExtra.rs" site_id="245#315">Film Klub Extra</channel>
     <channel lang="sr" xmltv_id="FilmPlus.hu" site_id="683#277">Film + Hungary</channel>
@@ -95,7 +95,7 @@
     <channel lang="sr" xmltv_id="FoxNewsChannel.us" site_id="661#774">Fox News Channel</channel>
     <channel lang="sr" xmltv_id="FoxSerbia.rs" site_id="217#627">Fox Srbija</channel>
     <channel lang="sr" xmltv_id="France24English.fr" site_id="666#204">France 24 English</channel>
-    <channel lang="sr" xmltv_id="GametoonHD.us" site_id="286#388">Gametoon</channel>
+    <channel lang="sr" xmltv_id="GametoonHD.nl" site_id="286#388">Gametoon</channel>
     <channel lang="sr" xmltv_id="GradskaMTV.rs" site_id="547#815">Gradska M TV</channel>
     <channel lang="sr" xmltv_id="History2Poland.pl" site_id="355#134">History 2 Polska</channel>
     <channel lang="sr" xmltv_id="HaHa.rs" site_id="284#219">Ha Ha</channel>
diff --git a/sites/musor.tv/musor.tv_hu.channels.xml b/sites/musor.tv/musor.tv_hu.channels.xml
index 84befba1..d2c5e40d 100644
--- a/sites/musor.tv/musor.tv_hu.channels.xml
+++ b/sites/musor.tv/musor.tv_hu.channels.xml
@@ -39,7 +39,7 @@
     <channel lang="hu" xmltv_id="DiscoveryChannelHungary.hu" site_id="DISCOVERY">Discovery Channel (HD)</channel>
     <channel lang="hu" xmltv_id="DiscoveryScience.us" site_id="DISCOVERYSCI">Discovery Science (HD)</channel>
     <channel lang="hu" xmltv_id="DisneyChannelHungary.hu" site_id="DISNEY">Disney Channel</channel>
-    <channel lang="hu" xmltv_id="DocuBoxHD.us" site_id="DOCUBOX_EN">Docubox HD</channel>
+    <channel lang="hu" xmltv_id="DocuBoxHD.nl" site_id="DOCUBOX_EN">Docubox HD</channel>
     <channel lang="hu" xmltv_id="DTXEastEurope.us" site_id="DTX">Discovery Turbo Xtra (DTX) (HD)</channel>
     <channel lang="hu" xmltv_id="DuckTV.sk" site_id="DUCKTV">Duck TV</channel>
     <channel lang="hu" xmltv_id="DuckTVHD.sk" site_id="DUCKHD">Duck TV HD</channel>
@@ -57,12 +57,12 @@
     <channel lang="hu" xmltv_id="FashionTVEurope.fr" site_id="FTVHD">Fashion TV HD</channel>
     <channel lang="hu" xmltv_id="FehervarTV.hu" site_id="FEHERVAR_TV">Fehérvár TV</channel>
     <channel lang="hu" xmltv_id="FEM3.hu" site_id="FEM3">FEM3</channel>
-    <channel lang="hu" xmltv_id="FightBoxHD.us" site_id="FIGHTBOX_EN">Fightbox HD</channel>
+    <channel lang="hu" xmltv_id="FightBoxHD.nl" site_id="FIGHTBOX_EN">Fightbox HD</channel>
     <channel lang="hu" xmltv_id="Film4.hu" site_id="FILM4">Film 4 (HD)</channel>
-    <channel lang="hu" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="FILMBOX_ARTHOUSE">Filmbox Arthouse</channel>
-    <channel lang="hu" xmltv_id="FilmBoxCentralEurope.us" site_id="FILMBOX">Filmbox</channel>
-    <channel lang="hu" xmltv_id="FilmBoxExtraHDCzechiaHungary.hu" site_id="FILMBOX_EXTRA_HD">Filmbox Extra HD</channel>
-    <channel lang="hu" xmltv_id="FilmBoxFamily.us" site_id="FILMBOXFAMILY">Filmbox Family</channel>
+    <channel lang="hu" xmltv_id="FilmBoxArthouse.nl" site_id="FILMBOX_ARTHOUSE">Filmbox Arthouse</channel>
+    <!-- <channel lang="hu" xmltv_id="FilmBoxCentralEurope.us" site_id="FILMBOX">Filmbox</channel> -->
+    <channel lang="hu" xmltv_id="FilmBoxExtraHDCzechRepublicSlovakia.cz" site_id="FILMBOX_EXTRA_HD">Filmbox Extra HD</channel>
+    <channel lang="hu" xmltv_id="FilmBoxFamily.nl" site_id="FILMBOXFAMILY">Filmbox Family</channel>
     <channel lang="hu" xmltv_id="FilmBoxPremiumHungary.hu" site_id="FILMBOX_PREMIUM">Filmbox Premium</channel>
     <channel lang="hu" xmltv_id="FilmBoxStarsHungary.hu" site_id="FILMBOX_STARS">Filmbox Stars</channel>
     <channel lang="hu" xmltv_id="FilmCafeHungary.hu" site_id="FILMCAFE">Film Café (HD)</channel>
@@ -73,9 +73,9 @@
     <channel lang="hu" xmltv_id="FitHD.hu" site_id="FIT_HD">Fit HD</channel>
     <channel lang="hu" xmltv_id="FixTV.hu" site_id="FIXTV">FIX TV (HD)</channel>
     <channel lang="hu" xmltv_id="FoodNetworkEMEA.us" site_id="FOODNETWORK">Food Network (HD)</channel>
-    <channel lang="hu" xmltv_id="FunBoxUHD.us" site_id="FUNBOX_UHD">Funbox UltraHD 4K</channel>
+    <channel lang="hu" xmltv_id="FunBoxUHD.nl" site_id="FUNBOX_UHD">Funbox UltraHD 4K</channel>
     <channel lang="hu" xmltv_id="Galaxy4.hu" site_id="GALAXY">Galaxy 4 (HD)</channel>
-    <channel lang="hu" xmltv_id="GametoonHD.us" site_id="GAMETOON">Gametoon HD</channel>
+    <channel lang="hu" xmltv_id="GametoonHD.nl" site_id="GAMETOON">Gametoon HD</channel>
     <channel lang="hu" xmltv_id="Hatoscsatorna.hu" site_id="HATOS_CSATORNA">Hatoscsatorna</channel>
     <channel lang="hu" xmltv_id="HBO2HDHungaria.hu" site_id="HBO2">HBO 2 (HD)</channel>
     <channel lang="hu" xmltv_id="HBO3HDHungaria.hu" site_id="HBO3">HBO 3 (HD)</channel>
diff --git a/sites/osn.com/osn.com_ae-ar.channels.xml b/sites/osn.com/osn.com_ae-ar.channels.xml
index e5c39edf..4962a712 100644
--- a/sites/osn.com/osn.com_ae-ar.channels.xml
+++ b/sites/osn.com/osn.com_ae-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="AE#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="AE#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="AE#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="AE#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="AE#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="AE#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="AE#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="AE#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ae-en.channels.xml b/sites/osn.com/osn.com_ae-en.channels.xml
index 7d7aa95d..1c78d98d 100644
--- a/sites/osn.com/osn.com_ae-en.channels.xml
+++ b/sites/osn.com/osn.com_ae-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="AE#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="AE#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="AE#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="AE#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="AE#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="AE#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="AE#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="AE#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_bh-ar.channels.xml b/sites/osn.com/osn.com_bh-ar.channels.xml
index 51cc5171..86a5e6bf 100644
--- a/sites/osn.com/osn.com_bh-ar.channels.xml
+++ b/sites/osn.com/osn.com_bh-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="BH#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="BH#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="BH#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="BH#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="BH#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="BH#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="BH#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="BH#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_bh-en.channels.xml b/sites/osn.com/osn.com_bh-en.channels.xml
index 6891f5bb..daf04fc9 100644
--- a/sites/osn.com/osn.com_bh-en.channels.xml
+++ b/sites/osn.com/osn.com_bh-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="BH#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="BH#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="BH#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="BH#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="BH#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="BH#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="BH#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="BH#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_dz-ar.channels.xml b/sites/osn.com/osn.com_dz-ar.channels.xml
index f86f63b4..cc809d67 100644
--- a/sites/osn.com/osn.com_dz-ar.channels.xml
+++ b/sites/osn.com/osn.com_dz-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="AG#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="AG#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="AG#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="AG#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="AG#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="AG#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="AG#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="AG#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_dz-en.channels.xml b/sites/osn.com/osn.com_dz-en.channels.xml
index 437dd08a..72afb055 100644
--- a/sites/osn.com/osn.com_dz-en.channels.xml
+++ b/sites/osn.com/osn.com_dz-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="AG#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="AG#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="AG#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="AG#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="AG#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="AG#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="AG#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="AG#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_eg-ar.channels.xml b/sites/osn.com/osn.com_eg-ar.channels.xml
index 44afbccf..7950b694 100644
--- a/sites/osn.com/osn.com_eg-ar.channels.xml
+++ b/sites/osn.com/osn.com_eg-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="EG#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="EG#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="EG#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="EG#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="EG#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="EG#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="EG#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="EG#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_eg-en.channels.xml b/sites/osn.com/osn.com_eg-en.channels.xml
index abebf88c..155e3cfb 100644
--- a/sites/osn.com/osn.com_eg-en.channels.xml
+++ b/sites/osn.com/osn.com_eg-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="EG#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="EG#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="EG#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="EG#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="EG#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="EG#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="EG#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="EG#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_iq-ar.channels.xml b/sites/osn.com/osn.com_iq-ar.channels.xml
index 49c1a811..69fb92f0 100644
--- a/sites/osn.com/osn.com_iq-ar.channels.xml
+++ b/sites/osn.com/osn.com_iq-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="IQ#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="IQ#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="IQ#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="IQ#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="IQ#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="IQ#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="IQ#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="IQ#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_iq-en.channels.xml b/sites/osn.com/osn.com_iq-en.channels.xml
index 6637b790..193d736f 100644
--- a/sites/osn.com/osn.com_iq-en.channels.xml
+++ b/sites/osn.com/osn.com_iq-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="IQ#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="IQ#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="IQ#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="IQ#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="IQ#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="IQ#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="IQ#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="IQ#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_jo-ar.channels.xml b/sites/osn.com/osn.com_jo-ar.channels.xml
index 8a897bd6..828c200f 100644
--- a/sites/osn.com/osn.com_jo-ar.channels.xml
+++ b/sites/osn.com/osn.com_jo-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="JO#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="JO#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="JO#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="JO#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="JO#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="JO#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="JO#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="JO#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_jo-en.channels.xml b/sites/osn.com/osn.com_jo-en.channels.xml
index b45883d5..1b5e9b9c 100644
--- a/sites/osn.com/osn.com_jo-en.channels.xml
+++ b/sites/osn.com/osn.com_jo-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="JO#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="JO#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="JO#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="JO#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="JO#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="JO#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="JO#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="JO#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_kw-ar.channels.xml b/sites/osn.com/osn.com_kw-ar.channels.xml
index 012b31b9..804db3d5 100644
--- a/sites/osn.com/osn.com_kw-ar.channels.xml
+++ b/sites/osn.com/osn.com_kw-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="KW#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="KW#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="KW#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="KW#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="KW#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="KW#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="KW#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="KW#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_kw-en.channels.xml b/sites/osn.com/osn.com_kw-en.channels.xml
index 08d6c0d4..a49758e3 100644
--- a/sites/osn.com/osn.com_kw-en.channels.xml
+++ b/sites/osn.com/osn.com_kw-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="KW#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="KW#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="KW#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="KW#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="KW#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="KW#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="KW#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="KW#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_lb-ar.channels.xml b/sites/osn.com/osn.com_lb-ar.channels.xml
index 3513bca3..cdd55431 100644
--- a/sites/osn.com/osn.com_lb-ar.channels.xml
+++ b/sites/osn.com/osn.com_lb-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="LB#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="LB#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="LB#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="LB#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="LB#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="LB#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="LB#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="LB#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_lb-en.channels.xml b/sites/osn.com/osn.com_lb-en.channels.xml
index 669b4e24..7e11051a 100644
--- a/sites/osn.com/osn.com_lb-en.channels.xml
+++ b/sites/osn.com/osn.com_lb-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="LB#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="LB#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="LB#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="LB#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="LB#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="LB#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="LB#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="LB#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ly-ar.channels.xml b/sites/osn.com/osn.com_ly-ar.channels.xml
index 75fac627..67796adc 100644
--- a/sites/osn.com/osn.com_ly-ar.channels.xml
+++ b/sites/osn.com/osn.com_ly-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="LY#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="LY#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="LY#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="LY#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="LY#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="LY#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="LY#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="LY#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ly-en.channels.xml b/sites/osn.com/osn.com_ly-en.channels.xml
index 45b0ba5c..057e2de7 100644
--- a/sites/osn.com/osn.com_ly-en.channels.xml
+++ b/sites/osn.com/osn.com_ly-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="LY#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="LY#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="LY#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="LY#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="LY#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="LY#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="LY#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="LY#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ma-ar.channels.xml b/sites/osn.com/osn.com_ma-ar.channels.xml
index 5297a538..e9b5b6f7 100644
--- a/sites/osn.com/osn.com_ma-ar.channels.xml
+++ b/sites/osn.com/osn.com_ma-ar.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="ar" xmltv_id="AghaniAghaniTV.lb" site_id="MA#AGH">Aghani Aghani TV</channel>
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="MA#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="MA#AAN">Al Aan TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="MA#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="MA#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="MA#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="MA#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="MA#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ma-en.channels.xml b/sites/osn.com/osn.com_ma-en.channels.xml
index 0d0bbba2..1aa1c363 100644
--- a/sites/osn.com/osn.com_ma-en.channels.xml
+++ b/sites/osn.com/osn.com_ma-en.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="en" xmltv_id="AghaniAghaniTV.lb" site_id="MA#AGH">Aghani Aghani TV</channel>
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="MA#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="MA#AAN">Al Aan TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="MA#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="MA#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="MA#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="MA#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="MA#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_mr-ar.channels.xml b/sites/osn.com/osn.com_mr-ar.channels.xml
index ec58587f..a44ab99a 100644
--- a/sites/osn.com/osn.com_mr-ar.channels.xml
+++ b/sites/osn.com/osn.com_mr-ar.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="ar" xmltv_id="AghaniAghaniTV.lb" site_id="MR#AGH">Aghani Aghani TV</channel>
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="MR#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="MR#AAN">Al Aan TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="MR#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="MR#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="MR#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="MR#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="MR#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_mr-en.channels.xml b/sites/osn.com/osn.com_mr-en.channels.xml
index eda8063c..a6b64a0c 100644
--- a/sites/osn.com/osn.com_mr-en.channels.xml
+++ b/sites/osn.com/osn.com_mr-en.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="en" xmltv_id="AghaniAghaniTV.lb" site_id="MR#AGH">Aghani Aghani TV</channel>
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="MR#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="MR#AAN">Al Aan TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="MR#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="MR#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="MR#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="MR#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="MR#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_om-ar.channels.xml b/sites/osn.com/osn.com_om-ar.channels.xml
index db3283ff..034eb617 100644
--- a/sites/osn.com/osn.com_om-ar.channels.xml
+++ b/sites/osn.com/osn.com_om-ar.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="ar" xmltv_id="AghaniAghaniTV.lb" site_id="OM#AGH">Aghani Aghani TV</channel>
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="OM#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="OM#AAN">Al Aan TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="OM#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="OM#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="OM#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="OM#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="OM#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_om-en.channels.xml b/sites/osn.com/osn.com_om-en.channels.xml
index 4331719a..72e60ba2 100644
--- a/sites/osn.com/osn.com_om-en.channels.xml
+++ b/sites/osn.com/osn.com_om-en.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="en" xmltv_id="AghaniAghaniTV.lb" site_id="OM#AGH">Aghani Aghani TV</channel>
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="OM#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="OM#AAN">Al Aan TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="OM#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="OM#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="OM#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="OM#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="OM#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ps-ar.channels.xml b/sites/osn.com/osn.com_ps-ar.channels.xml
index edd0ff6c..3d4a69a4 100644
--- a/sites/osn.com/osn.com_ps-ar.channels.xml
+++ b/sites/osn.com/osn.com_ps-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="PS#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="PS#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="PS#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="PS#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="PS#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="PS#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="PS#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="PS#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ps-en.channels.xml b/sites/osn.com/osn.com_ps-en.channels.xml
index 7d0bfb53..079b8703 100644
--- a/sites/osn.com/osn.com_ps-en.channels.xml
+++ b/sites/osn.com/osn.com_ps-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="PS#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="PS#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="PS#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="PS#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="PS#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="PS#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="PS#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="PS#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_qa-ar.channels.xml b/sites/osn.com/osn.com_qa-ar.channels.xml
index 7fd3d7c5..4737798a 100644
--- a/sites/osn.com/osn.com_qa-ar.channels.xml
+++ b/sites/osn.com/osn.com_qa-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="QA#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="QA#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="QA#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="QA#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="QA#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="QA#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="QA#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="QA#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_qa-en.channels.xml b/sites/osn.com/osn.com_qa-en.channels.xml
index a443bf85..40c491b8 100644
--- a/sites/osn.com/osn.com_qa-en.channels.xml
+++ b/sites/osn.com/osn.com_qa-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="QA#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="QA#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="QA#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="QA#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="QA#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="QA#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="QA#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="QA#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_sa-ar.channels.xml b/sites/osn.com/osn.com_sa-ar.channels.xml
index d918c968..dc095385 100644
--- a/sites/osn.com/osn.com_sa-ar.channels.xml
+++ b/sites/osn.com/osn.com_sa-ar.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="ar" xmltv_id="AghaniAghaniTV.lb" site_id="SA#AGH">Aghani Aghani TV</channel>
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="SA#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="SA#AAN">Al Aan TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="SA#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="SA#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="SA#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="SA#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="SA#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_sa-en.channels.xml b/sites/osn.com/osn.com_sa-en.channels.xml
index fbcf35e1..0a749d66 100644
--- a/sites/osn.com/osn.com_sa-en.channels.xml
+++ b/sites/osn.com/osn.com_sa-en.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="en" xmltv_id="AghaniAghaniTV.lb" site_id="SA#AGH">Aghani Aghani TV</channel>
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="SA#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="SA#AAN">Al Aan TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="SA#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="SA#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="SA#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="SA#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="SA#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_td-ar.channels.xml b/sites/osn.com/osn.com_td-ar.channels.xml
index f51bff15..d9e400ca 100644
--- a/sites/osn.com/osn.com_td-ar.channels.xml
+++ b/sites/osn.com/osn.com_td-ar.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="ar" xmltv_id="AghaniAghaniTV.lb" site_id="CH#AGH">Aghani Aghani TV</channel>
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="CH#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="CH#AAN">Al Aan TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="CH#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="CH#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="CH#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="CH#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="CH#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_td-en.channels.xml b/sites/osn.com/osn.com_td-en.channels.xml
index ac236e6e..fb89c2f5 100644
--- a/sites/osn.com/osn.com_td-en.channels.xml
+++ b/sites/osn.com/osn.com_td-en.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="en" xmltv_id="AghaniAghaniTV.lb" site_id="CH#AGH">Aghani Aghani TV</channel>
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="CH#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="CH#AAN">Al Aan TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="CH#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="CH#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="CH#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="CH#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="CH#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ye-ar.channels.xml b/sites/osn.com/osn.com_ye-ar.channels.xml
index 95d5b8e4..c5f1e707 100644
--- a/sites/osn.com/osn.com_ye-ar.channels.xml
+++ b/sites/osn.com/osn.com_ye-ar.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="ar" xmltv_id="AksyonTVInternational.ph" site_id="YE#AKS">Aksyon TV International</channel>
     <channel lang="ar" xmltv_id="AlAanTV.ae" site_id="YE#AAN">Al Aan TV</channel>
     <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="YE#DAF">Al Dafrah TV</channel>
-    <channel lang="ar" xmltv_id="AlhurraTV.us" site_id="YE#ALH">Alhurra TV</channel>
+    <channel lang="ar" xmltv_id="Alhurra.us" site_id="YE#ALH">Alhurra TV</channel>
     <channel lang="ar" xmltv_id="AlMajlisTV.kw" site_id="YE#KTM">Al-Majlis TV</channel>
     <channel lang="ar" xmltv_id="AlMamlakaTV.jo" site_id="YE#MMK">Al Mamlaka TV</channel>
     <channel lang="ar" xmltv_id="AlQurainTV.kw" site_id="YE#KTQ">Al-Qurain TV</channel>
diff --git a/sites/osn.com/osn.com_ye-en.channels.xml b/sites/osn.com/osn.com_ye-en.channels.xml
index 9d762cc9..012526e4 100644
--- a/sites/osn.com/osn.com_ye-en.channels.xml
+++ b/sites/osn.com/osn.com_ye-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AksyonTVInternational.ph" site_id="YE#AKS">Aksyon TV International</channel>
     <channel lang="en" xmltv_id="AlAanTV.ae" site_id="YE#AAN">Al Aan TV</channel>
     <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="YE#DAF">Al Dafrah TV</channel>
-    <channel lang="en" xmltv_id="AlhurraTV.us" site_id="YE#ALH">Alhurra TV</channel>
+    <channel lang="en" xmltv_id="Alhurra.us" site_id="YE#ALH">Alhurra TV</channel>
     <channel lang="en" xmltv_id="AlMajlisTV.kw" site_id="YE#KTM">Al-Majlis TV</channel>
     <channel lang="en" xmltv_id="AlMamlakaTV.jo" site_id="YE#MMK">Al Mamlaka TV</channel>
     <channel lang="en" xmltv_id="AlQurainTV.kw" site_id="YE#KTQ">Al-Qurain TV</channel>
diff --git a/sites/programetv.ro/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
index b4d8ca9f..707eee27 100644
--- a/sites/programetv.ro/programetv.ro_ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro_ro.channels.xml
@@ -56,8 +56,8 @@
     <channel lang="ro" xmltv_id="DiscoveryScience.us" site_id="discovery-science">Discovery Science</channel>
     <channel lang="ro" xmltv_id="DisneyChannelRomania.ro" site_id="disney-channel">Disney Channel</channel>
     <channel lang="ro" xmltv_id="DivaRomania.ro" site_id="diva">Diva Romania</channel>
-    <channel lang="ro" xmltv_id="Dizi.us" site_id="tdc">Dizi</channel>
-    <channel lang="ro" xmltv_id="DocuBoxHD.us" site_id="docu-box-hd">DocuBox HD</channel>
+    <channel lang="ro" xmltv_id="Dizi.nl" site_id="tdc">Dizi</channel>
+    <channel lang="ro" xmltv_id="DocuBoxHD.nl" site_id="docu-box-hd">DocuBox HD</channel>
     <channel lang="ro" xmltv_id="DorcelTV.nl" site_id="dorcel-tv">Dorcel TV</channel>
     <channel lang="ro" xmltv_id="DTXEastEurope.us" site_id="discovery-turbo-xtra-hd">DTX</channel>
     <channel lang="ro" xmltv_id="DuckTVSD.sk" site_id="duck-tv">Duck TV</channel>
@@ -67,23 +67,23 @@
     <channel lang="ro" xmltv_id="EEurope.us" site_id="e-entertainment">E!</channel>
     <channel lang="ro" xmltv_id="EpicDrama.se" site_id="epic-drama">Epic Drama</channel>
     <channel lang="ro" xmltv_id="ErdelyTV.ro" site_id="erdely-tv">Erdély TV</channel>
-    <channel lang="ro" xmltv_id="EroxHD.us" site_id="erox-hd">Erox HD</channel>
-    <channel lang="ro" xmltv_id="EroxxxHD.us" site_id="eroxxx-hd">Eroxxx HD</channel>
+    <channel lang="ro" xmltv_id="EroxHD.nl" site_id="erox-hd">Erox HD</channel>
+    <channel lang="ro" xmltv_id="EroxxxHD.nl" site_id="eroxxx-hd">Eroxxx HD</channel>
     <channel lang="ro" xmltv_id="EtnoTV.ro" site_id="etno-tv">Etno TV</channel>
     <channel lang="ro" xmltv_id="EuronewsEnglish.fr" site_id="euronews">EuroNews</channel>
     <channel lang="ro" xmltv_id="Eurosport1Romania.ro" site_id="eurosport-1">Eurosport 1</channel>
     <channel lang="ro" xmltv_id="Eurosport2Romania.ro" site_id="eurosport-2">Eurosport 2</channel>
     <channel lang="ro" xmltv_id="Eurosport4K.fr" site_id="eurosport-4k">Eurosport 4K</channel>
     <channel lang="ro" xmltv_id="ExtremeSportsChannel.nl" site_id="extreme-sports-channel">Extreme Sports Channel</channel>
-    <channel lang="ro" xmltv_id="FashionBoxHD.us" site_id="fashion-box-hd">FashionBox HD</channel>
+    <channel lang="ro" xmltv_id="FashionBoxHD.nl" site_id="fashion-box-hd">FashionBox HD</channel>
     <channel lang="ro" xmltv_id="FashionTVEurope.fr" site_id="fashion-tv">FashionTV</channel>
     <channel lang="ro" xmltv_id="FashionTVHDEurope.fr" site_id="fashion-tv-hd">FashionTV HD</channel>
     <channel lang="ro" xmltv_id="FavoritTV.ro" site_id="favorit">Favorit TV</channel>
-    <channel lang="ro" xmltv_id="FightBoxHD.us" site_id="fight-box-hd">FightBox HD</channel>
+    <channel lang="ro" xmltv_id="FightBoxHD.nl" site_id="fight-box-hd">FightBox HD</channel>
     <channel lang="ro" xmltv_id="Film4UK.uk" site_id="film4">Film 4 UK</channel>
-    <channel lang="ro" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="filmbox-arthouse">FilmBox Arthouse Worldwide</channel>
-    <channel lang="ro" xmltv_id="FilmBoxExtraHDRomania.ro" site_id="filmbox-extra-hd">FilmBox Extra HD</channel>
-    <channel lang="ro" xmltv_id="FilmBoxFamily.us" site_id="filmbox-family">FilmBox Family</channel>
+    <channel lang="ro" xmltv_id="FilmBoxArthouse.nl" site_id="filmbox-arthouse">FilmBox Arthouse Worldwide</channel>
+    <!-- <channel lang="ro" xmltv_id="FilmBoxExtraHDRomania.ro" site_id="filmbox-extra-hd">FilmBox Extra HD</channel> -->
+    <channel lang="ro" xmltv_id="FilmBoxFamily.nl" site_id="filmbox-family">FilmBox Family</channel>
     <channel lang="ro" xmltv_id="FilmBoxPremiumRomania.ro" site_id="filmbox-premium">FilmBox Premium</channel>
     <channel lang="ro" xmltv_id="FilmCafeRomania.ro" site_id="film-cafe">Film Café</channel>
     <channel lang="ro" xmltv_id="FilmNow.ro" site_id="film-now">Film Now</channel>
@@ -94,7 +94,7 @@
     <channel lang="ro" xmltv_id="France3.fr" site_id="france-3">France 3</channel>
     <channel lang="ro" xmltv_id="France5.fr" site_id="france-5">France 5</channel>
     <channel lang="ro" xmltv_id="FuelTV.us" site_id="fuel-tv-hd">Fuel TV</channel>
-    <channel lang="ro" xmltv_id="FunBoxUHD.us" site_id="funbox-uhd">FunBox UHD</channel>
+    <channel lang="ro" xmltv_id="FunBoxUHD.nl" site_id="funbox-uhd">FunBox UHD</channel>
     <channel lang="ro" xmltv_id="Galaxy4.hu" site_id="galaxy4">Galaxy 4</channel>
     <channel lang="ro" xmltv_id="GinxeSportsTVInternational.uk" site_id="ginx-esports-tv">Ginx eSports TV</channel>
     <channel lang="ro" xmltv_id="HappyChannel.ro" site_id="happy-channel">Happy Channel</channel>
diff --git a/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml b/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml
index 1055598a..565353c4 100644
--- a/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml
+++ b/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml
@@ -2,6 +2,6 @@
 <site site="programme-tv.vini.pf">
   <channels>
     <channel lang="fr" xmltv_id="Polynesie1ere.pf" site_id="polynesie-1ere">Polynésie 1ère</channel>
-    <channel lang="fr" xmltv_id="TahitiNuiTV.pf" site_id="tntv-local">Tahiti Nui TV</channel>
+    <channel lang="fr" xmltv_id="TNTV.pf" site_id="tntv-local">Tahiti Nui TV</channel>
   </channels>
 </site>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
index 65e58ddc..cc292f81 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="pl" xmltv_id="13thStreet.de" site_id="13th-street-250">13th Street Deutschland</channel>
     <channel lang="pl" xmltv_id="13Ulica.pl" site_id="13-ulica-316">13 Ulica</channel>
-    <channel lang="pl" xmltv_id="360TuneBox.us" site_id="360tunebox-302">360 Tune Box</channel>
+    <channel lang="pl" xmltv_id="360TuneBox.nl" site_id="360tunebox-302">360 Tune Box</channel>
     <channel lang="pl" xmltv_id="3sat.de" site_id="3sat-248">3sat</channel>
     <channel lang="pl" xmltv_id="4FunDance.pl" site_id="4fun-fit-dance-244">4 Fun Dance</channel>
     <channel lang="pl" xmltv_id="4FunTV.pl" site_id="4fun-tv-269">4 Fun TV</channel>
@@ -80,7 +80,7 @@
     <channel lang="pl" xmltv_id="DisneyChannelTurkey.tr" site_id="disney-junior-469">Disney Junior Türkiye &amp; Polska</channel>
     <channel lang="pl" xmltv_id="DisneyXDPoland.pl" site_id="disney-xd-235">Disney XD Polska</channel>
     <channel lang="pl" xmltv_id="DMAXGermany.de" site_id="dmax-428">DMAX Deutschland</channel>
-    <channel lang="pl" xmltv_id="DocuBoxHD.us" site_id="docubox-hd-175">DocuBox HD</channel>
+    <channel lang="pl" xmltv_id="DocuBoxHD.nl" site_id="docubox-hd-175">DocuBox HD</channel>
     <channel lang="pl" xmltv_id="DorcelTV.nl" site_id="dorcel-tv-507">Dorcel TV</channel>
     <channel lang="pl" xmltv_id="DorcelXXX.nl" site_id="dorcel-xxx-506">Dorcel XXX</channel>
     <channel lang="pl" xmltv_id="DTXPoland.pl" site_id="discovery-turbo-xtra-239">DTX Polska</channel>
@@ -95,8 +95,8 @@
     <channel lang="pl" xmltv_id="ElevenSports4Poland.pl" site_id="eleven-sports-4-607">Eleven Sports 4 Polska</channel>
     <channel lang="pl" xmltv_id="EnglishClubTV.uk" site_id="english-club-tv-148">English Club TV</channel>
     <channel lang="pl" xmltv_id="EpicDrama.se" site_id="epic-drama-610">Epic Drama</channel>
-    <channel lang="pl" xmltv_id="EroxHD.us" site_id="erox-hd-520">Erox HD</channel>
-    <channel lang="pl" xmltv_id="EroxxxHD.us" site_id="eroxxx-hd-512">Eroxxx HD</channel>
+    <channel lang="pl" xmltv_id="EroxHD.nl" site_id="erox-hd-520">Erox HD</channel>
+    <channel lang="pl" xmltv_id="EroxxxHD.nl" site_id="eroxxx-hd-512">Eroxxx HD</channel>
     <channel lang="pl" xmltv_id="EskaRockTV.pl" site_id="hip-hop-tv-511">Eska Rock TV</channel>
     <channel lang="pl" xmltv_id="EskaTV.pl" site_id="eska-tv-114">Eska TV</channel>
     <channel lang="pl" xmltv_id="EskaTVExtra.pl" site_id="eska-tv-extra-597">Eska TV Extra</channel>
@@ -108,17 +108,17 @@
     <channel lang="pl" xmltv_id="Eurosport2Poland.pl" site_id="eurosport-2-76">Eurosport 2 Polska</channel>
     <channel lang="pl" xmltv_id="EWTNEurope.us" site_id="ewtn-207">EWTN Europe</channel>
     <channel lang="pl" xmltv_id="ExtremeSportsChannelPoland.nl" site_id="extreme-sports-channel-231">Extreme Sports Channel Polska</channel>
-    <channel lang="pl" xmltv_id="FashionBoxHD.us" site_id="fashionbox-hd-171">FashionBox HD</channel>
+    <channel lang="pl" xmltv_id="FashionBoxHD.nl" site_id="fashionbox-hd-171">FashionBox HD</channel>
     <channel lang="pl" xmltv_id="FashionTVEurope.fr" site_id="fashion-tv-233">FashionTV Europe</channel>
     <channel lang="pl" xmltv_id="FashionTVHDEurope.fr" site_id="fashion-tv-hd-125">FashionTV HD Europe</channel>
-    <channel lang="pl" xmltv_id="FastFunBoxHD.us" site_id="fast-funbox-hd-104">Fast &amp; FunBox HD</channel>
-    <channel lang="pl" xmltv_id="FightBoxHD.us" site_id="fightbox-hd-453">FightBox HD</channel>
+    <channel lang="pl" xmltv_id="FastFunBoxHD.nl" site_id="fast-funbox-hd-104">Fast &amp; FunBox HD</channel>
+    <channel lang="pl" xmltv_id="FightBoxHD.nl" site_id="fightbox-hd-453">FightBox HD</channel>
     <channel lang="pl" xmltv_id="FightKlub.pl" site_id="fightklub-78">Fight Klub</channel>
-    <channel lang="pl" xmltv_id="FilmBoxAction.us" site_id="filmbox-action-451">FilmBox Action</channel>
-    <channel lang="pl" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="filmbox-arthouse-183">FilmBox Arthouse Worldwide</channel>
+    <channel lang="pl" xmltv_id="FilmBoxAction.nl" site_id="filmbox-action-451">FilmBox Action</channel>
+    <channel lang="pl" xmltv_id="FilmBoxArthouse.nl" site_id="filmbox-arthouse-183">FilmBox Arthouse Worldwide</channel>
     <channel lang="pl" xmltv_id="FilmBoxExtraHDPoland.pl" site_id="filmbox-extra-hd-86">FilmBox Extra HD Polska</channel>
-    <channel lang="pl" xmltv_id="FilmBoxFamily.us" site_id="filmbox-family-103">FilmBox Family</channel>
-    <channel lang="pl" xmltv_id="FilmBoxPremiumPoland.pl" site_id="filmbox-premium-85">FilmBox Premium Polska</channel>
+    <channel lang="pl" xmltv_id="FilmBoxFamily.nl" site_id="filmbox-family-103">FilmBox Family</channel>
+    <!-- <channel lang="pl" xmltv_id="FilmBoxPremiumPoland.pl" site_id="filmbox-premium-85">FilmBox Premium Polska</channel> -->
     <channel lang="pl" xmltv_id="FokusTV.pl" site_id="fokus-tv-46">Fokus TV</channel>
     <channel lang="pl" xmltv_id="Folx.de" site_id="folx-tv-206">Folx</channel>
     <channel lang="pl" xmltv_id="FoodNetworkPoland.pl" site_id="polsat-food-157">Food Network Polska</channel>
@@ -128,8 +128,8 @@
     <channel lang="pl" xmltv_id="France24English.fr" site_id="france-24-en-70">France 24 English</channel>
     <channel lang="pl" xmltv_id="France24French.fr" site_id="france-24-491">France 24 Français</channel>
     <channel lang="pl" xmltv_id="FrankenFernsehen.de" site_id="franken-fernsehen-370">Franken Fernsehen</channel>
-    <channel lang="pl" xmltv_id="FunBoxUHD.us" site_id="funbox-4k-605">FunBox UHD</channel>
-    <channel lang="pl" xmltv_id="GametoonHD.us" site_id="gametoon-hd-602">Gametoon</channel>
+    <channel lang="pl" xmltv_id="FunBoxUHD.nl" site_id="funbox-4k-605">FunBox UHD</channel>
+    <channel lang="pl" xmltv_id="GametoonHD.nl" site_id="gametoon-hd-602">Gametoon</channel>
     <channel lang="pl" xmltv_id="GinxeSportsTVInternational.uk" site_id="ginx-tv-503">Ginx eSports TV International</channel>
     <channel lang="pl" xmltv_id="GodTVUK.uk" site_id="god-tv-683">God TV UK</channel>
     <channel lang="pl" xmltv_id="GoldTV.pl" site_id="to-tv-88">Gold TV</channel>
diff --git a/sites/siba.com.co/siba.com.co_co.channels.xml b/sites/siba.com.co/siba.com.co_co.channels.xml
index d0f06913..b8f2a119 100644
--- a/sites/siba.com.co/siba.com.co_co.channels.xml
+++ b/sites/siba.com.co/siba.com.co_co.channels.xml
@@ -67,7 +67,7 @@
     <channel lang="es" xmltv_id="PenthouseTV.us" site_id="626">Penthouse TV</channel>
     <channel lang="es" xmltv_id="PlayboyTVLatinAmerica.us" site_id="556">Playboy TV</channel>
     <channel lang="es" xmltv_id="RCNNovelas.co" site_id="859">RCN Novelas</channel>
-    <channel lang="es" xmltv_id="RCNTV.co" site_id="399">RCN TV</channel>
+    <channel lang="es" xmltv_id="CanalRCN.co" site_id="399">RCN TV</channel>
     <channel lang="es" xmltv_id="RedPlus.co" site_id="421">Red+</channel>
     <channel lang="es" xmltv_id="SenalColombia.co" site_id="570">Señal Colombia</channel>
     <channel lang="es" xmltv_id="Sextreme.br" site_id="565">Sextreme</channel>
diff --git a/sites/startimestv.com/startimestv.com_bi.channels.xml b/sites/startimestv.com/startimestv.com_bi.channels.xml
index 80292877..6ae30adf 100644
--- a/sites/startimestv.com/startimestv.com_bi.channels.xml
+++ b/sites/startimestv.com/startimestv.com_bi.channels.xml
@@ -28,7 +28,7 @@
     <channel lang="en" xmltv_id="CloudsTV.tz" site_id="286">CLOUDS TV</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
     <channel lang="en" xmltv_id="EATV5.tz" site_id="285">EATV</channel>
@@ -104,7 +104,7 @@
     <channel lang="en" xmltv_id="ZeeCinemaAfrica.in" site_id="206">ZEE CINEMA</channel>
     <channel lang="en" xmltv_id="ZeeOneAfrica.za" site_id="1023102509">ZEE ONE</channel>
     <channel lang="en" xmltv_id="SenTV.sn" site_id="101495683">SEN TV</channel>
-    <channel lang="en" xmltv_id="RTBTV.bf" site_id="101603964">RTB</channel>
+    <channel lang="en" xmltv_id="RTB.bf" site_id="101603964">RTB</channel>
     <channel lang="en" xmltv_id="CISTV.gn" site_id="101804400">CISMEDIA</channel>
     <channel lang="en" xmltv_id="ZeeMagic.fr" site_id="1021478122">ZEE MAGIC</channel>
     <channel lang="en" xmltv_id="PassionNovelas.ci" site_id="1023196140">PASSIONS TV</channel>
diff --git a/sites/startimestv.com/startimestv.com_cd.channels.xml b/sites/startimestv.com/startimestv.com_cd.channels.xml
index 25d956fe..9623f744 100644
--- a/sites/startimestv.com/startimestv.com_cd.channels.xml
+++ b/sites/startimestv.com/startimestv.com_cd.channels.xml
@@ -44,7 +44,7 @@
     <channel lang="en" xmltv_id="DBMTV.fr" site_id="1582257592">DBM TV</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DigitalCongoTV.cd" site_id="489">Digital Congo</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamInTV.mg" site_id="712">DREAMIN</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
@@ -105,7 +105,7 @@
     <channel lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="421">Phoenix Info</channel>
     <channel lang="en" xmltv_id="PornhubTV.us" site_id="348886941">PORNHUB TV</channel>
     <channel lang="en" xmltv_id="PremiumBoxOffice.cn" site_id="1900548203">PBO</channel>
-    <channel lang="en" xmltv_id="RTBTV.bf" site_id="101603964">RTB</channel>
+    <channel lang="en" xmltv_id="RTB.bf" site_id="101603964">RTB</channel>
     <channel lang="en" xmltv_id="RTG.gn" site_id="480">RTG</channel>
     <channel lang="en" xmltv_id="RTGAWorld.cd" site_id="487">RTGA</channel>
     <channel lang="en" xmltv_id="RTI1.ci" site_id="564">RTI1</channel>
diff --git a/sites/startimestv.com/startimestv.com_cg.channels.xml b/sites/startimestv.com/startimestv.com_cg.channels.xml
index 53ef005d..1e8cf002 100644
--- a/sites/startimestv.com/startimestv.com_cg.channels.xml
+++ b/sites/startimestv.com/startimestv.com_cg.channels.xml
@@ -40,7 +40,7 @@
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DigitalCongoTV.cd" site_id="100877841">DIGITAL CONGO</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamInTV.mg" site_id="712">DREAMIN</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
@@ -93,7 +93,7 @@
     <channel lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="421">Phoenix Info</channel>
     <channel lang="en" xmltv_id="PornhubTV.us" site_id="348886941">PORNHUB TV</channel>
     <channel lang="en" xmltv_id="PremiumBoxOffice.cn" site_id="1900548203">PBO</channel>
-    <channel lang="en" xmltv_id="RTBTV.bf" site_id="101603964">RTB</channel>
+    <channel lang="en" xmltv_id="RTB.bf" site_id="101603964">RTB</channel>
     <channel lang="en" xmltv_id="RTG.gn" site_id="480">RTG</channel>
     <channel lang="en" xmltv_id="RTGAWorld.cd" site_id="487">RTGA</channel>
     <channel lang="en" xmltv_id="RTI1.ci" site_id="564">RTI1</channel>
diff --git a/sites/startimestv.com/startimestv.com_ci.channels.xml b/sites/startimestv.com/startimestv.com_ci.channels.xml
index b89a4d11..827d8e51 100644
--- a/sites/startimestv.com/startimestv.com_ci.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ci.channels.xml
@@ -45,7 +45,7 @@
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DigitalCongoTV.cd" site_id="489">Digital Congo</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamInTV.mg" site_id="712">DREAMIN</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
@@ -58,7 +58,7 @@
     <channel lang="en" xmltv_id="EcclesiaTV.ci" site_id="105632607">ECCLESIA TV</channel>
     <channel lang="en" xmltv_id="EmmanuelTV.ng" site_id="459">EMMANUEL TV</channel>
     <channel lang="en" xmltv_id="FaceTV.ug" site_id="304">FACE TV</channel>
-    <channel lang="en" xmltv_id="FashionBoxHD.us" site_id="1237706986">FASHIONBOX</channel>
+    <channel lang="en" xmltv_id="FashionBoxHD.nl" site_id="1237706986">FASHIONBOX</channel>
     <channel lang="en" xmltv_id="FoxLifePortugal.pt" site_id="626">FOX LIFE</channel>
     <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="149">FOX NEWS</channel>
     <channel lang="en" xmltv_id="France2.fr" site_id="424">France 2</channel>
@@ -107,7 +107,7 @@
     <channel lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="421">Phoenix Info</channel>
     <channel lang="en" xmltv_id="PornhubTV.us" site_id="348886941">PORNHUB TV</channel>
     <channel lang="en" xmltv_id="PremiumBoxOffice.cn" site_id="1900548203">PBO</channel>
-    <channel lang="en" xmltv_id="RTBTV.bf" site_id="101603964">RTB</channel>
+    <channel lang="en" xmltv_id="RTB.bf" site_id="101603964">RTB</channel>
     <channel lang="en" xmltv_id="RTG.gn" site_id="480">RTG</channel>
     <channel lang="en" xmltv_id="RTGAWorld.cd" site_id="487">RTGA</channel>
     <channel lang="en" xmltv_id="RTI1.ci" site_id="564">RTI1</channel>
diff --git a/sites/startimestv.com/startimestv.com_cm.channels.xml b/sites/startimestv.com/startimestv.com_cm.channels.xml
index c3c262ec..1fda3054 100644
--- a/sites/startimestv.com/startimestv.com_cm.channels.xml
+++ b/sites/startimestv.com/startimestv.com_cm.channels.xml
@@ -39,7 +39,7 @@
     <channel lang="en" xmltv_id="CheriflaTV.ml" site_id="527353882">CHERIFLA TV</channel>
     <channel lang="en" xmltv_id="Colors.in" site_id="1529033737">COLORS</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
     <channel lang="en" xmltv_id="EAfrica.us" site_id="498">E!</channel>
     <channel lang="en" xmltv_id="EFrance.fr" site_id="146">E!F</channel>
@@ -48,7 +48,7 @@
     <channel lang="en" xmltv_id="ESPNAfrica.za" site_id="150">ESPN</channel>
     <channel lang="en" xmltv_id="EspaceTV.gn" site_id="527196385">ESPACE TV</channel>
     <channel lang="en" xmltv_id="FarinWata.ng" site_id="197">FARIN WATA</channel>
-    <channel lang="en" xmltv_id="FashionBoxHD.us" site_id="1237706986">FASHIONBOX</channel>
+    <channel lang="en" xmltv_id="FashionBoxHD.nl" site_id="1237706986">FASHIONBOX</channel>
     <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="149">FOX NEWS</channel>
     <channel lang="en" xmltv_id="France24English.fr" site_id="346">FRANCE 24 E</channel>
     <channel lang="en" xmltv_id="France24French.fr" site_id="504">FRANCE 24</channel>
diff --git a/sites/startimestv.com/startimestv.com_ga.channels.xml b/sites/startimestv.com/startimestv.com_ga.channels.xml
index 8093559f..a52ca95e 100644
--- a/sites/startimestv.com/startimestv.com_ga.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ga.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="en" xmltv_id="CloudsTV.tz" site_id="286">CLOUDS TV</channel>
     <channel lang="en" xmltv_id="Colors.in" site_id="1529033737">COLORS</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
     <channel lang="en" xmltv_id="EAfrica.us" site_id="498">E!</channel>
diff --git a/sites/startimestv.com/startimestv.com_gh.channels.xml b/sites/startimestv.com/startimestv.com_gh.channels.xml
index 9dc4c991..d55f2b54 100644
--- a/sites/startimestv.com/startimestv.com_gh.channels.xml
+++ b/sites/startimestv.com/startimestv.com_gh.channels.xml
@@ -29,7 +29,7 @@
     <channel lang="en" xmltv_id="DBMTV.fr" site_id="1582257592">DBM TV</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
diff --git a/sites/startimestv.com/startimestv.com_gn.channels.xml b/sites/startimestv.com/startimestv.com_gn.channels.xml
index 44d6fc67..5298e0ae 100644
--- a/sites/startimestv.com/startimestv.com_gn.channels.xml
+++ b/sites/startimestv.com/startimestv.com_gn.channels.xml
@@ -42,7 +42,7 @@
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DigitalCongoTV.cd" site_id="489">Digital Congo</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamInTV.mg" site_id="712">DREAMIN</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
@@ -94,7 +94,7 @@
     <channel lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="421">Phoenix Info</channel>
     <channel lang="en" xmltv_id="PornhubTV.us" site_id="348886941">PORNHUB TV</channel>
     <channel lang="en" xmltv_id="PremiumBoxOffice.cn" site_id="1900548203">PBO</channel>
-    <channel lang="en" xmltv_id="RTBTV.bf" site_id="101603964">RTB</channel>
+    <channel lang="en" xmltv_id="RTB.bf" site_id="101603964">RTB</channel>
     <channel lang="en" xmltv_id="RTG.gn" site_id="480">RTG</channel>
     <channel lang="en" xmltv_id="RTGAWorld.cd" site_id="487">RTGA</channel>
     <channel lang="en" xmltv_id="RTI1.ci" site_id="564">RTI1</channel>
diff --git a/sites/startimestv.com/startimestv.com_ke.channels.xml b/sites/startimestv.com/startimestv.com_ke.channels.xml
index 1a1ffba8..1e4065f5 100644
--- a/sites/startimestv.com/startimestv.com_ke.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ke.channels.xml
@@ -33,7 +33,7 @@
     <channel lang="en" xmltv_id="CTiAsia.tw" site_id="423">CTI Asia</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
diff --git a/sites/startimestv.com/startimestv.com_mg.channels.xml b/sites/startimestv.com/startimestv.com_mg.channels.xml
index d677b75d..ddf8df5a 100644
--- a/sites/startimestv.com/startimestv.com_mg.channels.xml
+++ b/sites/startimestv.com/startimestv.com_mg.channels.xml
@@ -41,7 +41,7 @@
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DigitalCongoTV.cd" site_id="489">Digital Congo</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamInTV.mg" site_id="712">DREAMIN</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
diff --git a/sites/startimestv.com/startimestv.com_mw.channels.xml b/sites/startimestv.com/startimestv.com_mw.channels.xml
index 8abbd44d..bb064c0f 100644
--- a/sites/startimestv.com/startimestv.com_mw.channels.xml
+++ b/sites/startimestv.com/startimestv.com_mw.channels.xml
@@ -20,7 +20,7 @@
     <channel lang="en" xmltv_id="ChinaMovie.cn" site_id="409">China Movies Channel</channel>
     <channel lang="en" xmltv_id="CitizenTV.ke" site_id="270">CITIZEN TV</channel>
     <channel lang="en" xmltv_id="CloudsTV.tz" site_id="286">CLOUDS TV</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
     <channel lang="en" xmltv_id="EAfrica.us" site_id="498">E!</channel>
diff --git a/sites/startimestv.com/startimestv.com_mz.channels.xml b/sites/startimestv.com/startimestv.com_mz.channels.xml
index 351944d9..d77fc2c9 100644
--- a/sites/startimestv.com/startimestv.com_mz.channels.xml
+++ b/sites/startimestv.com/startimestv.com_mz.channels.xml
@@ -32,7 +32,7 @@
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DisneyChannelPortugal.pt" site_id="512">DISNEY CHANNEL</channel>
     <channel lang="en" xmltv_id="DisneyJuniorPortugal.pt" site_id="513">Disney Junior</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
diff --git a/sites/startimestv.com/startimestv.com_ng.channels.xml b/sites/startimestv.com/startimestv.com_ng.channels.xml
index 829dab00..9387f7d9 100644
--- a/sites/startimestv.com/startimestv.com_ng.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ng.channels.xml
@@ -35,7 +35,7 @@
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="1646605613">DW</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
diff --git a/sites/startimestv.com/startimestv.com_rw.channels.xml b/sites/startimestv.com/startimestv.com_rw.channels.xml
index 9f5f4f9b..2da76468 100644
--- a/sites/startimestv.com/startimestv.com_rw.channels.xml
+++ b/sites/startimestv.com/startimestv.com_rw.channels.xml
@@ -33,7 +33,7 @@
     <channel lang="en" xmltv_id="CitizenTV.ke" site_id="270">CITIZEN TV</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DigitalCongoTV.cd" site_id="100877841">DIGITAL CONGO</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
     <channel lang="en" xmltv_id="EAfrica.us" site_id="498">E!</channel>
diff --git a/sites/startimestv.com/startimestv.com_tz.channels.xml b/sites/startimestv.com/startimestv.com_tz.channels.xml
index f62fa37e..8c0321fa 100644
--- a/sites/startimestv.com/startimestv.com_tz.channels.xml
+++ b/sites/startimestv.com/startimestv.com_tz.channels.xml
@@ -36,7 +36,7 @@
     <channel lang="en" xmltv_id="Colors.in" site_id="1529033737">COLORS</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="1646605613">DW</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
@@ -51,7 +51,7 @@
     <channel lang="en" xmltv_id="EstarsTV.ng" site_id="188">E-STARS</channel>
     <channel lang="en" xmltv_id="FaceTV.ug" site_id="304">FACE TV</channel>
     <channel lang="en" xmltv_id="FarinWata.ng" site_id="197">FARIN WATA</channel>
-    <channel lang="en" xmltv_id="FashionBoxHD.us" site_id="1237706986">FASHIONBOX</channel>
+    <channel lang="en" xmltv_id="FashionBoxHD.nl" site_id="1237706986">FASHIONBOX</channel>
     <channel lang="en" xmltv_id="FoxLifePortugal.pt" site_id="626">FOX LIFE</channel>
     <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="149">FOX NEWS</channel>
     <channel lang="en" xmltv_id="France2.fr" site_id="424">France 2</channel>
diff --git a/sites/startimestv.com/startimestv.com_ug.channels.xml b/sites/startimestv.com/startimestv.com_ug.channels.xml
index 68745238..25e5031e 100644
--- a/sites/startimestv.com/startimestv.com_ug.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ug.channels.xml
@@ -36,7 +36,7 @@
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="1646605613">DW</channel>
     <channel lang="en" xmltv_id="DaVinci.de" site_id="240">DA VINCI</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceFrance.fr" site_id="720">DISCOVERY SCI. F</channel>
-    <channel lang="en" xmltv_id="Dizi.us" site_id="1839721943">TDC</channel>
+    <channel lang="en" xmltv_id="Dizi.nl" site_id="1839721943">TDC</channel>
     <channel lang="en" xmltv_id="DoveTV.ng" site_id="234">DOVE TV</channel>
     <channel lang="en" xmltv_id="DragonTV.cn" site_id="410">东方卫视</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="864199787">DREAMWORKS</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
index ac6c08de..c8cb0028 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
@@ -57,7 +57,7 @@
     <channel lang="en" xmltv_id="InvestigationDiscoveryRussia.ru" site_id="32">Investigation Discovery</channel>
     <channel lang="en" xmltv_id="Kanal2.ee" site_id="3">Kanal 2</channel>
     <channel lang="en" xmltv_id="KaruselInternational.ru" site_id="75">Karusel</channel>
-    <channel lang="en" xmltv_id="KidzonePlus.ee" site_id="1293">Kidzone+</channel>
+    <channel lang="en" xmltv_id="KidZoneMini.ee" site_id="1293">Kidzone+</channel>
     <channel lang="en" xmltv_id="KidZoneTV.ee" site_id="1086">KidZone TV</channel>
     <channel lang="en" xmltv_id="KIKA.de" site_id="78">KIKA</channel>
     <channel lang="en" xmltv_id="LifeTV.ee" site_id="220">Life TV</channel>
@@ -111,13 +111,13 @@
     <channel lang="en" xmltv_id="TLCRussia.ru" site_id="823">TLC Russia</channel>
     <channel lang="en" xmltv_id="TNTComedy.ru" site_id="1279">TNT Comedy</channel>
     <channel lang="en" xmltv_id="TravelChannelEMEA.uk" site_id="1222">Travel Channel Europe</channel>
-    <channel lang="en" xmltv_id="TV3Eesti.ee" site_id="2">TV 3 Eesti</channel>
+    <channel lang="en" xmltv_id="TV3Estonia.ee" site_id="2">TV 3 Eesti</channel>
     <channel lang="en" xmltv_id="TV3Film.lv" site_id="226">TV 3 Film</channel>
     <channel lang="en" xmltv_id="TV3Plus.lv" site_id="221">TV 3 Plus</channel>
-    <channel lang="en" xmltv_id="TV3Sport.lv" site_id="228">TV 3 Sport</channel>
-    <channel lang="en" xmltv_id="TV3Sport2.lv" site_id="229">TV 3 Sport 2</channel>
+    <channel lang="en" xmltv_id="TV3Sport.uk" site_id="228">TV 3 Sport</channel>
+    <channel lang="en" xmltv_id="TV3Sport2.uk" site_id="229">TV 3 Sport 2</channel>
     <channel lang="en" xmltv_id="TV5MondeEurope.fr" site_id="85">TV5Monde Europe</channel>
-    <channel lang="en" xmltv_id="TV6Eesti.ee" site_id="223">TV 6 Eesti</channel>
+    <channel lang="en" xmltv_id="TV6Estonia.ee" site_id="223">TV 6 Eesti</channel>
     <channel lang="en" xmltv_id="TV1000ActionEast.ru" site_id="227">TV 1000 Action</channel>
     <channel lang="en" xmltv_id="TV1000East.ru" site_id="224">TV 1000 East</channel>
     <channel lang="en" xmltv_id="TV1000RusskoeKino.ru" site_id="225">TV 1000 Russkoe Kino</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
index 39d5a686..6454b289 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
@@ -57,7 +57,7 @@
     <channel lang="et" xmltv_id="InvestigationDiscoveryRussia.ru" site_id="32">Investigation Discovery</channel>
     <channel lang="et" xmltv_id="Kanal2.ee" site_id="3">Kanal 2</channel>
     <channel lang="et" xmltv_id="KaruselInternational.ru" site_id="75">Karusel</channel>
-    <channel lang="et" xmltv_id="KidzonePlus.ee" site_id="1293">Kidzone+</channel>
+    <channel lang="et" xmltv_id="KidZoneMini.ee" site_id="1293">Kidzone+</channel>
     <channel lang="et" xmltv_id="KidZoneTV.ee" site_id="1086">KidZone TV</channel>
     <channel lang="et" xmltv_id="KIKA.de" site_id="78">KIKA</channel>
     <channel lang="et" xmltv_id="LifeTV.ee" site_id="220">Life TV</channel>
@@ -109,13 +109,13 @@
     <channel lang="et" xmltv_id="TLCRussia.ru" site_id="823">TLC</channel>
     <channel lang="et" xmltv_id="TNTComedy.ru" site_id="1279">TNT Comedy</channel>
     <channel lang="et" xmltv_id="TravelChannelEMEA.uk" site_id="1222">Travel Channel</channel>
-    <channel lang="et" xmltv_id="TV3Eesti.ee" site_id="2">TV 3</channel>
+    <channel lang="et" xmltv_id="TV3Estonia.ee" site_id="2">TV 3</channel>
     <channel lang="et" xmltv_id="TV3Film.lv" site_id="226">TV 3 Film</channel>
     <channel lang="et" xmltv_id="TV3Plus.lv" site_id="221">TV 3 Plus</channel>
-    <channel lang="et" xmltv_id="TV3Sport.lv" site_id="228">TV 3 Sport</channel>
-    <channel lang="et" xmltv_id="TV3Sport2.lv" site_id="229">TV 3 Sport 2</channel>
+    <channel lang="et" xmltv_id="TV3Sport.uk" site_id="228">TV 3 Sport</channel>
+    <channel lang="et" xmltv_id="TV3Sport2.uk" site_id="229">TV 3 Sport 2</channel>
     <channel lang="et" xmltv_id="TV5MondeEurope.fr" site_id="85">TV5Monde</channel>
-    <channel lang="et" xmltv_id="TV6Eesti.ee" site_id="223">TV 6</channel>
+    <channel lang="et" xmltv_id="TV6Estonia.ee" site_id="223">TV 6</channel>
     <channel lang="et" xmltv_id="TV1000ActionEast.ru" site_id="227">TV 1000 Action</channel>
     <channel lang="et" xmltv_id="TV1000East.ru" site_id="224">TV 1000</channel>
     <channel lang="et" xmltv_id="TV1000RusskoeKino.ru" site_id="225">TV 1000 Russkoe Kino</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
index dfcbddab..5944a44e 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
@@ -57,7 +57,7 @@
     <channel lang="ru" xmltv_id="InvestigationDiscoveryRussia.ru" site_id="32">Investigation Discovery Rossiya</channel>
     <channel lang="ru" xmltv_id="Kanal2.ee" site_id="3">Kanal 2</channel>
     <channel lang="ru" xmltv_id="KaruselInternational.ru" site_id="75">Karusel International</channel>
-    <channel lang="ru" xmltv_id="KidzonePlus.ee" site_id="1293">Kidzone+</channel>
+    <channel lang="ru" xmltv_id="KidZoneMini.ee" site_id="1293">Kidzone+</channel>
     <channel lang="ru" xmltv_id="KidZoneTV.ee" site_id="1086">KidZone TV</channel>
     <channel lang="ru" xmltv_id="KIKA.de" site_id="78">KIKA</channel>
     <channel lang="ru" xmltv_id="LifeTV.ee" site_id="220">Life TV</channel>
@@ -111,13 +111,13 @@
     <channel lang="ru" xmltv_id="TLCRussia.ru" site_id="823">TLC Russia</channel>
     <channel lang="ru" xmltv_id="TNTComedy.ru" site_id="1279">TNT Comedy</channel>
     <channel lang="ru" xmltv_id="TravelChannelEMEA.uk" site_id="1222">Travel Channel Europe</channel>
-    <channel lang="ru" xmltv_id="TV3Eesti.ee" site_id="2">TV 3 Eesti</channel>
+    <channel lang="ru" xmltv_id="TV3Estonia.ee" site_id="2">TV 3 Eesti</channel>
     <channel lang="ru" xmltv_id="TV3Film.lv" site_id="226">TV 3 Film</channel>
     <channel lang="ru" xmltv_id="TV3Plus.lv" site_id="221">TV 3 Plus</channel>
-    <channel lang="ru" xmltv_id="TV3Sport.lv" site_id="228">TV 3 Sport</channel>
-    <channel lang="ru" xmltv_id="TV3Sport2.lv" site_id="229">TV 3 Sport 2</channel>
+    <channel lang="ru" xmltv_id="TV3Sport.uk" site_id="228">TV 3 Sport</channel>
+    <channel lang="ru" xmltv_id="TV3Sport2.uk" site_id="229">TV 3 Sport 2</channel>
     <channel lang="ru" xmltv_id="TV5MondeEurope.fr" site_id="85">TV5Monde Europe</channel>
-    <channel lang="ru" xmltv_id="TV6Eesti.ee" site_id="223">TV 6 Eesti</channel>
+    <channel lang="ru" xmltv_id="TV6Estonia.ee" site_id="223">TV 6 Eesti</channel>
     <channel lang="ru" xmltv_id="TV1000ActionEast.ru" site_id="227">TV 1000 Action</channel>
     <channel lang="ru" xmltv_id="TV1000East.ru" site_id="224">TV 1000 East</channel>
     <channel lang="ru" xmltv_id="TV1000RusskoeKino.ru" site_id="225">TV 1000 Russkoe Kino</channel>
diff --git a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
index ef8b5ab0..b844e3f1 100644
--- a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
+++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="tr" xmltv_id="24KitchenTurkey.us" site_id="552">24 Kitchen Türkiye</channel>
     <channel lang="tr" xmltv_id="24TV.tr" site_id="1883">24 TV</channel>
     <channel lang="tr" xmltv_id="360.tr" site_id="1884">360</channel>
-    <channel lang="tr" xmltv_id="360TuneBox.us" site_id="1844">360 Tune Box</channel>
+    <channel lang="tr" xmltv_id="360TuneBox.nl" site_id="1844">360 Tune Box</channel>
     <channel lang="tr" xmltv_id="A2.tr" site_id="1861">A2</channel>
     <channel lang="tr" xmltv_id="AHaber.tr" site_id="366">A Haber</channel>
     <channel lang="tr" xmltv_id="AkitTV.tr" site_id="1775">Akit TV</channel>
@@ -47,7 +47,7 @@
     <channel lang="tr" xmltv_id="DisneyChannelTurkey.tr" site_id="215">Disney Channel Türkiye</channel>
     <channel lang="tr" xmltv_id="DiyanetTV.tr" site_id="338">Diyanet TV</channel>
     <channel lang="tr" xmltv_id="DMAXTurkey.tr" site_id="1911">DMAX Türkiye</channel>
-    <channel lang="tr" xmltv_id="DocuBoxHD.us" site_id="437">DocuBox HD</channel>
+    <channel lang="tr" xmltv_id="DocuBoxHD.nl" site_id="437">DocuBox HD</channel>
     <channel lang="tr" xmltv_id="DuckTVSD.sk" site_id="358">Duck TV SD</channel>
     <channel lang="tr" xmltv_id="DWDeutsch.de" site_id="1882">DW Deutsch</channel>
     <channel lang="tr" xmltv_id="DWEnglish.de" site_id="175">DW English</channel>
@@ -59,19 +59,19 @@
     <channel lang="tr" xmltv_id="EnglishClubTV.uk" site_id="397">English Club TV</channel>
     <channel lang="tr" xmltv_id="Eurosport1.fr" site_id="176">Eurosport 1</channel>
     <channel lang="tr" xmltv_id="Eurosport2.fr" site_id="1604">Eurosport 2</channel>
-    <channel lang="tr" xmltv_id="FastFunBoxHD.us" site_id="1799">Fast &amp; FunBox HD</channel>
+    <channel lang="tr" xmltv_id="FastFunBoxHD.nl" site_id="1799">Fast &amp; FunBox HD</channel>
     <channel lang="tr" xmltv_id="FBTV.tr" site_id="47">FB TV</channel>
-    <channel lang="tr" xmltv_id="FightBoxHD.us" site_id="438">FightBox HD</channel>
-    <channel lang="tr" xmltv_id="FilmBoxArthouseAfricaTurkeyMiddleEast.us" site_id="1798">FilmBox Arthouse Africa &amp; Turkey &amp; Middle East</channel>
-    <channel lang="tr" xmltv_id="FilmBoxTurkey.us" site_id="1800">FilmBox Türkiye</channel>
+    <channel lang="tr" xmltv_id="FightBoxHD.nl" site_id="438">FightBox HD</channel>
+    <!-- <channel lang="tr" xmltv_id="FilmBoxArthouseAfricaTurkeyMiddleEast.us" site_id="1798">FilmBox Arthouse Africa &amp; Turkey &amp; Middle East</channel> -->
+    <channel lang="tr" xmltv_id="FilmBoxTurkey.tr" site_id="1800">FilmBox Türkiye</channel>
     <channel lang="tr" xmltv_id="FlashTV.tr" site_id="3718">Flash TV</channel>
     <channel lang="tr" xmltv_id="FoxCrimeTurkey.us" site_id="554">Fox Crime Türkiye</channel>
-    <channel lang="tr" xmltv_id="FoxTurkey.us" site_id="534">Fox Türkiye</channel>
+    <channel lang="tr" xmltv_id="FoxTurkey.tr" site_id="534">Fox Türkiye</channel>
     <channel lang="tr" xmltv_id="France24English.fr" site_id="349">France 24 English</channel>
     <channel lang="tr" xmltv_id="France24French.fr" site_id="350">France 24 Français</channel>
-    <channel lang="tr" xmltv_id="FunBoxUHD.us" site_id="1847">FunBox UHD</channel>
+    <channel lang="tr" xmltv_id="FunBoxUHD.nl" site_id="1847">FunBox UHD</channel>
     <channel lang="tr" xmltv_id="FXTurkey.us" site_id="553">FX Türkiye</channel>
-    <channel lang="tr" xmltv_id="GametoonHD.us" site_id="1850">Gametoon</channel>
+    <channel lang="tr" xmltv_id="GametoonHD.nl" site_id="1850">Gametoon</channel>
     <channel lang="tr" xmltv_id="HaberGlobal.tr" site_id="2047">Haber Global</channel>
     <channel lang="tr" xmltv_id="Haberturk.tr" site_id="1418">Habertürk</channel>
     <channel lang="tr" xmltv_id="HayatPlus.ba" site_id="194">Hayat Plus</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
index bcf3278a..2835992e 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -238,7 +238,7 @@
     <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="1509">Fox News Channel</channel>
     <channel lang="en" xmltv_id="France24English.fr" site_id="1639">France 24 English</channel>
     <channel lang="en" xmltv_id="FreeSports.uk" site_id="1603">FreeSports</channel>
-    <channel lang="en" xmltv_id="FunBoxUHD.us" site_id="1256">FunBox UHD</channel>
+    <channel lang="en" xmltv_id="FunBoxUHD.nl" site_id="1256">FunBox UHD</channel>
     <channel lang="en" xmltv_id="GBNews.uk" site_id="1823">GB News</channel>
     <channel lang="en" xmltv_id="GinxeSportsTVInternational.uk" site_id="1408">Ginx eSports TV International</channel>
     <channel lang="en" xmltv_id="GreatMovies.uk" site_id="1809">Great! Movies</channel>
diff --git a/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml b/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
index 3144d330..dea676eb 100644
--- a/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
+++ b/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
@@ -37,7 +37,7 @@
     <channel lang="bg" xmltv_id="DiscoveryChannelBulgaria.bg" site_id="10">Discovery Channel</channel>
     <channel lang="bg" xmltv_id="DiscoveryScience.us" site_id="98">Discovery Science</channel>
     <channel lang="bg" xmltv_id="DisneyChannelBulgaria.bg" site_id="185">Disney Channel</channel>
-    <channel lang="bg" xmltv_id="DocuBoxHD.us" site_id="279">DocuBox HD</channel>
+    <channel lang="bg" xmltv_id="DocuBoxHD.nl" site_id="279">DocuBox HD</channel>
     <channel lang="bg" xmltv_id="EKids.bg" site_id="363">EKids</channel>
     <channel lang="bg" xmltv_id="EpicDrama.se" site_id="351">Epic Drama</channel>
     <channel lang="bg" xmltv_id="Eurosport1.fr" site_id="13">Eurosport 1</channel>
@@ -47,10 +47,10 @@
     <channel lang="bg" xmltv_id="FashionTVEurope.fr" site_id="233">FashionTV</channel>
     <channel lang="bg" xmltv_id="FenFolk.bg" site_id="301">Fen Folk</channel>
     <channel lang="bg" xmltv_id="FenTV.bg" site_id="71">Fen TV</channel>
-    <channel lang="bg" xmltv_id="FightBoxHD.us" site_id="280">FightBox HD</channel>
-    <channel lang="bg" xmltv_id="FilmBoxCentralEurope.us" site_id="354">FilmBox</channel>
-    <channel lang="bg" xmltv_id="FilmBoxExtraHDAdria.us" site_id="282">FilmBox Extra HD</channel>
-    <channel lang="bg" xmltv_id="FilmBoxStarsAdria.us" site_id="355">FilmBox Plus</channel>
+    <channel lang="bg" xmltv_id="FightBoxHD.nl" site_id="280">FightBox HD</channel>
+    <!-- <channel lang="bg" xmltv_id="FilmBoxCentralEurope.us" site_id="354">FilmBox</channel> -->
+    <channel lang="bg" xmltv_id="FilmBoxExtraHDBulgaria.bg" site_id="282">FilmBox Extra HD</channel>
+    <channel lang="bg" xmltv_id="FilmBoxStarsBulgaria.bg" site_id="355">FilmBox Plus</channel>
     <channel lang="bg" xmltv_id="FoodNetworkEMEA.us" site_id="234">Food Network</channel>
     <channel lang="bg" xmltv_id="FoxBulgaria.bg" site_id="230">Fox</channel>
     <channel lang="bg" xmltv_id="FoxCrimeBulgaria.bg" site_id="86">Fox Crime</channel>
diff --git a/sites/tv.lv/tv.lv_lv.channels.xml b/sites/tv.lv/tv.lv_lv.channels.xml
index 41ac88a4..757734fb 100644
--- a/sites/tv.lv/tv.lv_lv.channels.xml
+++ b/sites/tv.lv/tv.lv_lv.channels.xml
@@ -12,12 +12,12 @@
     <channel lang="lv" xmltv_id="TV1000East.ru" site_id="tv1000-cee">TV 1000 CEE</channel>
     <channel lang="lv" xmltv_id="TV1000RusskoeKino.ru" site_id="tv1000-kino">TV 1000 Russkoe Kino</channel>
     <channel lang="lv" xmltv_id="TV3Film.lv" site_id="tv3-film">TV 3 Film</channel>
-    <channel lang="lv" xmltv_id="TV3Latvija.lv" site_id="tv3-1">TV 3</channel>
+    <channel lang="lv" xmltv_id="TV3Latvia.lv" site_id="tv3-1">TV 3</channel>
     <channel lang="lv" xmltv_id="TV3Life.lv" site_id="tv3-life">TV 3 Life</channel>
     <channel lang="lv" xmltv_id="TV3Mini.lv" site_id="tv3-mini">TV 3 Mini</channel>
-    <channel lang="lv" xmltv_id="TV3Sport.lv" site_id="tv3-sport">TV 3 Sport</channel>
-    <channel lang="lv" xmltv_id="TV3Sport2.lv" site_id="tv3-sport-2">TV 3 Sport 2</channel>
-    <channel lang="lv" xmltv_id="TV6Latvija.lv" site_id="tv6-1">TV 6</channel>
+    <channel lang="lv" xmltv_id="TV3Sport.uk" site_id="tv3-sport">TV 3 Sport</channel>
+    <channel lang="lv" xmltv_id="TV3Sport2.uk" site_id="tv3-sport-2">TV 3 Sport 2</channel>
+    <channel lang="lv" xmltv_id="TV6Latvia.lv" site_id="tv6-1">TV 6</channel>
     <channel lang="lv" xmltv_id="ViasatExplore.se" site_id="viasat-explore-nordic">Viasat Explore Nordic</channel>
     <channel lang="lv" xmltv_id="ViasatHistory.se" site_id="viasat-history-cee">Viasat History CEE</channel>
     <channel lang="lv" xmltv_id="ViasatNature.se" site_id="viasat-nature-cee">Viasat Nature CEE</channel>
diff --git a/sites/tv.mail.ru/tv.mail.ru_am.channels.xml b/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
index 59f844ae..54a355a8 100644
--- a/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
+++ b/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
@@ -12,7 +12,7 @@
     <channel lang="hy" xmltv_id="ATVKhaghaliqTV.am" site_id="2967">ATV Khaghaliq TV</channel>
     <channel lang="hy" xmltv_id="ATVKinoman.am" site_id="2968">ATV Kinoman</channel>
     <channel lang="hy" xmltv_id="ATVTavaTV.am" site_id="2953">ATV Tava TV</channel>
-    <channel lang="hy" xmltv_id="H1.am" site_id="2995">H1</channel>
+    <channel lang="hy" xmltv_id="1TV.am" site_id="2995">H1</channel>
     <channel lang="hy" xmltv_id="KentronTV.am" site_id="2788">Kentron TV</channel>
     <channel lang="hy" xmltv_id="NorHayastanTV.am" site_id="2862">Nor Hayastan TV</channel>
     <channel lang="hy" xmltv_id="ShantMusicTV.am" site_id="2499">Shant Music</channel>
diff --git a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
index 0991103b..06b2f4bf 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -41,7 +41,7 @@
     <channel lang="ru" xmltv_id="DiscoveryChannelEast.us" site_id="213#discovery-vostochnaya-evropa-740">Discovery Channel East</channel>
     <channel lang="ru" xmltv_id="DiscoveryChannelRussia.ru" site_id="213#discovery-channel-21">Discovery Channel Rossiya</channel>
     <channel lang="ru" xmltv_id="DiscoveryScienceRussia.ru" site_id="213#discovery-science-524">Discovery Science Rossiya</channel>
-    <channel lang="ru" xmltv_id="DocuBoxHD.us" site_id="213#docubox-hd-1227">DocuBox HD</channel>
+    <channel lang="ru" xmltv_id="DocuBoxHD.nl" site_id="213#docubox-hd-1227">DocuBox HD</channel>
     <channel lang="ru" xmltv_id="DomashnieZhivotnye.ru" site_id="213#domashnie-jivotnye-578">Domashnie Zhivotnye</channel>
     <channel lang="ru" xmltv_id="Domashniy.ru" site_id="213#domashniy-5">Domashniy</channel>
     <channel lang="ru" xmltv_id="DomKino.ru" site_id="213#dom-kino-715">Dom Kino</channel>
@@ -59,12 +59,12 @@
     <channel lang="ru" xmltv_id="Eurosport2Russia.ru" site_id="213#eurosport-2-720">Eurosport 2 Rossiya</channel>
     <channel lang="ru" xmltv_id="Evrokino.ru" site_id="213#evrokino-505">Evrokino</channel>
     <channel lang="ru" xmltv_id="ExtremeSportsChannel.nl" site_id="213#extreme-sports-484">Extreme Sports Channel</channel>
-    <channel lang="ru" xmltv_id="FashionBoxHD.us" site_id="213#fashion-box-hd-1242">FashionBox HD</channel>
+    <channel lang="ru" xmltv_id="FashionBoxHD.nl" site_id="213#fashion-box-hd-1242">FashionBox HD</channel>
     <channel lang="ru" xmltv_id="FashionOneEurope.uk" site_id="213#fashion-one-732">Fashion One Europe</channel>
     <channel lang="ru" xmltv_id="FashionTVRussia.ru" site_id="213#fashion-tv-152">FashionTV Russia</channel>
-    <channel lang="ru" xmltv_id="FastFunBoxHD.us" site_id="213#fast-fun-box-hd-1243">Fast &amp; FunBox HD</channel>
+    <channel lang="ru" xmltv_id="FastFunBoxHD.nl" site_id="213#fast-fun-box-hd-1243">Fast &amp; FunBox HD</channel>
     <channel lang="ru" xmltv_id="FeniksplusKino.ru" site_id="213#feniks-kino-659">Feniks plus Kino</channel>
-    <channel lang="ru" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="213#filmbox-arthouse-1244">FilmBox Arthouse Worldwide</channel>
+    <channel lang="ru" xmltv_id="FilmBoxArthouse.nl" site_id="213#filmbox-arthouse-1244">FilmBox Arthouse Worldwide</channel>
     <channel lang="ru" xmltv_id="FoodNetworkRussia.us" site_id="213#food-network-1194">Food Network Russia</channel>
     <channel lang="ru" xmltv_id="FoxLifeRussia.ru" site_id="213#fox-life-619">Fox Life Russia</channel>
     <channel lang="ru" xmltv_id="FoxRussia.ru" site_id="213#fox-643">Fox Russia</channel>
@@ -241,7 +241,7 @@
     <channel lang="ru" xmltv_id="TochkaTV.ru" site_id="213#tochkatv-68">Tochka TV</channel>
     <channel lang="ru" xmltv_id="TravelChannelEMEA.uk" site_id="213#travel-channel-617">Travel Channel Europe</channel>
     <channel lang="ru" xmltv_id="TravelPlusAdventure.ru" site_id="213#traveladventure-773">Travel + Adventure</channel>
-    <channel lang="ru" xmltv_id="TriAngela.ru" site_id="213#tri-angela-218">Tri Angela</channel>
+    <channel lang="ru" xmltv_id="3ABNRussia.ru" site_id="213#tri-angela-218">Tri Angela</channel>
     <channel lang="ru" xmltv_id="TV1000ActionEast.ru" site_id="213#tv1000-action-426">TV 1000 Action</channel>
     <channel lang="ru" xmltv_id="TV1000East.ru" site_id="213#tv1000-427">TV 1000 East</channel>
     <channel lang="ru" xmltv_id="TV1000RusskoeKino.ru" site_id="213#tv1000-russkoe-kino-475">TV 1000 Russkoe Kino</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
index f094b9da..d9189744 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="sl" xmltv_id="3sat.de" site_id="1000640">3sat</channel>
     <channel lang="sl" xmltv_id="24KitchenAdria.us" site_id="1000307">24 Kitchen</channel>
-    <channel lang="sl" xmltv_id="360TuneBox.us" site_id="1000558">360 Tune Box</channel>
+    <channel lang="sl" xmltv_id="360TuneBox.nl" site_id="1000558">360 Tune Box</channel>
     <channel lang="sl" xmltv_id="A1TV.me" site_id="2000000050">A1 TV</channel>
     <channel lang="sl" xmltv_id="AgroTV.rs" site_id="1000686">Agro TV</channel>
     <channel lang="sl" xmltv_id="AlJazeeraBalkans.qa" site_id="1000180">Al Jazeera Balk</channel>
@@ -48,7 +48,7 @@
     <channel lang="sl" xmltv_id="DaVinci.de" site_id="1000055">Da Vinci</channel>
     <channel lang="sl" xmltv_id="DivaAdria.us" site_id="2000000040">Diva</channel>
     <channel lang="sl" xmltv_id="DMSat.rs" site_id="2000000026">DM Sat</channel>
-    <channel lang="sl" xmltv_id="DocuBoxHD.us" site_id="1000551">DocuBox HD</channel>
+    <channel lang="sl" xmltv_id="DocuBoxHD.nl" site_id="1000551">DocuBox HD</channel>
     <channel lang="sl" xmltv_id="DomKino.ru" site_id="1000274">Dom Kino</channel>
     <channel lang="sl" xmltv_id="DorcelXXX.nl" site_id="1000486">Dorcel XXX</channel>
     <channel lang="sl" xmltv_id="DrFit.bg" site_id="1000391">Dr. Fit</channel>
@@ -61,8 +61,8 @@
     <channel lang="sl" xmltv_id="ELTAHD.ba" site_id="1000240">Elta TV</channel>
     <channel lang="sl" xmltv_id="EpicDrama.se" site_id="1000501">Epic Drama</channel>
     <channel lang="sl" xmltv_id="ePosavjeTV.si" site_id="1000651">ePosavje TV</channel>
-    <channel lang="sl" xmltv_id="EroxHD.us" site_id="1000559">Erox HD</channel>
-    <channel lang="sl" xmltv_id="EroxxxHD.us" site_id="1000553">Eroxxx HD</channel>
+    <channel lang="sl" xmltv_id="EroxHD.nl" site_id="1000559">Erox HD</channel>
+    <channel lang="sl" xmltv_id="EroxxxHD.nl" site_id="1000553">Eroxxx HD</channel>
     <channel lang="sl" xmltv_id="ETV.si" site_id="1000641">ETV</channel>
     <channel lang="sl" xmltv_id="EuronewsEnglish.fr" site_id="1000764">EuroNews HD</channel>
     <channel lang="sl" xmltv_id="Eurosport1.fr" site_id="1000025">Eurosport HD</channel>
@@ -72,17 +72,17 @@
     <channel lang="sl" xmltv_id="EWTNEurope.us" site_id="36">EWTN Europe</channel>
     <channel lang="sl" xmltv_id="ExodusTV.si" site_id="1000455">Exodus TV</channel>
     <channel lang="sl" xmltv_id="ExtremeSportsChannel.nl" site_id="37">Extreme Sports Channel</channel>
-    <channel lang="sl" xmltv_id="FashionBoxHD.us" site_id="1000556">FashionBox HD</channel>
+    <channel lang="sl" xmltv_id="FashionBoxHD.nl" site_id="1000556">FashionBox HD</channel>
     <channel lang="sl" xmltv_id="FashionTVEurope.fr" site_id="1000056">FashionTV Europe</channel>
-    <channel lang="sl" xmltv_id="FastFunBoxHD.us" site_id="1000552">Fast &amp; FunBox HD</channel>
+    <channel lang="sl" xmltv_id="FastFunBoxHD.nl" site_id="1000552">Fast &amp; FunBox HD</channel>
     <channel lang="sl" xmltv_id="FederalnaTV.ba" site_id="1000183">Federalna TV</channel>
     <channel lang="sl" xmltv_id="FenFolk.bg" site_id="1000545">Fen Folk</channel>
     <channel lang="sl" xmltv_id="FenTV.bg" site_id="1000544">Fen TV</channel>
-    <channel lang="sl" xmltv_id="FightBoxHD.us" site_id="1000550">FightBox HD</channel>
-    <channel lang="sl" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="1000557">FilmBox Arthouse</channel>
-    <channel lang="sl" xmltv_id="FilmBoxExtraHDAdria.us" site_id="1000548">FilmBox Extra HD</channel>
-    <channel lang="sl" xmltv_id="FilmBoxPremiumAdria.us" site_id="1000547">FilmBox Premium HD</channel>
-    <channel lang="sl" xmltv_id="FilmBoxStarsAdria.us" site_id="1000549">FilmBox Stars</channel>
+    <channel lang="sl" xmltv_id="FightBoxHD.nl" site_id="1000550">FightBox HD</channel>
+    <channel lang="sl" xmltv_id="FilmBoxArthouse.nl" site_id="1000557">FilmBox Arthouse</channel>
+    <channel lang="sl" xmltv_id="FilmBoxExtraHDBulgaria.bg" site_id="1000548">FilmBox Extra HD</channel>
+    <!-- <channel lang="sl" xmltv_id="FilmBoxPremiumAdria.us" site_id="1000547">FilmBox Premium HD</channel> -->
+    <channel lang="sl" xmltv_id="FilmBoxStarsBulgaria.bg" site_id="1000549">FilmBox Stars</channel>
     <channel lang="sl" xmltv_id="FoxCrimeSerbia.rs" site_id="1000310">Fox Crime</channel>
     <channel lang="sl" xmltv_id="FoxLifeSerbia.rs" site_id="1000309">Fox Life</channel>
     <channel lang="sl" xmltv_id="FoxMoviesSlovenia.si" site_id="1000311">Fox Movies</channel>
@@ -90,8 +90,8 @@
     <channel lang="sl" xmltv_id="France2.fr" site_id="1000639">France 2</channel>
     <channel lang="sl" xmltv_id="France24English.fr" site_id="1000159">France 24 English</channel>
     <channel lang="sl" xmltv_id="France24French.fr" site_id="1000158">France 24 Français</channel>
-    <channel lang="sl" xmltv_id="FunBoxUHD.us" site_id="1000521">FunBox UHD</channel>
-    <channel lang="sl" xmltv_id="GametoonHD.us" site_id="1000554">Gametoon</channel>
+    <channel lang="sl" xmltv_id="FunBoxUHD.nl" site_id="1000521">FunBox UHD</channel>
+    <channel lang="sl" xmltv_id="GametoonHD.nl" site_id="1000554">Gametoon</channel>
     <channel lang="sl" xmltv_id="GeaTV.si" site_id="1000034">Gea TV</channel>
     <channel lang="sl" xmltv_id="GoldTV.si" site_id="1000407">Gold TV</channel>
     <channel lang="sl" xmltv_id="GolicaTV.si" site_id="2000000056">Golica TV</channel>
diff --git a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
index 9e67a01e..044c3ead 100644
--- a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="hu" xmltv_id="Eurosport1.fr" site_id="94">Eurosport 1</channel>
     <channel lang="hu" xmltv_id="Eurosport2.fr" site_id="37">Eurosport 2</channel>
     <channel lang="hu" xmltv_id="FEM3.hu" site_id="307">Fem 3</channel>
-    <channel lang="hu" xmltv_id="FilmBoxCentralEurope.us" site_id="226">FilmBox</channel>
+    <!-- <channel lang="hu" xmltv_id="FilmBoxCentralEurope.us" site_id="226">FilmBox</channel> -->
     <channel lang="hu" xmltv_id="FilmCafeHungary.hu" site_id="89">Film Café</channel>
     <channel lang="hu" xmltv_id="FilmMania.hu" site_id="95">Film Mánia</channel>
     <channel lang="hu" xmltv_id="FilmNowHungary.hu" site_id="245">Film Now</channel>
diff --git a/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml b/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
index 3f16428d..a5965f79 100644
--- a/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
+++ b/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
@@ -52,7 +52,7 @@
     <channel lang="tr" xmltv_id="FBTV.tr" site_id="148">FB TV</channel>
     <channel lang="tr" xmltv_id="FMTV.tr" site_id="163">FM TV</channel>
     <channel lang="tr" xmltv_id="FoxCrimeTurkey.us" site_id="82">Fox Crime Türkiye</channel>
-    <channel lang="tr" xmltv_id="FoxTurkey.us" site_id="93">Fox Türkiye</channel>
+    <channel lang="tr" xmltv_id="FoxTurkey.tr" site_id="93">Fox Türkiye</channel>
     <channel lang="tr" xmltv_id="France24Arabic.fr" site_id="161">France 24 Arabic</channel>
     <channel lang="tr" xmltv_id="France24English.fr" site_id="16">France 24 English</channel>
     <channel lang="tr" xmltv_id="FXTurkey.us" site_id="131">FX Türkiye</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_al.channels.xml b/sites/tvprofil.com/tvprofil.com_al.channels.xml
index 7d67e1ce..7c39e13e 100644
--- a/sites/tvprofil.com/tvprofil.com_al.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_al.channels.xml
@@ -2,7 +2,7 @@
 <site site="tvprofil.com">
   <channels>
     <channel lang="hr" xmltv_id="24KitchenSerbia.rs" site_id="al/programacioni#24kitchen">24 Kitchen Srbija</channel>
-    <channel lang="hr" xmltv_id="360TuneBox.us" site_id="al/programacioni#360-tunebox">360 Tune Box</channel>
+    <channel lang="hr" xmltv_id="360TuneBox.nl" site_id="al/programacioni#360-tunebox">360 Tune Box</channel>
     <channel lang="hr" xmltv_id="3Plus.al" site_id="al/programacioni#3-plus">3 Plus</channel>
     <channel lang="hr" xmltv_id="AlJazeeraBalkans.qa" site_id="al/programacioni#al-jazeera-balkans">Aljazeera Balkans</channel>
     <channel lang="hr" xmltv_id="AlJazeeraEnglish.qa" site_id="al/programacioni#al-jazeera">Aljazeera English</channel>
@@ -26,14 +26,14 @@
     <channel lang="hr" xmltv_id="DasErste.de" site_id="al/programacioni#ard">Das Erste</channel>
     <channel lang="hr" xmltv_id="DiscoveryScience.us" site_id="al/programacioni#discovery-science">Discovery Science</channel>
     <channel lang="hr" xmltv_id="DMSat.rs" site_id="al/programacioni#dmsat">DM Sat</channel>
-    <channel lang="hr" xmltv_id="DocuBoxHD.us" site_id="al/programacioni#docubox-hd">DocuBox HD</channel>
+    <channel lang="hr" xmltv_id="DocuBoxHD.nl" site_id="al/programacioni#docubox-hd">DocuBox HD</channel>
     <channel lang="hr" xmltv_id="DorcelTV.nl" site_id="al/programacioni#dorcel">Dorcel TV</channel>
     <channel lang="hr" xmltv_id="DuckTVHD.sk" site_id="al/programacioni#ducktv">Duck TV HD</channel>
     <channel lang="hr" xmltv_id="DWEnglish.de" site_id="al/programacioni#deutchewelle">DW English</channel>
     <channel lang="hr" xmltv_id="EEurope.us" site_id="al/programacioni#entertainment">E! Europe</channel>
     <channel lang="hr" xmltv_id="EnglishClubTV.uk" site_id="al/programacioni#club-tv">English Club TV</channel>
-    <channel lang="hr" xmltv_id="EroxHD.us" site_id="al/programacioni#erox-hd">Erox HD</channel>
-    <channel lang="hr" xmltv_id="EroxxxHD.us" site_id="al/programacioni#eroxxx-hd">Eroxxx HD</channel>
+    <channel lang="hr" xmltv_id="EroxHD.nl" site_id="al/programacioni#erox-hd">Erox HD</channel>
+    <channel lang="hr" xmltv_id="EroxxxHD.nl" site_id="al/programacioni#eroxxx-hd">Eroxxx HD</channel>
     <channel lang="hr" xmltv_id="Eurochannel.us" site_id="al/programacioni#eurochannel">Eurochannel</channel>
     <channel lang="hr" xmltv_id="EuronewsAlbania.al" site_id="al/programacioni#euronews">EuroNews Albania</channel>
     <channel lang="hr" xmltv_id="Eurosport1.fr" site_id="al/programacioni#eurosport">Eurosport 1</channel>
@@ -41,12 +41,12 @@
     <channel lang="hr" xmltv_id="ExplorerNatyra.al" site_id="al/programacioni#explorer-natyra">Explorer Natyra</channel>
     <channel lang="hr" xmltv_id="ExplorerShkence.al" site_id="al/programacioni#explorer-shkence">Explorer Shkencë</channel>
     <channel lang="hr" xmltv_id="ExtremeSportsChannel.nl" site_id="al/programacioni#extreme-sports">Extreme Sports Channel</channel>
-    <channel lang="hr" xmltv_id="FashionBoxHD.us" site_id="al/programacioni#fashionbox-hd">FashionBox HD</channel>
+    <channel lang="hr" xmltv_id="FashionBoxHD.nl" site_id="al/programacioni#fashionbox-hd">FashionBox HD</channel>
     <channel lang="hr" xmltv_id="FashionTVEurope.fr" site_id="al/programacioni#fashion-tv">FashionTV Europe</channel>
-    <channel lang="hr" xmltv_id="FastFunBoxHD.us" site_id="al/programacioni#fast-funbox-hd">Fast &amp; FunBox HD</channel>
-    <channel lang="hr" xmltv_id="FightBoxHD.us" site_id="al/programacioni#fightbox-hd">FightBox HD</channel>
+    <channel lang="hr" xmltv_id="FastFunBoxHD.nl" site_id="al/programacioni#fast-funbox-hd">Fast &amp; FunBox HD</channel>
+    <channel lang="hr" xmltv_id="FightBoxHD.nl" site_id="al/programacioni#fightbox-hd">FightBox HD</channel>
     <channel lang="hr" xmltv_id="FilmAksion.al" site_id="al/programacioni#film-aksion-digitalb">Film Aksion</channel>
-    <channel lang="hr" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="al/programacioni#filmbox-arthouse">FilmBox Arthouse Worldwide</channel>
+    <channel lang="hr" xmltv_id="FilmBoxArthouse.nl" site_id="al/programacioni#filmbox-arthouse">FilmBox Arthouse Worldwide</channel>
     <channel lang="hr" xmltv_id="FilmDrame.al" site_id="al/programacioni#film-drame-digitalb">Film Dramë</channel>
     <channel lang="hr" xmltv_id="FilmDyHD.al" site_id="al/programacioni#film-dy-hd">Film Dy HD</channel>
     <channel lang="hr" xmltv_id="FilmHits.al" site_id="al/programacioni#film-hits-digitalb">Film Hits</channel>
@@ -56,13 +56,13 @@
     <channel lang="hr" xmltv_id="FoodNetworkEMEA.us" site_id="al/programacioni#food-network">Food Network EMEA</channel>
     <channel lang="hr" xmltv_id="FoxCrimeSerbia.rs" site_id="al/programacioni#fox-crime">Fox Crime Srbija</channel>
     <channel lang="hr" xmltv_id="FoxLifeRegional.us" site_id="al/programacioni#fox-life">Fox Life Regional</channel>
-    <channel lang="hr" xmltv_id="FoxTurkey.us" site_id="al/programacioni#fox-turkey">Fox Türkiye</channel>
+    <channel lang="hr" xmltv_id="FoxTurkey.tr" site_id="al/programacioni#fox-turkey">Fox Türkiye</channel>
     <channel lang="hr" xmltv_id="France2.fr" site_id="al/programacioni#france-2">France 2</channel>
     <channel lang="hr" xmltv_id="France24English.fr" site_id="al/programacioni#france24">France 24 English</channel>
     <channel lang="hr" xmltv_id="France24French.fr" site_id="al/programacioni#france-24-franch">France 24 Français</channel>
     <channel lang="hr" xmltv_id="France3.fr" site_id="al/programacioni#france-3">France 3</channel>
     <channel lang="hr" xmltv_id="France5.fr" site_id="al/programacioni#france-5">France 5</channel>
-    <channel lang="hr" xmltv_id="GametoonHD.us" site_id="al/programacioni#gametoon-hd">Gametoon</channel>
+    <channel lang="hr" xmltv_id="GametoonHD.nl" site_id="al/programacioni#gametoon-hd">Gametoon</channel>
     <channel lang="hr" xmltv_id="Haberturk.tr" site_id="al/programacioni#haberturk">Habertürk</channel>
     <channel lang="hr" xmltv_id="Hayat.ba" site_id="al/programacioni#hayat-tv">Hayat</channel>
     <channel lang="hr" xmltv_id="HayatFolk.ba" site_id="al/programacioni#hayat-folk">Hayat Folk</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_bg.channels.xml b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
index 18c6efa2..bc33c79a 100644
--- a/sites/tvprofil.com/tvprofil.com_bg.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
@@ -62,7 +62,7 @@
     <channel lang="bg" xmltv_id="BarelyLegalTV.us" site_id="bg/tv-programa#barely-legal">Barely Legal TV</channel>
     <channel lang="bg" xmltv_id="BloombergTVBulgaria.bg" site_id="bg/tv-programa#bloomberg-tv-bg">Bloomberg TV Bulgaria</channel>
     <channel lang="bg" xmltv_id="DisneyChannelBulgaria.bg" site_id="bg/tv-programa#disney-channel-bg">Disney Channel Bulgaria</channel>
-    <channel lang="bg" xmltv_id="FilmBoxStarsAdria.us" site_id="bg/tv-programa#filmbox-stars-bg">FilmBox Stars Adria</channel>
+    <channel lang="bg" xmltv_id="FilmBoxStarsBulgaria.bg" site_id="bg/tv-programa#filmbox-stars-bg">FilmBox Stars Adria</channel>
     <channel lang="bg" xmltv_id="FoxBulgaria.bg" site_id="bg/tv-programa#fox-bg">Fox Bulgaria</channel>
     <channel lang="bg" xmltv_id="FoxCrimeAdria.us" site_id="bg/tv-programa#fox-crime-bg">Fox Crime Adria</channel>
     <channel lang="bg" xmltv_id="FoxLifeBulgaria.bg" site_id="bg/tv-programa#fox-life-bg">Fox Life Bulgaria</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index f69b3cdb..462cfd06 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -178,7 +178,7 @@
     <channel lang="en" xmltv_id="DisneyXDEast.us" site_id="18279">Disney XD East</channel>
     <channel lang="en" xmltv_id="DisneyXDWest.us" site_id="18793">Disney XD West</channel>
     <channel lang="en" xmltv_id="DoctorWho.us" site_id="120086">Classic Doctor Who</channel>
-    <channel lang="en" xmltv_id="DocuBoxHD.us" site_id="78765">DocuBox HD</channel>
+    <channel lang="en" xmltv_id="DocuBoxHD.nl" site_id="78765">DocuBox HD</channel>
     <channel lang="en" xmltv_id="Docurama.us" site_id="110479">Docurama</channel>
     <channel lang="en" xmltv_id="DogTV.us" site_id="82446">Dog TV</channel>
     <channel lang="en" xmltv_id="Dream2.eg" site_id="60324">Dream 2</channel>
diff --git a/sites/vivacom.bg/vivacom.bg_bg.channels.xml b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
index 8e0fbb9e..e81e052e 100644
--- a/sites/vivacom.bg/vivacom.bg_bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
@@ -2,7 +2,7 @@
 <site site="vivacom.bg">
   <channels>
     <channel lang="bg" xmltv_id="24KitchenBulgaria.bg" site_id="5#24 Kitchen">24 Kitchen</channel>
-    <channel lang="en" xmltv_id="360TuneBox.us" site_id="19#360 Tunebox">360 Tune Box</channel>
+    <channel lang="en" xmltv_id="360TuneBox.nl" site_id="19#360 Tunebox">360 Tune Box</channel>
     <channel lang="bg" xmltv_id="78TV.bg" site_id="23#7/8 TV  ">7/8 TV</channel>
     <channel lang="bg" xmltv_id="AgroTV.bg" site_id="9#Агро ТВ">Agro TV</channel>
     <channel lang="bg" xmltv_id="AlfaTV.bg" site_id="9#Алфа ТВ">Alfa TV</channel>
@@ -54,30 +54,30 @@
     <channel lang="bg" xmltv_id="DiscoveryScience.us" site_id="15#Discovery Science HD">Discovery Science</channel>
     <channel lang="bg" xmltv_id="DisneyChannelBulgaria.bg" site_id="7#Disney">Disney Channel</channel>
     <channel lang="en" xmltv_id="DMSat.rs" site_id="12#DM Sat">DM Sat</channel>
-    <channel lang="bg" xmltv_id="DocuBoxHD.us" site_id="16#DocuBox HD">DocuBox HD</channel>
+    <channel lang="bg" xmltv_id="DocuBoxHD.nl" site_id="16#DocuBox HD">DocuBox HD</channel>
     <channel lang="bg" xmltv_id="DorcelTV.nl" site_id="21#Dorcel HD">Dorcel TV</channel>
     <channel lang="bg" xmltv_id="DuckTVSD.sk" site_id="8#Duck TV">Duck TV</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="21#Deutsche Welle">DW</channel>
     <channel lang="bg" xmltv_id="EKids.bg" site_id="8#E Kids">EKids</channel>
     <channel lang="en" xmltv_id="EnglishClubTV.uk" site_id="9#English Club TV">English Club TV</channel>
     <channel lang="bg" xmltv_id="EpicDrama.se" site_id="21#Epic Drama">Epic Drama</channel>
-    <channel lang="bg" xmltv_id="EroxHD.us" site_id="21#EroX HD ">Erox HD</channel>
-    <channel lang="bg" xmltv_id="EroxxxHD.us" site_id="21#EROXXX">Eroxxx</channel>
+    <channel lang="bg" xmltv_id="EroxHD.nl" site_id="21#EroX HD ">Erox HD</channel>
+    <channel lang="bg" xmltv_id="EroxxxHD.nl" site_id="21#EROXXX">Eroxxx</channel>
     <channel lang="en" xmltv_id="Eurochannel.us" site_id="7#Eurochannel">Eurochannel</channel>
     <channel lang="en" xmltv_id="EuronewsEnglish.fr" site_id="9#Euronews HD">EuroNews HD</channel>
     <channel lang="bg" xmltv_id="Eurosport1.fr" site_id="17#Eurosport">Eurosport 1</channel>
     <channel lang="bg" xmltv_id="Eurosport2.fr" site_id="18#Eurosport 2">Eurosport 2</channel>
     <channel lang="bg" xmltv_id="Evrokom.bg" site_id="2#Evrokom NCTV">Evrokom</channel>
     <channel lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="3#Extreme Sports">Extreme Sports Channel</channel>
-    <channel lang="en" xmltv_id="FashionBoxHD.us" site_id="16#FashionBox HD ">FashionBox HD</channel>
-    <channel lang="en" xmltv_id="FastFunBoxHD.us" site_id="4#Fast and Fun ">Fast &amp; FunBox</channel>
+    <channel lang="en" xmltv_id="FashionBoxHD.nl" site_id="16#FashionBox HD ">FashionBox HD</channel>
+    <channel lang="en" xmltv_id="FastFunBoxHD.nl" site_id="4#Fast and Fun ">Fast &amp; FunBox</channel>
     <channel lang="bg" xmltv_id="FenFolk.bg" site_id="13#Fen Folk TV">Fen Folk</channel>
     <channel lang="bg" xmltv_id="FenTV.bg" site_id="19#Fen TV">Fen TV</channel>
-    <channel lang="en" xmltv_id="FightBoxHD.us" site_id="4#Fight Box ">FightBox HD</channel>
-    <channel lang="en" xmltv_id="FilmBoxArthouseWorldwide.us" site_id="19#FilmBox Arthouse">FilmBox Arthouse Worldwide</channel>
-    <channel lang="bg" xmltv_id="FilmBoxBasic.us" site_id="7#Filmbox Basic SD">FilmBox Basic</channel>
+    <channel lang="en" xmltv_id="FightBoxHD.nl" site_id="4#Fight Box ">FightBox HD</channel>
+    <channel lang="en" xmltv_id="FilmBoxArthouse.nl" site_id="19#FilmBox Arthouse">FilmBox Arthouse Worldwide</channel>
+    <!-- <channel lang="bg" xmltv_id="FilmBoxBasic.nl" site_id="7#Filmbox Basic SD">FilmBox Basic</channel> -->
     <channel lang="bg" xmltv_id="FilmBoxExtraHDBulgaria.bg" site_id="19#FilmBox Extra">FilmBox Extra</channel>
-    <channel lang="bg" xmltv_id="FilmBoxStarsAdria.us" site_id="6#FilmBox Stars">FilmBox Stars</channel>
+    <channel lang="bg" xmltv_id="FilmBoxStarsBulgaria.bg" site_id="6#FilmBox Stars">FilmBox Stars</channel>
     <channel lang="bg" xmltv_id="FolklorTVHD.bg" site_id="12#Фолклор ТВ">Folklor TV</channel>
     <channel lang="bg" xmltv_id="FoodNetworkEMEA.us" site_id="19#Food Network">Food Network</channel>
     <channel lang="bg" xmltv_id="FoxBulgaria.bg" site_id="2#Fox HD">Fox HD</channel>
@@ -85,7 +85,7 @@
     <channel lang="bg" xmltv_id="FoxLifeBulgaria.bg" site_id="5#Fox Life">Fox Life</channel>
     <channel lang="bg" xmltv_id="France24French.fr" site_id="11#France 24">France 24</channel>
     <channel lang="en" xmltv_id="FuelTV.us" site_id="4#Fuel TV">Fuel TV</channel>
-    <channel lang="en" xmltv_id="GametoonHD.us" site_id="5#Gametoon HD  ">Gametoon</channel>
+    <channel lang="en" xmltv_id="GametoonHD.nl" site_id="5#Gametoon HD  ">Gametoon</channel>
     <channel lang="tr" xmltv_id="Haberturk.tr" site_id="24#Haberturk">Habertürk</channel>
     <channel lang="bg" xmltv_id="HBO2Bulgaria.bg" site_id="18#HBO 2">HBO 2</channel>
     <channel lang="bg" xmltv_id="HBO3Bulgaria.bg" site_id="18#HBO 3">HBO 3</channel>
diff --git a/sites/zap.co.ao/zap.co.ao_ao.channels.xml b/sites/zap.co.ao/zap.co.ao_ao.channels.xml
index 7da9f87e..6ed160fc 100644
--- a/sites/zap.co.ao/zap.co.ao_ao.channels.xml
+++ b/sites/zap.co.ao/zap.co.ao_ao.channels.xml
@@ -34,7 +34,7 @@
     <channel lang="pt" xmltv_id="ESPNAfrica.za" site_id="38">ESPN Africa</channel>
     <channel lang="pt" xmltv_id="EuronewsPortuguese.fr" site_id="19">EuroNews Português</channel>
     <channel lang="pt" xmltv_id="ExtremeSportsChannel.nl" site_id="178">Extreme Sports Channel</channel>
-    <channel lang="pt" xmltv_id="FightBoxHD.us" site_id="42">FightBox HD</channel>
+    <channel lang="pt" xmltv_id="FightBoxHD.nl" site_id="42">FightBox HD</channel>
     <channel lang="pt" xmltv_id="FoodNetworkEMEA.us" site_id="79">Food Network EMEA</channel>
     <channel lang="pt" xmltv_id="FoxComedyPortugal.pt" site_id="143">Fox Comedy Portugal</channel>
     <channel lang="pt" xmltv_id="FoxCrimePortugal.pt" site_id="66">Fox Crime Portugal</channel>
@@ -45,7 +45,7 @@
     <channel lang="pt" xmltv_id="France3.fr" site_id="124">France 3</channel>
     <channel lang="pt" xmltv_id="France5.fr" site_id="125">France 5</channel>
     <channel lang="pt" xmltv_id="France24French.fr" site_id="108">France 24 Français</channel>
-    <channel lang="pt" xmltv_id="GametoonHD.us" site_id="195">Gametoon</channel>
+    <channel lang="pt" xmltv_id="GametoonHD.nl" site_id="195">Gametoon</channel>
     <channel lang="pt" xmltv_id="GloboOn.ao" site_id="134">Globo On</channel>
     <channel lang="pt" xmltv_id="GloomChannel.mz" site_id="172">Gloom Channel</channel>
     <channel lang="pt" xmltv_id="GulliBrasil.br" site_id="199">Gulli Brasil</channel>