Added way to search by first name as well as ID