Adding support for selectors on fallback