diff --git a/provision/700_crm/1000_namespace.yaml b/provision/700_crm/1000_namespace.yaml
index 295c19dce..54c00c666 100644
--- a/provision/700_crm/1000_namespace.yaml
+++ b/provision/700_crm/1000_namespace.yaml
@@ -1,6 +1,6 @@
 namespaces:
   crm:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: CRM
     allow:
       everyone:
diff --git a/provision/700_crm/1100_modules.yaml b/provision/700_crm/1100_modules.yaml
index a5c75884a..f78b2c054 100644
--- a/provision/700_crm/1100_modules.yaml
+++ b/provision/700_crm/1100_modules.yaml
@@ -1,7 +1,7 @@
 namespace: crm
 modules:
   Account:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Account
     fields:
       AccountName:
@@ -1301,7 +1301,7 @@ modules:
           selectType: multiple
         multi: true
   AccountContactRole:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: AccountContactRole
     fields:
       AccountId:
@@ -1358,7 +1358,7 @@ modules:
             value: Other
           selectType: default
   Campaigns:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Campaigns
     fields:
       IsActive:
@@ -1529,7 +1529,7 @@ modules:
           format: ""
           precision: 0
   Case:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Case
     fields:
       AccountId:
@@ -1541,6 +1541,18 @@ modules:
           queryFields:
           - AccountName
           selectType: ""
+      SuppliedEmail:
+        label: Contact Email
+        kind: Email
+        private: true
+      SuppliedName:
+        label: Contact Name
+        kind: String
+        private: true
+      SuppliedPhone:
+        label: Contact Phone
+        kind: String
+        private: true
       CaseNumber:
         label: Case Number
         kind: Number
@@ -1728,7 +1740,7 @@ modules:
           presetWithAuthenticated: true
           selectType: default
   CaseUpdate:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: CaseUpdate
     fields:
       CaseId:
@@ -1771,7 +1783,7 @@ modules:
           falseLabel: "No"
           trueLabel: "Yes"
   Contact:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Contact
     fields:
       AccountId:
@@ -2985,7 +2997,7 @@ modules:
           selectType: multiple
         multi: true
   Contract:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Contract
     fields:
       AccountId:
@@ -4170,7 +4182,7 @@ modules:
           mode: list
         multi: true
   ContractContactRole:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: ContractContactRole
     fields:
       ContactId:
@@ -4231,7 +4243,7 @@ modules:
             value: Other
           selectType: default
   ContractLineItem:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: ContractLineItem
     fields:
       Description:
@@ -4346,7 +4358,7 @@ modules:
           multiLine: false
           useRichTextEditor: false
   EmailTemplate:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: EmailTemplate
     fields:
       IsActive:
@@ -4401,7 +4413,7 @@ modules:
           multiLine: true
           useRichTextEditor: true
   Entitlement:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Entitlement
     fields:
       AccountId:
@@ -4484,7 +4496,7 @@ modules:
             value: Dedicated Support
           selectType: default
   EntitlementContact:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: EntitlementContact
     fields:
       ContactId:
@@ -4512,7 +4524,7 @@ modules:
           - Name
           selectType: ""
   EntitlementTemplate:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: EntitlementTemplate
     fields:
       BusinessHours:
@@ -4549,7 +4561,7 @@ modules:
           - Phone
           - Web
   Event:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Event
     fields:
       IsAllDayEvent:
@@ -4695,7 +4707,7 @@ modules:
           - Subject
           selectType: ""
   Idea:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Idea
     fields:
       Categories:
@@ -4771,7 +4783,7 @@ modules:
           format: "0"
           precision: 0
   Lead:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Lead
     fields:
       Street:
@@ -5658,7 +5670,7 @@ modules:
           selectType: multiple
         multi: true
   Note:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Note
     fields:
       Body:
@@ -5899,7 +5911,7 @@ modules:
           mode: list
         multi: true
   Opportunity:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Opportunity
     fields:
       AccountId:
@@ -6139,7 +6151,7 @@ modules:
           mode: list
         multi: true
   OpportunityCompetitor:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: OpportunityCompetitor
     fields:
       CompetitorName:
@@ -6167,7 +6179,7 @@ modules:
           multiLine: true
           useRichTextEditor: true
   OpportunityContactRole:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: OpportunityContactRole
     fields:
       ContactId:
@@ -6208,7 +6220,7 @@ modules:
           - Technical Buyer
           - Other
   OpportunityLineItem:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: OpportunityLineItem
     fields:
       ServiceDate:
@@ -6299,7 +6311,7 @@ modules:
           precision: 2
           suffix: €
   Pricebook:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Pricebook
     fields:
       IsActive:
@@ -6323,7 +6335,7 @@ modules:
         label: Price Book Name
         kind: String
   PricebookEntry:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: PricebookEntry
     fields:
       IsActive:
@@ -6377,7 +6389,7 @@ modules:
           multiLine: false
           useRichTextEditor: false
   Product:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Product
     fields:
       IsActive:
