Bug fix: primary/secondary URIs were not being selected