fixed all data loading issue