@@ -6435,7 +6447,7 @@ modules:
           - Name
           selectType: default
   Question:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Question
     fields:
       BestReplyId:
@@ -6474,7 +6486,7 @@ modules:
           format: 0
           precision: 0
   Quote:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Quote
     fields:
       AccountId:
@@ -8671,7 +8683,7 @@ modules:
         label: Record Label
         kind: String
   QuoteLineItem:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: QuoteLineItem
     fields:
       ServiceDate:
@@ -8770,7 +8782,7 @@ modules:
         options:
           multiLine: true
   Reply:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Reply
     fields:
       DownVotes:
@@ -8817,7 +8829,7 @@ modules:
           queryFields:
           - Title
   Settings:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Settings
     fields:
       QuoteExpirationDays:
@@ -8876,7 +8888,7 @@ modules:
           format: "0000000"
           precision: 0
   Solution:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Solution
     fields:
       IsPublished:
@@ -8953,7 +8965,7 @@ modules:
           mode: list
         multi: true
   Task:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Task
     fields:
       AccountId:
@@ -9124,7 +9136,7 @@ modules:
           - Subject
           selectType: default
   Vote:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Vote
     fields:
       IdeaId:
diff --git a/provision/700_crm/1200_charts.yaml b/provision/700_crm/1200_charts.yaml
index 8f1fabc04..80f42928b 100644
--- a/provision/700_crm/1200_charts.yaml
+++ b/provision/700_crm/1200_charts.yaml
@@ -1,7 +1,7 @@
 namespace: crm
 charts:
   AccountsByRating:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Accounts by rating
     config:
       reports:
@@ -26,7 +26,7 @@ charts:
           label: Accounts
       colorScheme: tableau.Tableau10
   AccountsByType:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Accounts by type
     config:
       reports:
@@ -46,7 +46,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   ActiveCampaignsByType:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Active campaigns by type
     config:
       reports:
@@ -63,7 +63,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau20
   CampaignAmountAllOpportunitiesVsTarget:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Campaign amount all opportunities vs target
     config:
       reports:
@@ -85,7 +85,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Traffic9
   CampaignAmountAllWonOpportunitiesVsTarget:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Campaign amount all won opportunities vs target
     config:
       reports:
@@ -107,7 +107,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Traffic9
   CampaignCostVsRevenue:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Campaign cost vs revenue
     config:
       reports:
@@ -146,7 +146,7 @@ charts:
           label: Euro
       colorScheme: tableau.Tableau10
   CampaignCosts:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Campaign costs
     config:
       reports:
@@ -170,7 +170,7 @@ charts:
           label: Value
       colorScheme: tableau.Tableau10
   CasesByOrigin:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases by origin
     config:
       reports:
@@ -187,7 +187,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   CasesByPriority:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases by priority
     config:
       reports:
@@ -205,7 +205,7 @@ charts:
         renderer: {}
       colorScheme: office.Wisp6
   CasesByStatus:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases by status
     config:
       reports:
@@ -222,7 +222,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   CasesByType:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases by type
     config:
       reports:
@@ -239,7 +239,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   CasesPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases per month
     config:
       reports:
@@ -267,7 +267,7 @@ charts:
           label: Cases
       colorScheme: tableau.Tableau20
   ContactsPerCountry:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Contacts per country
     config:
       reports:
@@ -291,7 +291,7 @@ charts:
           label: Contacts
       colorScheme: tableau.Tableau20
   ContactsPerSeniorLeveltitle:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Contacts per senior level title
     config:
       reports:
@@ -313,7 +313,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   ContractsByStatus:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Contracts by Status
     config:
       reports:
@@ -330,7 +330,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   ContractsPerStartingMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Contracts per starting month
     config:
       reports:
@@ -359,7 +359,7 @@ charts:
           label: Activated contracts
       colorScheme: tableau.Tableau20
   Dealsize:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Dealsize
     config:
       reports:
@@ -394,7 +394,7 @@ charts:
           label: Euro
       colorScheme: tableau.Tableau10
   EventsPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Events per month
     config:
       reports:
@@ -417,7 +417,7 @@ charts:
           label: Events
       colorScheme: tableau.Tableau10
   EventsPerType:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Events per type
     config:
       reports:
@@ -434,7 +434,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   LeadFunnel:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Lead funnel
     config:
       reports:
@@ -460,7 +460,7 @@ charts:
         renderer: {}
       colorScheme: tableau.ClassicMedium10
   LeadsByCountry:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Leads by country
     config:
       reports:
@@ -485,7 +485,7 @@ charts:
           label: Leads per country
       colorScheme: tableau.Tableau10
   LeadsByRating:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Leads by rating
     config:
       reports:
@@ -505,7 +505,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   LeadsBySource:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Leads by source
     config:
       reports:
@@ -524,7 +524,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau20
   LeadsByType:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Leads by type
     config:
       reports:
@@ -547,7 +547,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   LeadsPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Leads per month
     config:
       reports:
