Fix cluster-info related bugs because of the changed record