diff --git a/sites/meo.pt/meo.pt.channels.xml b/sites/meo.pt/meo.pt.channels.xml
index 3c6d6fc2a..04ea3ecf6 100644
--- a/sites/meo.pt/meo.pt.channels.xml
+++ b/sites/meo.pt/meo.pt.channels.xml
@@ -9,27 +9,28 @@
   <channel site="meo.pt" lang="en" xmltv_id="SkyNewsInternational.uk" site_id="SKYN">Sky News</channel>
   <channel site="meo.pt" lang="en" xmltv_id="TPAi.ao" site_id="TPA">TPA Notícias</channel>
   <channel site="meo.pt" lang="en" xmltv_id="TRTWorld.tr" site_id="TRTWHD">TRT World</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="1E1INT">1+1 International</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="1Plus1International.ua" site_id="1E1INT">1+1 International</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="1E1UNEW">1+1 United News</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="18">18</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="24KTHD">24Kitchen</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="ALJAZHD">Aljazeera</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AMCBRE">AMC Break</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AMCCRI">AMC Crime</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AMCHD">AMC</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="ARIRANG">Arirang</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AXNHD">AXN</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AXNMHD">AXN Movies</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AXWHD">AXN White</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AZORES">Azores TV</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="C180">CANAL 180</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="24Kitchen.pt" site_id="24KTHD">24Kitchen</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AlJazeera.qa" site_id="ALJAZHD">Aljazeera</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AMCBreak.pt" site_id="AMCBRE">AMC Break</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AMCCrime.pt" site_id="AMCCRI">AMC Crime</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AMC.pt" site_id="AMCHD">AMC</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="ArirangTV.kr" site_id="ARIRANG">Arirang</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AXN.pt" site_id="AXNHD">AXN</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AXNMovies.pt" site_id="AXNMHD">AXN Movies</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AXNWhite.pt" site_id="AXWHD">AXN White</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="VITECAzoresTV.pt" site_id="AZORES">Azores TV</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="Canal180.pt" site_id="C180">CANAL 180</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="CanalHollywood.pt" site_id="HOLHD">Canal Hollywood</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CAÇAPHD">Caça e Pesca</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CAÇAVHD">Caçavision</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CASACOZ">Casa e Cozinha</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CCTV4HD">CCTV 4</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CGTNHD">CGTN</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CINEHD">Cinemundo</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CLUBHD">Clubbing TV</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="CasaeCozinha.pt" site_id="CASACOZ">Casa e Cozinha</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="CCTV4Europe.cn" site_id="CCTV4HD">CCTV 4</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="CGTN.cn" site_id="CGTNHD">CGTN</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="CineMundo.pt" site_id="CINEHD">Cinemundo</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="ClubbingTV.fr" site_id="CLUBHD">Clubbing TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="CNITO">Cartoonito</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="DAZN1.pt" site_id="DAZN1">DAZN 1</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="DAZN2.pt" site_id="DAZN2">DAZN 2</channel>
