More UTF-8 in xmap