Make print command xml output more consistent