small tweaks for XML route
Merge branch 'dev'