diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/Customer.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/Customer.xml
index 8e11083d34..8b39995c6a 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/Customer.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/Customer.xml
@@ -17,16 +17,6 @@
     xsi:schemaLocation="https://api-platform.com/schema/metadata/resources-3.0 https://api-platform.com/schema/metadata/resources-3.0.xsd"
 >
     <resource class="Sylius\Component\Core\Model\Customer">
-        <validationContext>
-            <values>
-                <value name="groups">
-                    <values>
-                        <value>sylius</value>
-                    </values>
-                </value>
-            </values>
-        </validationContext>
-
         <operations>
 
             <!-- Admin operations-->
@@ -42,7 +32,7 @@
                     </values>
                 </normalizationContext>
                 <filters>
-                    <filter>sylius.api.customer_group_filter</filter>
+                    <filter>sylius_api.filter.customer_group</filter>
                 </filters>
             </operation>
 
@@ -145,6 +135,18 @@
 
             <!-- Shop operations-->
 
+            <operation class="ApiPlatform\Metadata\Get" uriTemplate="/shop/customers/{id}">
+                <normalizationContext>
+                    <values>
+                        <value name="groups">
+                            <values>
+                                <value>sylius:shop:customer:show</value>
+                            </values>
+                        </value>
+                    </values>
+                </normalizationContext>
+            </operation>
+
             <operation
                 class="ApiPlatform\Metadata\Post"
                 uriTemplate="/shop/customers"
@@ -161,6 +163,15 @@
                         </value>
                     </values>
                 </denormalizationContext>
+                <validationContext>
+                    <values>
+                        <value name="groups">
+                            <values>
+                                <value>sylius</value>
+                            </values>
+                        </value>
+                    </values>
+                </validationContext>
                 <openapiContext>
                     <values>
                         <value name="summary">Registers a new shop user</value>
@@ -198,17 +209,6 @@
                 </normalizationContext>
             </operation>
 
-            <operation class="ApiPlatform\Metadata\Get" uriTemplate="/shop/customers/{id}">
-                <normalizationContext>
-                    <values>
-                        <value name="groups">
-                            <values>
-                                <value>sylius:shop:customer:show</value>
-                            </values>
-                        </value>
-                    </values>
-                </normalizationContext>
-            </operation>
         </operations>
     </resource>
 </resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
index ba8faea71a..ba710de0f9 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
@@ -300,7 +300,7 @@
 <!--            <tag name="api_platform.filter" />-->
 <!--        </service>-->
 
-        <service id="sylius.api.customer_group_filter" parent="api_platform.doctrine.orm.search_filter" public="true">
+        <service id="sylius_api.filter.customer_group" parent="api_platform.doctrine.orm.search_filter" public="true">
             <argument type="collection">
                 <argument key="group.name">exact</argument>
             </argument>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/query_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/query_handlers.xml
index 35ff7e65c6..e1ba7409fa 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/query_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/query_handlers.xml
@@ -25,9 +25,9 @@
             <argument type="service" id="sylius.customer_statistics_provider" />
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\QueryHandler\GetStatisticsHandler">
-            <argument type="service" id="Sylius\Component\Core\Statistics\Provider\StatisticsProviderInterface" />
-            <argument type="service" id="sylius.repository.channel" />
-        </service>
+<!--        <service id="Sylius\Bundle\ApiBundle\QueryHandler\GetStatisticsHandler">-->
+<!--            <argument type="service" id="Sylius\Component\Core\Statistics\Provider\StatisticsProviderInterface" />-->
+<!--            <argument type="service" id="sylius.repository.channel" />-->
+<!--        </service>-->
     </services>
 </container>