diff --git a/channels/animeworld.py b/channels/animeworld.py
index bd7ca222..3660b6d2 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -175,7 +175,8 @@ def findvideos(item):
 
     for ID, name in resp.matches:
         # if not item.number: item.number = support.match(item.title, patron=r'(\d+) -').match
-        match = support.match(data, patronBlock=r'data-name="{}"[^>]+>(.*?)(?:<div class="(?:server|download)|link)', patron=r'data-id="([^"]+)" data-episode-num="{}".*?href="([^"]+)"'.format(ID, item.contentEpisodeNumber if item.contentEpisodeNumber else 1)).match
+        match = support.match(data, patronBlock=r'data-name="{}"[^>]+>(.*?)(?:<div class="(?:server|download)|link)'.format(ID), patron=r'data-id="([^"]+)" data-episode-num="{}".*?href="([^"]+)"'.format(item.contentEpisodeNumber if item.contentEpisodeNumber else 1)).match
+
         if match:
             epID, epurl = match
             # if 'vvvvid' in name.lower():
diff --git a/core/support.py b/core/support.py
index 001819d9..9be50d0e 100755
--- a/core/support.py
+++ b/core/support.py
@@ -1193,19 +1193,17 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
                             info(videoitem, 'Non supportato')
                             return
                 videoitem.server = findS[2]
-                videoitem.title = findS[0]
+                videoitem.title= findS[0]
                 videoitem.url = findS[1]
                 srv_param = servertools.get_server_parameters(videoitem.server.lower())
             else:
                 videoitem.server = videoitem.server.lower()
 
         if videoitem.video_urls or srv_param.get('active', False):
-            # dbg()
-            item.title = item.contentTitle.strip() if item.contentType == 'movie' and item.contentTitle or (config.get_localized_string(30161) in item.fulltitle) else item.fulltitle
-            # videoitem = item.clone()
             quality = videoitem.quality if videoitem.quality else item.quality if item.quality else ''
             videoitem.contentLanguage = videoitem.contentLanguage if videoitem.contentLanguage else item.contentLanguage if item.contentLanguage else 'ITA'
-            videoitem.title = item.title
+            videoitem.serverName = videoitem.title if videoitem.server == 'directo' else servertools.get_server_parameters(videoitem.server).get('name', videoitem.server.capitalize())
+            videoitem.title = item.contentTitle.strip() if item.contentType == 'movie' and item.contentTitle or (config.get_localized_string(30161) in item.fulltitle) else item.fulltitle
             videoitem.plot = typo(videoitem.title, 'bold') + (typo(quality, '_ [] bold') if quality else '')
             videoitem.channel = item.channel
             videoitem.fulltitle = item.fulltitle
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 21c2b260..81261cd2 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -378,7 +378,7 @@ def render_items(itemlist, parent_item):
             if item.title2: title = '{} - {}'.format(title, item.title2)
 
             if config.get_setting('format_title'):
-                server = typo(servertools.get_server_parameters(item.server).get('name', item.server.capitalize()), '_ []') if item.server else ''
+                server = typo(item.serverName, '_ []') if item.server else ''
                 quality = typo(item.quality, '_ [] color kod') if item.quality else ''
                 lang = typo(item.contentLanguage, '_ [] color kod') if item.contentLanguage else ''
                 extra = typo(item.extraInfo, '_ [] color kod') if item.extraInfo else ''