revised every selector since p-names no longer unique