Fixes to image file/name/category/tag output

Fixes to select xml files as well