From a8360d22090e97ed2934990ce3816769ff431eeb Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <github@oiya.xyz>
Date: Mon, 14 Nov 2022 11:43:45 +0300
Subject: [PATCH] Fixes validation errors

---
 sites/astro.com.my/astro.com.my_my.channels.xml  | 10 +++++-----
 .../clickthecity.com_ph.channels.xml             |  4 ++--
 sites/kplus.vn/kplus.vn_vn.channels.xml          |  2 +-
 .../mncvision.id/mncvision.id_id-en.channels.xml |  8 ++++----
 .../mncvision.id/mncvision.id_id-id.channels.xml |  8 ++++----
 sites/mysky.com.ph/mysky.com.ph_ph.channels.xml  |  6 +++---
 .../mytvsuper.com_hk-en.channels.xml             | 12 ++++++------
 .../mytvsuper.com_hk-zh.channels.xml             | 12 ++++++------
 .../nowplayer.now.com_hk-en.channels.xml         | 16 ++++++++--------
 .../nowplayer.now.com_hk-zh.channels.xml         | 10 +++++-----
 .../starhubtvplus.com_sg.channels.xml            |  6 +++---
 .../transvision.co.id_id.channels.xml            |  2 +-
 .../tv.trueid.net/tv.trueid.net_th.channels.xml  | 12 ++++++------
 sites/useetv.com/useetv.com_id.channels.xml      |  6 +++---
 sites/vidio.com/vidio.com_id.channels.xml        |  4 ++--
 15 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/sites/astro.com.my/astro.com.my_my.channels.xml b/sites/astro.com.my/astro.com.my_my.channels.xml
index 57a7bc26..c9953052 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -73,9 +73,9 @@
     <channel lang="ms" xmltv_id="ColorsTamil.in" site_id="298">Colors Tamil</channel>
     <channel lang="ms" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="369">Crime + Investigation</channel>
     <channel lang="ms" xmltv_id="CTiAsia.tw" site_id="424">CTI TV</channel>
-    <channel lang="ms" xmltv_id="DiscoveryAsiaThailand.th" site_id="136">Discovery Asia</channel>
+    <channel lang="ms" xmltv_id="DiscoveryAsia.sg" site_id="136">Discovery Asia</channel>
     <channel lang="ms" xmltv_id="DiscoveryChannelIndonesia.id" site_id="376">Discovery Channel</channel>
-    <channel lang="ms" xmltv_id="DMAXAsia.sg" site_id="367">DMAX</channel>
+    <channel lang="ms" xmltv_id="DMAXSoutheastAsia.sg" site_id="367">DMAX</channel>
     <channel lang="ms" xmltv_id="DWEnglish.de" site_id="287">DW English</channel>
     <channel lang="ms" xmltv_id="eGGNetwork.my" site_id="206">Egg Network</channel>
     <channel lang="ms" xmltv_id="EurosportAsia.fr" site_id="339">Eurosport</channel>
@@ -91,8 +91,8 @@
     <channel lang="ms" xmltv_id="HBOHitsAsia.sg" site_id="449">HBO Hits</channel>
     <channel lang="ms" xmltv_id="HGTVAsia.us" site_id="198">HGTV</channel>
     <channel lang="ms" xmltv_id="HistoryAsia.us" site_id="144">History</channel>
-    <channel lang="ms" xmltv_id="Hits.sg" site_id="179">Hits</channel>
-    <channel lang="ms" xmltv_id="HitsMovies.sg" site_id="391">Hits Movies</channel>
+    <channel lang="ms" xmltv_id="HITS.sg" site_id="179">Hits</channel>
+    <channel lang="ms" xmltv_id="HITSMovies.sg" site_id="391">Hits Movies</channel>
     <channel lang="ms" xmltv_id="iQIYI.cn" site_id="355">Iqiyi</channel>
     <channel lang="ms" xmltv_id="KBSWorld.kr" site_id="161">KBS World</channel>
     <channel lang="ms" xmltv_id="KIX.hk" site_id="157">Kix</channel>
@@ -124,7 +124,7 @@
     <channel lang="ms" xmltv_id="SunMusic.in" site_id="417">Sun Music</channel>
     <channel lang="ms" xmltv_id="SunTVMalaysia.my" site_id="358">Sun TV</channel>
     <channel lang="ms" xmltv_id="TADAA.my" site_id="432">Ta-Daa!</channel>
-    <channel lang="ms" xmltv_id="TLCSoutheastAsia.us" site_id="338">TLC</channel>
+    <channel lang="ms" xmltv_id="TLCSoutheastAsia.sg" site_id="338">TLC</channel>
     <channel lang="ms" xmltv_id="TV3.my" site_id="106">TV 3</channel>
     <channel lang="ms" xmltv_id="TV9.my" site_id="48">TV 9</channel>
     <channel lang="ms" xmltv_id="TVAlhijrah.my" site_id="149">TV Alhijrah</channel>
diff --git a/sites/clickthecity.com/clickthecity.com_ph.channels.xml b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
index 8994499b..64ff70f3 100644
--- a/sites/clickthecity.com/clickthecity.com_ph.channels.xml
+++ b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
@@ -29,8 +29,8 @@
     <channel lang="en" xmltv_id="NickelodeonPhilippines.ph" site_id="nickelodeon">Nickelodeon</channel>
     <channel lang="en" xmltv_id="PBO.ph" site_id="pbo">PBO</channel>
     <channel lang="en" xmltv_id="PTV.ph" site_id="ptv">PTV</channel>
