Add hacks for selectors