diff --git a/servers/clipwatching.json b/servers/clipwatching.json
index 8352dcf2..c30208df 100644
--- a/servers/clipwatching.json
+++ b/servers/clipwatching.json
@@ -4,8 +4,8 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "clipwatching.com/(?:embed-)?([a-zA-Z0-9]+).html",
-        "url": "http://clipwatching.com/embed-\\1.html"
+        "pattern": "clipwatching.com/((?:embed-)?[a-zA-Z0-9./_-]+).html",
+        "url": "http://clipwatching.com/\\1.html"
       }
     ]
   },
diff --git a/servers/clipwatching.py b/servers/clipwatching.py
index e3330c8a..03abba2d 100644
--- a/servers/clipwatching.py
+++ b/servers/clipwatching.py
@@ -30,4 +30,5 @@ def get_video_url(page_url, user="", password="", video_password=""):
         logger.info(label)
         if ".jpg" not in video:
             video_urls.append(['%s [%sp] [ClipWatching]' % (Type, label), video])
+    video_urls.sort(key=lambda x: x[0].split()[1])
     return video_urls
diff --git a/servers/onlystream.py b/servers/onlystream.py
index d775237b..93d777b8 100644
--- a/servers/onlystream.py
+++ b/servers/onlystream.py
@@ -26,4 +26,5 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     for url, quality in sources:
         quality = 'auto' if not quality else quality
         video_urls.append(['.' + url.split('.')[-1] + ' [' + quality + '] [Onlystream]', url])
+    video_urls.sort(key=lambda x: x[0].split()[1])
     return video_urls