Refactor OrderItem search