PageSize query fix