Corrected order of substitution application in building valve selectors.
add-valve-selector won't attempt to add if a selector already exists.