search functionality perfectely added...some bugs removed