Added ability to search on first name and last name