Added check to set content type of returned multipart element and not just return application/ovtet-stream for all