order xml fixes
order xml fixes