Add type to HTTP messages + correct handling of multiple headers with same header name