Corrected links, add htmlidentities