re-add search logic