[FIX] XQuery: preserve order of AND/OR operands