Better handling of content-types for non-objects in requests