Improved HTML matching.