diff --git a/sites/teliatv.ee/teliatv.ee.channels.xml b/sites/teliatv.ee/teliatv.ee.channels.xml
index a5a704b5..7bbffb68 100644
--- a/sites/teliatv.ee/teliatv.ee.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee.channels.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="teliatv.ee">
   <channels>
+    <channel lang="de" xmltv_id="ARTEFrance.fr" site_id="24">ARTE Français</channel>
+    <channel lang="de" xmltv_id="RTLGermany.de" site_id="20">RTL Deutschland</channel>
+    <channel lang="de" xmltv_id="SAT1.de" site_id="11">Sat. 1 Deutschland</channel>
     <channel lang="en" xmltv_id="1Plus2.lv" site_id="1341">1+2</channel>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="en" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
     <channel lang="en" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet</channel>
     <channel lang="en" xmltv_id="ARTEFrance.fr" site_id="24">ARTE Français</channel>
     <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
+    <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="52">BBC World News Europe</channel>
     <channel lang="en" xmltv_id="BloombergTVEurope.uk" site_id="81">Bloomberg TV Europe</channel>
     <channel lang="en" xmltv_id="BoomerangCEE.us" site_id="57">Boomerang</channel>
@@ -21,6 +25,7 @@
     <channel lang="en" xmltv_id="DiscoveryScienceRussia.ru" site_id="33">Discovery Science</channel>
     <channel lang="en" xmltv_id="DisneyChannelScandinavia.uk" site_id="102">Disney Channel Scandinavia</channel>
     <channel lang="en" xmltv_id="DisneyJuniorScandinavia.uk" site_id="103">Disney Junior Scandinavia</channel>
+    <channel lang="en" xmltv_id="DisneyJuniorScandinavia.uk" site_id="103">Disney Junior Scandinavia</channel>
     <channel lang="en" xmltv_id="DomKino.ru" site_id="95">Dom Kino International</channel>
     <channel lang="en" xmltv_id="DTXRussia.ru" site_id="217">DTX</channel>
     <channel lang="en" xmltv_id="DuckTV.sk" site_id="1108">Duck TV SD</channel>
@@ -30,6 +35,7 @@
     <channel lang="en" xmltv_id="Duo6.ee" site_id="1080">Duo 6</channel>
     <channel lang="en" xmltv_id="Duo7.ee" site_id="1343">Duo 7</channel>
     <channel lang="en" xmltv_id="Dusk.nl" site_id="1088">Dusk</channel>
+    <channel lang="en" xmltv_id="Dusk.nl" site_id="1088">Dusk</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="73">DW English</channel>
     <channel lang="en" xmltv_id="EestiKanal.ee" site_id="1333">Eesti Kanal</channel>
     <channel lang="en" xmltv_id="EntusiastTV.ee" site_id="1290">Entusiast TV</channel>
@@ -42,6 +48,7 @@
     <channel lang="en" xmltv_id="Eurosport1Russia.ru" site_id="35">Eurosport 1</channel>
     <channel lang="en" xmltv_id="FashionTVRussia.ru" site_id="54">FashionTV</channel>
     <channel lang="en" xmltv_id="FightSports.us" site_id="1268">Fight Sports</channel>
+    <channel lang="en" xmltv_id="FightSports.us" site_id="1268">Fight Sports</channel>
     <channel lang="en" xmltv_id="Filmzone.ee" site_id="1238">Filmzone</channel>
     <channel lang="en" xmltv_id="FilmzonePlus.ee" site_id="1239">Filmzone+</channel>
     <channel lang="en" xmltv_id="Football.ru" site_id="262">Telekanal Futbol</channel>
@@ -64,6 +71,7 @@
     <channel lang="en" xmltv_id="LifeTV.ee" site_id="220">Life TV</channel>
     <channel lang="en" xmltv_id="LoloTV.lv" site_id="222">Lolo TV</channel>
     <channel lang="en" xmltv_id="MCMTopRussia.ru" site_id="84">MCM Top Russia</channel>
+    <channel lang="en" xmltv_id="MCMTopRussia.ru" site_id="84">MCM Top Russia</channel>
     <channel lang="en" xmltv_id="Mezzo.fr" site_id="36">Mezzo</channel>
     <channel lang="en" xmltv_id="MezzoLiveHD.fr" site_id="789">Mezzo Live HD</channel>
     <channel lang="en" xmltv_id="MoyaPlaneta.ru" site_id="151">Moya Planeta</channel>
