diff --git a/Screens/f155.sql b/Screens/f155.sql
index 5d02e32..556755e 100644
--- a/Screens/f155.sql
+++ b/Screens/f155.sql
@@ -13,7 +13,7 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   17:17 Monday March 17, 2008
+--   Date and Time:   17:48 Monday March 17, 2008
 --   Exported By:     PRIESTJ
 --   Flashback:       0
 --   Export Type:     Application Export
@@ -28,7 +28,7 @@ prompt  APPLICATION 155 - webmip
 --   Pages:                53
 --     Items:             358
 --     Computations:        1
---     Validations:       284
+--     Validations:       285
 --     Processes:          96
 --     Regions:            78
 --     Buttons:           113
@@ -145,7 +145,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 28038130488354430 + wwv_flow_api.g_id_offset,
   p_error_template    => 42209241448421762 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'N',
-  p_checksum_salt_last_reset => '20080317171729',
+  p_checksum_salt_last_reset => '20080317174813',
   p_home_link         => 'f?p=&APP_ID.:101',
   p_flow_language     => 'en-gb',
   p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE',
@@ -190,7 +190,7 @@ wwv_flow_api.create_flow(
   p_substitution_string_02 => 'T_AND_C_URL',
   p_substitution_value_02  => 'http://www.nationalgrid.com/uk/metering/mip/tc.htm',
   p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss=> '20080317171729',
+  p_last_upd_yyyymmddhh24miss=> '20080317174813',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -318,8 +318,7 @@ declare
     l_clob clob;
     l_length number := 1;
 begin
-p:=p||'return;'||chr(10)||
-'BEGIN'||chr(10)||
+p:=p||'BEGIN'||chr(10)||
 '    FOR rItem IN'||chr(10)||
 '      ( SELECT ITEM_NAME'||chr(10)||
 '          FROM APEX_APPLICATION_PAGE_ITEMS'||chr(10)||
@@ -330,9 +329,9 @@ p:=p||'return;'||chr(10)||
 '           AND LOV_NULL_VALUE   IS NULL'||chr(10)||
 '      )'||chr(10)||
 '    LOOP'||chr(10)||
-'        IF V(rItem.ITEM_NAME) =';
+'        IF V(rItem.ITEM_NAME) = ''%null'' ';
 
-p:=p||' ''%null'' || ''%'''||chr(10)||
+p:=p||'|| ''%'''||chr(10)||
 '        THEN'||chr(10)||
 '            Apex_Util.set_session_state(rItem.ITEM_NAME, NULL);'||chr(10)||
 '        END IF;'||chr(10)||
@@ -7411,7 +7410,7 @@ wwv_flow_api.create_page(
   p_required_role => 14572900838700208+ wwv_flow_api.g_id_offset,
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss => '20080317164121',
+  p_last_upd_yyyymmddhh24miss => '20080317174142',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -8678,6 +8677,29 @@ end;
 /
 
  
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 6571427905689231 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 19,
+  p_validation_name => 'Meter type must not be null',
+  p_validation_sequence=> 210,
+  p_validation => 'if :P19_COST_TYPE = ''LACO'' and :P19_METY_CODE is null then'||chr(10)||
+'  return ''Meter type must have some value.'';'||chr(10)||
+'end if;',
+  p_validation_type => 'FUNC_BODY_RETURNING_ERR_TEXT',
+  p_error_message => '',
+  p_associated_item=> 43722932628273750 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> '');
+ 
+null;
+ 
+end;
+/
+
+ 
 begin
  
 declare
@@ -11119,7 +11141,7 @@ wwv_flow_api.create_page(
   p_required_role => 16097609166220701+ wwv_flow_api.g_id_offset,
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss => '20080317171630',
+  p_last_upd_yyyymmddhh24miss => '20080317174357',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -11704,7 +11726,7 @@ wwv_flow_api.create_page_branch(
   p_branch_type=> 'REDIRECT_URL',
   p_branch_sequence=> 2,
   p_branch_condition_type=> 'REQUEST_IN_CONDITION',
-  p_branch_condition=> 'P32_ENTY_CODE,P32_EXISTING_METER_MODEL',
+  p_branch_condition=> 'P32_ENTY_CODE:P32_EXISTING_METER_MODEL',
   p_branch_comment=> 'Created 26-NOV-2007 15:45 by PRIESTJ');
  
 wwv_flow_api.create_page_branch(
@@ -20247,74 +20269,119 @@ declare
   l_length number := 1;
 begin
 p:=p||'DECLARE'||chr(10)||
-'l_rec_meter_reqs mip_enquiry.t_rec_meter_reqs;'||chr(10)||
+'  l_rec_meter_reqs mip_enquiry.t_rec_meter_reqs;'||chr(10)||
 'BEGIN'||chr(10)||
 ''||chr(10)||
-'mip_debug.pl(''ResetMeterSizes'', ''P32:ResetMeterSizes:entry'');'||chr(10)||
+'  mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'              ,''P32:ResetMeterSizes:entry'');'||chr(10)||
 ''||chr(10)||
-'IF :P32_L_AMR_REQUIRED = ''H'' THEN :P32_AMR_REQUIRED := NULL; END IF;'||chr(10)||
-'IF :P32_L_ANNUAL_REQUIRED = ''H'' THEN :P32_ANNUAL_REQUIRED := NULL; END IF;'||chr(10)||
-'IF :P32_L_BASE_REQUIRED = ''H'' THEN :P32_BASE_REQUIRED := NULL; END IF;'||chr(10)||
-'IF :P32_L_BYPASS_REQUIRED = ''H'' THEN :P32_BYPASS_RE';
+'  IF :p32_l_amr_required = ''H'' THEN'||chr(10)||
+'    :p32_amr_required := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_annual_quantity = ''H'' THEN'||chr(10)||
+'    :p32_annual_quantity := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_base_required = ''H'' THEN'||chr(10)||
+'    :p32_base_required := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  ';
 
-p:=p||'QUIRED := NULL; END IF;'||chr(10)||
-'IF :P32_L_CONVERTOR_REQUIRED = ''H'' THEN :P32_CONVERTOR_REQUIRED := NULL; END IF;'||chr(10)||
-'mip_debug.pl(''ResetMeterSizes'', ''P32:ResetMeterSizes:1'');'||chr(10)||
-'IF :P32_L_DS_BOOSTER_OR_COMPRESS = ''H'' THEN '||chr(10)||
-'mip_debug.pl(''ResetMeterSizes'', ''P32:ResetMeterSizes:1A'');'||chr(10)||
-':P32_DS_BOOSTER_OR_COMPRESS := NULL;'||chr(10)||
-'END IF;'||chr(10)||
-'IF :P32_L_EMS_REQUIRED = ''H'' THEN :P32_EMS_REQUIRED := NULL; END IF;'||chr(10)||
-'IF :P32_L_E';
+p:=p||'IF :p32_l_bypass_required = ''H'' THEN'||chr(10)||
+'    :p32_bypass_required := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_convertor_required = ''H'' THEN'||chr(10)||
+'    :p32_convertor_required := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'              ,''P32:ResetMeterSizes:1'');'||chr(10)||
+'  IF :p32_l_ds_booster_or_compress = ''H'' THEN'||chr(10)||
+'    mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'                ,''P32:ResetMeterSizes:1A'');'||chr(10)||
+'    :p32_ds_booster_';
 
