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 d70f562a..858e8311 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -66,7 +66,7 @@
     <channel lang="ms" xmltv_id="CelestialClassicMovies.hk" site_id="187">Celestial Classic Movies</channel>
     <channel lang="ms" xmltv_id="CelestialMoviesMalaysia.my" site_id="134">Celestial Movies Malaysia</channel>
     <channel lang="ms" xmltv_id="ChuttiTVMalaysia.my" site_id="51">Chutti TV Malaysia</channel>
-    <channel lang="ms" xmltv_id="CinemaxAsia.us" site_id="337">Cinemax Asia</channel>
+    <channel lang="ms" xmltv_id="CinemaxAsia.sg" site_id="337">Cinemax Asia</channel>
     <channel lang="ms" xmltv_id="Colors.in" site_id="365">Colors</channel>
     <channel lang="ms" xmltv_id="ColorsTamil.in" site_id="298">Colors Tamil</channel>
     <channel lang="ms" xmltv_id="ComedyCentralAsia.us" site_id="262">Comedy Central Asia</channel>
@@ -75,7 +75,7 @@
     <channel lang="ms" xmltv_id="DWEnglish.de" site_id="287">DW English</channel>
     <channel lang="ms" xmltv_id="DiscoveryAsia.us" site_id="136">Discovery Asia</channel>
     <channel lang="ms" xmltv_id="DiscoveryChannelSoutheastAsia.us" site_id="376">Discovery Channel Southeast Asia</channel>
-    <channel lang="ms" xmltv_id="EggNetwork.my" site_id="206">Egg Network</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 Asia</channel>
     <channel lang="ms" xmltv_id="FoodNetworkAsia.sg" site_id="153">Food Network Asia</channel>
     <channel lang="ms" xmltv_id="France24English.fr" site_id="289">France 24 English</channel>
@@ -84,7 +84,7 @@
     <channel lang="ms" xmltv_id="GoShopMalay118.my" site_id="192">Go Shop Malay 118</channel>
     <channel lang="ms" xmltv_id="GoShopMalay120.my" site_id="294">Go Shop Malay 120</channel>
     <channel lang="ms" xmltv_id="GolfChannelMalaysia.my" site_id="189">Golf Channel Malaysia</channel>
-    <channel lang="ms" xmltv_id="HBOFamilyMalaysia.us" site_id="450">HBO Family Malaysia</channel>
+    <channel lang="ms" xmltv_id="HBOFamilyAsia.sg" site_id="450">HBO Family Malaysia</channel>
     <channel lang="ms" xmltv_id="HBOHitsMalaysia.us" site_id="449">HBO Hits Malaysia</channel>
     <channel lang="ms" xmltv_id="HBOMalaysia.my" site_id="143">HBO Malaysia</channel>
     <channel lang="ms" xmltv_id="HGTVAsia.us" site_id="198">HGTV Asia</channel>
diff --git a/sites/clickthecity.com/clickthecity.com_ph.channels.xml b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
index 95beaa98..ff857639 100644
--- a/sites/clickthecity.com/clickthecity.com_ph.channels.xml
+++ b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
@@ -7,16 +7,16 @@
     <channel lang="en" xmltv_id="AXNAsia.sg" site_id="axn">AXN</channel>
     <channel lang="en" xmltv_id="CelestialMoviesPinoy.hk" site_id="celestial-movies-pinoy">Celestial Movies Pinoy</channel>
     <channel lang="en" xmltv_id="CinemaOneGlobal.ph" site_id="cinema-one">Cinema One</channel>
-    <channel lang="en" xmltv_id="CinemaxAsia.us" site_id="cinemax">Cinemax</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="cinemax">Cinemax</channel>
     <channel lang="en" xmltv_id="CNNPhilippines.ph" site_id="cnn-philippines">CNN Philippines</channel>
     <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.us" site_id="crime-investigation">Crime &amp; Investigation</channel>
     <channel lang="en" xmltv_id="IBC13.ph" site_id="ibc-tv-13">IBC 13</channel>
     <channel lang="en" xmltv_id="ETC.ph" site_id="etc">ETC</channel>
