[FIX] XQuery, no-preserve option