[WIP] Add realiable retrieve long queries