Update charset helper and filename sanitize