diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js
index d87b03d6..e1187adc 100644
--- a/packages/bookshop/srv/admin-service.js
+++ b/packages/bookshop/srv/admin-service.js
@@ -12,8 +12,8 @@ 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()
+  // admin.on ('READ', 'usersAddresses', (req) => {  // REVISIT: all requests go to auto-exposed Addresses
+  admin.on ('READ', 'Addresses', (req) => {
     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: