diff --git a/channels/unsorted.m3u b/channels/unsorted.m3u
index 54f45393b0..82e82b3469 100644
--- a/channels/unsorted.m3u
+++ b/channels/unsorted.m3u
@@ -517,10 +517,10 @@ http://189.216.247.113/Content/HLS/Live/Channel(XHGC)/index.m3u8
 https://trinity-lh.akamaihd.net/i/TelevicentroLive2_d@508538/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://canal56.com/wp-content/uploads/2017/06/logoc56header.png" group-title="",Canal 56
 https://cdn01.yowi.tv/VI76V4AZS4/live-1000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal BHTV
-http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/media_w554966584.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal BHTV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal BHTV (Opt-1)
 http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8?iptvgratis?chile.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal BHTV (Opt-2)
+http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/media_w554966584.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.Canalcostatv.es/wp-content/uploads/2013/12/logo-cabecera.png" group-title="",Canal Costa
 http://stream.canalcostatv.es:1935/web/IKbtqOuj/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal D
@@ -1701,19 +1701,19 @@ http://haititivi.com:8088/haititv/tele6NY/tracks-v1a1/index.m3u8
 http://htvpalsat.mada.ps:8888/najah/index.m3u8?v=1559311573
 #EXTINF:-1 tvg-id="" tvg-name="Nasul TV" tvg-logo="https://iptv.live/images/logo/channel/smalls/a98d664fb0f2909992d398d5c843e468.png" group-title="",Nasul TV
 https://5ab29cc78f681.streamlock.net:443/nasultvlive/nasultvlive/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/NatGeo.uk.png" group-title="",Nat Geo
-http://livecdnh1.tvanywhere.ae:80/hls/nat_geo/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo (Opt-1)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/New_NatGeo_People_logo.svg/1200px-New_NatGeo_People_logo.svg.png" group-title="",Nat Geo People
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/NatGeo.uk.png" group-title="",Nat Geo (Opt-2)
+http://livecdnh1.tvanywhere.ae:80/hls/nat_geo/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/New_NatGeo_People_logo.svg/1200px-New_NatGeo_People_logo.svg.png" group-title="",Nat Geo People (Opt-1)
 http://livecdnh1.tvanywhere.ae:80/hls/nat_geo_people/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo PEOPLE
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo People (Opt-2)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo people HD ENGLISH
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo People (Opt-3)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo people SD ENGLISH
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo People (Opt-4)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="",Nat Geo Wild
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="",Nat Geo Wild (Opt-6)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild (Opt-1)
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/index.m3u8
@@ -1723,7 +1723,7 @@ http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/Stream(05)/index.m
 http://6dfbb588.melpakomn.ru/iptv/QZH6CQVGHR6Z99 /216/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild (Opt-4)
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo wild SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild (Opt-5)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/02.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/d/d2/NBA_TV.svg/1200px-NBA_TV.svg.png" group-title="",NBA TV
 http://185.246.209.109:8080/NBA9/index.m3u8
@@ -2837,9 +2837,9 @@ http://uni5rtmp.tulix.tv:1935/bettervida/bettervida/playlist.m3u8
 mms://live.vietchristian.com/tv
 #EXTINF:-1 tvg-id="" tvg-name="Vintage Music" tvg-logo="http://kapang.com/vintagemusic/wp-content/uploads/sites/71/2017/08/vintagemusiclogo.png" group-title="",Vintage Music
 http://streamingserver002.viewtvgroup.com/kapanglivetv-playout-vintagetv/tracks-v2a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VISION 4
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Vision 4
 http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/vision4/hls_video/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VISIT-X TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",VISIT-X
 http://stream.visit-x.tv:1935/vxtv/live_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vkDryWT.png" group-title="",Viva Cristo TV (US)
 http://ss6.domint.net:1946/vct_str/vctv/playlist.m3u8
@@ -3469,6 +3469,8 @@ http://60.30.52.41/live/bhtv2/playlist.m3u8
 http://31182.hlsplay.aodianyun.com/lms_31182/tv_channel_175.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",澳亞衛視
 http://stream.mastvnet.com/MASTV/sd/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rtvchannel.com.au/wp-content/uploads/2017/04/xshow_08.png,Mic_.2KNN9OHw1p.png.pagespeed.ce.2KNN9OHw1p.png" group-title="",澳大利亚天和电视台
+http://rtvcdn.com.au:8082/TV_GG.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",濮阳公共频道
 http://218.29.171.2:380/live/py2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",濮阳睛彩电影
@@ -3737,7 +3739,3 @@ http://hljjms.chinashadt.com:2036/live/1003.stream/playlist.m3u8
 http://223.110.243.169/PLTV/3/224/3221227252/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黔西南综合
 http://live.qxndt.com/channel2/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rtvchannel.com.au/wp-content/uploads/2017/04/xshow_08.png,Mic_.2KNN9OHw1p.png.pagespeed.ce.2KNN9OHw1p.png" group-title="",澳大利亚天和电视台
-http://rtvcdn.com.au:8082/TV_GG.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Vision 4
-http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/vision4/hls_video/index.m3u8