-    <channel lang="en" xmltv_id="RockEntertainment.sg" site_id="rock-entertainment">Rock Entertainment</channel>
-    <channel lang="en" xmltv_id="RockExtreme.sg" site_id="rock-extreme">Rock Extreme</channel>
+    <channel lang="en" xmltv_id="ROCKEntertainment.sg" site_id="rock-entertainment">Rock Entertainment</channel>
+    <channel lang="en" xmltv_id="ROCKExtreme.sg" site_id="rock-extreme">Rock Extreme</channel>
     <channel lang="en" xmltv_id="TeleNovelaChannel.ph" site_id="telenovela-channel">TeleNovela Channel</channel>
     <channel lang="en" xmltv_id="TV5.ph" site_id="tv5">TV5</channel>
     <channel lang="en" xmltv_id="VivaCinema.ph" site_id="viva-tv">VIVA Cinema</channel>
diff --git a/sites/kplus.vn/kplus.vn_vn.channels.xml b/sites/kplus.vn/kplus.vn_vn.channels.xml
index 343b5ae9..f2a0882e 100644
--- a/sites/kplus.vn/kplus.vn_vn.channels.xml
+++ b/sites/kplus.vn/kplus.vn_vn.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="vi" xmltv_id="AsianFoodNetwork.sg" site_id="4529">AFC</channel>
     <channel lang="vi" xmltv_id="AXNVietnam.vn" site_id="7036">AXN HD</channel>
     <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="DiscoveryChannelSoutheastAsia.sg" site_id="7057">DISCOVERY CHANNEL</channel>
     <channel lang="vi" xmltv_id="VTVCab1.vn" site_id="4508">VTVCab1-GIAITRITV</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>
diff --git a/sites/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index f8dd200b..856a07d9 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="en" xmltv_id="ABCAustralia.au" site_id="350">ABC Australia Asia</channel>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="331">Aljazeera English</channel>
-    <channel lang="en" xmltv_id="AnimalPlanetIndonesia.id" site_id="203">Animal Planet</channel>
+    <channel lang="en" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="203">Animal Planet</channel>
     <channel lang="en" xmltv_id="AnimaxAsia.sg" site_id="157">Animax Asia</channel>
     <channel lang="en" xmltv_id="ANTV.id" site_id="115">ANTV</channel>
     <channel lang="en" xmltv_id="ArirangWorld.kr" site_id="351">Arirang World</channel>
@@ -45,8 +45,8 @@
     <channel lang="en" xmltv_id="HBOSignatureAsia.sg" site_id="6">HBO Signature Asia</channel>
     <channel lang="en" xmltv_id="HGTVAsia.us" site_id="245">HGTV Asia</channel>
     <channel lang="en" xmltv_id="HistoryAsia.us" site_id="206">History Asia</channel>
-    <channel lang="en" xmltv_id="Hits.sg" site_id="160">Hits</channel>
-    <channel lang="en" xmltv_id="HitsMovies.sg" site_id="11">Hits Movies</channel>
+    <channel lang="en" xmltv_id="HITS.sg" site_id="160">Hits</channel>
+    <channel lang="en" xmltv_id="HITSMovies.sg" site_id="11">Hits Movies</channel>
     <channel lang="en" xmltv_id="IDXChannel.id" site_id="100">IDX Channel</channel>
     <channel lang="en" xmltv_id="Ie.id" site_id="96">Ie</channel>
     <channel lang="en" xmltv_id="IMC.id" site_id="14">IMC</channel>
@@ -88,7 +88,7 @@
     <channel lang="en" xmltv_id="SPOTV2.kr" site_id="308">SPOTV 2</channel>
     <channel lang="en" xmltv_id="TawafTV.id" site_id="105">Tawaf TV</channel>
     <channel lang="en" xmltv_id="Thrill.hk" site_id="19">Thrill</channel>
-    <channel lang="en" xmltv_id="TLCSoutheastAsia.us" site_id="248">TLC Southeast Asia</channel>
+    <channel lang="en" xmltv_id="TLCSoutheastAsia.sg" site_id="248">TLC Southeast Asia</channel>
     <channel lang="en" xmltv_id="Trans7.id" site_id="110">Trans 7</channel>
     <channel lang="en" xmltv_id="TransTV.id" site_id="87">Trans TV</channel>
     <channel lang="en" xmltv_id="tvNAsia.hk" site_id="158">TVN Premium Indonesia</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index bedf0018..c67555c6 100644
--- a/sites/mncvision.id/mncvision.id_id-id.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-id.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="id" xmltv_id="ABCAustralia.au" site_id="350">ABC Australia Asia</channel>
     <channel lang="id" xmltv_id="AlJazeeraEnglish.qa" site_id="331">Aljazeera</channel>
-    <channel lang="id" xmltv_id="AnimalPlanetIndonesia.id" site_id="203">Animal Planet</channel>
+    <channel lang="id" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="203">Animal Planet</channel>
     <channel lang="id" xmltv_id="AnimaxAsia.sg" site_id="157">Animax</channel>
     <channel lang="id" xmltv_id="ANTV.id" site_id="115">ANTV</channel>
     <channel lang="id" xmltv_id="ArirangWorld.kr" site_id="351">Arirang World</channel>
