Fix issue with sub-selectors not working from previous commit