Changed the TagCollection and Tags to store their types for the insert
tag feature.