Improve content-type matcher