fix & support with comma-delimited selectors