Update contact and fix content escape issue