avoid making the n+1st request

this was especially annoying when downloading single records as each query would create two requests