Small changes to validate the HTML in content