Updated the HTML Stream handler