added support for embedded tags.