Index fixed, data loading fixed