Improves accept header to bare template MIME type mapping
Improve accept header to bare template MIME-type mapping