Added checking of html tags