Fix table sorting regression caused by SegmentVariant work