Fix charset handling of ContentTypeField