@@ -38,74 +39,73 @@
   <channel site="meo.pt" lang="pt" xmltv_id="DAZN5.pt" site_id="DAZN5">DAZN 5</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="DAZN6.pt" site_id="DAZN6">DAZN 6</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="DEST">MEO Destaques</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="DISCVHD">Discovery Channel</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="DiscoveryChannel.pt" site_id="DISCVHD">Discovery Channel</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="DOGTVHD">Dog TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="DORCEL">DORCEL TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="DUCKTV">Duck TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="E! HD">E! Entertainment</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="ENGLISH">English Club TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="EURHD">Eurosport 1</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="EURNIHD">Euronews (I)</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="Eurosport1International.fr" site_id="EURNIHD">Euronews (I)</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="EURS2HD">Eurosport 2</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="FREEDOM">Freedom</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="FTV4K">Fashion TV 4K</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="FTVHD">Fashion TV</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="FREEDOM.ua" site_id="FREEDOM">Freedom</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="FashionTVUHD.fr" site_id="FTV4K">Fashion TV 4K</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="FashionTVEurope.fr" site_id="FTVHD">Fashion TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="GALERIA">Galeria</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="HGTV">Home &amp; Garden TV</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="HISTHD">História</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="HOLHD">Hollywood</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="HOTHD">HOT</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="Historia.pt" site_id="HISTHD">História</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="HOT.pt" site_id="HOTHD">HOT</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="ID">Investigation Discovery</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="ITALIA">RAI Italia</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="KANUCA">Kanuka TV</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="KVARTV">Kvartal TV International</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="LVTVHD">Localvisão TV</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="KvartalTV.ua" site_id="KVARTV">Kvartal TV International</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="LocalVisaoTV.pt" site_id="LVTVHD">Localvisão TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="MAANAIM">TV Maanaim</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="MCMTHD">MCM Top</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="MTVPHD">MTV Portugal</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="MCMTop.fr" site_id="MCMTHD">MCM Top</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="MTV.pt" site_id="MTVPHD">MTV Portugal</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="NEWBR">NEW Brasil</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="NGHD">National Geographic</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="NICKJR">Nick Jr.</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="NOVOT">Novo Tempo</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="ODISSHD">Odisseia</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="NationalGeographic.pt" site_id="NGHD">National Geographic</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="NickJr.pt" site_id="NICKJR">Nick Jr.</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="NovoTempoPortugal.pt" site_id="NOVOT">Novo Tempo Portugal</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="Odisseia.pt" site_id="ODISSHD">Odisseia</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="ONETORO">OneToro TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="PBTVHD">Playboy TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="QHD">Q</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="REC HD">Record Europa</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SCPHD">Sporting TV</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SICNOV">SIC Novelas</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SLBHD">BTV</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPT1HD">Sport TV1</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPT2HD">Sport TV2</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPT3HD">Sport TV3</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPT4HD">Sport TV4</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPT5HD">Sport TV5</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPT6HD">Sport TV6</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPT7HD">Sport TV 7</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SPTVHD">Sport TV+</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="STARCHA">STAR Channel</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="STARCOM">STAR Comedy</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="STARCRI">STAR Crime</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="STARLIF">STAR Life</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="STARMOV">STAR Movies</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="SYFHD">SyFy</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TAGES24">Tagesschau24</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TRAHD">Trace Urban</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TRAXP">Travelxp HD</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TRAXP4K">Travelxp 4K HDR</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TV5HD">TV5 Monde</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TVA">Televisão África</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TVE24HD">TVE 24H</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="TVEIHD">TVEi</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="UNIFE">Unifé TV</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="VIXEN">VIXEN</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="VMAISTVI">V+ TVI</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="RecordTVEuropa.pt" site_id="REC HD">Record Europa</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportingTV.pt" site_id="SCPHD">Sporting TV</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SICNovelas.pt" site_id="SICNOV">SIC Novelas</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="BenficaTV.pt" site_id="SLBHD">BTV</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTV1.pt" site_id="SPT1HD">Sport TV1</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTV2.pt" site_id="SPT2HD">Sport TV2</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTV3.pt" site_id="SPT3HD">Sport TV3</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTV4.pt" site_id="SPT4HD">Sport TV4</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTV5.pt" site_id="SPT5HD">Sport TV5</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTV6.pt" site_id="SPT6HD">Sport TV6</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTV7.pt" site_id="SPT7HD">Sport TV 7</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SportTVPlus.pt" site_id="SPTVHD">Sport TV+</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="StarChannel.pt" site_id="STARCHA">STAR Channel</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="StarComedy.pt" site_id="STARCOM">STAR Comedy</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="StarCrime.pt" site_id="STARCRI">STAR Crime</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="StarLife.pt" site_id="STARLIF">STAR Life</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="StarMovies.pt" site_id="STARMOV">STAR Movies</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="Syfy.pt" site_id="SYFHD">SyFy</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="tagesschau24.de" site_id="TAGES24">Tagesschau24</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="TraceUrban.fr" site_id="TRAHD">Trace Urban</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="Travelxp.in" site_id="TRAXP">Travelxp HD</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="Travelxp4KEurope.in" site_id="TRAXP4K">Travelxp 4K HDR</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="TV5MondeEurope.fr" site_id="TV5HD">TV5 Monde</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="TVA.cv" site_id="TVA">Televisão África</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="24Horas.es" site_id="TVE24HD">TVE 24H</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="TVEIHD">TVEi</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="UnifeTV.pt" site_id="UNIFE">Unifé TV</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="VixenTV.ca" site_id="VIXEN">VIXEN</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="VPlusTVI.pt" site_id="VMAISTVI">V+ TVI</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="" site_id="VOD">MEO VideoClube</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="WILDHD">National Geographic Wild</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="WSPORT">W-Sport</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="NationalGeographicWild.pt" site_id="WILDHD">National Geographic Wild</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="WSport.za" site_id="WSPORT">W-Sport</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="3sat.de" site_id="3SAT">3SAT</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="ABolaTV.pt" site_id="ABOLA">A Bola TV</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="" site_id="AFRO">Afro Music</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="AfroMusicChannel.ao" site_id="AFRO">Afro Music</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="AlmaLusa.pt" site_id="ALMALUS">Alma Lusa</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="arte.fr" site_id="ARTEHD">Arte</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="ARTV.pt" site_id="ARTV">ARTV</channel>
