Improve selectors accuracy