Added support for querying cluster by cluster id.