Switched to BeautifulSoup as HTML parser
Heuristics tuned