Improvements of HTML parser.