Finish basic search feature