Revised HTMLExtraction