(fix) Increment on each fetch call, only test for offset reset and fetch next after waiting for entity to resolve - #2190