PROV-406 Fix for disappearing/incorrect links