Change Query return type to PageResult