Improve PropertySelectorParser