Fix mapping of api
add data to handle unable to load on 1st load