Fix Paginator handling of empty result set