updated query for cluster/zone