Add support for inclusive tags, tags with values.