Modified issue of not able to search again