Add paging to shape handler

Also adds mild testing for non-paged results