Smarter content type check