First pass at fixing list case pagination