Change &address; and &contact; entities to Xincludes