Fixes on removing ContactCode from XML if no value

Fixes on removing ContactCode from XML if no value