Actuallt wire in the catalog searches from the grid sorting into the _folder_contents method.
TODO tests, docs
add a comment, reflow long lines
Merge branch 'master' into ree-actually-use-catalog-for-sorting