[FIX] XQuery, #1029: better support for removal of diacritics