diff --git a/packages/bookshop/app/orders/fiori-service.cds b/packages/bookshop/app/orders/fiori-service.cds
index 78fc9754..4f4e7a04 100644
--- a/packages/bookshop/app/orders/fiori-service.cds
+++ b/packages/bookshop/app/orders/fiori-service.cds
@@ -34,7 +34,7 @@ annotate AdminService.Orders with {
                 },
                 {
                     $Type             : 'Common.ValueListParameterOut',
-                    LocalDataProperty : 'shippingAddress_BusinessPartner',
+                    LocalDataProperty : 'shippingAddress_contact',
                     ValueListProperty : 'BusinessPartner'
                 },
                 {
diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js
index 33176d37..d87b03d6 100644
--- a/packages/bookshop/srv/admin-service.js
+++ b/packages/bookshop/srv/admin-service.js
@@ -13,6 +13,7 @@ const { Books, Addresses } = db.entities // entities in local database
 module.exports = (admin => {
   // Handler to delegate ValueHelp requests to S/4 backend, fetching current user's addresses from there
   admin.on ('READ', 'usersAddresses', (req) => {
+    console.trace()
     const { SELECT } = cds.ql(req) //> convenient alternative to bupa.transaction(req).run(SELECT...)
     return SELECT.from (externalAddresses) .where ({ contact: req.user.id || 'anonymous' })
     //> this is applying projection from CDS model generically, i.e. the equivalent of: