Updated to allow for html in summary and highlight fields