[TASK] selected underscore and arrow fixes (RT-2816)
Merge pull request #1914 from Mesrop/release-RT-2816-05-12

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