add self close tag support