Tried to improve the performance for the selected check

Reviewer: Dan V (post commit)

Issue: 9095