Selectors refactory exceptions fixes