Improve selectors.