Starting to refactor hide/show search code...