Fix seriously horked data refresh logic