data loading on refresh fixed