More progress on Tag, ControlledVocabularyTerm.