Adds match searching to discovery