Proper fix for handling cluster_id in NodeCollectionHandler