cluster-discovery: more clarity