Another attempt at fixing the strange URLs in annotations.