Improved handling of changes to settings while fetching data