fixed all the selectors