Updated check from URL and additional html checks