Fixed Unicode Rendering Bug

Updated data model