diff --git a/_config/config.yml b/_config/config.yml
index 32fd984..2ce2f7f 100755
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -6,7 +6,7 @@ Before:
 SilverStripe\Control\Controller:
   extensions:
     - PlasticStudio\Search\SearchControllerExtension
-PlasticStudio\Search\SearchPageController:
+# PlasticStudio\Search\SearchPageController:
   # types:
   #   docs:
   #     Label: 'Documents'
diff --git a/src/SearchPage.php b/src/SearchPage.php
index 44d4908..ccef5db 100755
--- a/src/SearchPage.php
+++ b/src/SearchPage.php
@@ -3,6 +3,7 @@
 namespace PlasticStudio\Search;
 
 use Page;
+use SilverStripe\ORM\DB;
 
 class SearchPage extends Page {
 	private static $description = "Search engine and results page. You only need one of these page types.";
diff --git a/src/SearchPageController.php b/src/SearchPageController.php
index 6ef1c50..800ae76 100755
--- a/src/SearchPageController.php
+++ b/src/SearchPageController.php
@@ -23,11 +23,11 @@ class SearchPageController extends PageController {
 	public function index($request){
 		
 		if (Director::isLive()){
-			Requirements::css('/resources/plasticstudio/search/client/Search.min.css');
-			Requirements::javascript('/resources/plasticstudio/search/client/Search.min.js');
+			Requirements::css('plasticstudio/search:client/Search.min.css');
+			Requirements::javascript('plasticstudio/search:client/Search.min.js');
 		} else {
-			Requirements::css('/resources/plasticstudio/search/client/Search.css');
-			Requirements::javascript('/resources/plasticstudio/search/client/Search.js');
+			Requirements::css('plasticstudio/search:client/Search.css');
+			Requirements::javascript('plasticstudio/search:client/Search.js');
 		}
 		
 		// get the parameters and variables of this request (ie the query and filters)
diff --git a/templates/Jaedb/Search/Layout/SearchPage.ss b/templates/PlasticStudio/Search/Layout/SearchPage.ss
old mode 100755
new mode 100644
similarity index 99%
rename from templates/Jaedb/Search/Layout/SearchPage.ss
rename to templates/PlasticStudio/Search/Layout/SearchPage.ss
index e596c04..426d767
--- a/templates/Jaedb/Search/Layout/SearchPage.ss
+++ b/templates/PlasticStudio/Search/Layout/SearchPage.ss
@@ -1,4 +1,3 @@
-
 <div class="search-results-page">
 
 	$AdvancedSearchForm