Link highlighting fixes