Put basic Search funcitonality in