[ORB-532] Only add default item if surgeon role actually exists