APD-616: Removed call to convertToHtmlLink