Added Locator ref to TagDescriptors to fix null locator string problem