-p:=p||'XISTING_CONVERTOR = ''H'' THEN :P32_EXISTING_CONVERTOR := NULL; END IF;'||chr(10)||
-'IF :P32_L_EXISTING_LOGGER = ''H'' THEN :P32_EXISTING_LOGGER := NULL; END IF;'||chr(10)||
-'IF :P32_L_MESC_CODE = ''H'' THEN :P32_MESC_CODE := NULL; END IF;'||chr(10)||
-'IF :P32_L_METER_OWNER = ''H'' THEN :P32_METER_OWNER := NULL; END IF;'||chr(10)||
-'mip_debug.pl(''ResetMeterSizes'', ''P32:ResetMeterSizes:2'');'||chr(10)||
-'IF :P32_L_HOUSING_REQUIRED = ''H'' THEN :P32_HOUSING_REQUIRED :=';
+p:=p||'or_compress := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_ems_required = ''H'' THEN'||chr(10)||
+'    :p32_ems_required := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_existing_convertor = ''H'' THEN'||chr(10)||
+'    :p32_existing_convertor := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_existing_logger = ''H'' THEN'||chr(10)||
+'    :p32_existing_logger := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_mesc_code = ''H'' THEN'||chr(10)||
+'    :p32_mesc_code := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_meter_owner = ''H'' THEN';
 
