Improve guessing at content type