Cleanup, fixing one off search button bugs.