Further improvements on simplify_html