Update searching to be more efficient