-    <channel lang="en" xmltv_id="Gem.in" site_id="gem">GEM</channel>
+    <channel lang="en" xmltv_id="GEM.sg" site_id="gem">GEM</channel>
     <channel lang="en" xmltv_id="GMANewsTV.ph" site_id="gma-news-tv">GMA News TV</channel>
     <channel lang="en" xmltv_id="GMATV.ph" site_id="gma">GMA</channel>
     <channel lang="en" xmltv_id="GTV.ph" site_id="gtv">GTV</channel>
-    <channel lang="en" xmltv_id="HBOAsia.us" site_id="hbo-asia">HBO Asia</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="hbo-asia">HBO Asia</channel>
     <channel lang="en" xmltv_id="HistoryPhilippines.ph" site_id="history">History</channel>
     <channel lang="en" xmltv_id="JeepneyTV.ph" site_id="jeepney-tv">Jeepney TV</channel>
     <channel lang="en" xmltv_id="KapamilyaChannel.ph" site_id="kapamilya-channel">Kapamilya Channel</channel>
diff --git a/sites/kplus.vn/kplus.vn_vn.channels.xml b/sites/kplus.vn/kplus.vn_vn.channels.xml
index 5cb0caa4..390e68f4 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="DiscoveryChannelSoutheastAsia.us" 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.us" 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/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index 66aa20ab..702ec13c 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -25,7 +25,7 @@
     <channel lang="en" xmltv_id="CelestialMoviesIndonesia.id" site_id="20">Celestial Movies Indonesia</channel>
     <channel lang="en" xmltv_id="CGTN.cn" site_id="353">CGTN</channel>
     <channel lang="en" xmltv_id="CGTNDocumentary.cn" site_id="205">CGTN Documentary</channel>
-    <channel lang="en" xmltv_id="CinemaxAsia.us" site_id="8">Cinemax Asia</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="8">Cinemax Asia</channel>
     <channel lang="en" xmltv_id="CNA.sg" site_id="330">CNA</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="337">CNBC Asia-Pacific</channel>
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International Asia Pacific</channel>
@@ -40,10 +40,10 @@
     <channel lang="en" xmltv_id="Galaxy.id" site_id="13">Galaxy</channel>
     <channel lang="en" xmltv_id="GalaxyPremium.id" site_id="12">Galaxy Premium</channel>
     <channel lang="en" xmltv_id="GTV.id" site_id="81">GTV</channel>
-    <channel lang="en" xmltv_id="HBOAsia.us" site_id="7">HBO Asia</channel>
-    <channel lang="en" xmltv_id="HBOFamilyAsia.us" site_id="9">HBO Family Asia</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="7">HBO Asia</channel>
+    <channel lang="en" xmltv_id="HBOFamilyAsia.sg" site_id="9">HBO Family Asia</channel>
     <channel lang="en" xmltv_id="HBOHits.sg" site_id="10">HBO Hits</channel>
-    <channel lang="en" xmltv_id="HBOSignatureAsia.us" site_id="6">HBO Signature Asia</channel>
+    <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>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index 21aa6a49..008ef13a 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="CinemaxAsia.us" 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 Asia-Pacific</channel>
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International Asia Pacific</channel>
@@ -40,10 +40,10 @@
     <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="HBOAsia.us" site_id="7">HBO Asia</channel>
-    <channel lang="id" xmltv_id="HBOFamilyAsia.us" site_id="9">HBO Family Asia</channel>
+    <channel lang="id" xmltv_id="HBOAsia.sg" site_id="7">HBO Asia</channel>
+    <channel lang="id" xmltv_id="HBOFamilyAsia.sg" site_id="9">HBO Family Asia</channel>
     <channel lang="id" xmltv_id="HBOHits.sg" site_id="10">HBO Hits</channel>
-    <channel lang="id" xmltv_id="HBOSignatureAsia.us" site_id="6">HBO Signature Asia</channel>
+    <channel lang="id" xmltv_id="HBOSignatureAsia.sg" site_id="6">HBO Signature Asia</channel>
     <channel lang="id" xmltv_id="HGTVAsia.us" site_id="245">HGTV Asia</channel>
     <channel lang="id" xmltv_id="HistoryAsia.us" site_id="206">History Asia</channel>
     <channel lang="id" xmltv_id="Hits.sg" site_id="160">Hits</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 ef0b0f32..52809cf0 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
