removed escaping field values, added option to override file content type