[MOD] XQuery, multipart/form-data: use nested map