improvements to selectors engine