Add utf8 encoding tags. Fixes regression for #4403