Update similar selectors to attribute selectors