@@ -23,7 +23,7 @@
     <channel lang="en" xmltv_id="CCTV1.cn" site_id="541">CCTV 1</channel>
     <channel lang="en" xmltv_id="CCTV4Asia.cn" site_id="542">CCTV 4 Asia</channel>
     <channel lang="en" xmltv_id="ChannelAdult.hk" site_id="903">Channel Adult</channel>
-    <channel lang="en" xmltv_id="CinemaxAsia.us" site_id="113">Cinemax Asia</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="113">Cinemax Asia</channel>
     <channel lang="en" xmltv_id="CNA.sg" site_id="322">CNA</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="319">CNBC Asia-Pacific</channel>
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="316">CNN International Asia Pacific</channel>
@@ -47,10 +47,10 @@
     <channel lang="en" xmltv_id="GMALifeTV.ph" site_id="721">GMA Life TV</channel>
     <channel lang="en" xmltv_id="GMANewsTVInternational.ph" site_id="722">GMA News TV International</channel>
     <channel lang="en" xmltv_id="GMAPinoyTVAsiaPacific.ph" site_id="720">GMA Pinoy TV Asia-Pacific</channel>
-    <channel lang="en" xmltv_id="HBOAsia.us" site_id="115">HBO Asia</channel>
-    <channel lang="en" xmltv_id="HBOFamilyAsia.us" site_id="112">HBO Family Asia</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="115">HBO Asia</channel>
+    <channel lang="en" xmltv_id="HBOFamilyAsia.sg" site_id="112">HBO Family Asia</channel>
     <channel lang="en" xmltv_id="HBOHits.sg" site_id="111">HBO Hits</channel>
-    <channel lang="en" xmltv_id="HBOSignatureAsia.us" site_id="114">HBO Signature Asia</channel>
+    <channel lang="en" xmltv_id="HBOSignatureAsia.sg" site_id="114">HBO Signature Asia</channel>
     <channel lang="en" xmltv_id="HGTVAsia.us" site_id="529">HGTV Asia</channel>
     <channel lang="en" xmltv_id="HistoryAsia.us" site_id="223">History Asia</channel>
     <channel lang="en" xmltv_id="HKSTV.hk" site_id="368">HKS TV</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 396d9aac..787d382c 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
@@ -23,7 +23,7 @@
     <channel lang="zh" xmltv_id="CCTV1.cn" site_id="541">CCTV 1</channel>
     <channel lang="zh" xmltv_id="CCTV4Asia.cn" site_id="542">CCTV 4 Asia</channel>
     <channel lang="zh" xmltv_id="ChannelAdult.hk" site_id="903">Channel Adult</channel>
-    <channel lang="zh" xmltv_id="CinemaxAsia.us" site_id="113">Cinemax Asia</channel>
+    <channel lang="zh" xmltv_id="CinemaxAsia.sg" site_id="113">Cinemax Asia</channel>
     <channel lang="zh" xmltv_id="CNA.sg" site_id="322">CNA</channel>
     <channel lang="zh" xmltv_id="CNBCAsia.sg" site_id="319">CNBC Asia-Pacific</channel>
     <channel lang="zh" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="316">CNN International Asia Pacific</channel>
@@ -47,10 +47,10 @@
     <channel lang="zh" xmltv_id="GMALifeTV.ph" site_id="721">GMA Life TV</channel>
     <channel lang="zh" xmltv_id="GMANewsTVInternational.ph" site_id="722">GMA News TV International</channel>
     <channel lang="zh" xmltv_id="GMAPinoyTVAsiaPacific.ph" site_id="720">GMA Pinoy TV Asia-Pacific</channel>
-    <channel lang="zh" xmltv_id="HBOAsia.us" site_id="115">HBO Asia</channel>
-    <channel lang="zh" xmltv_id="HBOFamilyAsia.us" site_id="112">HBO Family Asia</channel>
+    <channel lang="zh" xmltv_id="HBOAsia.sg" site_id="115">HBO Asia</channel>
+    <channel lang="zh" xmltv_id="HBOFamilyAsia.sg" site_id="112">HBO Family Asia</channel>
     <channel lang="zh" xmltv_id="HBOHits.sg" site_id="111">HBO Hits</channel>
