Ensure html is given as html content-type
Fix string match for HTML errors
Remove all empty header setting