Better handling of post fields in multipart