diff --git a/server/djrandom/frontend/static/player.js b/server/djrandom/frontend/static/player.js
index dc565255dcede502320863b132a9aa5fca9f9a99..f49c930703c77cd31600973c6aa7605c7f1414aa 100644
--- a/server/djrandom/frontend/static/player.js
+++ b/server/djrandom/frontend/static/player.js
@@ -250,7 +250,7 @@ djr.state = {
 djr.init = function (userid) {
   djr.state.userid = userid;
   djr.state.backend = new djr.Backend(userid);
-  djr.state.player = new Player(djr.state.backend, '#djr_player');
+  djr.state.player = new djr.Player(djr.state.backend, '#djr_player');
 };
 
 // Export the player for quick onclick access
diff --git a/server/djrandom/frontend/templates/index.html b/server/djrandom/frontend/templates/index.html
index 32cf04315eeddc1e0932811667ca82ab78ccb1e1..d2d5b21cd8bd0cd124798a0712d5c8b0d07a871d 100644
--- a/server/djrandom/frontend/templates/index.html
+++ b/server/djrandom/frontend/templates/index.html
@@ -16,7 +16,8 @@ do_autocomplete = function(request, response) {
 };
 
 do_search = function() {
-  djr.doSearch($('#queryField').val());
+  var player = djr.player();
+  player.search($('#queryField').val());
   return false;
 };
 
@@ -25,7 +26,7 @@ $(document).ready(function() {
     source: do_autocomplete,
     autoFocus: true,
     delay: 200,
-    minLength: 3,
+    minLength: 1,
     });
   $('#queryField').focus();
   $('#searchForm').submit(do_search);
@@ -84,7 +85,7 @@ DJ:Random
     </p>
   </form>
 
-  <div id="resultsDiv">
+  <div id="playlistDiv">
   </div>
 </div>