Added search functionality <Praveen>