add search logic and update daemon