Updated the search form to prepare it before implementation