@@ -45,8 +45,8 @@
     <channel lang="id" xmltv_id="HBOSignatureAsia.sg" site_id="6">HBO Signature</channel>
     <channel lang="id" xmltv_id="HGTVAsia.us" site_id="245">HGTV</channel>
     <channel lang="id" xmltv_id="HistoryAsia.us" site_id="206">History</channel>
-    <channel lang="id" xmltv_id="Hits.sg" site_id="160">Hits</channel>
-    <channel lang="id" xmltv_id="HitsMovies.sg" site_id="11">Hits Movies</channel>
+    <channel lang="id" xmltv_id="HITS.sg" site_id="160">Hits</channel>
+    <channel lang="id" xmltv_id="HITSMovies.sg" site_id="11">Hits Movies</channel>
     <channel lang="id" xmltv_id="IDXChannel.id" site_id="100">IDX Channel</channel>
     <channel lang="id" xmltv_id="Ie.id" site_id="96">Ie</channel>
     <channel lang="id" xmltv_id="IMC.id" site_id="14">IMC</channel>
@@ -88,7 +88,7 @@
     <channel lang="id" xmltv_id="SPOTV2.kr" site_id="308">SPOTV 2</channel>
     <channel lang="id" xmltv_id="TawafTV.id" site_id="105">Tawaf TV</channel>
     <channel lang="id" xmltv_id="Thrill.hk" site_id="19">Thrill</channel>
-    <channel lang="id" xmltv_id="TLCSoutheastAsia.us" site_id="248">TLC</channel>
+    <channel lang="id" xmltv_id="TLCSoutheastAsia.sg" site_id="248">TLC</channel>
     <channel lang="id" xmltv_id="Trans7.id" site_id="110">Trans 7</channel>
     <channel lang="id" xmltv_id="TransTV.id" site_id="87">Trans TV</channel>
     <channel lang="id" xmltv_id="tvNAsia.hk" site_id="158">TVN Premium Indonesia</channel>
diff --git a/sites/mysky.com.ph/mysky.com.ph_ph.channels.xml b/sites/mysky.com.ph/mysky.com.ph_ph.channels.xml
index f53e21bd..b45ab088 100644
--- a/sites/mysky.com.ph/mysky.com.ph_ph.channels.xml
+++ b/sites/mysky.com.ph/mysky.com.ph_ph.channels.xml
@@ -28,8 +28,8 @@
     <channel lang="en" xmltv_id="PremierFootball.ph" site_id="322">PREMIER FOOTBALL HD</channel>
     <channel lang="en" xmltv_id="PremierSports.ph" site_id="140">PREMIER SPORTS</channel>
     <channel lang="en" xmltv_id="PremierSports2.ph" site_id="326">PREMIER SPORTS 2 HD</channel>
-    <channel lang="en" xmltv_id="RockEntertainment.sg" site_id="53">ROCK ENTERTAINMENT</channel>
-    <channel lang="en" xmltv_id="RockExtreme.sg" site_id="104">ROCK EXTREME</channel>
+    <channel lang="en" xmltv_id="ROCKEntertainment.sg" site_id="53">ROCK ENTERTAINMENT</channel>
+    <channel lang="en" xmltv_id="ROCKExtreme.sg" site_id="104">ROCK EXTREME</channel>
     <channel lang="en" xmltv_id="SolarSports.ph" site_id="70">SOLAR SPORTS</channel>
     <channel lang="en" xmltv_id="SPOTV.kr" site_id="31">SPOTV</channel>
     <channel lang="en" xmltv_id="SPOTV2.kr" site_id="32">SPOTV 2</channel>
@@ -42,7 +42,7 @@
     <channel lang="en" xmltv_id="TAPTV.ph" site_id="324">TAP TV</channel>
     <channel lang="en" xmltv_id="TechStorm.sg" site_id="301">TECH STORM</channel>
     <channel lang="en" xmltv_id="Thrill.hk" site_id="107">THRILL</channel>
-    <channel lang="en" xmltv_id="TLCPhilippines.ph" site_id="62">TLC</channel>
+    <channel lang="en" xmltv_id="TLCSoutheastAsia.sg" site_id="62">TLC</channel>
     <channel lang="en" xmltv_id="TV5.ph" site_id="10">TV5</channel>
     <channel lang="en" xmltv_id="TVBSAsia.tw" site_id="144">TVBS ASIA</channel>
     <channel lang="en" xmltv_id="TVBSNews.tw" site_id="304">TVBS NEWS</channel>
diff --git a/sites/mytvsuper.com/mytvsuper.com_hk-en.channels.xml b/sites/mytvsuper.com/mytvsuper.com_hk-en.channels.xml
index ee3c4718..c19363d2 100644
--- a/sites/mytvsuper.com/mytvsuper.com_hk-en.channels.xml
+++ b/sites/mytvsuper.com/mytvsuper.com_hk-en.channels.xml
@@ -2,7 +2,7 @@
 <site site="mytvsuper.com">
   <channels>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="CJAZ">Al Jazeera English</channel>
-    <channel lang="en" xmltv_id="AnimalPlanetHongKong.hk" site_id="ANP">Animal Planet</channel>
+    <channel lang="en" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="ANP">Animal Planet</channel>
     <channel lang="en" xmltv_id="AnimaxHongKong.hk" site_id="CANI">Animax</channel>
     <channel lang="en" xmltv_id="ArirangTV.kr" site_id="CARI">Arirang TV</channel>
     <channel lang="en" xmltv_id="AsianDrama.hk" site_id="CTVS">Asian Drama</channel>
