Fixes issue 216: Use query limit/offset on query instead of query result.
Allow paginated to work with list results.
Fixed tests to work with query based paginated results.
Merge remote-tracking branch 'origin/pr/225'