diff --git a/deluge/ui/webui/json_api.py b/deluge/ui/webui/json_api.py
index c023108b0..84e48d3d3 100644
--- a/deluge/ui/webui/json_api.py
+++ b/deluge/ui/webui/json_api.py
@@ -81,12 +81,9 @@ class json_rpc:
     * methods : http://dev.deluge-torrent.org/wiki/Development/UiClient#Remoteapi
     """
     #extra exposed methods
-    json_exposed = ["update_ui","get_stats","set_torrent_options","system_listMethods",
+    json_exposed = ["update_ui","get_stats","system_listMethods",
         "get_webui_config","set_webui_config","get_webui_templates"]
     cache = {}
-    torrent_options = ["trackers","max_connections","max_upload_slots","max_upload_speed",
-    "max_download_speed","file_priorities","prioritize_first_last","auto_managed","stop_at_ratio",
-    "stop_ratio","remove_at_ratio"]
 
     def GET(self):
         return json_error("only POST is supported")
@@ -144,8 +141,8 @@ class json_rpc:
 
     def get_stats(self):
         """
+        todo: move to core.
         returns:
-        {{{
         {
         'download_rate':float(),
         'upload_rate':float(),
@@ -155,7 +152,6 @@ class json_rpc:
         'max_num_connections':int(),
         'dht_nodes',int()
         }
-        }}}
         """
         stats = {}
 
@@ -180,58 +176,25 @@ class json_rpc:
         Goal : limit the number of ajax calls
 
         input:
-        {{{
-            keys: see get_torrent_status
-            filter_dict: see label_get_filtered_ids # only effective if the label plugin is enabled.
+            keys: see get_torrents_status
+            filter_dict: see get_torrents_status
             cache_id: # todo
-        }}}
         returns:
-        {{{
         {
             "torrents": see get_torrent_status
-            "filters": see label_get_filters
+            "filters": see get_filter_tree
             "stats": see get_stats
             "cache_id":int # todo
         }
-        }}}
         """
-        if 'Label' in sclient.get_enabled_plugins():
-            torrent_ids =  sclient.label_get_filtered_ids(filter_dict)
-            filters = sclient.label_filter_items()
-        else:
-            torrent_ids =  sclient.get_session_state()
-            filters = {"state":[["All",-1]],"tracker":[],"label":[]}
-
+        filters = sclient.get_filter_tree()
         return {
-            "torrents":sclient.get_torrents_status({"id":torrent_ids}, keys),
+            "torrents":sclient.get_torrents_status(filter_dict , keys),
             "filters":filters,
             "stats":self.get_stats(),
             "cache_id":-1
         }
 
-    def set_torrent_options(self, torrent_id, options_dict):
-        """
-        Composite call.
-        Goal: limit the number of ajax calls
-
-        input:
-        {{{
-            torrent_id: the id of the torrent who's options are to be changed
-            options_dict: a dictionary inwhich the options to be changed are contained
-        }}}
-        """
-
-        for option in options_dict:
-            if option in self.torrent_options:
-                value = options_dict[option]
-                if type(value) == str:
-                    try:
-                        value = float(value)
-                    except:
-                        pass
-                func = getattr(sclient, 'set_torrent_' + option)
-                func(torrent_id, value)
-
     def get_webui_config(self):
         return dict([x for x in utils.config.get_config().iteritems() if not x[0].startswith("pwd")])
 
diff --git a/deluge/ui/webui/pages.py b/deluge/ui/webui/pages.py
index bd8ba584d..1652ae048 100644
--- a/deluge/ui/webui/pages.py
+++ b/deluge/ui/webui/pages.py
@@ -106,19 +106,15 @@ class index:
 
         #organize-filters
         label_filters = {}
-        #disable label plugin for now..
-        if False and 'label' in [pl.lower() for pl in proxy.get_enabled_plugins()]:
-            filter_dict = {}
-            if vars.filter_cat and vars.filter_value and vars.filter_value <> "All":
-                filter_dict = {vars.filter_cat:vars.filter_value}
 
-            torrent_ids =  proxy.label_get_filtered_ids(filter_dict)
-            label_filters = proxy.label_filter_items()
+        filter_dict = {}
+        if vars.filter_cat and vars.filter_value and vars.filter_value <> "All":
+            filter_dict = {vars.filter_cat:vars.filter_value}
 
-        else:
-            torrent_ids =  proxy.get_session_state()
+        torrents =  proxy.get_torrents_status(filter_dict, TORRENT_KEYS)
+        label_filters = proxy.get_filter_tree()
 
-        torrent_list = utils.get_enhanced_torrent_list(torrent_ids)
+        torrent_list = utils.get_enhanced_torrent_list(torrents)
 
         #sorting:
         if vars.sort:
diff --git a/deluge/ui/webui/templates/white/part_torrent_list.html b/deluge/ui/webui/templates/white/part_torrent_list.html
index 4df6e3583..aac5320bc 100644
--- a/deluge/ui/webui/templates/white/part_torrent_list.html
+++ b/deluge/ui/webui/templates/white/part_torrent_list.html
@@ -23,14 +23,11 @@ document.onkeydown = torrent_table.keydown;
         $:(sort_head('name', _('Name')))
         $:(sort_head('total_size', _('Size')))
         $:(sort_head('progress', _('Progress')))
-
-        $if label_filters:
-            <!--HACK:
-            abusing label_filters to check if the Orgnize plugin is enabled
-            -->
-            $:(sort_head('label', _('Label')))
-            $:(sort_head('tracker_host', _('Tracker')))
-
+        <!--
+        $#if label_filters:
+        $#:(sort_head('label', _('Label')))
+        -->
+        $:(sort_head('tracker_host', _('Tracker')))
         $:(sort_head('num_seeds', _('Seeders')))
         $:(sort_head('num_peers', _('Peers')))
         $:(sort_head('download_payload_rate', _('Download')))
@@ -69,9 +66,11 @@ $for torrent in torrent_list:
             </div>
         </div>
     </td>
-    $if label_filters:
-        <td>$torrent.label</td>
-        <td>$torrent.tracker_host</td>
+    <!--
+    $#if label_filters:
+        <td>$#torrent.label</td>
+    -->
+    <td>$torrent.tracker_host</td>
     <td>
     $if torrent.total_seeds != -1:
         $torrent.num_seeds ($torrent.total_seeds)
diff --git a/deluge/ui/webui/utils.py b/deluge/ui/webui/utils.py
index 5b2673421..a38f25490 100644
--- a/deluge/ui/webui/utils.py
+++ b/deluge/ui/webui/utils.py
@@ -133,7 +133,7 @@ def get_stats():
 
     return stats
 
-def enhance_torrent_status(torrent_id,status):
+def enhance_torrent_status(torrent_id, status):
     """
     in: raw torrent_status
     out: enhanced torrent_staus
@@ -162,13 +162,12 @@ def get_torrent_status(torrent_id):
     status = sclient.get_torrent_status(torrent_id,TORRENT_KEYS)
     return enhance_torrent_status(torrent_id, status)
 
-def get_enhanced_torrent_list(torrent_ids):
+def get_enhanced_torrent_list(torrents):
     """
     returns a list of storified-torrent-dicts.
     """
-    torrent_dict = sclient.get_torrents_status({"id":torrent_ids}, TORRENT_KEYS)
     return [enhance_torrent_status(id, status)
-            for id, status in torrent_dict.iteritems()]
+            for id, status in torrents.iteritems()]
 
 def get_newforms_data(form_class):
     """