new search logic added