Better search def for swarm