@@ -19,8 +19,8 @@
     <channel lang="en" xmltv_id="ClassicMovies.hk" site_id="CCLM">Classic Movies</channel>
     <channel lang="en" xmltv_id="CNAInternational.sg" site_id="CCNA">Channel NewsAsia</channel>
     <channel lang="en" xmltv_id="CreationTV.hk" site_id="CRE">Creation TV</channel>
-    <channel lang="en" xmltv_id="DiscoveryChannelHongKong.hk" site_id="DSC">Discovery Channel</channel>
-    <channel lang="en" xmltv_id="DiscoveryScienceHongKong.hk" site_id="SCI">Discovery Science</channel>
+    <channel lang="en" xmltv_id="DiscoveryChannelSoutheastAsia.sg" site_id="DSC">Discovery Channel</channel>
+    <channel lang="en" xmltv_id="DiscoveryScienceSoutheastAsia.sg" site_id="SCI">Discovery Science</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="CDW1">DW</channel>
     <channel lang="en" xmltv_id="EntertainmentNews.hk" site_id="CTVE">Entertainment News</channel>
     <channel lang="en" xmltv_id="EurosportAsia.fr" site_id="EUS">Eurosport</channel>
@@ -47,10 +47,10 @@
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="CNHK">NHK World-Japan</channel>
     <channel lang="en" xmltv_id="NickelodeonAsia.sg" site_id="CNIKO">Nickelodeon</channel>
     <channel lang="en" xmltv_id="NickJrAsia.sg" site_id="CNIJR">Nick Jr</channel>
-    <channel lang="en" xmltv_id="ParamountNetworkHongKong.hk" site_id="PAR">Paramount Network</channel>
+    <channel lang="en" xmltv_id="ParamountNetworkAsia.us" site_id="PAR">Paramount Network</channel>
     <channel lang="en" xmltv_id="Pearl.hk" site_id="P">Pearl</channel>
-    <channel lang="en" xmltv_id="RockEntertainment.sg" site_id="CRTE">ROCK Entertainment</channel>
-    <channel lang="en" xmltv_id="RockExtreme.sg" site_id="CRTX">ROCK Extreme</channel>
+    <channel lang="en" xmltv_id="ROCKEntertainment.sg" site_id="CRTE">ROCK Entertainment</channel>
+    <channel lang="en" xmltv_id="ROCKExtreme.sg" site_id="CRTX">ROCK Extreme</channel>
     <channel lang="en" xmltv_id="Thrill.hk" site_id="CTHR">Thrill</channel>
     <channel lang="en" xmltv_id="TVBClassic.hk" site_id="CTVC">TVB Classic</channel>
     <channel lang="en" xmltv_id="TVBFinanceSportsInformationChannel.hk" site_id="A">TVB Finance, Sports &amp; Information Channel</channel>
diff --git a/sites/mytvsuper.com/mytvsuper.com_hk-zh.channels.xml b/sites/mytvsuper.com/mytvsuper.com_hk-zh.channels.xml
index f426fb19..3f9e2137 100644
--- a/sites/mytvsuper.com/mytvsuper.com_hk-zh.channels.xml
+++ b/sites/mytvsuper.com/mytvsuper.com_hk-zh.channels.xml
@@ -2,7 +2,7 @@
 <site site="mytvsuper.com">
   <channels>
     <channel lang="zh" xmltv_id="AlJazeeraEnglish.qa" site_id="CJAZ">半島電視台英語頻道</channel>
-    <channel lang="zh" xmltv_id="AnimalPlanetHongKong.hk" site_id="ANP">動物星球頻道</channel>
+    <channel lang="zh" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="ANP">動物星球頻道</channel>
     <channel lang="zh" xmltv_id="AnimaxHongKong.hk" site_id="CANI">Animax</channel>
     <channel lang="zh" xmltv_id="ArirangTV.kr" site_id="CARI">Arirang TV</channel>
     <channel lang="zh" xmltv_id="AsianDrama.hk" site_id="CTVS">亞洲劇台</channel>
@@ -19,8 +19,8 @@
     <channel lang="zh" xmltv_id="ClassicMovies.hk" site_id="CCLM">粵語片台</channel>
     <channel lang="zh" xmltv_id="CNAInternational.sg" site_id="CCNA">亞洲新聞台</channel>
     <channel lang="zh" xmltv_id="CreationTV.hk" site_id="CRE">創世電視</channel>
-    <channel lang="zh" xmltv_id="DiscoveryChannelHongKong.hk" site_id="DSC">Discovery頻道</channel>
-    <channel lang="zh" xmltv_id="DiscoveryScienceHongKong.hk" site_id="SCI">Discovery科學頻道</channel>
+    <channel lang="zh" xmltv_id="DiscoveryChannelSoutheastAsia.sg" site_id="DSC">Discovery頻道</channel>
+    <channel lang="zh" xmltv_id="DiscoveryScienceSoutheastAsia.sg" site_id="SCI">Discovery科學頻道</channel>
     <channel lang="zh" xmltv_id="DWEnglish.de" site_id="CDW1">DW</channel>
     <channel lang="zh" xmltv_id="EntertainmentNews.hk" site_id="CTVE">娛樂新聞台</channel>
     <channel lang="zh" xmltv_id="EurosportAsia.fr" site_id="EUS">歐洲體育台</channel>
