Further updates for SegmentClusterType editing.