make discovering nodes and groups more robust