Added support for escaped tags