CON-1788 | simplifying css selectors