Updated and fixed lazy loading of data from tracker