More selector improvments