Only set tagTypeId and tagTypeName when they exist