Finish version 1 of search