Implemented the search with the other fields