Added escaping for commas/parent reference in selectors