Fix off-by-one error in result fetcher
Implement few more extra calls