[TASK] selected underscore and arrow fixes (RT-2816)