improve Selectors