Update HtmlContent attribute mergefields to render value based on attribute's field type rather than just the raw value