diff --git a/gdpr/db/data-privacy.cds b/gdpr/db/data-privacy.cds
index f864c966..8d5572cc 100644
--- a/gdpr/db/data-privacy.cds
+++ b/gdpr/db/data-privacy.cds
@@ -19,6 +19,16 @@ annotate bookshop.CustomerPostalAddress with @PersonalData.EntitySemantics: 'Dat
     country   @PersonalData.IsPotentiallyPersonal;
   }
 
+// annotations for Personal Data Manager - Search Fields
+annotate bookshop.Customers with @(Communication.Contact  : {
+    n : {
+        surname: lastName,
+        given:   firstName
+    },
+}); 
+
+annotate bookshop.Customers.emailAddress with @Communication.IsEmailAddress;
+
 
 // annotations for Audit Log
 annotate bookshop.Customers with @AuditLog.Operation: {Read: true, Insert: true, Update: true, Delete: true};
diff --git a/gdpr/manifest.yml b/gdpr/manifest.yml
index 046bbe8d..e7d365dc 100644
--- a/gdpr/manifest.yml
+++ b/gdpr/manifest.yml
@@ -13,8 +13,8 @@ applications:
   buildpack: nodejs_buildpack
   services:
   - gdpr-db
-  - name: pdm
-    parameters: ./pdm-config.json 
+#  - name: pdm
+#    parameters: ./pdm-config.json 
 
 # -----------------------------------------------------------------------------------
 # HANA Database Content Deployer App