added support for html self closing tags