Based on some feedback from #8548 and #8535 This also sets the charset to UTF-8 to support more characters.