Encoding correction
Updated Interface