-p:=p||' NULL; END IF;'||chr(10)||
-'IF :P32_L_LOAD_CONTROL_TYPE = ''H'' THEN :P32_LOAD_CONTROL_TYPE := NULL; END IF;'||chr(10)||
-'IF :P32_L_MPRN = ''H'' THEN :P32_MPRN := NULL; END IF;'||chr(10)||
-'IF :P32_L_MPRN_ALT = ''H'' THEN :P32_MPRN_ALT := NULL; END IF;'||chr(10)||
-'IF :P32_L_QMAX = ''H'' THEN :P32_QMAX := NULL; END IF;'||chr(10)||
-'mip_debug.pl(''ResetMeterSizes'', ''P32:ResetMeterSizes:3'');'||chr(10)||
-'IF :P32_L_REQUIRED_IP_DETAILS = ''H'' THEN :P32_REQUIRED_IP_DETAILS := NULL; ';
+p:=p||''||chr(10)||
+'    :p32_meter_owner := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'              ,''P32:ResetMeterSizes:2'');'||chr(10)||
+'  IF :p32_l_housing_required = ''H'' THEN'||chr(10)||
+'    :p32_housing_required := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_load_control_type = ''H'' THEN'||chr(10)||
+'    :p32_load_control_type := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_mprn = ''H'' THEN'||chr(10)||
+'    :p32_mprn := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_mprn_alt = ''H'' THEN'||chr(10)||
+'    :p';
 