@@ -47,10 +47,10 @@
     <channel lang="zh" xmltv_id="NHKWorldJapan.jp" site_id="CNHK">NHK World-Japan</channel>
     <channel lang="zh" xmltv_id="NickelodeonAsia.sg" site_id="CNIKO">Nickelodeon</channel>
     <channel lang="zh" xmltv_id="NickJrAsia.sg" site_id="CNIJR">Nick Jr</channel>
-    <channel lang="zh" xmltv_id="ParamountNetworkHongKong.hk" site_id="PAR">Paramount Network</channel>
+    <channel lang="zh" xmltv_id="ParamountNetworkAsia.us" site_id="PAR">Paramount Network</channel>
     <channel lang="zh" xmltv_id="Pearl.hk" site_id="P">明珠台</channel>
-    <channel lang="zh" xmltv_id="RockEntertainment.sg" site_id="CRTE">ROCK綜藝娛樂</channel>
-    <channel lang="zh" xmltv_id="RockExtreme.sg" site_id="CRTX">ROCK超極娛樂</channel>
+    <channel lang="zh" xmltv_id="ROCKEntertainment.sg" site_id="CRTE">ROCK綜藝娛樂</channel>
+    <channel lang="zh" xmltv_id="ROCKExtreme.sg" site_id="CRTX">ROCK超極娛樂</channel>
     <channel lang="zh" xmltv_id="Thrill.hk" site_id="CTHR">Thrill</channel>
     <channel lang="zh" xmltv_id="TVBClassic.hk" site_id="CTVC">千禧經典台</channel>
     <channel lang="zh" xmltv_id="TVBFinanceSportsInformationChannel.hk" site_id="A">無綫財經 體育 資訊台</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
index 301f265c..7e18fc0a 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="en" xmltv_id="ABCAustralia.au" site_id="561">ABC Australia Asia</channel>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="325">Aljazeera English</channel>
-    <channel lang="en" xmltv_id="AnimalPlanetHongKong.hk" site_id="210">Animal Planet</channel>
+    <channel lang="en" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="210">Animal Planet</channel>
     <channel lang="en" xmltv_id="AnimaxAsia.sg" site_id="150">Animax Asia</channel>
     <channel lang="en" xmltv_id="AsianFoodNetwork.sg" site_id="527">Asian Food Network</channel>
     <channel lang="en" xmltv_id="AstroCricket.my" site_id="674">Astro Cricket</channel>
@@ -30,10 +30,10 @@
     <channel lang="en" xmltv_id="ColorsAsiaPacific.in" site_id="780">Colors</channel>
     <channel lang="en" xmltv_id="CTiAsia.tw" site_id="538">CTI TV Asia</channel>
     <channel lang="en" xmltv_id="DaVinciAsia.de" site_id="460">Da Vinci</channel>
-    <channel lang="en" xmltv_id="DiscoveryAsiaHongKong.hk" site_id="208">Discovery Asia</channel>
-    <channel lang="en" xmltv_id="DiscoveryChannelHongKong.hk" site_id="209">Discovery Channel</channel>
-    <channel lang="en" xmltv_id="DiscoveryScienceHongKong.hk" site_id="211">Discovery Science</channel>
-    <channel lang="en" xmltv_id="DMAXAsia.sg" site_id="212">DMAX Southeast Asia</channel>
+    <channel lang="en" xmltv_id="DiscoveryAsia.sg" site_id="208">Discovery Asia</channel>
+    <channel lang="en" xmltv_id="DiscoveryChannelSoutheastAsia.sg" site_id="209">Discovery Channel</channel>
+    <channel lang="en" xmltv_id="DiscoveryScienceSoutheastAsia.sg" site_id="211">Discovery Science</channel>
+    <channel lang="en" xmltv_id="DMAXSoutheastAsia.sg" site_id="212">DMAX Southeast Asia</channel>
     <channel lang="en" xmltv_id="DreamWorksChannelAsia.us" site_id="440">DreamWorks TV</channel>
     <channel lang="en" xmltv_id="DWDeutsch.de" site_id="765">DW Deutsch</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="324">DW English</channel>
@@ -101,7 +101,7 @@
     <channel lang="en" xmltv_id="PhoenixChineseChannel.hk" site_id="548">Phoenix Chinese Channel</channel>
     <channel lang="en" xmltv_id="PhoenixHongKongChannel.hk" site_id="367">Phoenix Hong Kong</channel>
     <channel lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="366">Phoenix InfoNews Channel</channel>
-    <channel lang="en" xmltv_id="RockEntertainment.sg" site_id="517">Rock Entertainment</channel>
+    <channel lang="en" xmltv_id="ROCKEntertainment.sg" site_id="517">Rock Entertainment</channel>
     <channel lang="en" xmltv_id="RT.ru" site_id="329">RT News</channel>
     <channel lang="en" xmltv_id="RugbyPassTV.uk" site_id="679">RugbyPass TV</channel>
     <channel lang="en" xmltv_id="SanshaTV.cn" site_id="553">Sansha TV</channel>
