Fix cluster identification after node restructuring