rearranged selectors in parser