[MOD] XQuery: better UCA collation support