Tidies search controller a little.