xhtml: better track HTML tags