fixes for multipart data fields