@@ -116,8 +116,8 @@
     <channel lang="en" xmltv_id="StarPlus.in" site_id="794">Star Plus Southeast Asia</channel>
     <channel lang="en" xmltv_id="TheFilipinoChannelAsia.us" site_id="725">TFC Asia-Pacific</channel>
     <channel lang="en" xmltv_id="Thrill.hk" site_id="125">Thrill</channel>
-    <channel lang="en" xmltv_id="TLCSoutheastAsia.us" site_id="213">TLC Southeast Asia</channel>
-    <channel lang="en" xmltv_id="TravelChannelAsia.uk" site_id="528">Travel Channel Asia</channel>
+    <channel lang="en" xmltv_id="TLCSoutheastAsia.sg" site_id="213">TLC Southeast Asia</channel>
+    <channel lang="en" xmltv_id="TravelChannelSoutheastAsia.sg" site_id="528">Travel Channel Asia</channel>
     <channel lang="en" xmltv_id="TV5MondeAsia.fr" site_id="714">TV5Monde Asie</channel>
     <channel lang="en" xmltv_id="TV5MondeStyle.fr" site_id="713">TV5Monde Style HD</channel>
     <channel lang="en" xmltv_id="TVBSAsia.tw" site_id="163">TVBS Asia</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
index c79c84dc..7681834c 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="zh" xmltv_id="ABCAustralia.au" site_id="561">ABC Australia Asia</channel>
     <channel lang="zh" xmltv_id="AlJazeeraEnglish.qa" site_id="325">Aljazeera English</channel>
-    <channel lang="zh" xmltv_id="AnimalPlanetHongKong.hk" site_id="210">Animal Planet</channel>
+    <channel lang="zh" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="210">Animal Planet</channel>
     <channel lang="zh" xmltv_id="AnimaxAsia.sg" site_id="150">Animax Asia</channel>
     <channel lang="zh" xmltv_id="AsianFoodNetwork.sg" site_id="527">Asian Food Network</channel>
     <channel lang="zh" xmltv_id="AstroCricket.my" site_id="674">Astro Cricket</channel>
@@ -30,7 +30,7 @@
     <channel lang="zh" xmltv_id="ColorsAsiaPacific.in" site_id="780">Colors Asia Pacific</channel>
     <channel lang="zh" xmltv_id="CTiAsia.tw" site_id="538">CTI TV Asia</channel>
     <channel lang="zh" xmltv_id="DaVinciAsia.de" site_id="460">Da Vinci Asia</channel>
-    <channel lang="zh" xmltv_id="DMAXAsia.sg" site_id="212">DMAX Southeast Asia</channel>
+    <channel lang="zh" xmltv_id="DMAXSoutheastAsia.sg" site_id="212">DMAX Southeast Asia</channel>
     <channel lang="zh" xmltv_id="DreamWorksChannelAsia.us" site_id="440">DreamWorks TV Asia</channel>
     <channel lang="zh" xmltv_id="DWDeutsch.de" site_id="765">DW Deutsch</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="324">DW English</channel>
@@ -98,7 +98,7 @@
     <channel lang="zh" xmltv_id="PhoenixChineseChannel.hk" site_id="548">Phoenix Chinese Channel</channel>
     <channel lang="zh" xmltv_id="PhoenixHongKongChannel.hk" site_id="367">Phoenix Hong Kong</channel>
     <channel lang="zh" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="366">Phoenix InfoNews Channel</channel>
-    <channel lang="zh" xmltv_id="RockEntertainment.sg" site_id="517">Rock Entertainment</channel>
+    <channel lang="zh" xmltv_id="ROCKEntertainment.sg" site_id="517">Rock Entertainment</channel>
     <channel lang="en" xmltv_id="RT.ru" site_id="329">RT News</channel>
     <channel lang="zh" xmltv_id="RugbyPassTV.uk" site_id="679">RugbyPass TV</channel>
     <channel lang="zh" xmltv_id="SanshaTV.cn" site_id="553">Sansha TV</channel>
@@ -113,8 +113,8 @@
     <channel lang="zh" xmltv_id="StarPlus.in" site_id="794">Star Plus Southeast Asia</channel>
     <channel lang="zh" xmltv_id="TheFilipinoChannelAsia.us" site_id="725">TFC Asia-Pacific</channel>
     <channel lang="zh" xmltv_id="Thrill.hk" site_id="125">Thrill</channel>
-    <channel lang="zh" xmltv_id="TLCSoutheastAsia.us" site_id="213">TLC Southeast Asia</channel>
-    <channel lang="zh" xmltv_id="TravelChannelAsia.uk" site_id="528">Travel Channel Asia</channel>
+    <channel lang="zh" xmltv_id="TLCSoutheastAsia.sg" site_id="213">TLC Southeast Asia</channel>
+    <channel lang="zh" xmltv_id="TravelChannelSoutheastAsia.sg" site_id="528">Travel Channel Asia</channel>
     <channel lang="zh" xmltv_id="TV5MondeAsia.fr" site_id="714">TV5Monde Asie</channel>
     <channel lang="zh" xmltv_id="TV5MondeStyle.fr" site_id="713">TV5Monde Style HD</channel>
     <channel lang="zh" xmltv_id="TVBSAsia.tw" site_id="163">TVBS Asia</channel>
diff --git a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
index 150cdd04..bf6f1b7c 100644
--- a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
+++ b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
@@ -59,8 +59,8 @@
     <channel lang="en" xmltv_id="HBOHitsAsia.sg" site_id="605">HBO Hits HD</channel>
     <channel lang="en" xmltv_id="HBOSignatureAsia.sg" site_id="603">HBO Signature HD</channel>
     <channel lang="en" xmltv_id="HistoryAsia.us" site_id="401">HISTORY HD</channel>
