fetch data fixes