[FIX] XQuery, simple map (!): parsing and evaluation revised