Extended support of xhtml tags