DEV-49936 - fixed selection