@@ -575,7 +575,7 @@ charts:
           label: Leads
       colorScheme: tableau.Tableau20
   MonthlySales:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Monthly sales
     config:
       reports:
@@ -610,7 +610,7 @@ charts:
           max: ""
       colorScheme: tableau.Tableau20
   NumberOfOpportunitiesVsTarget:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Number of opportunities vs target
     config:
       reports:
@@ -631,7 +631,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Traffic9
   OpportunitiesCreatedPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Opportunities created per month
     config:
       reports:
@@ -659,7 +659,7 @@ charts:
           beginAtZero: true
           label: Opportunities
   OpportunityLineItemsValue:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Opportunity line items value
     config:
       reports:
@@ -680,7 +680,7 @@ charts:
           label: value
       colorScheme: tableau.Tableau20
   OpportunitySalesPipeline:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Opportunity sales pipeline
     config:
       reports:
@@ -709,7 +709,7 @@ charts:
         renderer: {}
       colorScheme: tableau.ClassicMedium10
   OpportunityStatusFunnel:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Opportunity status funn
     config:
       reports:
@@ -737,7 +737,7 @@ charts:
         renderer: {}
       colorScheme: tableau.ClassicMedium10
   PriceBookEntriesPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Price book entries per month
     config:
       reports:
@@ -760,7 +760,7 @@ charts:
           label: Price book entries
       colorScheme: tableau.Tableau10
   PriceBooksCreatedPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Price books created per month
     config:
       reports:
@@ -783,7 +783,7 @@ charts:
           label: Price books
       colorScheme: tableau.Tableau10
   ProductsAddedPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Products added per month
     config:
       reports:
@@ -805,7 +805,7 @@ charts:
           label: Products
       colorScheme: tableau.Tableau10
   ProductsPerFamily:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Products per family
     config:
       reports:
@@ -823,7 +823,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   QuotesByStatus:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Quotes by status
     config:
       reports:
@@ -841,7 +841,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau20
   QuotesPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Quotes per month
     config:
       reports:
@@ -871,7 +871,7 @@ charts:
           label: Quotes
       colorScheme: tableau.Tableau20
   SalesVsTarget:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Sales vs target
     config:
       reports:
@@ -894,7 +894,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Traffic9
   SalesYTD:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Sales YTD
     config:
       reports:
@@ -916,7 +916,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Traffic9
   SolutionsByStatus:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Solutions by status
     config:
       reports:
@@ -933,7 +933,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   SolutionsCreatedPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Solutions created per month
     config:
       reports:
@@ -956,7 +956,7 @@ charts:
           label: Solutions
       colorScheme: tableau.Tableau10
   TasksByStatus:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Tasks by status
     config:
       reports:
@@ -974,7 +974,7 @@ charts:
         renderer: {}
       colorScheme: tableau.ClassicGreenOrange6
   TasksPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Tasks per month
     config:
       reports:
diff --git a/provision/700_crm/1400_pages.yaml b/provision/700_crm/1400_pages.yaml
index 8ca346a5b..a40aa3cef 100644
--- a/provision/700_crm/1400_pages.yaml
+++ b/provision/700_crm/1400_pages.yaml
@@ -1,7 +1,7 @@
 namespace: crm
 pages:
   - handle: Home
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Home
     blocks:
     - title: My New Leads
@@ -222,7 +222,7 @@ pages:
       xywh: [8, 0, 4, 11]
     visible: true
   - handle: Leads
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Leads
     blocks:
     - title: Leads by type
@@ -269,7 +269,7 @@ pages:
       xywh: [0, 0, 9, 16]
     pages:
       - handle: RecordPageForModuleLead
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Lead
         title: Record page for module "Lead"
         blocks:
@@ -427,7 +427,7 @@ pages:
           xywh: [6, 15, 3, 8]
         visible: true
       - handle: MyLeads
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: My Leads
         blocks:
         - title: My Leads
@@ -463,7 +463,7 @@ pages:
           xywh: [0, 0, 12, 17]
         visible: true
       - handle: AllNewLeads
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: All New Leads
         blocks:
         - title: New Leads
@@ -500,7 +500,7 @@ pages:
         visible: true
     visible: true
   - handle: Accounts
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Accounts
     blocks:
     - title: All accounts
@@ -548,7 +548,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleAccount
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Account
         title: Record page for module "Account"
         blocks:
@@ -806,7 +806,7 @@ pages:
           xywh: [9, 17, 3, 7]
         pages:
           - handle: RecordPageForModuleAccountContactRole
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: AccountContactRole
             title: Record page for module "AccountContactRole"
             blocks:
@@ -823,7 +823,7 @@ pages:
         visible: true
     visible: true
   - handle: Contacts
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Contacts
     blocks:
     - title: List of Contacts
@@ -868,7 +868,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleContact
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Contact
         title: Record page for module "Contact"
         blocks:
@@ -1042,7 +1042,7 @@ pages:
         visible: false
     visible: true
   - handle: Opportunities
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Opportunities
     blocks:
     - title: List of Opportunities
