Adding support for underscores in selectors