Updated UGC fields to enable escaping in MarkupFields.

Thank you to Vinod for reporting.