Improve contact search