WP-2729 Changed handling that converts sunet_ids to entity_ids