Move map data into sub-element (@todo: XSLT could be optimized for that), several bug fixes