diff --git a/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs b/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
index 4acb71fd..b00b922b 100644
--- a/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
@@ -72,7 +72,7 @@ namespace ENI2.DetailViewControls
             this.buttonDeleteTemplate.IsEnabled = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor;
         }
 
-        public override void Initialize()
+        public async override void Initialize()
         {
             base.Initialize();
 
@@ -127,7 +127,7 @@ namespace ENI2.DetailViewControls
 
             if(_agntTemplates == null)
             {
-                _agntTemplates = DBManager.Instance.GetAGNTTemplates(); // inital full load
+                _agntTemplates = await DBManagerAsync.GetAGNTTemplatesAsync(); // inital full load
                 _agntTemplates.Sort();
                 Trace.WriteLine(string.Format("{0} agent templates loaded", _agntTemplates.Count));
             }
diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 3ade16f5..fbf1f661 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -27,6 +27,10 @@ namespace ENI2.DetailViewControls
         private Message _wasRcptMessage;
         private WAS_RCPT _selectedWAS_RCPT;
 
+        private static List<WasteDisposalServiceProvider_Template> _wsdpTemplates = null;
+        private WasteDisposalServiceProvider_Template _currentTemplate;
+        private WasteDisposalServiceProvider_Template _undoTemplate;
+
         private static readonly string[] _wasteDeliveryList =
         {
             "ALL",