Switch also in the second query statement to offset

Issue #6

I'm not 100% sure if that solves the overall problem, but I think that it can be one of the causes.