@@ -71,9 +79,11 @@
     <channel lang="en" xmltv_id="MTV80s.uk" site_id="72">MTV 80s</channel>
     <channel lang="en" xmltv_id="MTV90s.uk" site_id="69">MTV 90s</channel>
     <channel lang="en" xmltv_id="MTVGlobal.uk" site_id="39">MTV Global</channel>
+    <channel lang="en" xmltv_id="MTVGlobal.uk" site_id="39">MTV Global</channel>
     <channel lang="en" xmltv_id="MTVHitsEurope.uk" site_id="71">MTV Hits Europe</channel>
     <channel lang="en" xmltv_id="MTVLive.uk" site_id="1302">MTV Live HD</channel>
     <channel lang="en" xmltv_id="MyHits.ee" site_id="76">MyHits</channel>
+    <channel lang="en" xmltv_id="MyHits.ee" site_id="76">MyHits</channel>
     <channel lang="en" xmltv_id="MyZenTV.fr" site_id="1306">MyZen TV</channel>
     <channel lang="en" xmltv_id="NationalGeographicRussia.ru" site_id="19">National Geographic</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildRussia.ru" site_id="79">National Geographic Wild</channel>
@@ -87,11 +97,13 @@
     <channel lang="en" xmltv_id="OrsentTV.ee" site_id="141">Orsent TV</channel>
     <channel lang="en" xmltv_id="PBKEstonia.ee" site_id="28">Perviy Baltijskyi Kanal</channel>
     <channel lang="en" xmltv_id="PrivateTV.nl" site_id="148">Private TV</channel>
+    <channel lang="en" xmltv_id="PrivateTV.nl" site_id="148">Private TV</channel>
     <channel lang="en" xmltv_id="ProSieben.de" site_id="60">ProSieben</channel>
     <channel lang="en" xmltv_id="Rai1.it" site_id="86">Rai 1</channel>
     <channel lang="en" xmltv_id="RBKTV.ru" site_id="97">RBK TV</channel>
     <channel lang="en" xmltv_id="RENTVBaltic.lv" site_id="23">REN TV Baltic</channel>
     <channel lang="en" xmltv_id="RFMTV.fr" site_id="83">RFM TV</channel>
+    <channel lang="en" xmltv_id="RFMTV.fr" site_id="83">RFM TV</channel>
     <channel lang="en" xmltv_id="RTLGermany.de" site_id="20">RTL Deutschland</channel>
     <channel lang="en" xmltv_id="RTRPlaneta.ru" site_id="18">RTR Planeta</channel>
     <channel lang="en" xmltv_id="Russia24.ru" site_id="153">Rossiya 24</channel>
@@ -100,7 +112,10 @@
     <channel lang="en" xmltv_id="SkyNewsInternational.uk" site_id="91">Sky News International</channel>
     <channel lang="en" xmltv_id="Smartzone.ee" site_id="1344">Smartzone</channel>
     <channel lang="en" xmltv_id="StingrayClassica.ca" site_id="790">Stingray Classica</channel>
+    <channel lang="en" xmltv_id="StingrayClassica.ca" site_id="790">Stingray Classica</channel>
     <channel lang="en" xmltv_id="StingrayDJAZZ.ca" site_id="1129">Stingray Djazz</channel>
+    <channel lang="en" xmltv_id="StingrayDJAZZ.ca" site_id="1129">Stingray Djazz</channel>
+    <channel lang="en" xmltv_id="StingrayiConcerts.ca" site_id="731">Stingray IConcerts</channel>
     <channel lang="en" xmltv_id="StingrayiConcerts.ca" site_id="731">Stingray IConcerts</channel>
     <channel lang="en" xmltv_id="SuperRTL.de" site_id="17">Super RTL Deutschland</channel>
     <channel lang="en" xmltv_id="TaevasTV7.fi" site_id="248">Taevas TV7</channel>
@@ -135,6 +150,7 @@
     <channel lang="et" xmltv_id="1Plus2.lv" site_id="1341">1+2</channel>
     <channel lang="et" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="et" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
+    <channel lang="et" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
     <channel lang="et" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet</channel>
     <channel lang="et" xmltv_id="ARTEFrance.fr" site_id="24">ARTE</channel>
     <channel lang="et" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth</channel>
