Added more HTML checks