better handling of orchestrator group