Add support for tag escapes