diff --git a/deluge/ui/webui/templates/advanced/part_categories.html b/deluge/ui/webui/templates/advanced/part_categories.html
index 611dd03cf..a0cdfc12e 100644
--- a/deluge/ui/webui/templates/advanced/part_categories.html
+++ b/deluge/ui/webui/templates/advanced/part_categories.html
@@ -15,7 +15,9 @@ $for state, num in filters.state:
 </select>
 <select name='tracker' id='tracker'
     onchange="document.getElementById('category_form').submit()"
-    title="$_('Filter on Tracker')">
+    title="$_('Filter on Tracker')"
+    style="width:150px"
+    >
 <option value="">$_('Trackers')</option>
 $for tracker, num in filters.tracker:
     <option value="$tracker"
@@ -26,10 +28,14 @@ $for tracker, num in filters.tracker:
     </option>
 </select>
 
-    <input type="image" id='toolbar_refresh'
-    src='/static/images/tango/view-refresh.png'
-    title='$_('Refresh')'
-    >
+<input type="text" name="keyword" value="$get('keyword')" style="width:150px"
+title="$_('Filter on a keyword')"
+/>
+
+<input type="image" id='toolbar_refresh' name="refresh_organize"
+src='/static/images/tango/view-refresh.png'
+title='$_('Refresh')'
+>
 
 </form>
 
diff --git a/deluge/ui/webui/templates/deluge/index.html b/deluge/ui/webui/templates/deluge/index.html
index 5dd658574..1d512e98b 100644
--- a/deluge/ui/webui/templates/deluge/index.html
+++ b/deluge/ui/webui/templates/deluge/index.html
@@ -1,4 +1,4 @@
-$def with (torrent_list, all_torrents)
+$def with (torrent_list, organize_filter)
 $:render.header(_('Torrent list'))
 
 <table class="torrent_list" border=0 id='torrent_table'>
diff --git a/deluge/ui/webui/templates/deluge/sort_column_head.html b/deluge/ui/webui/templates/deluge/sort_column_head.html
index d354a6c4f..6712cb9b9 100644
--- a/deluge/ui/webui/templates/deluge/sort_column_head.html
+++ b/deluge/ui/webui/templates/deluge/sort_column_head.html
@@ -1,6 +1,6 @@
 $def with (column_id, column_name, order, active_up, active_down)
 <th class="torrent_table">
-<a href="/index?sort=$column_id&order=$order&filter=$get('filter')&category=$get('category')">
+<a href="/index?sort=$column_id&order=$order&state=$get('state')&tracker=$get('tracker')&keyword=$get('keyword')"">
 $column_name\
 $if active_up:
     <img src="/static/images/tango/up.png" />