Fix for pagination and new resolver.