[issue:1] Add non-latin name handling workaround