Added support for tags on the contentView