CON-1707 | Remove tag selectors