diff --git a/packages/bookshop/app/orders/fiori-service.cds b/packages/bookshop/app/orders/fiori-service.cds
index 2c2b573e..4ead6a8b 100644
--- a/packages/bookshop/app/orders/fiori-service.cds
+++ b/packages/bookshop/app/orders/fiori-service.cds
@@ -59,17 +59,6 @@ annotate AdminService.Orders with {
                 },
             ]
         },
-        SideEffects  : {
-            EffectTypes      : #ValueChange,
-            SourceProperties : [shippingAddress_AddressID],
-            TargetProperties : [
-                shippingAddress.country,
-                shippingAddress.houseNumber,
-                shippingAddress.streetName,
-                shippingAddress.cityName,
-                shippingAddress.postalCode
-            ]
-        }
     });
 }
 
@@ -188,7 +177,19 @@ annotate AdminService.Orders with @(UI : {
             Label : '{i18n>postalCode}'
         },
     ]},
-}, ) {
+},
+Common.SideEffects : {
+        EffectTypes      : #ValueChange,
+        SourceProperties : [shippingAddress_AddressID],
+        TargetProperties : [
+            shippingAddress.country,
+            shippingAddress.houseNumber,
+            shippingAddress.streetName,
+            shippingAddress.cityName,
+            shippingAddress.postalCode
+        ]
+    },
+) {
     createdAt @UI.HiddenFilter : false;
     createdBy @UI.HiddenFilter : false;
 };