@@ -1095,7 +1095,7 @@ pages:
       xywh: [8, 0, 2, 6]
     pages:
       - handle: RecordPageForModuleOpportunity
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Opportunity
         title: Record page for module "Opportunity"
         blocks:
@@ -1322,7 +1322,7 @@ pages:
           xywh: [8, 18, 4, 8]
         pages:
           - handle: RecordPageForModuleOpportunityContactRole
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: OpportunityContactRole
             title: Record page for module "OpportunityContactRole"
             blocks:
@@ -1337,7 +1337,7 @@ pages:
               xywh: [0, 0, 4, 16]
             visible: false
           - handle: RecordPageForModuleOpportunityLineItem
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: OpportunityLineItem
             title: Record page for module "OpportunityLineItem"
             blocks:
@@ -1378,7 +1378,7 @@ pages:
               xywh: [8, 0, 4, 16]
             visible: false
           - handle: RecordPageForModuleOpportunityCompetitor
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: OpportunityCompetitor
             title: Record page for module "OpportunityCompetitor"
             blocks:
@@ -1397,7 +1397,7 @@ pages:
         visible: false
     visible: true
   - handle: Quotes
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Quotes
     blocks:
     - title: List of Quotes
@@ -1446,7 +1446,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleQuote
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Quote
         title: Record page for module "Quote"
         blocks:
@@ -1662,7 +1662,7 @@ pages:
           xywh: [4, 11, 4, 1]
         pages:
           - handle: RecordPageForModuleQuoteLineItem
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: QuoteLineItem
             title: Record page for module "QuoteLineItem"
             blocks:
@@ -1687,7 +1687,7 @@ pages:
         visible: false
     visible: true
   - handle: Contracts
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Contracts
     blocks:
     - title: List of Contracts
@@ -1735,7 +1735,7 @@ pages:
       xywh: [9, 0, 3, 9]
     pages:
       - handle: RecordPageForModuleContract
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Contract
         title: Record page for module "Contract"
         blocks:
@@ -1939,7 +1939,7 @@ pages:
           xywh: [0, 10, 6, 9]
         pages:
           - handle: RecordPageForModuleContractContactRole
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: ContractContactRole
             title: Record page for module "ContractContactRole"
             blocks:
@@ -1954,7 +1954,7 @@ pages:
               xywh: [0, 0, 4, 16]
             visible: false
           - handle: RecordPageForModuleEntitlement
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Entitlement
             title: Record page for module "Entitlement"
             blocks:
@@ -2021,7 +2021,7 @@ pages:
               xywh: [8, 0, 4, 13]
             pages:
               - handle: RecordPageForModuleEntitlementContact
-                (envoy): { skipIf: "!missing" }
+                (envoy): { onExisting: "skip" }
                 module: EntitlementContact
                 title: Record page for module "EntitlementContact"
                 blocks:
@@ -2035,7 +2035,7 @@ pages:
                   xywh: [0, 0, 4, 14]
                 visible: false
               - handle: RecordPageForModuleEntitlementTemplate
-                (envoy): { skipIf: "!missing" }
+                (envoy): { onExisting: "skip" }
                 module: EntitlementTemplate
                 title: Record page for module "EntitlementTemplate"
                 blocks:
@@ -2053,7 +2053,7 @@ pages:
                 visible: false
             visible: false
           - handle: RecordPageForModuleContractLineItem
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: ContractLineItem
             title: Record page for module "ContractLineItem"
             blocks:
@@ -2093,7 +2093,7 @@ pages:
         visible: false
     visible: true
   - handle: Campaigns
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Campaigns
     blocks:
     - title: List of Campaigns
@@ -2210,7 +2210,7 @@ pages:
       xywh: [10, 0, 2, 4]
     pages:
       - handle: RecordPageForModuleCampaign
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Campaigns
         title: Record page for module "Campaign"
         blocks:
@@ -2369,7 +2369,7 @@ pages:
         visible: false
     visible: true
   - handle: Products
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Products
     blocks:
     - title: List of Products
@@ -2413,7 +2413,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleProduct
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Product
         title: Record page for module "Product"
         blocks:
@@ -2527,7 +2527,7 @@ pages:
           xywh: [8, 0, 4, 10]
         visible: false
       - handle: PriceBook
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Price book
         blocks:
         - title: Price Books
@@ -2572,7 +2572,7 @@ pages:
           xywh: [9, 8, 3, 8]
         pages:
           - handle: RecordPageForModulePricebook
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Pricebook
             title: Record page for module "Pricebook"
             blocks:
@@ -2639,7 +2639,7 @@ pages:
               xywh: [0, 14, 12, 8]
             pages:
               - handle: RecordPageForModulePricebookEntry
-                (envoy): { skipIf: "!missing" }
+                (envoy): { onExisting: "skip" }
                 module: PricebookEntry
                 title: Record page for module "PricebookEntry"
                 blocks:
@@ -2658,7 +2658,7 @@ pages:
         visible: true
     visible: true
   - handle: Events
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Events
     blocks:
     - title: List of Events
@@ -2771,7 +2771,7 @@ pages:
       xywh: [3, 0, 6, 16]
     pages:
       - handle: RecordPageForModuleEvent
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Event
         title: Record page for module "Event"
         blocks:
@@ -2823,7 +2823,7 @@ pages:
         visible: false
     visible: true
   - handle: Tasks
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Tasks
     blocks:
     - title: List of Tasks
@@ -2872,7 +2872,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleTask
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Task
         title: Record page for module "Task"
         blocks:
@@ -2922,7 +2922,7 @@ pages:
         visible: false
     visible: true
   - handle: Dashboards
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Dashboards
     blocks:
     - title: Leads per day
@@ -2990,7 +2990,7 @@ pages:
       xywh: [6, 14, 3, 7]
     pages:
       - handle: LeadFunnelDashboard
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Lead Funnel Dashboard
         blocks:
         - title: Number of Leads in Campaigns
@@ -3129,7 +3129,7 @@ pages:
           xywh: [9, 18, 3, 7]
         visible: true
       - handle: ForecastDashboard
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Forecast Dashboard
         blocks:
         - title: Sales YTD
@@ -3190,7 +3190,7 @@ pages:
           xywh: [0, 6, 6, 8]
         visible: true
       - handle: KPIsAndSalesActivitiesDashboard
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: KPIs and Sales Activities Dashboard
         blocks:
         - title: New Leads
@@ -3377,7 +3377,7 @@ pages:
           xywh: [6, 22, 6, 7]
         visible: true
       - handle: ExecutiveDailyViewDashboard
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Executive Daily View Dashboard
         blocks:
         - title: Sales Pipeline
@@ -3481,7 +3481,7 @@ pages:
         visible: true
     visible: true
   - handle: More
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: More
     blocks:
     - title: Additional CRM modules
@@ -3491,7 +3491,7 @@ pages:
       xywh: [0, 0, 3, 3]
     pages:
       - handle: Notes
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Notes
         blocks:
         - title: List of Notes
@@ -3525,7 +3525,7 @@ pages:
           xywh: [0, 0, 12, 16]
         pages:
           - handle: RecordPageForModuleNote
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Note
             title: Record page for module "Note"
             blocks:
@@ -3565,7 +3565,7 @@ pages:
             visible: false
         visible: true
       - handle: Cases
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Cases
         blocks:
         - title: List of Cases
@@ -3633,7 +3633,7 @@ pages:
           xywh: [8, 5, 2, 6]
         pages:
           - handle: RecordPageForModuleCase
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Case
             title: Record page for module "Case"
             blocks:
@@ -3644,6 +3644,9 @@ pages:
                 - name: Subject
                 - name: AccountId
                 - name: ContactId
+                - name: SuppliedEmail
+                - name: SuppliedName
+                - name: SuppliedPhone
                 - name: ProductId
               style:
                 variants: {border: primary, headerText: primary}
@@ -3812,7 +3815,7 @@ pages:
               xywh: [6, 0, 3, 12]
             pages:
               - handle: RecordPageForModuleCaseUpdate
-                (envoy): { skipIf: "!missing" }
+                (envoy): { onExisting: "skip" }
                 module: CaseUpdate
                 title: Record page for module "CaseUpdate"
                 blocks:
@@ -3834,7 +3837,7 @@ pages:
             visible: false
         visible: true
       - handle: Solutions
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Solutions
         blocks:
         - title: List of Solutions
@@ -3880,7 +3883,7 @@ pages:
           xywh: [9, 8, 3, 8]
         pages:
           - handle: RecordPageForModuleSolution
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Solution
             title: Record page for module "Solution"
             blocks:
@@ -3900,7 +3903,7 @@ pages:
             visible: false
         visible: true
       - handle: DefaultSettings
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Default Settings
         description: A list of defaults values which are called upon in automation
           processes.
@@ -3929,7 +3932,7 @@ pages:
           xywh: [0, 0, 12, 7]
         pages:
           - handle: RecordPageForModuleDefaultSettings
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Settings
             title: Record page for module "DefaultSettings"
             blocks:
@@ -3975,7 +3978,7 @@ pages:
         visible: true
     visible: true
   - handle: UnpublishedModules
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Unpublished modules
     blocks:
     - title: Temp
@@ -3985,7 +3988,7 @@ pages:
       xywh: [0, 0, 3, 3]
     pages:
       - handle: RecordPageForModuleQuestion
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Question
         title: Record page for module "Question"
         blocks:
@@ -4046,7 +4049,7 @@ pages:
           xywh: [4, 0, 8, 13]
         pages:
           - handle: RecordPageForModuleReply
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Reply
             title: Record page for module "Reply"
             blocks:
@@ -4076,7 +4079,7 @@ pages:
               xywh: [6, 0, 6, 20]
             visible: false
           - handle: RecordPageForModuleVote
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Vote
             title: Record page for module "Vote"
             blocks:
