Search logic added