Upgrade HTML scraping mechanism

Change-Id: Ic28d1cbcf7e23e3ff6f8d90ea62922da569701c0
Merge "Upgrade HTML scraping mechanism"