Fix Issue #13. Improving code, one place to process find order in OrderService.