PROV-507 Fix auto-linking behavior