Add support for empty tags