fix(python): Address overly-permissive expand_selectors function, minor fixes

fix(python): Address overly-permissive expand_selectors function, minor fixes #7362