Improving performance of selectors