I think we also have a change to fast-path an early exit. The default query timeout is VERY conservative. We should pass in the number of nodes, and if we get that many responses, just exit. Otherwise we will wait like 10x longer than needed for the 95% case.