follow-up unicode improvements

Authored by sgerlach on Dec 13 2017, 6:57 PM.