@@ -229,6 +245,7 @@
     <channel lang="et" xmltv_id="StingrayiConcerts.ca" site_id="731">Stingray IConcerts</channel>
     <channel lang="et" xmltv_id="SuperRTL.de" site_id="17">Super RTL</channel>
     <channel lang="et" xmltv_id="TaevasTV7.fi" site_id="248">Taevas TV7</channel>
+    <channel lang="et" xmltv_id="TaevasTV7.fi" site_id="248">Taevas TV7</channel>
     <channel lang="et" xmltv_id="TBNBaltia.ee" site_id="261">TBN</channel>
     <channel lang="et" xmltv_id="Telecafe.ru" site_id="703">Telecafé</channel>
     <channel lang="et" xmltv_id="TLCRussia.ru" site_id="823">TLC</channel>
@@ -257,11 +274,9 @@
     <channel lang="et" xmltv_id="Vremya.ru" site_id="94">Vremya</channel>
     <channel lang="et" xmltv_id="YleTV1.fi" site_id="12">YLE TV 1</channel>
     <channel lang="et" xmltv_id="YleTV2.fi" site_id="13">YLE TV 2</channel>
+    <channel lang="nl" xmltv_id="DisneyChannelScandinavia.uk" site_id="102">Disney Channel Scandinavia</channel>
     <channel lang="ru" xmltv_id="1Plus2.lv" site_id="1341">1+2</channel>
-    <channel lang="ru" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
     <channel lang="ru" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet Rossiya</channel>
-    <channel lang="ru" xmltv_id="ARTEFrance.fr" site_id="24">ARTE Français</channel>
-    <channel lang="ru" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
     <channel lang="ru" xmltv_id="BoomerangCEE.us" site_id="57">Boomerang Central &amp; Eastern Europe</channel>
     <channel lang="ru" xmltv_id="Canal24Horas.es" site_id="144">Canal 24 Horas</channel>
     <channel lang="ru" xmltv_id="CartoonNetworkRussia.ru" site_id="55">Cartoon Network Russia &amp; South East Europe</channel>
@@ -269,8 +284,6 @@
     <channel lang="ru" xmltv_id="CTCBaltics.ru" site_id="1087">STS Baltic</channel>
     <channel lang="ru" xmltv_id="DiscoveryChannelRussia.ru" site_id="26">Discovery Channel Rossiya</channel>
     <channel lang="ru" xmltv_id="DiscoveryScienceRussia.ru" site_id="33">Discovery Science Rossiya</channel>
-    <channel lang="ru" xmltv_id="DisneyChannelScandinavia.uk" site_id="102">Disney Channel Scandinavia</channel>
-    <channel lang="ru" xmltv_id="DisneyJuniorScandinavia.uk" site_id="103">Disney Junior Scandinavia</channel>
     <channel lang="ru" xmltv_id="DomKino.ru" site_id="95">Dom Kino International</channel>
     <channel lang="ru" xmltv_id="DTXRussia.ru" site_id="217">DTX Rossiya</channel>
     <channel lang="ru" xmltv_id="DuckTV.sk" site_id="1108">Duck TV SD</channel>
@@ -279,7 +292,6 @@
     <channel lang="ru" xmltv_id="Duo5.ee" site_id="728">Duo 5</channel>
     <channel lang="ru" xmltv_id="Duo6.ee" site_id="1080">Duo 6</channel>
     <channel lang="ru" xmltv_id="Duo7.ee" site_id="1343">Duo 7</channel>
-    <channel lang="ru" xmltv_id="Dusk.nl" site_id="1088">Dusk</channel>
     <channel lang="ru" xmltv_id="EestiKanal.ee" site_id="1333">Eesti Kanal</channel>
     <channel lang="ru" xmltv_id="EntusiastTV.ee" site_id="1290">Entusiast TV</channel>
     <channel lang="ru" xmltv_id="EpicDrama.se" site_id="1292">Epic Drama</channel>
@@ -290,7 +302,6 @@
     <channel lang="ru" xmltv_id="EuronewsRussian.fr" site_id="59">EuroNews Russkiy</channel>
     <channel lang="ru" xmltv_id="Eurosport1Russia.ru" site_id="35">Eurosport 1 Rossiya</channel>
     <channel lang="ru" xmltv_id="FashionTVRussia.ru" site_id="54">FashionTV Russia</channel>
