CRM-20206 Use existing function to replace ampersand codes