Allow directory to be searched by first name (bug #2208)