improving content-type header management