diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 0b0a375..6fec693 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -5,9 +5,11 @@
 var NAV_PREF_TREE = "tree";
 var NAV_PREF_PANELS = "panels";
 var nav_pref;
-var toRoot;
 var isMobile = false; // true if mobile, so we can adjust some layout
 
+var basePath = getBaseUri(location.pathname);
+var SITE_ROOT = toRoot + basePath.substring(1,basePath.indexOf("/",1));
+  
 
 /******  ON LOAD SET UP STUFF *********/
 
@@ -30,7 +32,7 @@
   
   // set search's onkeyup handler here so we can show suggestions 
   // even while search results are visible
-  $("#search_autocomplete").keyup(function() {return search_changed(event, false, '/')});
+  $("#search_autocomplete").keyup(function() {return search_changed(event, false, toRoot)});
 
   // set up the search close button
   $('.search .close').click(function() {
@@ -526,11 +528,6 @@
   prettyPrint();
 } );
 
-function setToRoot(root) {
-  toRoot = root;
-  // note: toRoot also used by carousel.js
-}
-
 function init() {
   //resizeNav();
 
diff --git a/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js b/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
index 1838ccb..6b1e525 100644
--- a/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
+++ b/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
@@ -473,7 +473,7 @@
 
       // forcefully regain key-up event control (previously jacked by search api)
       $("#search_autocomplete").keyup(function(event) {
-        return search_changed(event, false, '/');
+        return search_changed(event, false, toRoot);
       });
 
       // add event listeners to each tab so we can track the browser history