-    <channel lang="ru" xmltv_id="FightSports.us" site_id="1268">Fight Sports</channel>
     <channel lang="ru" xmltv_id="Filmzone.ee" site_id="1238">Filmzone</channel>
     <channel lang="ru" xmltv_id="FilmzonePlus.ee" site_id="1239">Filmzone+</channel>
     <channel lang="ru" xmltv_id="Football.ru" site_id="262">Telekanal Futbol</channel>
@@ -311,12 +322,9 @@
     <channel lang="ru" xmltv_id="KIKA.de" site_id="78">KIKA</channel>
     <channel lang="ru" xmltv_id="LifeTV.ee" site_id="220">Life TV</channel>
     <channel lang="ru" xmltv_id="LoloTV.lv" site_id="222">Lolo TV</channel>
-    <channel lang="ru" xmltv_id="MCMTopRussia.ru" site_id="84">MCM Top Russia</channel>
     <channel lang="ru" xmltv_id="Mezzo.fr" site_id="36">Mezzo</channel>
     <channel lang="ru" xmltv_id="MezzoLiveHD.fr" site_id="789">Mezzo Live HD</channel>
     <channel lang="ru" xmltv_id="MoyaPlaneta.ru" site_id="151">Moya Planeta</channel>
-    <channel lang="ru" xmltv_id="MTVGlobal.uk" site_id="39">MTV Global</channel>
-    <channel lang="ru" xmltv_id="MyHits.ee" site_id="76">MyHits</channel>
     <channel lang="ru" xmltv_id="MyZenTV.fr" site_id="1306">MyZen TV</channel>
     <channel lang="ru" xmltv_id="NationalGeographicRussia.ru" site_id="19">National Geographic</channel>
     <channel lang="ru" xmltv_id="NationalGeographicWildRussia.ru" site_id="79">National Geographic Wild</channel>
@@ -329,23 +337,15 @@
     <channel lang="ru" xmltv_id="OkhotaiRybalka.ru" site_id="74">Okhota i Rybalka</channel>
     <channel lang="ru" xmltv_id="OrsentTV.ee" site_id="141">Orsent TV</channel>
     <channel lang="ru" xmltv_id="PBKEstonia.ee" site_id="28">Perviy Baltijskyi Kanal</channel>
-    <channel lang="ru" xmltv_id="PrivateTV.nl" site_id="148">Private TV</channel>
     <channel lang="ru" xmltv_id="ProSieben.de" site_id="60">ProSieben Deutschland</channel>
     <channel lang="ru" xmltv_id="Rai1.it" site_id="86">Rai 1</channel>
     <channel lang="ru" xmltv_id="RBKTV.ru" site_id="97">RBK TV</channel>
     <channel lang="ru" xmltv_id="RENTVBaltic.lv" site_id="23">REN TV Baltic</channel>
-    <channel lang="ru" xmltv_id="RFMTV.fr" site_id="83">RFM TV</channel>
-    <channel lang="ru" xmltv_id="RTLGermany.de" site_id="20">RTL Deutschland</channel>
     <channel lang="ru" xmltv_id="RTRPlaneta.ru" site_id="18">RTR Planeta</channel>
     <channel lang="ru" xmltv_id="Russia24.ru" site_id="153">Rossiya 24</channel>
-    <channel lang="ru" xmltv_id="SAT1.de" site_id="11">Sat. 1 Deutschland</channel>
     <channel lang="ru" xmltv_id="SetantaSports1Evraziya.ie" site_id="1206">Setanta Sports 1 Evraziya</channel>
     <channel lang="ru" xmltv_id="Smartzone.ee" site_id="1344">Smartzone</channel>
-    <channel lang="ru" xmltv_id="StingrayClassica.ca" site_id="790">Stingray Classica</channel>
-    <channel lang="ru" xmltv_id="StingrayDJAZZ.ca" site_id="1129">Stingray Djazz</channel>
-    <channel lang="ru" xmltv_id="StingrayiConcerts.ca" site_id="731">Stingray IConcerts</channel>
     <channel lang="ru" xmltv_id="SuperRTL.de" site_id="17">Super RTL Deutschland</channel>
-    <channel lang="ru" xmltv_id="TaevasTV7.fi" site_id="248">Taevas TV7</channel>
     <channel lang="ru" xmltv_id="TBNBaltia.ee" site_id="261">TBN Baltia</channel>
     <channel lang="ru" xmltv_id="Telecafe.ru" site_id="703">Telecafé International</channel>
     <channel lang="ru" xmltv_id="TLCRussia.ru" site_id="823">TLC Russia</channel>