Bring back links and more precise fix (not have <> enclosed url alone in line)