diff --git a/templates/grid_base.mako b/templates/grid_base.mako
index ce4b4f11e77..d80b2674575 100644
--- a/templates/grid_base.mako
+++ b/templates/grid_base.mako
@@ -41,637 +41,563 @@
 </%def>
 
 <%def name="grid_javascripts()">
-   ${h.js("jquery.autocomplete", "autocomplete_tagging" )}
-   <script type="text/javascript">        
-       ## TODO: generalize and move into galaxy.base.js
-       $(document).ready(function() {
-           init_grid_elements();
-           init_grid_controls();
-           
-           // Initalize filter elements.
-           $('input[type=text]').each( function() 
-           {
-               $(this).click( function() { $(this).attr('value', '') } );
-           });
-       });
-       ## Can this be moved into base.mako?
-       %if refresh_frames:
-           %if 'masthead' in refresh_frames:            
-               ## Refresh masthead == user changes (backward compatibility)
-               if ( parent.user_changed ) {
-                   %if trans.user:
-                       parent.user_changed( "${trans.user.email}", ${int( app.config.is_admin_user( trans.user ) )} );
-                   %else:
-                       parent.user_changed( null, false );
-                   %endif
-               }
-           %endif
-           %if 'history' in refresh_frames:
-               if ( parent.frames && parent.frames.galaxy_history ) {
-                   parent.frames.galaxy_history.location.href="${h.url_for( controller='root', action='history')}";
-                   if ( parent.force_right_panel ) {
-                       parent.force_right_panel( 'show' );
-                   }
-               }
-           %endif
-           %if 'tools' in refresh_frames:
-               if ( parent.frames && parent.frames.galaxy_tools ) {
-                   parent.frames.galaxy_tools.location.href="${h.url_for( controller='root', action='tool_menu')}";
-                   if ( parent.force_left_panel ) {
-                       parent.force_left_panel( 'show' );
-                   }
-               }
-           %endif
-       %endif
-       
-       //
-       // Code to handle grid operations: filtering, sorting, paging, and operations.
-       //
-       
-       // Operations that are async (AJAX) compatible.
-       var async_ops = new Object();
-       %for operation in grid.operations:
-           %if operation.async_compatible:
-               async_ops['${operation.label.lower()}'] = "True";
-           %endif
-       %endfor
-       
-       // Initialize grid controls
-       function init_grid_controls()
-       {
-           
-           // Initialize operation buttons.
-           $('input[name=operation]:submit').each(function() {
-               $(this).click( function() {
-                  // Get operation name.
-                  var operation_name = $(this).attr("value");
-
-                  // For some reason, $('input[name=id]:checked').val() does not return all ids for checked boxes.
-                  // The code below performs this function.
-                  var item_ids = new Array()
-                  $('input[name=id]:checked').each(function() {
-                      item_ids[item_ids.length] = $(this).val();
-                  });
-                  do_operation(operation_name, item_ids); 
-               });
-           });
-           
-           // Initialize submit image elements.
-           $('.submit-image').each( function() 
-           {
-               // On mousedown, add class to simulate click.
-               $(this).mousedown( function() {
-                  $(this).addClass('gray-background'); 
-               });
-               
-               // On mouseup, add class to simulate click.
-               $(this).mouseup( function() {
-                  $(this).removeClass('gray-background'); 
-               });
-               
-           });
-           
-           // Initialize sort links.
-           $('.sort-link').each( function() 
-           {
-               var sort_key = $(this).attr('sort_key');
-               $(this).click( function() {
-                  set_sort_condition(sort_key);
-                  return false; 
-               });
-               
-           });
-           
-           // Initialize page links.
-           $('.page-link > a').each( function() 
-           {
-               var page_num = $(this).attr('page_num');
-               $(this).click( function() {
-                  set_page(page_num);
-                  return false; 
-               });
-               
-           });
-           $('#show-all-link').click( function() {
-               set_page('all');
-               return false;
-           });
-           
-           // Initialize categorical filters.
-           $('.categorical-filter > a').each( function() 
-           {
-               $(this).click( function() {
-                   var filter_key = $(this).attr('filter_key');
-                   var filter_val = $(this).attr('filter_val');
-                   set_categorical_filter(filter_key, filter_val);
-                   return false;
-               });
-           });
-           
-           // Initialize text filters.
-           $('.text-filter-form').each( function() 
-           {
-               $(this).submit( function() {
-                   var column_key = $(this).attr('column_key');
-                   var text_input_obj = $('#input-' + column_key + '-filter');
-                   var text_input = text_input_obj.val();
-                   text_input_obj.val('');
-                   add_filter_condition(column_key, text_input, true);
-                   return false;
-               });                
-           });
-                                       
-           // Initialize autocomplete for text inputs in search UI.
-           var t = $("#input-tags-filter");
-           if (t.length)
-           {
-                       
-               var autocomplete_options = 
-                   { selectFirst: false, autoFill: false, highlight: false, mustMatch: false };
-
-               t.autocomplete("${h.url_for( controller='tag', action='tag_autocomplete_data', item_class='History' )}", autocomplete_options);
-           }      
-           
-           var t2 = $("#input-name-filter");
-           if (t2.length)
-           {
-               var autocomplete_options = 
-                   { selectFirst: false, autoFill: false, highlight: false, mustMatch: false };
-
-               t2.autocomplete("${h.url_for( controller='history', action='name_autocomplete_data' )}", autocomplete_options);
-           }
-           
-           // Initialize advanced search toggles.
-           $('.advanced-search-toggle').each( function() 
-           {
-               $(this).click( function() {
-                  $('#more-search-options').slideToggle('fast');
-                  return false;
-               });
-           });
-       }
-
-       // Initialize grid elements.
-       function init_grid_elements() 
-       {
-           // Initialize grid selection checkboxes.
-           $(".grid").each( function() {
-               var grid = this;
-               var checkboxes = $(this).find("input.grid-row-select-checkbox");
-               var update = $(this).find( "span.grid-selected-count" );
-               update.text("");
-               $(checkboxes).each( function() {
-                   $(this).change( function() {
-                       var n = $(checkboxes).filter("[checked]").size();
-                       update.text( n );
+    ${h.js("jquery.autocomplete", "autocomplete_tagging" )}
+    <script type="text/javascript">        
+        ## TODO: generalize and move into galaxy.base.js
+        $(document).ready(function() {
+            init_grid_elements();
+            init_grid_controls();
+            
+            // Initialize filter elements.
+            $('input[type=text]').each( function() {
+                $(this).click( function() { $(this).attr('value', ''); } );
+            });
+        });
+        ## Can this be moved into base.mako?
+        %if refresh_frames:
+            %if 'masthead' in refresh_frames:            
+                ## Refresh masthead == user changes (backward compatibility)
+                if ( parent.user_changed ) {
+                    %if trans.user:
+                        parent.user_changed( "${trans.user.email}", ${int( app.config.is_admin_user( trans.user ) )} );
+                    %else:
+                        parent.user_changed( null, false );
+                    %endif
+                }
+            %endif
+            %if 'history' in refresh_frames:
+                if ( parent.frames && parent.frames.galaxy_history ) {
+                    parent.frames.galaxy_history.location.href="${h.url_for( controller='root', action='history')}";
+                    if ( parent.force_right_panel ) {
+                        parent.force_right_panel( 'show' );
+                    }
+                }
+            %endif
+            %if 'tools' in refresh_frames:
+                if ( parent.frames && parent.frames.galaxy_tools ) {
+                    parent.frames.galaxy_tools.location.href="${h.url_for( controller='root', action='tool_menu')}";
+                    if ( parent.force_left_panel ) {
+                        parent.force_left_panel( 'show' );
+                    }
+                }
+            %endif
+        %endif
+        
+        //
+        // Code to handle grid operations: filtering, sorting, paging, and operations.
+        //
+        
+        // Operations that are async (AJAX) compatible.
+        var async_ops = {};
+        %for operation in grid.operations:
+            %if operation.async_compatible:
+                async_ops['${operation.label.lower()}'] = "True";
+            %endif
+        %endfor
+        
+        // Initialize grid controls
+        function init_grid_controls() {
+            // Initialize operation buttons.
+            $('input[name=operation]:submit').each(function() {
+                $(this).click( function() {
+                   // Get operation name.
+                   var operation_name = $(this).attr("value");
+ 
+                   // For some reason, $('input[name=id]:checked').val() does not return all ids for checked boxes.
+                   // The code below performs this function.
+                   var item_ids = [];
+                   $('input[name=id]:checked').each(function() {
+                       item_ids[item_ids.length] = $(this).val();
                    });
-               })
-           });
-           
-           // Initialize item labels.
-           $(".label").each( function() {
-               // If href has an operation in it, do operation when clicked. Otherwise do nothing.
-               var href = $(this).attr('href');
-               if ( href.indexOf('operation=') != -1 )
-               {
-                   $(this).click( function() {
-                       do_operation_from_href( $(this).attr('href') );
-                       return false;
-                   });   
-               }
-           });
-           
-           // Initialize item menu operations.
-           make_popup_menus();
-       }
-       
-       // Filter values for categorical filters.
-       var categorical_filters = new Object();
-       %for column in grid.columns:
-           %if column.filterable is not None and not isinstance( column, TextColumn ):
-               var ${column.key}_filters =
-               {
-               %for i, filter in enumerate( column.get_accepted_filters() ):
-                   %if i > 0:
-                       ,
-                   %endif
-                   ${filter.label} : ${h.to_json_string( filter.args )}
-               %endfor
-               };
-               categorical_filters['${column.key}'] = ${column.key}_filters;
-           %endif
-       %endfor
-           
-       // Initialize URL args with filter arguments.
-       var url_args = ${h.to_json_string( cur_filter_dict )};
-       
-       // Place "f-" in front of all filter arguments.
-       var arg;
-       for (arg in url_args)
-       {
-           value = url_args[arg];
-           delete url_args[arg];
-           url_args["f-" + arg] = value;
-       }
-       
-       // Add sort argument to URL args.
-       url_args['sort'] = "${encoded_sort_key}";
-       
-       // Add async keyword to URL args.
-       url_args['async'] = true;
-       
-       // Add page to URL args.
-       url_args['page'] = ${cur_page_num};
-       
-       var num_pages = ${num_pages};
-       
-       // Go back to page one; this is useful when a filter is applied.
-       function go_page_one() 
-       {
-           // Need to go back to page 1 if not showing all.
-           var cur_page = url_args['page'];
-           if (cur_page != null && cur_page != undefined && cur_page != 'all')
-               url_args['page'] = 1;
-       }
-       
-       // Add tag to grid filter.
-       function add_tag_to_grid_filter(tag_name, tag_value)
-       {
-           // Put tag name and value together.
-           var tag = tag_name + (tag_value != null && tag_value != "" ? ":" + tag_value : "");
-           $('#more-search-options').show('fast');
-           add_filter_condition("tags", tag, true);         
-       }
-       
-       // Add a condition to the grid filter; this adds the condition and refreshes the grid.
-       function add_filter_condition(name, value, append)
-       {
-           // Do nothing is value is empty.
-           if (value == "")
-               return false;
-           
-           // Update URL arg with new condition.            
-           if (append)
-           {
-               // Update or append value.
-               var cur_val = url_args["f-" + name];
-               var new_val;
-               if (cur_val == null || cur_val == undefined)
-               {
-                   new_val = value;
-               }
-               else if (typeof(cur_val) == "string")
-               {
-                   if (cur_val == "All")
-                       new_val = value;
-                   else
-                   {
-                       // Replace string with array.
-                       var values = new Array();
-                       values[0] = cur_val;
-                       values[1] = value;
-                       new_val = values;   
-                   }
-               }
-               else {
-                   // Current value is an array.
-                   new_val = cur_val;
-                   new_val[new_val.length] = value;
-               }
-               url_args["f-" + name] = new_val;
-           }
-           else
-           {
-               // Replace value.
-               url_args["f-" + name] = value;
-           }
-           
-           // Add button that displays filter and provides a button to delete it.
-           var t = $("<span>" + value +
-                     "&nbsp;<a href='#'><img src='${h.url_for('/static/images/delete_tag_icon_gray.png')}'/></a></span>");
-           t.addClass('text-filter-val');
-           t.click(function() {
-               // Remove filter condition.
-
-               // Remove visible element.
-               $(this).remove();
-               
-               // Remove condition from URL args.
-               var cur_val = url_args["f-" + name];
-               if (cur_val == null || cur_val == undefined)
-               {
-                   // Unexpected. Throw error?
-               }
-               else if (typeof(cur_val) == "string")
-               {
-                   if (cur_val == "All") 
-                   {
-                       // Unexpected. Throw error?
-                   }        
-                   else
-                       // Remove condition.
-                       delete url_args["f-" + name];
-               }
-               else {
-                   // Current value is an array.
-                   var conditions = cur_val;
-                   var index;
-                   for (index = 0; index < conditions.length; index++)
-                       if (conditions[index] == value)
-                       {
-                           conditions.splice(index, 1);
-                           break;
-                       }   
-               }
-
-               go_page_one();
-               update_grid();
-           });
-           
-           var container = $('#' + name + "-filtering-criteria");
-           container.append(t);
-           
-           go_page_one();
-           update_grid();
-       }
-       
-       // Set sort condition for grid.
-       function set_sort_condition(col_key)
-       {
-           // Set new sort condition. New sort is col_key if sorting new column; if reversing sort on
-           // currently sorted column, sort is reversed.
-           var cur_sort = url_args['sort'];
-           var new_sort = col_key;
-           if ( cur_sort.indexOf( col_key ) != -1)
-           {                
-               // Reverse sort.
-               if ( cur_sort.substring(0,1) != '-' )
-                   new_sort = '-' + col_key;
-               else
-               { 
-                   // Sort reversed by using just col_key.
-               }
-           }
-           
-           // Remove sort arrows elements.
-           $('.sort-arrow').remove()
-           
-           // Add sort arrow element to new sort column.
-           var sort_arrow = "&uarr;";
-           if (new_sort.substring(0,1) != '-')
-               sort_arrow = "&darr;";
-           var t = $("<span>" + sort_arrow + "</span>").addClass('sort-arrow');
-           var th = $("#" + col_key + '-header');
-           th.append(t);
-           
-           // Need to go back to page 1 if not showing all.
-           var cur_page = url_args['page'];
-           if (cur_page != null && cur_page != undefined && cur_page != 'all')
-               url_args['page'] = 1;
-           
-           // Update grid.
-           url_args['sort'] = new_sort;
-           go_page_one();
-           update_grid();
-       }
-       
-       // Set new value for categorical filter.
-       function set_categorical_filter(name, new_value)
-       {
-           // Update filter hyperlinks to reflect new filter value.
-           var category_filter = categorical_filters[name];
-           var cur_value = url_args["f-" + name];
-           $("." + name + "-filter").each( function() {
-               var text = $.trim( $(this).text() );
-               var filter = category_filter[text];
-               var filter_value = filter[name];
-               if (filter_value == new_value)
-               {
-                   // Remove filter link since grid will be using this filter. It is assumed that
+                   do_operation(operation_name, item_ids); 
+                });
+            });
+            
+            // Initialize submit image elements.
+            $('.submit-image').each( function() {
+                // On mousedown, add class to simulate click.
+                $(this).mousedown( function() {
+                   $(this).addClass('gray-background'); 
+                });
+                
+                // On mouseup, add class to simulate click.
+                $(this).mouseup( function() {
+                   $(this).removeClass('gray-background'); 
+                });
+                
+            });
+            
+            // Initialize sort links.
+            $('.sort-link').each( function() {
+                var sort_key = $(this).attr('sort_key');
+                $(this).click( function() {
+                   set_sort_condition(sort_key);
+                   return false; 
+                });
+                
+            });
+            
+            // Initialize page links.
+            $('.page-link > a').each( function() {
+                var page_num = $(this).attr('page_num');
+                $(this).click( function() {
+                   set_page(page_num);
+                   return false; 
+                });
+                
+            });
+            $('#show-all-link').click( function() {
+                set_page('all');
+                return false;
+            });
+            
+            // Initialize categorical filters.
+            $('.categorical-filter > a').each( function() {
+                $(this).click( function() {
+                    var filter_key = $(this).attr('filter_key');
+                    var filter_val = $(this).attr('filter_val');
+                    set_categorical_filter(filter_key, filter_val);
+                    return false;
+                });
+            });
+            
+            // Initialize text filters.
+            $('.text-filter-form').each( function() {
+                $(this).submit( function() {
+                    var column_key = $(this).attr('column_key');
+                    var text_input_obj = $('#input-' + column_key + '-filter');
+                    var text_input = text_input_obj.val();
+                    text_input_obj.val('');
+                    add_filter_condition(column_key, text_input, true);
+                    return false;
+                });                
+            });
+                                        
+            // Initialize autocomplete for text inputs in search UI.
+            var t = $("#input-tags-filter");
+            if (t.length) {
+                t.autocomplete(  "${h.url_for( controller='tag', action='tag_autocomplete_data', item_class='History' )}", 
+                                 { selectFirst: false, autoFill: false, highlight: false, mustMatch: false });
+            }      
+ 
+            var t2 = $("#input-name-filter");
+            if (t2.length) {
+                t2.autocomplete( "${h.url_for( controller='history', action='name_autocomplete_data' )}",
+                                 { selectFirst: false, autoFill: false, highlight: false, mustMatch: false });
+            }
+            
+            // Initialize advanced search toggles.
+            $('.advanced-search-toggle').each( function() {
+                $(this).click( function() {
+                   $('#more-search-options').slideToggle('fast');
+                   return false;
+                });
+            });
+        }
+ 
+        // Initialize grid elements.
+        function init_grid_elements() {
+            // Initialize grid selection checkboxes.
+            $(".grid").each( function() {
+                var checkboxes = $(this).find("input.grid-row-select-checkbox");
+                var update = $(this).find( "span.grid-selected-count" );
+                update.text("");
+                $(checkboxes).each( function() {
+                    $(this).change( function() {
+                        var n = $(checkboxes).filter("[checked]").size();
+                        update.text( n );
+                    });
+                });
+            });
+            
+            // Initialize item labels.
+            $(".label").each( function() {
+                // If href has an operation in it, do operation when clicked. Otherwise do nothing.
+                var href = $(this).attr('href');
+                if ( href.indexOf('operation=') != -1 ) {
+                    $(this).click( function() {
+                        do_operation_from_href( $(this).attr('href') );
+                        return false;
+                    });   
+                }
+            });
+            
+            // Initialize item menu operations.
+            make_popup_menus();
+        }
+        
+        // Filter values for categorical filters.
+        var categorical_filters = {};
+        %for column in grid.columns:
+            %if column.filterable is not None and not isinstance( column, TextColumn ):
+                var ${column.key}_filters = ${ h.to_json_string( dict([ (filter.label, filter.args) for filter in column.get_accepted_filters() ]) ) };
+                categorical_filters['${column.key}'] = ${column.key}_filters;
+            %endif
+        %endfor
+            
+        // Initialize URL args with filter arguments.
+        var url_args = ${h.to_json_string( cur_filter_dict )};
+        
+        // Place "f-" in front of all filter arguments.
+        $.map(url_args, function(arg) {
+            return "f-" + arg;
+        });
+        
+        // Add sort argument to URL args.
+        url_args['sort'] = "${encoded_sort_key}";
+        
+        // Add async keyword to URL args.
+        url_args['async'] = true;
+        
+        // Add page to URL args.
+        url_args['page'] = ${cur_page_num};
+        
+        var num_pages = ${num_pages};
+        
+        // Go back to page one; this is useful when a filter is applied.
+        function go_page_one() {
+            // Need to go back to page 1 if not showing all.
+            var cur_page = url_args['page'];
+            if (cur_page !== null && cur_page !== undefined && cur_page != 'all') {
+                url_args['page'] = 1;
+            }               
+        }
+        
+        // Add a condition to the grid filter; this adds the condition and refreshes the grid.
+        function add_filter_condition(name, value, append) {
+            // Do nothing is value is empty.
+            if (value == "") {
+                return false;
+            }
+            
+            // Update URL arg with new condition.            
+            if (append) {
+                // Update or append value.
+                var cur_val = url_args["f-" + name];
+                var new_val;
+                if (cur_val === null || cur_val === undefined) {
+                    new_val = value;
+                } else if (typeof(cur_val) == "string") {
+                    if (cur_val == "All") {
+                        new_val = value;
+                    } else {
+                        // Replace string with array.
+                        var values = [];
+                        values[0] = cur_val;
+                        values[1] = value;
+                        new_val = values;   
+                    }
+                } else {
+                    // Current value is an array.
+                    new_val = cur_val;
+                    new_val[new_val.length] = value;
+                }
+                url_args["f-" + name] = new_val;
+            } else {
+                // Replace value.
+                url_args["f-" + name] = value;
+            }
+            
+            // Add button that displays filter and provides a button to delete it.
+            var t = $("<span>" + value +
+                      "&nbsp;<a href='#'><img src='${h.url_for('/static/images/delete_tag_icon_gray.png')}'/></a></span>");
+            t.addClass('text-filter-val');
+            t.click(function() {
+                // Remove filter condition.
+ 
+                // Remove visible element.
+                $(this).remove();
+                
+                // Remove condition from URL args.
+                var cur_val = url_args["f-" + name];
+                if (cur_val === null || cur_val === undefined) {
+                    // Unexpected. Throw error?
+                } else if (typeof(cur_val) == "string") {
+                    if (cur_val == "All") {
+                        // Unexpected. Throw error?
+                    } else {
+                        // Remove condition.
+                        delete url_args["f-" + name];
+                    }
+                } else {
+                    // Current value is an array.
+                    var conditions = cur_val;
+                    for (var index = 0; index < conditions.length; index++) {
+                        if (conditions[index] == value) {
+                            conditions.splice(index, 1);
+                            break;
+                        }
+                    }
+                }
+ 
+                go_page_one();
+                update_grid();
+            });
+            
+            var container = $('#' + name + "-filtering-criteria");
+            container.append(t);
+            
+            go_page_one();
+            update_grid();
+        }
+        
+        // Add tag to grid filter.
+        function add_tag_to_grid_filter(tag_name, tag_value) {
+            // Put tag name and value together.
+            var tag = tag_name + (tag_value !== null && tag_value != "" ? ":" + tag_value : "");
+            $('#more-search-options').show('fast');
+            add_filter_condition("tags", tag, true); 
+        }
+ 
+        // Set sort condition for grid.
+        function set_sort_condition(col_key) {
+            // Set new sort condition. New sort is col_key if sorting new column; if reversing sort on
+            // currently sorted column, sort is reversed.
+            var cur_sort = url_args['sort'];
+            var new_sort = col_key;
+            if ( cur_sort.indexOf( col_key ) != -1) {                
+                // Reverse sort.
+                if ( cur_sort.substring(0,1) != '-' ) {
+                    new_sort = '-' + col_key;
+                } else { 
+                    // Sort reversed by using just col_key.
+                }
+            }
+            
+            // Remove sort arrows elements.
+            $('.sort-arrow').remove();
+            
+            // Add sort arrow element to new sort column.
+            var sort_arrow = (new_sort.substring(0,1) == '-') ? "&uarr;" : "&darr;";
+            var t = $("<span>" + sort_arrow + "</span>").addClass('sort-arrow');
+            var th = $("#" + col_key + '-header');
+            th.append(t);
+            
+            // Need to go back to page 1 if not showing all.
+            var cur_page = url_args['page'];
+            if (cur_page !== null && cur_page !== undefined && cur_page != 'all') {
+                url_args['page'] = 1;
+            }
+            // Update grid.
+            url_args['sort'] = new_sort;
+            go_page_one();
+            update_grid();
+        }
+        
+        // Set new value for categorical filter.
+        function set_categorical_filter(name, new_value) {
+            // Update filter hyperlinks to reflect new filter value.
+            var category_filter = categorical_filters[name];
+            var cur_value = url_args["f-" + name];
+            $("." + name + "-filter").each( function() {
+                var text = $.trim( $(this).text() );
+                var filter = category_filter[text];
+                var filter_value = filter[name];
+                if (filter_value == new_value) {
+                    // Remove filter link since grid will be using this filter. It is assumed that
+                    // this element has a single child, a hyperlink/anchor with text.
+                    $(this).empty();
+                    $(this).addClass("current-filter");
+                    $(this).append(text);
+                } else if (filter_value == cur_value) {
+                    // Add hyperlink for this filter since grid will no longer be using this filter. It is assumed that
+                    // this element has a single child, a hyperlink/anchor.
+                    $(this).empty();
+                    var t = $("<a href='#'>" + text + "</a>");
+                    t.click(function() {
+                        set_categorical_filter( name, filter_value ); 
+                    });
+                    $(this).removeClass("current-filter");
+                    $(this).append(t);
+                }
+            });
+                        
+            // Update grid.
+            url_args["f-" + name] = new_value;
+            go_page_one();
+            update_grid();
+        }
+        
+        // Set page to view.
+        function set_page(new_page) {
+            // Update page hyperlink to reflect new page.
+            $(".page-link").each( function() {
+               var id = $(this).attr('id');
+               var page_num = parseInt( id.split("-")[2] ); // Id has form 'page-link-<page_num>
+               var cur_page = url_args['page'];
+               if (page_num == new_page) {
+                   // Remove link to page since grid will be on this page. It is assumed that
                    // this element has a single child, a hyperlink/anchor with text.
+                   var text = $(this).children().text();
                    $(this).empty();
-                   $(this).addClass("current-filter");
-                   $(this).append(text);
-               }
-               else if (filter_value == cur_value)
-               {
-                   // Add hyperlink for this filter since grid will no longer be using this filter. It is assumed that
+                   $(this).addClass("inactive-link");
+                   $(this).text(text);
+               } else if (page_num == cur_page) {
+                   // Add hyperlink to this page since grid will no longer be on this page. It is assumed that
                    // this element has a single child, a hyperlink/anchor.
+                   var text = $(this).text();
                    $(this).empty();
+                   $(this).removeClass("inactive-link");
                    var t = $("<a href='#'>" + text + "</a>");
                    t.click(function() {
-                       set_categorical_filter( name, filter_value ); 
+                      set_page(page_num); 
                    });
-                   $(this).removeClass("current-filter");
                    $(this).append(t);
                }
-           });
-                       
-           // Update grid.
-           url_args["f-" + name] = new_value;
-           go_page_one();
-           update_grid();
-       }
-       
-       // Set page to view.
-       function set_page(new_page)
-       {
-           // Update page hyperlink to reflect new page.
-           $(".page-link").each( function() {
-              var id = $(this).attr('id');
-              var page_num = parseInt( id.split("-")[2] ); // Id has form 'page-link-<page_num>
-              var cur_page = url_args['page'];
-              if (page_num == new_page)
-              {
-                  // Remove link to page since grid will be on this page. It is assumed that
-                  // this element has a single child, a hyperlink/anchor with text.
-                  var text = $(this).children().text();
-                  $(this).empty();
-                  $(this).addClass("inactive-link");
-                  $(this).text(text);
-              }
-              else if (page_num == cur_page)
-              {
-                  // Add hyperlink to this page since grid will no longer be on this page. It is assumed that
-                  // this element has a single child, a hyperlink/anchor.
-                  var text = $(this).text();
-                  $(this).empty();
-                  $(this).removeClass("inactive-link");
-                  var t = $("<a href='#'>" + text + "</a>");
-                  t.click(function() {
-                     set_page(page_num); 
-                  });
-                  $(this).append(t);
-              }
-           });
-
-           var maintain_page_links = true;
-           if (new_page == "all")
-           {
-               url_args['page'] = new_page;
-               maintain_page_links = false;
-           }
-           else
-               url_args['page'] = parseInt(new_page);
-           update_grid(maintain_page_links);
-       }
-       
-       // Perform a grid operation.
-       function do_operation(operation, item_ids)
-       {
-           operation = operation.toLowerCase();
-           
-           // Update URL args.
-           url_args['operation'] = operation;
-           url_args['id'] = item_ids;
-           
-           // If operation cannot be performed asynchronously, redirect to location. Otherwise do operation.
-           var no_async = ( async_ops[operation] == undefined || async_ops[operation] == null);
-           if (no_async)
-           {
-               go_to_URL();
-           }
-           else
-           {
-               update_grid(true);
-               delete url_args['operation'];
-               delete url_args['id'];
-           }
-       }
-       
-       // Perform a hyperlink click that initiates an operation. If there is no operation, ignore click.
-       function do_operation_from_href(href)
-       {
-           // Get operation, id in hyperlink's href.
-           var href_parts = href.split("?");
-           if (href_parts.length > 1)
-           {
-               var href_parms_str = href_parts[1];
-               var href_parms = href_parms_str.split("&");
-               var operation = null;
-               var id = -1;
-               for (var index = 0; index < href_parms.length; index++)
-               {
-                   if (href_parms[index].indexOf('operation') != -1)
-                   {
-                       // Found operation parm; get operation value. 
-                       operation = href_parms[index].split('=')[1];
-                   }
-                   else if (href_parms[index].indexOf('id') != -1)
-                   {
-                       // Found id parm; get id value.
-                       id = href_parms[index].split('=')[1];
-                   }
-               }
-               
-               // Do operation.
-               do_operation(operation, id);
-               return false;
-           }
-           
-       }
-       
-       // Navigate window to the URL defined by url_args. This method should be used to short-circuit grid AJAXing.
-       function go_to_URL()
-       {
-           // Not async request.
-           url_args['async'] = false;
-           
-           // Build argument string.
-           var arg_str = "";
-           var arg;
-           for (arg in url_args)
-               arg_str = arg_str + arg + "=" + url_args[arg] + "&";
-           
-           // Go.
-           window.location = encodeURI( "${h.url_for()}?" + arg_str );
-       }
-       
-       // Update grid.
-       function update_grid(maintain_page_links)
-       {
-           ## If grid is not using async, then go to URL.
-           %if not grid.use_async:
+            });
+ 
+            var maintain_page_links = true;
+            if (new_page == "all") {
+                url_args['page'] = new_page;
+                maintain_page_links = false;
+            } else {
+                url_args['page'] = parseInt(new_page);
+            }
+            update_grid(maintain_page_links);
+        }
+        
+        // Perform a grid operation.
+        function do_operation(operation, item_ids) {
+            operation = operation.toLowerCase();
+            
+            // Update URL args.
+            url_args['operation'] = operation;
+            url_args['id'] = item_ids;
+            
+            // If operation cannot be performed asynchronously, redirect to location. Otherwise do operation.
+            var no_async = ( async_ops[operation] === undefined || async_ops[operation] === null);
+            if (no_async) {
                 go_to_URL();
-                return;
-           %endif
-           
-           // If there's an operation in the args, do POST; otherwise, do GET.
-           var operation = url_args['operation'];
-           var method = (operation != null && operation != undefined ? "POST" : "GET" );
-           $('.loading-elt-overlay').show(); // Show overlay to indicate loading and prevent user actions.
-           $.ajax({
-               type: method,
-               url: "${h.url_for()}",
-               data: url_args,
-               error: function() { alert( "Grid refresh failed" ) },
-               success: function(response_text) {
-                   // HACK: use a simple string to separate the elements in the
-                   // response: (1) table body; (2) number of pages in table; and (3) message.
-                   var parsed_response_text = response_text.split("*****");
-                   
-                   // Update grid body.
-                   var table_body = parsed_response_text[0];
-                   $('#grid-table-body').html(table_body);
-                   
-                   // Process grid body.
-                   init_grid_elements();
-                   make_popup_menus();
-                   
-                   // Update number of pages.
-                   var num_pages = parseInt( parsed_response_text[1] );
-                   
-                   // Rebuild page links.
-                   if (!maintain_page_links)
-                   {
-                       // Remove page links.
-                       var page_link_container = $('#page-link-container');
-                       page_link_container.children().remove();
-                       
-                       // First page is the current page.
-                       var t = $("<span>1</span>");
-                       t.addClass('page-link');
-                       t.addClass('inactive-link');
-                       t.attr('id', 'page-link-1');
-                       page_link_container.append(t);
-                       
-                       // Show all link is visible only if there are multiple pages.
-                       var elt = $('#show-all-link-span');
-                       if (num_pages > 1)
-                           elt.show();
-                       else
-                           elt.hide();
-       
-                       // Subsequent pages are navigable.
-                       for (var i = 2; i <= num_pages; i++)
-                       {
-                           var span = $("<span></span>");
-                           span.addClass('page-link');
-                           span.attr('id', 'page-link-' + i);
-                           var t = $("<a href='#'>" + i + "</a>");
-                           t.attr('page', i);
-                           t.click(function() {
-                               var page = $(this).attr('page');
-                               set_page(page);
-                           });
-                           span.append(t)
-                           page_link_container.append(span);
-                       }
-                   }
-                   
-                   // Hide loading overlay.
-                   $('.loading-elt-overlay').hide();
-                   
-                   // Show message if there is one.
-                   var message = $.trim( parsed_response_text[2] );
-                   if (message != "")
-                   {
-                       $('#grid-message').html( message );
-                       setTimeout("$('#grid-message').hide()", 5000);
-                   }
-               }
-           });    
-       }
+            } else {
+                update_grid(true);
+                delete url_args['operation'];
+                delete url_args['id'];
+            }
+        }
+        
+        // Perform a hyperlink click that initiates an operation. If there is no operation, ignore click.
+        function do_operation_from_href(href) {
+            // Get operation, id in hyperlink's href.
+            var href_parts = href.split("?");
+            if (href_parts.length > 1) {
+                var href_parms_str = href_parts[1];
+                var href_parms = href_parms_str.split("&");
+                var operation = null;
+                var id = -1;
+                for (var index = 0; index < href_parms.length; index++) {
+                    if (href_parms[index].indexOf('operation') != -1) {
+                        // Found operation parm; get operation value. 
+                        operation = href_parms[index].split('=')[1];
+                    } else if (href_parms[index].indexOf('id') != -1) {
+                        // Found id parm; get id value.
+                        id = href_parms[index].split('=')[1];
+                    }
+                }
+                
+                // Do operation.
+                do_operation(operation, id);
+                return false;
+            }
+            
+        }
+        
+        // Navigate window to the URL defined by url_args. This method should be used to short-circuit grid AJAXing.
+        function go_to_URL() {
+            // Not async request.
+            url_args['async'] = false;
+            
+            // Build argument string.
+            var arg_str = "";
+            for (var arg in url_args) {
+                arg_str = arg_str + arg + "=" + url_args[arg] + "&";
+            }
+            
+            // Go.
+            window.location = encodeURI( "${h.url_for()}?" + arg_str );
+        }
+        
+        // Update grid.
+        function update_grid(maintain_page_links) {
+            ## If grid is not using async, then go to URL.
+            %if not grid.use_async:
+                 go_to_URL();
+                 return;
+            %endif
+            
+            // If there's an operation in the args, do POST; otherwise, do GET.
+            var operation = url_args['operation'];
+            var method = (operation !== null && operation !== undefined ? "POST" : "GET" );
+            $('.loading-elt-overlay').show(); // Show overlay to indicate loading and prevent user actions.
+            $.ajax({
+                type: method,
+                url: "${h.url_for()}",
+                data: url_args,
+                error: function() { alert( "Grid refresh failed" ); },
+                success: function(response_text) {
+                    // HACK: use a simple string to separate the elements in the
+                    // response: (1) table body; (2) number of pages in table; and (3) message.
+                    var parsed_response_text = response_text.split("*****");
+                    
+                    // Update grid body.
+                    var table_body = parsed_response_text[0];
+                    $('#grid-table-body').html(table_body);
+                    
+                    // Process grid body.
+                    init_grid_elements();
+                    make_popup_menus();
+                    
+                    // Update number of pages.
+                    var num_pages = parseInt( parsed_response_text[1] );
+                    
+                    // Rebuild page links.
+                    if (!maintain_page_links) {
+                        // Remove page links.
+                        var page_link_container = $('#page-link-container');
+                        page_link_container.children().remove();
+                        
+                        // First page is the current page.
+                        var t = $("<span>1</span>");
+                        t.addClass('page-link');
+                        t.addClass('inactive-link');
+                        t.attr('id', 'page-link-1');
+                        page_link_container.append(t);
+                        
+                        // Show all link is visible only if there are multiple pages.
+                        var elt = $('#show-all-link-span');
+                        if (num_pages > 1) {
+                            elt.show();
+                        } else {
+                            elt.hide();
+                        }
+        
+                        // Subsequent pages are navigable.
+                        for (var i = 2; i <= num_pages; i++) {
+                            var span = $("<span></span>");
+                            span.addClass('page-link');
+                            span.attr('id', 'page-link-' + i);
+                            var t = $("<a href='#'>" + i + "</a>");
+                            t.attr('page', i);
+                            t.click(function() {
+                                var page = $(this).attr('page');
+                                set_page(page);
+                            });
+                            span.append(t);
+                            page_link_container.append(span);
+                        }
+                    }
+                    
+                    // Hide loading overlay.
+                    $('.loading-elt-overlay').hide();
+                    
+                    // Show message if there is one.
+                    var message = $.trim( parsed_response_text[2] );
+                    if (message != "") {
+                        $('#grid-message').html( message );
+                        setTimeout( function() { $('#grid-message').hide(); }, 5000);
+                    }
+                }
+            });    
+        }
     </script>
 </%def>