Handle utf8 name for queries #39