diff --git a/search-extension.js b/search-extension.js
index 2e9647a..fab17c3 100644
--- a/search-extension.js
+++ b/search-extension.js
@@ -7,11 +7,13 @@ chrome.omnibox.onInputChanged.addListener(function(text, suggest) {
 });
 
 function navigate(url) {
-  chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
-    chrome.tabs.update(tabs[0].id, {url: url});
-  });
+    chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
+        chrome.tabs.update(tabs[0].id, {url: url});
+    });
 }
 
 chrome.omnibox.onInputEntered.addListener(function(text) {
-    navigate("https://zenplayer.audio?v=" + encodeURIComponent(text) )
+    // TODO: lame hack, assume we're doing real search if we find a space
+    var param = text.indexOf(" ") ? "q=" : "v=";
+    navigate("https://zenplayer.audio?" + param + encodeURIComponent(text));
 });
\ No newline at end of file