ADD search logic