Fixes issue 216: Paginated responses are extremely slow