Improvements to nested selectors