Fix dealing with cluster_id NodeHandler and revert the same part in NodeClusterHandler due to issues with networks/interfaces