[SELECTOR] Some fixes