#757: preserve query filtering when paginate