- extract service name instead of organization name
- compute display name in code, rather than template
- display entityID first, as mandatory, and name as optional