Search logic modified