Refactored find(ModelQuery) and findWithOrder(ModelQuery).