diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js
index 6154029df7..faff46b780 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js
@@ -36,7 +36,7 @@ function getUserEvents(user, range)
 		var site = availableSites[j];
 		if (site.isMember(user))
 		{
-			paths.push("PATH:\"/cm:sites/cm:" + site.shortName + "/cm:calendar/*\"");
+			paths.push("PATH:\"/app:company_home/st:sites/cm:" + site.shortName + "/cm:calendar/*\"");
 		}
 	}
 	
@@ -52,7 +52,7 @@ function getUserEvents(user, range)
 			var dateClause = " +@ia\\:fromDate:[" + from + "T00:00:00 TO 2032\\-1\\-1T00:00:00]";
 			luceneQuery += dateClause;
 		}
-		results = search.luceneSearch("workspace://SiteStore", luceneQuery, "ia:fromDate", true);
+		results = search.luceneSearch(luceneQuery, "ia:fromDate", true);
 	}
 
 	return results;
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
index 5d991ed17f..33a4fe8a67 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
@@ -34,7 +34,7 @@ function getWikiPages(siteId)
    }
    
    var pages = [];
-   var wikiPages = search.luceneSearch("workspace://SiteStore", query);
+   var wikiPages = search.luceneSearch(query);
    
    var page;
    for (var i=0; i < wikiPages.length; i++)