Better handling of html inside tags