Fix issues of data loading really slowly and some of it missing