[#285] Added pagination fix
Merge pull request #466 from akvo/kasper-285

[#285] Added pagination fix