Removed search-specific code, as this will move in a seperate form-class
Seperate class for the search form
Reimplemented the search-functionality in a seperate class