fixup! Adjust default search params to find any clusters
fixup! Add multi-cluster support
fixup! Maintain compatability with previous versions