@@ -4099,7 +4102,7 @@ pages:
             visible: false
         visible: false
       - handle: Ideas
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Ideas
         blocks:
         - title: List of Ideas
@@ -4128,7 +4131,7 @@ pages:
           xywh: [0, 0, 12, 20]
         pages:
           - handle: RecordPageForModuleIdea
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Idea
             title: Record page for module "Idea"
             blocks:
@@ -4174,7 +4177,7 @@ pages:
             visible: false
         visible: false
       - handle: Emails
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Emails
         blocks:
         - title: List of Email Templates
@@ -4191,7 +4194,7 @@ pages:
           xywh: [8, 0, 4, 20]
         pages:
           - handle: RecordPageForModuleEmailTemplate
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: EmailTemplate
             title: Record page for module "EmailTemplate"
             blocks:
@@ -4208,7 +4211,7 @@ pages:
             visible: false
         visible: false
       - handle: Questions
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Questions
         blocks:
         - title: List of Questions
diff --git a/provision/701_service-solution/1000_namespace.yaml b/provision/701_service-solution/1000_namespace.yaml
index 2b7940329..4a3138d51 100644
--- a/provision/701_service-solution/1000_namespace.yaml
+++ b/provision/701_service-solution/1000_namespace.yaml
@@ -1,4 +1,4 @@
 namespaces:
   service-solution:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Service Solution
diff --git a/provision/701_service-solution/1100_modules.yaml b/provision/701_service-solution/1100_modules.yaml
index 13930e1e7..ed4d4ec3c 100644
--- a/provision/701_service-solution/1100_modules.yaml
+++ b/provision/701_service-solution/1100_modules.yaml
@@ -1,7 +1,7 @@
 namespace: service-solution
 modules:
   Account:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Account
     fields:
       AccountName:
@@ -686,12 +686,6 @@ modules:
       Facebook:
         label: Facebook
         kind: String
-      AccountSelect:
-        label: Accounts
-        kind: Select
-        options:
-          options: []
-          selectType: default
       TotalTime:
         label: Total time of all cases
         kind: Number
@@ -707,7 +701,7 @@ modules:
           precision: "2"
           prefix: $
   Attachement:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Attachement
     fields:
       File:
@@ -731,7 +725,7 @@ modules:
         label: Name
         kind: String
   Case:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Case
     fields:
       Status:
@@ -845,6 +839,8 @@ modules:
       Number:
         label: Case Number
         kind: String
+        expressions:
+          valueExpr: "\"Ticket#\" + strftime(new.createdAt, \"%Y%m%d%H%M%S%b\")"
       ProductId:
         label: Product
         kind: Record
@@ -883,7 +879,7 @@ modules:
         label: PreviousStatus
         kind: String
   Contact:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Contact
     fields:
       AccountId:
@@ -1587,7 +1583,7 @@ modules:
         kind: String
         private: true
   Department:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Department
     meta: '{}'
     fields:
@@ -1622,14 +1618,8 @@ modules:
           format: "0.00"
           precision: "2"
           prefix: $
-      DepartmentSelect:
-        label: Departments
-        kind: Select
-        options:
-          multiLine: false
-          useRichTextEditor: false
   EmailMessage:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: EmailMessage
     meta: '{}'
     fields:
@@ -1684,7 +1674,7 @@ modules:
           - Number
           selectType: default
   EmailTemplate:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: EmailTemplate
     meta: '{}'
     fields:
@@ -1706,7 +1696,7 @@ modules:
         options:
           multiLine: true
   Entitlement:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Entitlement
     fields:
       AccountId:
@@ -1772,7 +1762,7 @@ modules:
           - Year(s)
           selectType: default
   EntitlementTemplate:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: EntitlementTemplate
     fields:
       Name:
@@ -1805,7 +1795,7 @@ modules:
           selectType: multiple
         multi: true
   KnowledgeBase:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: KnowledgeBase
     fields:
       Number:
@@ -1891,7 +1881,7 @@ modules:
           - Name
           selectType: default
   Product:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Product
     fields:
       IsActive:
@@ -1967,7 +1957,7 @@ modules:
           options: []
           selectType: default
   Settings:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Settings
     meta: '{}'
     fields:
@@ -2017,7 +2007,7 @@ modules:
           - Name
           selectType: default
   Update:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Update
     fields:
       CaseId:
diff --git a/provision/701_service-solution/1200_charts.yaml b/provision/701_service-solution/1200_charts.yaml
index 25934a21b..2918accee 100644
--- a/provision/701_service-solution/1200_charts.yaml
+++ b/provision/701_service-solution/1200_charts.yaml
@@ -1,7 +1,7 @@
 namespace: service-solution
 charts:
   ActiveEntitlements:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Number of active entitlements
     config:
       reports:
@@ -20,7 +20,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   AverageTimeSpentPerCase:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Average time spent per case
     config:
       reports:
@@ -40,7 +40,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   CaseUpdatesPerType:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Case updates per type
     config:
       reports:
