Add support for tags and remove generated content