Correct non-negative schema
Improve paging