fix cluster list discovery and improve performance