@@ -60,7 +60,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   CasesByCategory:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases by category
     config:
       reports:
@@ -83,7 +83,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   CasesByPriority:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases by priority
     config:
       reports:
@@ -104,7 +104,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   CasesByStatus:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cases by status
     config:
       reports:
@@ -125,7 +125,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   ClosedCasesPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Closed cases per month
     config:
       reports:
@@ -150,7 +150,7 @@ charts:
           label: Cases
       colorScheme: tableau.Tableau10
   CostPerCategory:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Total cost per category
     config:
       reports:
@@ -174,7 +174,7 @@ charts:
           label: $
       colorScheme: tableau.Tableau10
   CostPerProductFamily:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Cost per product family
     config:
       reports:
@@ -197,13 +197,13 @@ charts:
           label: $
       colorScheme: tableau.Tableau10
   CostsPerAccount:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Total costs per account
     config:
       reports:
       - dimensions:
         - conditions: {}
-          field: AccountSelect
+          field: AccountName
           meta: {}
           modifier: (no grouping / buckets)
         filter: ""
@@ -220,7 +220,7 @@ charts:
           label: $
       colorScheme: tableau.Tableau10
   KnowledgeBaseArticlesPerType:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Knowledge Base articles per type
     config:
       reports:
@@ -241,7 +241,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   KnowledgeBaseItemsCreatedPerDay:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Knowledge Base items created per day
     config:
       reports:
@@ -264,7 +264,7 @@ charts:
           label: KB Items
       colorScheme: tableau.Tableau10
   NewCasesByMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: New cases per month
     config:
       reports:
@@ -290,13 +290,13 @@ charts:
           label: Cases
       colorScheme: tableau.Tableau10
   TimePerAccount:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Total time spend per account
     config:
       reports:
       - dimensions:
         - conditions: {}
-          field: AccountSelect
+          field: AccountName
           meta: {}
           modifier: (no grouping / buckets)
         filter: ""
@@ -311,7 +311,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau20
   TimeSpentPerProductFamily:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Time Spent per Product Family
     config:
       reports:
@@ -335,13 +335,13 @@ charts:
         renderer: {}
       colorScheme: tableau.ClassicMedium10
   TotalCostPerDepartment:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Total costs per department
     config:
       reports:
       - dimensions:
         - conditions: {}
-          field: DepartmentSelect
+          field: Name
           meta: {}
           modifier: (no grouping / buckets)
           skipMissing: true
@@ -359,7 +359,7 @@ charts:
           label: $
       colorScheme: tableau.Tableau10
   TotalCostPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Total cost per month
     config:
       reports:
@@ -381,7 +381,7 @@ charts:
           label: $
       colorScheme: tableau.Tableau10
   TotalTimeSpentPerCategory:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: 'Total time spent per category '
     config:
       reports:
@@ -403,13 +403,13 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   TotalTimeSpentPerDepartment:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Total time spent per department
     config:
       reports:
       - dimensions:
         - conditions: {}
-          field: DepartmentSelect
+          field: Name
           meta: {}
           modifier: (no grouping / buckets)
           skipMissing: true
@@ -425,7 +425,7 @@ charts:
         renderer: {}
       colorScheme: tableau.Tableau10
   TotalTimeSpentPerMonth:
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     name: Total time spent per month
     config:
       reports:
diff --git a/provision/701_service-solution/1400_pages.yaml b/provision/701_service-solution/1400_pages.yaml
index f5b25d4b6..2f37bab4c 100644
--- a/provision/701_service-solution/1400_pages.yaml
+++ b/provision/701_service-solution/1400_pages.yaml
@@ -1,7 +1,7 @@
 namespace: service-solution
 pages:
   - handle: Home
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Home
     blocks:
     - title: All Cases
@@ -74,7 +74,7 @@ pages:
       xywh: [9, 11, 3, 5]
     visible: true
   - handle: Cases
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Cases
     blocks:
     - title: All cases
@@ -120,7 +120,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleCase
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Case
         title: Record page for module "Case"
         blocks:
@@ -242,7 +242,7 @@ pages:
           xywh: [3, 3, 6, 2]
         pages:
           - handle: RecordPageForModuleAttachement
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Attachement
             title: Record page for module "Attachement"
             blocks:
@@ -258,7 +258,7 @@ pages:
               xywh: [0, 0, 5, 18]
             visible: false
           - handle: RecordPageForModuleUpdate
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Update
             title: Record page for module "Update"
             blocks:
@@ -301,7 +301,7 @@ pages:
             visible: false
         visible: false
       - handle: AllMyCases
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: All my cases
         blocks:
         - title: All my cases
@@ -334,7 +334,7 @@ pages:
           xywh: [0, 0, 12, 16]
         visible: true
       - handle: MyNewCases
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: My new cases
         blocks:
         - title: My new cases
@@ -368,7 +368,7 @@ pages:
         visible: true
     visible: true
   - handle: Accounts
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Accounts
     blocks:
     - title: Accounts
