Remodeled and robustified selector parser