diff --git a/lib/javascript/html5_player.js b/lib/javascript/html5_player.js
index 15415f4e..05ed348b 100644
--- a/lib/javascript/html5_player.js
+++ b/lib/javascript/html5_player.js
@@ -122,23 +122,20 @@ function ended(event)
 }
 function search(event)
 {
-    var search = new RegExp(".*" + $('#input_search').text() + ".*", "i");
-    for(var item = $('#playlist'); item; item = item.next())
-    {
-        if(!search.test(item.textContent != undefined ? item.textContent : item.innerText))
-        {
-            item.hide();
+    var search = new RegExp(".*" + $('#input_search').val() + ".*", "i");
+    $.each(playlist_items, function (index, item) {
+        if (!search.test(item.title)) {
+            item.element.hide();
         }
-        else
-        {
-            item.show();
-        }
-    }
+        else {
+            item.element.show();
+        }
+    });
 }
 function clear_search(event)
 {
-    $('#input_search').text('');
-    search(event);
+    $('#input_search').val('');
+    //search(event);
 }
 
 $(document).ready(function() {