Switch to using @ to separate key/value pairs in serialized locators
Switch to consistent prefixes between locators