Fix underscore ('_') encoding