-p:=p||'END IF;'||chr(10)||
-'IF :P32_L_REQUIRED_IP_MBAR = ''H'' THEN :P32_REQUIRED_IP_MBAR := NULL; END IF;'||chr(10)||
-'IF v(''P32_L_REQUIRED_METERING_PRESSURE'') = ''H'' THEN :P32_REQUIRED_METERING_PRESSURE := NULL; END IF;'||chr(10)||
-'IF :P32_L_REQUIRED_SVCP_CODE = ''H'' THEN :P32_REQUIRED_SVCP_CODE := NULL; END IF;'||chr(10)||
-'IF :P32_L_TWIN_STREAM_REQUIRED = ''H'' THEN :P32_TWIN_STREAM_REQUIRED := NULL; END IF;'||chr(10)||
+p:=p||'32_mprn_alt := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_qmax = ''H'' THEN'||chr(10)||
+'    :p32_qmax := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'              ,''P32:ResetMeterSizes:3'');'||chr(10)||
+'  IF :p32_l_required_ip_details = ''H'' THEN'||chr(10)||
+'    :p32_required_ip_details := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_required_ip_mbar = ''H'' THEN'||chr(10)||
+'    :p32_required_ip_mbar := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF v(''P32_L_REQUIRED_METERING_PRESSURE'') = ';
+
+p:=p||'''H'' THEN'||chr(10)||
+'    :p32_required_metering_pressure := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_required_svcp_code = ''H'' THEN'||chr(10)||
+'    :p32_required_svcp_code := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
+'  IF :p32_l_twin_stream_required = ''H'' THEN'||chr(10)||
+'    :p32_twin_stream_required := NULL;'||chr(10)||
+'  END IF;'||chr(10)||
 ''||chr(10)||
-'mip_debug.pl(''ResetMeterSizes'', ''P32:Rese';
+'  mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'              ,''P32:ResetMeterSizes:4'');'||chr(10)||
+''||chr(10)||
+'  l_rec_meter_reqs := mip_enquiry.calc_meter_reqs(p_enty_code => ';
 
-p:=p||'tMeterSizes:4'');'||chr(10)||
-''||chr(10)||
-'l_rec_meter_reqs := mip_enquiry.calc_meter_reqs('||chr(10)||
-'p_enty_code          => :P32_ENTY_CODE'||chr(10)||
-',p_existing_mesc_code => :P32_EXISTING_MESC_CODE'||chr(10)||
-',p_required_mesc_code => :P32_METER_SIZE'||chr(10)||
-',p_existing_metr_code => :P32_EXISTING_METER_MODEL'||chr(10)||
-',p_existing_mety_code => :P32_EXISTING_METY_CODE'||chr(10)||
-',p_existing_prty_id => :P32_EXISTING_PRTY_ID'||chr(10)||
-',p_qmax => :P32_QMAX);'||chr(10)||
-'mip_debug.pl(''ResetMeterSi';
+p:=p||':p32_enty_code, p_existing_mesc_code => CASE :p32_existing_mesc_code WHEN ''%null'' || ''%'' THEN NULL ELSE :p32_existing_mesc_code END, p_required_mesc_code => CASE :p32_meter_size WHEN ''%null'' || ''%'' THEN NULL ELSE :p32_meter_size END, p_existing_metr_code => CASE :p32_existing_meter_model WHEN ''%null'' || ''%'' THEN NULL ELSE :p32_existing_meter_model END, p_existing_mety_code => CASE :p32_existing_me';
 
-p:=p||'zes'', ''P32:ResetMeterSizes:5'');'||chr(10)||
+p:=p||'ty_code WHEN ''%null'' || ''%'' THEN NULL ELSE :p32_existing_mety_code END, p_existing_prty_id => CASE :p32_existing_prty_id WHEN ''%null'' || ''%'' THEN NULL ELSE :p32_existing_prty_id END, p_qmax => CASE :p32_qmax WHEN ''%null'' || ''%'' THEN NULL ELSE :p32_qmax END);'||chr(10)||
 ''||chr(10)||
-':P32_EXISTING_MESC_CODE := l_rec_meter_reqs.existing_mesc_code;'||chr(10)||
-':P32_METER_SIZE := l_rec_meter_reqs.required_mesc_code;'||chr(10)||
-':P32_EXISTING_METER_MODEL := l_rec_meter_reqs.existing_metr_code;'||chr(10)||
-':P32_EXISTING_METY_CODE := l_rec_meter_reqs.existing_mety_code;'||chr(10)||
-':P32_EXISTING_PRTY_ID := l_rec_meter_reqs.existing_prty_id;'||chr(10)||
-':P32_QMAX := l_rec_meter_reqs.qmax;'||chr(10)||
+'  mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'              ,''P32:ResetMeterSizes:5'');'||chr(10)||
 ''||chr(10)||
-'mip_debug.p';
+'  :p32_existing_mesc_code   := l_rec_meter_reqs.existing_mes';
 
-p:=p||'l(''ResetMeterSizes'', ''P32:ResetMeterSizes:exit'');'||chr(10)||
+p:=p||'c_code;'||chr(10)||
+'  :p32_meter_size           := l_rec_meter_reqs.required_mesc_code;'||chr(10)||
+'  :p32_existing_meter_model := l_rec_meter_reqs.existing_metr_code;'||chr(10)||
+'  :p32_existing_mety_code   := l_rec_meter_reqs.existing_mety_code;'||chr(10)||
+'  :p32_existing_prty_id     := l_rec_meter_reqs.existing_prty_id;'||chr(10)||
+'  :p32_qmax                 := l_rec_meter_reqs.qmax;'||chr(10)||
 ''||chr(10)||
+'  mip_debug.pl(''ResetMeterSizes'''||chr(10)||
+'              ,''P32:ResetM';
+
+p:=p||'eterSizes:exit'');'||chr(10)||
 ''||chr(10)||
 'END;';