Fix for pageSize=all and new IntermediateExpansion