Fixed bug. Need to show all data