diff --git a/specials/url.py b/specials/url.py
index 368d1400..58a6576f 100644
--- a/specials/url.py
+++ b/specials/url.py
@@ -3,16 +3,16 @@
 from core import servertools
 from core.support import match, info, server
 from core.item import Item
-from platformcode import config, logger
+from platformcode import config, logger, platformtools
 
 
 def mainlist(item):
     info()
 
     itemlist = []
-    itemlist.append(Item(channel=item.channel, action="search", title=config.get_localized_string(60089), thumbnail=item.thumbnail, args='server'))
-    itemlist.append(Item(channel=item.channel, action="search", title=config.get_localized_string(60090), thumbnail=item.thumbnail, args='direct'))
-    itemlist.append(Item(channel=item.channel, action="search", title=config.get_localized_string(60091), thumbnail=item.thumbnail))
+    itemlist.append(Item(channel=item.channel, action="search", title=config.get_localized_string(60089), thumbnail=item.thumbnail, args='server', folder=False))
+    itemlist.append(Item(channel=item.channel, action="search", title=config.get_localized_string(60090), thumbnail=item.thumbnail, args='direct', folder=False))
+    itemlist.append(Item(channel=item.channel, action="search", title=config.get_localized_string(60091), thumbnail=item.thumbnail, folder=False))
 
     return itemlist
 
@@ -33,12 +33,15 @@ def search(item, text):
         itemlist = server(item, itemlist=itemlist)
     else:
         data = match(text).data
-        itemlist = servertools.find_video_items(data=data)
+        itemlist = server(item, data=data)
         for item in itemlist:
             item.channel = "url"
             item.action = "play"
 
-    if len(itemlist) == 0:
-        itemlist.append(Item(channel=item.channel, action="search", title=config.get_localized_string(60093)))
-
-    return itemlist
+    if itemlist:
+        if len(itemlist) == 1:
+            from platformcode.launcher import play
+            play(itemlist[0].clone(no_return=True))
+        platformtools.serverWindow(item, itemlist)
+    else:
+        platformtools.dialog_notification(config.get_localized_string(20000), config.get_localized_string(60347))