More cleanup/refactoring of the controller search trait
Merge branch 'master' into merge_guides, updating usage of search.