-    <channel lang="en" xmltv_id="Hits.sg" site_id="519">Hits HD</channel>
-    <channel lang="en" xmltv_id="HitsMovies.sg" site_id="512">HITS MOVIES HD</channel>
+    <channel lang="en" xmltv_id="HITS.sg" site_id="519">Hits HD</channel>
+    <channel lang="en" xmltv_id="HITSMovies.sg" site_id="512">HITS MOVIES HD</channel>
     <channel lang="en" xmltv_id="HubECity.sg" site_id="111">Hub E City HD</channel>
     <channel lang="en" xmltv_id="HubSports1.sg" site_id="201">Hub Sports 1 HD</channel>
     <channel lang="en" xmltv_id="HubSports2.sg" site_id="202">Hub Sports 2 HD</channel>
@@ -102,7 +102,7 @@
     <channel lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="806">Phoenix InfoNews Channel HD</channel>
     <channel lang="en" xmltv_id="PremierSports1Asia.ie" site_id="207">Premier Sports TV</channel>
     <channel lang="en" xmltv_id="PreviewChannel.sg" site_id="101">Preview Channel</channel>
-    <channel lang="en" xmltv_id="RockEntertainment.sg" site_id="509">Blue Ant Entertainment HD</channel>
+    <channel lang="en" xmltv_id="ROCKEntertainment.sg" site_id="509">Blue Ant Entertainment HD</channel>
     <channel lang="en" xmltv_id="SEAToday.id" site_id="720">SEA Today</channel>
     <channel lang="en" xmltv_id="SkyNewsAustralia.au" site_id="703">Sky News HD</channel>
     <channel lang="en" xmltv_id="SmithsonianChannelAsia.us" site_id="415">Smithsonian Channel HD</channel>
diff --git a/sites/transvision.co.id/transvision.co.id_id.channels.xml b/sites/transvision.co.id/transvision.co.id_id.channels.xml
index 8e368cbd..d637a683 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -65,7 +65,7 @@
     <channel lang="id" xmltv_id="NickelodeonAsia.sg" site_id="NCK">Nickelodeon</channel>
     <channel lang="id" xmltv_id="OneTVAsia.sg" site_id="ONE">ONE HD</channel>
     <channel lang="id" xmltv_id="RCTI.id" site_id="RCTI">RCTI</channel>
-    <channel lang="id" xmltv_id="RockEntertainment.sg" site_id="RTLK">Rock Entertainment HD</channel>
+    <channel lang="id" xmltv_id="ROCKEntertainment.sg" site_id="RTLK">Rock Entertainment HD</channel>
     <channel lang="id" xmltv_id="RajawaliTV.id" site_id="BCH">RTV</channel>
     <channel lang="id" xmltv_id="RT.ru" site_id="RUSK">Russia Today</channel>
     <channel lang="id" xmltv_id="SCTV.id" site_id="SCTV">SCTV</channel>
diff --git a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
index 08ba6e7b..f4f69639 100644
--- a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
+++ b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
@@ -2,7 +2,7 @@
 <site site="tv.trueid.net">
   <channels>
     <channel lang="th" xmltv_id="AmarinTV.th" site_id="amarintv-hd">Amarin 34 HD</channel>
-    <channel lang="th" xmltv_id="AnimalPlanetThailand.th" site_id="animalplanet-hd">Animal Planet HD</channel>
+    <channel lang="th" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="animalplanet-hd">Animal Planet HD</channel>
     <channel lang="th" xmltv_id="AsianFoodNetwork.sg" site_id="asian-food-channel">Asian Food Network</channel>
     <channel lang="th" xmltv_id="AXNThailand.th" site_id="axn-hd">AXN HD</channel>
     <channel lang="th" xmltv_id="BBCEarthAsia.uk" site_id="bbc-earth-hd">BBC Earth HD</channel>
@@ -18,8 +18,8 @@
     <channel lang="th" xmltv_id="CNBCAsia.sg" site_id="cnbc">CNBC</channel>
     <channel lang="th" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="cnn-hd">CNN HD</channel>
     <channel lang="th" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="crime-investigation">Crime + Investigation</channel>
-    <channel lang="th" xmltv_id="DiscoveryAsiaThailand.th" site_id="discoveryasia">Discovery Asia</channel>
-    <channel lang="th" xmltv_id="DiscoveryChannelThailand.th" site_id="discoverychannel">Discovery Channel</channel>
+    <channel lang="th" xmltv_id="DiscoveryAsia.sg" site_id="discoveryasia">Discovery Asia</channel>
+    <channel lang="th" xmltv_id="DiscoveryChannelSoutheastAsia.sg" site_id="discoverychannel">Discovery Channel</channel>
     <channel lang="th" xmltv_id="DreamWorksChannelAsia.us" site_id="dreamworks-hd">DreamWorks TV HD</channel>
     <channel lang="th" xmltv_id="FashionTVAsia.fr" site_id="fashion-tv">FashionTV</channel>
     <channel lang="th" xmltv_id="FoodNetworkAsia.sg" site_id="food-network-hd">Food Network HD</channel>
