Upgrade to UTF-8 and include explicit tags