diff --git a/code_samples/api/commerce/src/Command/OrderCommand.php b/code_samples/api/commerce/src/Command/OrderCommand.php
index 242b81b57a..85059aae61 100644
--- a/code_samples/api/commerce/src/Command/OrderCommand.php
+++ b/code_samples/api/commerce/src/Command/OrderCommand.php
@@ -6,6 +6,7 @@
 
 use Ibexa\Contracts\Core\Repository\PermissionResolver;
 use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Contracts\CoreSearch\Values\Query\Criterion\LogicalOr;
 use Ibexa\Contracts\OrderManagement\OrderServiceInterface;
 use Ibexa\Contracts\OrderManagement\Value\Order\OrderQuery;
 use Ibexa\Contracts\OrderManagement\Value\Order\Query\Criterion\CompanyNameCriterion;
@@ -19,7 +20,6 @@
 use Ibexa\Contracts\OrderManagement\Value\OrderValue;
 use Ibexa\Contracts\OrderManagement\Value\Struct\OrderCreateStruct;
 use Ibexa\Contracts\OrderManagement\Value\Struct\OrderUpdateStruct;
-use Ibexa\Contracts\ProductCatalog\Values\Common\Query\Criterion\LogicalOr;
 use Money;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/composer.json b/composer.json
index 34e5554136..9ead46ed80 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,8 @@
         "ibexa/form-builder": "5.0.x-dev",
         "ibexa/solr": "5.0.x-dev",
         "ibexa/version-comparison": "5.0.x-dev",
-        "league/oauth2-google": "^4.0"
+        "league/oauth2-google": "^4.0",
+        "ibexa/core-search": "~5.0.x-dev"
     },
     "scripts": {
         "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
diff --git a/docs/commerce/order_management/order_management_api.md b/docs/commerce/order_management/order_management_api.md
index eb1de31951..ae630397e7 100644
--- a/docs/commerce/order_management/order_management_api.md
+++ b/docs/commerce/order_management/order_management_api.md
@@ -35,7 +35,7 @@ To fetch multiple orders, use the `OrderService::findOrders` method.
 It follows the same search query pattern as other APIs:
 
 ``` php
-[[= include_file('code_samples/api/commerce/src/Command/OrderCommand.php', 9, 13) =]][[= include_file('code_samples/api/commerce/src/Command/OrderCommand.php', 21, 22) =]]
+[[= include_file('code_samples/api/commerce/src/Command/OrderCommand.php', 8, 9) =]][[= include_file('code_samples/api/commerce/src/Command/OrderCommand.php', 10, 14) =]]
 
 // ...
 [[= include_file('code_samples/api/commerce/src/Command/OrderCommand.php', 116, 125) =]]