diff --git a/channels/ua.m3u b/channels/ua.m3u
index cf3530775c..5e6cb39284 100644
--- a/channels/ua.m3u
+++ b/channels/ua.m3u
@@ -71,11 +71,11 @@ http://api.tv.ipnet.ua/api/v1/manifest/1311963170.m3u8?codec=mpeg4
 http://cdn1.live-tv.od.ua:8081/a1od/gtvod-abr/a1od/gtvod-720p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",GTV (Opt-2)
 http://cdn1.live-tv.od.ua:8081/a1od/gtvod-abr/a1od/gtvod-480p/playlist.m3u8
-#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion
+#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion (Opt-1)
 http://95.67.47.115/hls/hdfashion_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion
+#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion (Opt-2)
 http://95.67.47.115/hls/hdfashion_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion
+#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion (Opt-3)
 http://95.67.47.115/hls/hdfashion_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="id-fashion" tvg-name="ID Fashion" tvg-logo="" group-title="Fashion",ID Fashion (Opt-1)
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_hi/index.m3u8
@@ -203,10 +203,10 @@ http://cdn1.live-tv.od.ua:8081/a1od/a1od-abr/a1od/a1od-720p/playlist.m3u8
 http://cdn1.live-tv.od.ua:8081/a1od/a1od-abr/a1od/a1od-480p/playlist.m3u8
 #EXTINF:-1 tvg-id="avers" tvg-name="Аверс" tvg-logo="https://detector.media/doc/images/news/archive/2016/127502/ArticleImage_127502.jpg" group-title="",Аверс
 http://avers.pp.ua/hls/efir.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Академия
-http://cdn1.live-tv.od.ua:8081/36chod/36chod-abr/36chod/36chod/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ak.od.ua/wp-content/uploads/2017/01/logo_retina.png" group-title="",Академия
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ak.od.ua/wp-content/uploads/2017/01/logo_retina.png" group-title="",Академия (Opt-1)
 http://cdn1.live-tv.od.ua:8081/36chod/36chod-abr/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Академия (Opt-2)
+http://cdn1.live-tv.od.ua:8081/36chod/36chod-abr/36chod/36chod/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Архат ТВ
 http://arhat.tv/public/720p/index.m3u8
 #EXTINF:-1 tvg-id="vkusnoe-tv" tvg-name="Вкусное TV" tvg-logo="" group-title="Food",Вкусное ТВ
@@ -263,10 +263,10 @@ http://live.m2.tv/hls/stream.m3u8
 http://live.m2.tv/hls3/stream.m3u8
 #EXTINF:-1 tvg-id="m2-ua" tvg-name="М2" tvg-logo="https://iptvx.one/icn/m2-ua.png" group-title="Music",М2 (Opt-2)
 http://live.m2.tv/hls3/stream.m3u8
-#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://iptvx.one/icn/maliatko-tv.png" group-title="Kids",Малятко TV
-http://api.tv.ipnet.ua/api/v1/manifest/1311963260.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://i.imgur.com/aOS34dT.png" group-title="Kids",Малятко TV
+#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://i.imgur.com/aOS34dT.png" group-title="Kids",Малятко TV (Opt-1)
 http://api.tv.ipnet.ua/api/v1/manifest/1311963260.m3u8
+#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://iptvx.one/icn/maliatko-tv.png" group-title="Kids",Малятко TV (Opt-2)
+http://api.tv.ipnet.ua/api/v1/manifest/1311963260.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.mediainform.in.ua/wp-content/uploads/2016/12/cropped-MI-Logo-site-01-2-300x59.png" group-title="",Медиа-Информ
 http://cdn1.live-tv.od.ua:8081/mediainfo/miod-abr/mediainfo/miod/playlist.m3u8
 #EXTINF:-1 tvg-id="nadia" tvg-name="Надія" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Надія (Opt-1)