diff -Nru unity-scope-piratebay-0.1/debian/bzr-builder.manifest unity-scope-piratebay-0.1/debian/bzr-builder.manifest
--- unity-scope-piratebay-0.1/debian/bzr-builder.manifest	2012-08-01 09:48:05.000000000 +0000
+++ unity-scope-piratebay-0.1/debian/bzr-builder.manifest	2012-10-27 16:40:52.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~29
-lp:~davidc3/onehundredscopes/piratebay-precise revid:davidc@framli.eu-20120801094652-t3freo2t1jzwv75q
+# bzr-builder format 0.3 deb-version {debupstream}-0~30
+lp:~davidc3/onehundredscopes/piratebay-precise revid:davidc@framli.eu-20121027163226-a9360mkrb1imjndu
diff -Nru unity-scope-piratebay-0.1/debian/changelog unity-scope-piratebay-0.1/debian/changelog
--- unity-scope-piratebay-0.1/debian/changelog	2012-08-01 09:48:05.000000000 +0000
+++ unity-scope-piratebay-0.1/debian/changelog	2012-10-27 16:40:52.000000000 +0000
@@ -1,8 +1,8 @@
-unity-scope-piratebay (0.1-0~29~precise1) precise; urgency=low
+unity-scope-piratebay (0.1-0~30~precise1) precise; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Wed, 01 Aug 2012 09:48:05 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Sat, 27 Oct 2012 16:40:52 +0000
 
 unity-scope-piratebay (0.1) oneiric; urgency=low
 
diff -Nru unity-scope-piratebay-0.1/src/unity-scope-piratebay unity-scope-piratebay-0.1/src/unity-scope-piratebay
--- unity-scope-piratebay-0.1/src/unity-scope-piratebay	2012-08-01 09:48:04.000000000 +0000
+++ unity-scope-piratebay-0.1/src/unity-scope-piratebay	2012-10-27 16:40:51.000000000 +0000
@@ -31,10 +31,15 @@
         self.scope.connect ("search-changed", self.on_search_changed)
         self.scope.connect ("filters-changed", lambda scope : self.scope.queue_search_changed(Unity.SearchType.DEFAULT))
         self.scope.connect ("activate-uri", self.on_activate_uri);
-        self.uri_bases = ['https://tpb.pirateparty.org.uk','https://thepiratebay.se','https://tpb.ipredator.se','https://piratereverse.info']
+        self.uri_bases = ['https://piratereverse.info','https://tpb.ipredator.se','https://thepiratebay.se','https://tpb.pirateparty.org.uk']
         self.uri_pointer = 0
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self._on_preference_changed)
         self.scope.export()
     
+    def _on_preference_changed (self, *_):
+        self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
+    
     def on_activate_uri (self, scope, uri):
         if uri.startswith("more"):
             results = self.scope.props.results_model
@@ -48,21 +53,19 @@
             GLib.spawn_command_line_async('gvfs-open %s' % uri)
             return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH, goto_uri='')
 
-    def on_search_changed (self, scope, search=None, search_type=0, cancellable=None):
-        if search:
-            search_string = search.props.search_string
-        else:
-            search_string = None
+    def on_search_changed (self, scope, search, search_type, *_):
+        results = self.scope.props.results_model
+        results.clear()
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            search.finished()
+            return
+        search_string = search.props.search_string.strip ()
         if search_type == Unity.SearchType.DEFAULT:
-            results = self.scope.props.results_model
-            results.clear()
             self.update_results_model (search_string, results, 0)
             results.flush_revision_queue ()
         else:
             print "Global search : hide"
-        
-        if search:
-            search.finished()
+        search.finished()
 
     def update_results_model(self, search, model, page):
         try: