Fixes for searching and page rendering in the tool shed's admin grids.
Merged from next-stable