Improve OriginalLink safety