Apply code review changes to get expert by unique email instead of name