first name match improvements