fix bug in user mapping and sorting by display name