--HR-394 Tweaks for roles screen bug