fixing the selector lookahead to guard against missing/empty selectors
Merge branch 'master' into headless-block-fix