added search-by-id and search-by-first/last name functionality