-    <channel lang="zh" xmltv_id="HBOSignatureAsia.us" site_id="114">HBO Signature Asia</channel>
+    <channel lang="zh" xmltv_id="HBOSignatureAsia.sg" site_id="114">HBO Signature Asia</channel>
     <channel lang="zh" xmltv_id="HGTVAsia.us" site_id="529">HGTV Asia</channel>
     <channel lang="zh" xmltv_id="HistoryAsia.us" site_id="223">History Asia</channel>
     <channel lang="zh" xmltv_id="HKSTV.hk" site_id="368">HKS TV</channel>
diff --git a/sites/starhubtvplus.com/starhubtvplus.com.test.js b/sites/starhubtvplus.com/starhubtvplus.com.test.js
index 8224b8c0..ce5d1ecc 100644
--- a/sites/starhubtvplus.com/starhubtvplus.com.test.js
+++ b/sites/starhubtvplus.com/starhubtvplus.com.test.js
@@ -11,7 +11,7 @@ dayjs.extend(utc)
 const date = dayjs.utc('2022-05-10', 'YYYY-MM-DD').startOf('d')
 const channel = {
   site_id: '102',
-  xmltv_id: 'Channel5Singapore.sg'
+  xmltv_id: 'Channel5.sg'
 }
 
 it('can generate valid url', () => {
diff --git a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
index 58ddb920..5e36fe82 100644
--- a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
+++ b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
@@ -29,12 +29,12 @@
     <channel lang="en" xmltv_id="CelestialClassicMovies.hk" site_id="869">CCM</channel>
     <channel lang="en" xmltv_id="CelestialMovies.hk" site_id="868">Celestial Movies HD</channel>
     <channel lang="en" xmltv_id="CGTN.cn" site_id="722">CGTN</channel>
-    <channel lang="en" xmltv_id="Channel5Singapore.sg" site_id="102">Channel 5 HD</channel>
-    <channel lang="en" xmltv_id="Channel8Singapore.sg" site_id="103">Channel 8 HD</channel>
+    <channel lang="en" xmltv_id="Channel5.sg" site_id="102">Channel 5 HD</channel>
+    <channel lang="en" xmltv_id="Channel8.sg" site_id="103">Channel 8 HD</channel>
     <channel lang="en" xmltv_id="ChannelU.sg" site_id="107">Channel U HD</channel>
     <channel lang="en" xmltv_id="CinemaOneGlobal.ph" site_id="145">Cinema One Global</channel>
     <channel lang="en" xmltv_id="CinemaWorld.my" site_id="613">CinemaWorld HD</channel>
-    <channel lang="en" xmltv_id="CinemaxAsia.us" site_id="611">Cinemax HD</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="611">Cinemax HD</channel>
     <channel lang="en" xmltv_id="CitraEntertainment.id" site_id="115">Citra Entertainment</channel>
     <channel lang="en" xmltv_id="CNA.sg" site_id="106">Channel NewsAsia HD</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="707">CNBC HD</channel>
@@ -51,13 +51,13 @@
     <channel lang="en" xmltv_id="FashionTVAsia.fr" site_id="443">FashionTV HD</channel>
     <channel lang="en" xmltv_id="FightSports.us" site_id="212">FIGHT SPORTS HD</channel>
     <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="702">Fox News Channel HD</channel>
-    <channel lang="en" xmltv_id="Gem.in" site_id="814">GEM HD</channel>
+    <channel lang="en" xmltv_id="GEM.sg" site_id="814">GEM HD</channel>
     <channel lang="en" xmltv_id="GMALifeTV.ph" site_id="147">GMA Life TV</channel>
     <channel lang="en" xmltv_id="GMAPinoyTV.ph" site_id="146">GMA Pinoy TV</channel>
-    <channel lang="en" xmltv_id="HBOAsia.us" site_id="601">HBO HD</channel>
-    <channel lang="en" xmltv_id="HBOFamilyAsia.us" site_id="604">HBO Family HD</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="601">HBO HD</channel>
+    <channel lang="en" xmltv_id="HBOFamilyAsia.sg" site_id="604">HBO Family HD</channel>
     <channel lang="en" xmltv_id="HBOHits.sg" site_id="605">HBO Hits HD</channel>
-    <channel lang="en" xmltv_id="HBOSignatureAsia.us" site_id="603">HBO Signature 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>
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 32a522c1..b8870ce3 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -23,7 +23,7 @@
     <channel lang="id" xmltv_id="CGTNDocumentary.cn" site_id="CC9">CGTN Documentary</channel>
     <channel lang="id" xmltv_id="CNA.sg" site_id="NAC">Channel NewsAsia</channel>
     <channel lang="id" xmltv_id="CinemaWorld.my" site_id="CIWO">Cinema World HD</channel>
-    <channel lang="id" xmltv_id="CinemaxAsia.us" site_id="CMX">CINEMAX HD</channel>
+    <channel lang="id" xmltv_id="CinemaxAsia.sg" site_id="CMX">CINEMAX HD</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="CNBC">CNBC Asia</channel>
     <channel lang="id" xmltv_id="CNNIndonesia.id" site_id="CNI">CNN Indonesia HD</channel>
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="CNN">CNN International HD</channel>
@@ -40,12 +40,12 @@
     <channel lang="id" xmltv_id="FashionTVAsia.fr" site_id="FTV">Fashion TV HD</channel>
     <channel lang="id" xmltv_id="FightSports.us" site_id="FSP">Fight Sports HD</channel>
     <channel lang="id" xmltv_id="France24English.fr" site_id="FRC">France 24</channel>
-    <channel lang="id" xmltv_id="Gem.in" site_id="GEM">GEM HD</channel>
+    <channel lang="id" xmltv_id="GEM.sg" site_id="GEM">GEM HD</channel>
     <channel lang="id" xmltv_id="GTV.id" site_id="GLO">GLOBAL TV</channel>
-    <channel lang="id" xmltv_id="HBOFamilyAsia.us" site_id="HBF">HBO Family HD</channel>
-    <channel lang="id" xmltv_id="HBOAsia.us" site_id="HBO">HBO HD</channel>
+    <channel lang="id" xmltv_id="HBOFamilyAsia.sg" site_id="HBF">HBO Family HD</channel>
+    <channel lang="id" xmltv_id="HBOAsia.sg" site_id="HBO">HBO HD</channel>
     <channel lang="id" xmltv_id="HBOHits.sg" site_id="HBH">HBO Hits HD</channel>
-    <channel lang="id" xmltv_id="HBOSignatureAsia.us" site_id="HBOS">HBO Signature HD</channel>
+    <channel lang="id" xmltv_id="HBOSignatureAsia.sg" site_id="HBOS">HBO Signature HD</channel>
     <channel lang="id" xmltv_id="HistoryAsia.us" site_id="HIS">History HD</channel>
     <channel lang="id" xmltv_id="History2Asia.us" site_id="TORY">HISTORY2 HD</channel>
     <channel lang="id" xmltv_id="Indosiar.id" site_id="IDS">Indosiar</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 ad0df204..0165f9ed 100644
--- a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
+++ b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
@@ -21,7 +21,7 @@
     <channel lang="th" xmltv_id="DreamWorksChannelAsia.us" site_id="hybrid-dreamworks-hd">DreamWorks TV Asia</channel>
     <channel lang="th" xmltv_id="FashionTVAsia.fr" site_id="hybrid-fashion-tv">FashionTV Asia</channel>
     <channel lang="th" xmltv_id="FoodNetworkAsia.sg" site_id="hybrid-food-network-hd">Food Network Asia</channel>
-    <channel lang="th" xmltv_id="Gem.in" site_id="gem">Gem</channel>
+    <channel lang="th" xmltv_id="GEM.sg" site_id="gem">Gem</channel>
     <channel lang="th" xmltv_id="GMM25.th" site_id="gmm25">GMM 25</channel>
     <channel lang="th" xmltv_id="History2Asia.us" site_id="hybrid-h2">History 2 Asia</channel>
     <channel lang="th" xmltv_id="HistoryAsia.us" site_id="hybrid-history-channel-hd">History Asia</channel>
@@ -48,7 +48,7 @@
     <channel lang="th" xmltv_id="RockEntertainment.sg" site_id="hybrid-rtl-entertainment">Rock Entertainment</channel>
     <channel lang="th" xmltv_id="RockExtreme.sg" site_id="hybrid-rtl-extreme">Rock Extreme</channel>
     <channel lang="th" xmltv_id="SPOTV2.kr" site_id="spotv2-hd">SpoTV 2</channel>
-    <channel lang="th" xmltv_id="ThaiChannel8.th" site_id="ch8">Thai Channel 8</channel>
+    <channel lang="th" xmltv_id="Channel8.th" site_id="ch8">Thai Channel 8</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>