tidied up the search request model and added more fields