Improve Content-Type parsing