Optimised search to reduce network usage and improve performance