fix - List and Data for search