Additional HTML checks per #8