@@ -46,13 +46,13 @@
     <channel lang="th" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="phoenix-infonews">Phoenix InfoNews Channel</channel>
     <channel lang="th" xmltv_id="PPTVHD36.th" site_id="pptv-hd">PPTV HD 36</channel>
     <channel lang="th" xmltv_id="RamaChannel.th" site_id="hybrid-rama-channel">Rama Channel</channel>
-    <channel lang="th" xmltv_id="RockEntertainment.sg" site_id="rtl-entertainment">Rock Entertainment</channel>
-    <channel lang="th" xmltv_id="RockExtreme.sg" site_id="rtl-extreme">Rock Extreme</channel>
+    <channel lang="th" xmltv_id="ROCKEntertainment.sg" site_id="rtl-entertainment">Rock Entertainment</channel>
+    <channel lang="th" xmltv_id="ROCKExtreme.sg" site_id="rtl-extreme">Rock Extreme</channel>
     <channel lang="th" xmltv_id="SPOTV2.kr" site_id="spotv2-hd">SpoTV 2</channel>
     <channel lang="th" xmltv_id="ThaiPBS3.th" site_id="thaipbs">Thai PBS 3</channel>
     <channel lang="th" xmltv_id="ThairathTV32.th" site_id="thairathtv-hd">Thairath TV 32</channel>
     <channel lang="th" xmltv_id="ThaiTV5HD1.th" site_id="ch5">Thai TV 5 HD1</channel>
-    <channel lang="th" xmltv_id="TLCSoutheastAsia.us" site_id="tcl-hd">TLC HD</channel>
+    <channel lang="th" xmltv_id="TLCSoutheastAsia.sg" site_id="tcl-hd">TLC HD</channel>
     <channel lang="th" xmltv_id="TNN16.th" site_id="hybrid-3-tnn16">TNN 16</channel>
     <channel lang="th" xmltv_id="TNN2.th" site_id="tnn-2">TNN 2</channel>
     <channel lang="th" xmltv_id="True4U.th" site_id="true4u">True 4U</channel>
diff --git a/sites/useetv.com/useetv.com_id.channels.xml b/sites/useetv.com/useetv.com_id.channels.xml
index 06f16e23..ef6b3dd2 100644
--- a/sites/useetv.com/useetv.com_id.channels.xml
+++ b/sites/useetv.com/useetv.com_id.channels.xml
@@ -84,11 +84,11 @@
     <channel lang="id" xmltv_id="KBSWorld.kr" site_id="kbsworld">KBS World</channel>
     <channel lang="id" xmltv_id="CitraDrama.id" site_id="cdrama">Citra Drama </channel>
     <channel lang="id" xmltv_id="WarnerTVAsia.us" site_id="warner">Warner</channel>
-    <channel lang="id" xmltv_id="RockExtreme.sg" site_id="blueantextreme">Rock Extreme</channel>
-    <channel lang="id" xmltv_id="TLCSoutheastAsia.us" site_id="tlc">TLC</channel>
+    <channel lang="id" xmltv_id="ROCKExtreme.sg" site_id="blueantextreme">Rock Extreme</channel>
+    <channel lang="id" xmltv_id="TLCSoutheastAsia.sg" site_id="tlc">TLC</channel>
     <channel lang="id" xmltv_id="HistoryAsia.us" site_id="history">History</channel>
     <channel lang="id" xmltv_id="DuniaLain.id" site_id="dunialain">Dunia Lain</channel>
-    <channel lang="id" xmltv_id="RockEntertainment.sg" site_id="blueant">Rock Entertainment</channel>
+    <channel lang="id" xmltv_id="ROCKEntertainment.sg" site_id="blueant">Rock Entertainment</channel>
     <channel lang="id" xmltv_id="AniplusAsia.sg" site_id="aniplus">ANIPlus</channel>
     <channel lang="id" xmltv_id="AnimaxAsia.sg" site_id="animax">Animax</channel>
     <channel lang="id" xmltv_id="OneTVAsia.sg" site_id="sone">SONE</channel>
diff --git a/sites/vidio.com/vidio.com_id.channels.xml b/sites/vidio.com/vidio.com_id.channels.xml
index d2559c28..3e6e52e6 100644
--- a/sites/vidio.com/vidio.com_id.channels.xml
+++ b/sites/vidio.com/vidio.com_id.channels.xml
@@ -46,8 +46,8 @@
     <channel lang="id" xmltv_id="OChannel.id" site_id="206">O Channel</channel>
     <channel lang="id" xmltv_id="Reformed21.id" site_id="6853">Reformed 21 TV</channel>
     <channel lang="id" xmltv_id="PetTV.id" site_id="8556">Pet TV</channel>
-    <channel lang="id" xmltv_id="RockEntertainment.sg" site_id="8120">Rock Entertainment</channel>
-    <channel lang="id" xmltv_id="RockExtreme.sg" site_id="8121">Rock Extreme</channel>
+    <channel lang="id" xmltv_id="ROCKEntertainment.sg" site_id="8120">Rock Entertainment</channel>
+    <channel lang="id" xmltv_id="ROCKExtreme.sg" site_id="8121">Rock Extreme</channel>
     <channel lang="id" xmltv_id="RajawaliTV.id" site_id="1561">RTV</channel>
     <channel lang="id" xmltv_id="SCTV.id" site_id="204">SCTV</channel>
     <channel lang="id" xmltv_id="UChannel.id" site_id="6898">U Channel</channel>