@@ -413,7 +413,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleAccount
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Account
         title: Record page for module "Account"
         blocks:
@@ -524,7 +524,7 @@ pages:
           xywh: [0, 21, 6, 9]
         visible: false
       - handle: Contacts
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Contacts
         blocks:
         - title: Contacts
@@ -558,7 +558,7 @@ pages:
           xywh: [0, 0, 12, 16]
         pages:
           - handle: RecordPageForModuleContact
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Contact
             title: Record page for module "Contact"
             blocks:
@@ -652,7 +652,7 @@ pages:
               xywh: [0, 20, 9, 9]
             pages:
               - handle: RecordPageForModuleEmailMessage
-                (envoy): { skipIf: "!missing" }
+                (envoy): { onExisting: "skip" }
                 module: EmailMessage
                 title: Record page for module "Email Message"
                 blocks:
@@ -700,10 +700,16 @@ pages:
                 - title: Actions
                   options:
                     buttons:
-                    - label: Load selected tempate in to email message
+                    - enabled: true
+                      label: Load selected template in to email message
                       variant: primary
-                    - label: Send email to the contact
+                      resourceType: compose:record
+                      script: /client-scripts/compose/service-solution/EmailMessage/TemplateLoad.js:default
+                    - enabled: true
+                      label: Send email to the contact
                       variant: success
+                      resourceType: compose:record
+                      script: /client-scripts/compose/service-solution/EmailMessage/SendEmail.js:default
                   style:
                     variants: {bodyBg: white, border: primary, headerBg: white,
                       headerText: primary}
@@ -713,7 +719,7 @@ pages:
             visible: false
         visible: true
       - handle: Entitlements
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Entitlements
         blocks:
         - title: Entitlements
@@ -747,7 +753,7 @@ pages:
           xywh: [0, 0, 12, 16]
         pages:
           - handle: RecordPageForModuleEntitlement
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: Entitlement
             title: Record page for module "Entitlement"
             blocks:
@@ -791,7 +797,7 @@ pages:
         visible: true
     visible: true
   - handle: Products
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Products
     blocks:
     - title: Products
@@ -838,7 +844,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleProduct
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Product
         title: Record page for module "Product"
         blocks:
@@ -937,7 +943,7 @@ pages:
           xywh: [3, 0, 3, 10]
         visible: false
       - handle: EntitlementTemplates
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Entitlement Templates
         blocks:
         - title: Entitlement Templates
@@ -968,7 +974,7 @@ pages:
           xywh: [0, 0, 12, 16]
         pages:
           - handle: RecordPageForModuleEntitlementTemplate
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: EntitlementTemplate
             title: Record page for module "EntitlementTemplate"
             blocks:
@@ -1007,7 +1013,7 @@ pages:
         visible: true
     visible: true
   - handle: KnowledgeBase
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Knowledge Base
     blocks:
     - title: Knowledge Base
@@ -1053,7 +1059,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleKnowledgeBase
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: KnowledgeBase
         title: Record page for module "Knowledge Base"
         blocks:
@@ -1110,7 +1116,7 @@ pages:
         visible: false
     visible: true
   - handle: Departments
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Departments
     blocks:
     - title: Departments
@@ -1156,7 +1162,7 @@ pages:
       xywh: [9, 8, 3, 8]
     pages:
       - handle: RecordPageForModuleDepartment
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Department
         title: Record page for module "Department"
         blocks:
@@ -1175,7 +1181,7 @@ pages:
             fields:
             - name: TotalTime
             - name: TotalCost
-            - name: DepartmentSelect
+            - name: Name
           style:
             variants: {bodyBg: white, border: primary, headerBg: white, headerText: primary}
           kind: Record
@@ -1204,7 +1210,7 @@ pages:
         visible: false
     visible: true
   - handle: Dashboard
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Dashboard
     blocks:
     - title: Cases by category
@@ -1349,7 +1355,7 @@ pages:
       xywh: [9, 24, 3, 6]
     visible: true
   - handle: Settings
-    (envoy): { skipIf: "!missing" }
+    (envoy): { onExisting: "skip" }
     title: Settings
     blocks:
     - title: Settings
@@ -1375,7 +1381,7 @@ pages:
       xywh: [0, 0, 12, 5]
     pages:
       - handle: RecordPageForModuleSettings
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         module: Settings
         title: Record page for module "Settings"
         blocks:
@@ -1395,7 +1401,7 @@ pages:
           xywh: [0, 0, 6, 17]
         visible: false
       - handle: EmailTemplates
-        (envoy): { skipIf: "!missing" }
+        (envoy): { onExisting: "skip" }
         title: Email Templates
         blocks:
         - title: Email Templates
@@ -1426,7 +1432,7 @@ pages:
           xywh: [0, 0, 12, 16]
         pages:
           - handle: RecordPageForModuleEmailTemplate
-            (envoy): { skipIf: "!missing" }
+            (envoy): { onExisting: "skip" }
             module: EmailTemplate
             title: Record page for module "Email Template"
             blocks: