diff --git a/Data/BulkLoad/DATAITEM_ROLES.csv b/Data/BulkLoad/DATAITEM_ROLES.csv
index a7868bc..4681848 100644
--- a/Data/BulkLoad/DATAITEM_ROLES.csv
+++ b/Data/BulkLoad/DATAITEM_ROLES.csv
@@ -53,11 +53,11 @@ MPRN,Site Detail.MPRN,O-M4,O-M4,M,M,M,M,M,M,M,M,M,O,,67
 MPRN_ALT,Site Detail.Additional Information,O-M4,O-M4,O,O,O,O,O,O,O,O,O,O,,63
 OTHER_INFORMATION,Job Information.Other Information,O,O,O,O,O,O,O,O,O,O,O,O,,50
 OTHER_PROJECT_REFERENCE,Job Information.Other Related Projects,O,O,O,O,O,O,O,O,O,O,O,O,,51
-QMAX,Job Information.Measuring Capacity Qmax,M,O-M2,O,M,O-M2,O,O,O,O,M,O,O,,46
+QMAX,Job Information.Measuring Capacity Qmax,M,O-M2,O,M,O-M2,O,O,O,O,O-M2,O,O,,46
 QMIN,Job Information.Measuring Capacity Qmin,O,O,O,O,O,O,O,O,O,O,O,O,,47
 REQUIRED_IP_DETAILS,Job Information.IP Details,O-M3,H,O-M3,O-M3,H,O-M3,H,O-M3,O-M3,O-M3,O-M3,O-M3,if service pressure is IP,40
 REQUIRED_IP_MBAR,Job Information.IP Inlet pressure,O-M3,H,O-M3,O-M3,H,O-M3,H,O-M3,O-M3,O-M3,O-M3,O-M3,if service pressure is IP,41
-REQUIRED_MESC_CODE,Job Information.Meter Size,H,O-M2,H,H,O-M2,H,H,H,H,O,H,O,,48
+REQUIRED_MESC_CODE,Job Information.Meter Size,H,O-M2,H,H,O-M2,H,H,H,H,O-M2,H,O,,48
 REQUIRED_METERING_PRESSURE,Job Information.Required Meter Pressure,M,M,M,M,M,M,M,M,M,M,O,O,,52
 REQUIRED_SVCP_CODE,Job Information.Service Pressure,O-M3,M,O-M3,O-M3,M,O-M3,M,O-M3,O-M3,O-M3,O-M3,O-M3,,53
 SECOND_ALT_BUILDING,Second Contact Address.Building,O,O,O,O,O,O,O,O,O,O,O,O,,56
diff --git a/Documentation/Design/DATAITEM_ROLES.xls b/Documentation/Design/DATAITEM_ROLES.xls
index d895d29..d02201d 100644
Binary files a/Documentation/Design/DATAITEM_ROLES.xls and b/Documentation/Design/DATAITEM_ROLES.xls differ
diff --git a/Modules/mip_helper_special_cases.pck b/Modules/mip_helper_special_cases.pck
index 0aafaee..490b5e0 100644
--- a/Modules/mip_helper_special_cases.pck
+++ b/Modules/mip_helper_special_cases.pck
@@ -27,7 +27,7 @@ CREATE OR REPLACE PACKAGE BODY mip_helper_special_cases IS
     END IF;
   
     -- O-M2
-    IF p_rec.enty_code IN ('STD INSTALL', 'STD EXCHANGE') THEN
+    IF p_rec.enty_code IN ('STD INSTALL', 'STD EXCHANGE', 'CHANGE CAPACITY') THEN
       IF (p_rec.required_mesc_code IS NULL OR
          p_rec.required_mesc_code = 'OTHER') THEN
         IF p_rec.qmax IS NULL THEN
diff --git a/Modules/mip_quotation.pck b/Modules/mip_quotation.pck
index 2218249..3e61f97 100644
--- a/Modules/mip_quotation.pck
+++ b/Modules/mip_quotation.pck
@@ -213,12 +213,10 @@ CREATE OR REPLACE PACKAGE BODY mip_quotation IS
   PROCEDURE pl(p_in   VARCHAR2
               ,p_line IN NUMBER DEFAULT NULL) IS
   BEGIN
-   $IF mip_debug_constants.debugging OR mip_debug_constants.quotation $THEN
-    mip_debug.pl(p_unit => $$PLSQL_UNIT
-                ,p_line => p_line
-                ,p_in   => p_in);
-    $END
-    NULL;
+    $IF mip_debug_constants.debugging OR mip_debug_constants.quotation $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT
+                                                                                         ,p_line => p_line
+                                                                                         ,p_in   => p_in);
+    $END NULL;
   END pl;
 
   PROCEDURE add_quote_reason(p_enqu_id              IN enquiries.id%TYPE
@@ -1722,15 +1720,14 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
 
   PROCEDURE survey_required(p_enqu                      IN t_enqu
                            ,p_manual_or_automatic_quote IN OUT t_manual_or_automatic_quote) IS
-    l_svcpt_code         service_pressure_types.code%TYPE;
-    l_rec_metr_details   t_rec_metr_details;
-    l_required_mesc_code meter_size_codes.code%TYPE;
+    l_svcpt_code                service_pressure_types.code%TYPE;
+    l_rec_metr_details          t_rec_metr_details;
+    l_required_mesc_code        meter_size_codes.code%TYPE;
+    l_manual_or_automatic_quote t_manual_or_automatic_quote := gc_automatic_quote;
   BEGIN
     pl('survey_required'
       ,$$PLSQL_LINE);
   
-    p_manual_or_automatic_quote := gc_automatic_quote;
-  
     -- Site survey required for:
     -- Existing meter is (rotary or turbine) AND OFMAT enquiry;
   
@@ -1739,7 +1736,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
       l_rec_metr_details := get_existing_metr_details(p_enqu);
     
       IF l_rec_metr_details.mety_code IN ('ROTARY', 'TURBINE') THEN
-        p_manual_or_automatic_quote := gc_manual_quote;
+        l_manual_or_automatic_quote := gc_manual_quote;
         add_quote_reason(p_enqu.id
                         ,'Site Survey is required for OFMAT of an existing ' ||
                          initcap(l_rec_metr_details.mety_code) ||
@@ -1748,6 +1745,10 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
       END IF; -- ROTARY / TURBINE
     END IF; -- OFMAT
   
+    IF l_manual_or_automatic_quote = gc_manual_quote THEN
+      p_manual_or_automatic_quote := gc_manual_quote;
+    END IF;
+  
   END survey_required;
 
   FUNCTION tripartite_agreement_message(p_rec IN mip_enquiries_helper.t_rec_enquiries)
@@ -2304,7 +2305,8 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
     
       pl('Looking for modules to match the following: Service Pressure ' ||
          p_enqu.required_svcp_code || ', Outlet Pressure ' ||
-         p_enqu.required_metering_pressure || CASE l_required_mesc_code IS NULL WHEN TRUE THEN
+         p_enqu.required_metering_pressure || CASE
+         l_required_mesc_code IS NULL WHEN TRUE THEN
          'and required Qmax ' || l_required_qmax ELSE
          'and required Meter Size Code ' || l_required_mesc_code
          END || '.');