diff --git a/sites/nostv.pt/nostv.pt.channels.xml b/sites/nostv.pt/nostv.pt.channels.xml
index bc5ac5ab2..913004285 100644
--- a/sites/nostv.pt/nostv.pt.channels.xml
+++ b/sites/nostv.pt/nostv.pt.channels.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="55">Rai Italia</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="58">Canal 180</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="Canal180.pt" site_id="58">Canal 180</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="124">BNT World</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="129">Caça e Pesca</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="138">TPA Notícias</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="172">TVE 24h</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="245">BTV1 HD</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="TPAi.ao" site_id="138">TPA Notícias</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="24Horas.es" site_id="172">TVE 24h</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="BenficaTV.pt" site_id="245">BTV1 HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="343">STV Notícias</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="449">Sport TV NBA</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="588">Canal Galeria</channel>
@@ -14,13 +14,13 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="685">ELEVEN EXTRA 2</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="686">ELEVEN EXTRA 3</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="687">ELEVEN EXTRA 4</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="689">Unifé TV</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="UnifeTV.pt" site_id="689">Unifé TV</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="694">OneToro TV</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="697">New Brasil</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="702">Dizi</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="TimelessDiziChannel.ro" site_id="702">Dizi</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="1Plus1International.ua" site_id="24">1+1</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="24Kitchen.pt" site_id="243">24Kitchen HD</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="272">Afro Music Channel</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="AfroMusicChannel.ao" site_id="272">Afro Music Channel</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="AlJazeera.qa" site_id="108">Al Jazeera</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="AMC.pt" site_id="415">AMC HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="AMCBreak.pt" site_id="509">AMC Break HD</channel>
@@ -43,7 +43,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="CartoonNetwork.pt" site_id="252">Cartoon Network HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="CasaeCozinha.pt" site_id="572">Casa e Cozinha HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="CCTV4Europe.cn" site_id="316">CCTV 4</channel>
-  <channel site="nostv.pt" lang="en" xmltv_id="" site_id="312">CGTN</channel>
+  <channel site="nostv.pt" lang="en" xmltv_id="CGTN.cn" site_id="312">CGTN</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="CMTV.pt" site_id="425">CMTV HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="CNBCEurope.uk" site_id="52">CNBC</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="CNNInternationalEurope.us" site_id="26">CNN</channel>
@@ -71,11 +71,11 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="FashionTVHD.fr" site_id="47">FTV HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="FightNetwork.ca" site_id="236">Fight Network HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="FoodNetworkEMEA.us" site_id="62">Food Network HD</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="174">STAR Channel</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="113">STAR Comedy</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="244">STAR Crime</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="175">STAR Life</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="242">STAR Movies</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="StarChannel.pt" site_id="174">STAR Channel</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="StarComedy.pt" site_id="113">STAR Comedy</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="StarCrime.pt" site_id="244">STAR Crime</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="StarLife.pt" site_id="175">STAR Life</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="StarMovies.pt" site_id="242">STAR Movies</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="France24English.fr" site_id="109">France 24 (I)</channel>
   <channel site="nostv.pt" lang="fr" xmltv_id="France24French.fr" site_id="132">France 24 (F)</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="FUELTV.at" site_id="72">Fuel TV HD</channel>
@@ -143,7 +143,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="SportTV4.pt" site_id="247">SPORT TV4 HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SportTV5.pt" site_id="180">SPORT TV5 HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SportTV6.pt" site_id="610">Sport TV 6 HD</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="706">Sport TV 7 HD</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="SportTV7.pt" site_id="706">Sport TV 7 HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SportTVPlus.pt" site_id="417">SPORT TV+ HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="StingrayiConcerts.ca" site_id="42">Stingray iConcerts HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="Syfy.pt" site_id="201">Syfy HD</channel>
@@ -162,7 +162,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="TVCineTop.pt" site_id="141">TVCine TOP HD</channel>
   <channel site="nostv.pt" lang="es" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="48">TVEi</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TVI.pt" site_id="555">TVI HD</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="TVIFiccao.pt" site_id="574">TVI Ficção HD</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="VPlusTVI.pt" site_id="574">V+TVI HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TVIReality.pt" site_id="567">TVI Reality HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TVRInternational.ro" site_id="123">TVR Internacional</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="WSport.za" site_id="701">W-Sport</channel>