diff --git a/Application/application/create_application.sql b/Application/application/create_application.sql
index 0a717a1..21c072f 100644
--- a/Application/application/create_application.sql
+++ b/Application/application/create_application.sql
@@ -14,7 +14,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 24740611526526770 + wwv_flow_api.g_id_offset,
   p_error_template    => 24734616867526758 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'Y',
-  p_checksum_salt_last_reset => '20071129171058',
+  p_checksum_salt_last_reset => '20071129174644',
   p_home_link         => 'f?p=&APP_ID.:1',
   p_box_width         => '98%',
   p_flow_language     => 'en-gb',
@@ -53,8 +53,8 @@ wwv_flow_api.create_flow(
   p_default_reportr_template   =>24740611526526770 + wwv_flow_api.g_id_offset,
   p_default_menur_template => 24737010408526765 + wwv_flow_api.g_id_offset,
   p_default_listr_template => 24740611526526770 + wwv_flow_api.g_id_offset,
-  p_last_updated_by => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss=> '20071129171058',
+  p_last_updated_by => 'PRIESTJ',
+  p_last_upd_yyyymmddhh24miss=> '20071129174644',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
diff --git a/Application/application/pages/page_00032.sql b/Application/application/pages/page_00032.sql
index 17cb23a..83c5db0 100644
--- a/Application/application/pages/page_00032.sql
+++ b/Application/application/pages/page_00032.sql
@@ -24,8 +24,8 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_role => 16097609166220701+ wwv_flow_api.g_id_offset,
   p_required_patch=> null + wwv_flow_api.g_id_offset,
-  p_last_updated_by => 'ADMIN',
-  p_last_upd_yyyymmddhh24miss => '20071129153302',
+  p_last_updated_by => 'PRIESTJ',
+  p_last_upd_yyyymmddhh24miss => '20071129174314',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -1971,10 +1971,8 @@ wwv_flow_api.create_page_item(
 'where pacm.come_id = come.id and come.comt_code = :P32_AGENT_COMT_CODE'||chr(10)||
 'and (pacm.prty_id = :P32_AGENT_ID OR pacm.prty_id = :P32_AGENT_ID2)',
   p_lov_columns=> 1,
-  p_lov_display_null=> 'YES',
+  p_lov_display_null=> 'NO',
   p_lov_translated=> 'N',
-  p_lov_null_text=>'-Please select a value-',
-  p_lov_null_value=> '',
   p_cSize=> 30,
   p_cMaxlength=> 2000,
   p_cHeight=> 5,
@@ -1985,8 +1983,8 @@ wwv_flow_api.create_page_item(
   p_rowspan => 1,
   p_label_alignment  => 'RIGHT',
   p_field_alignment  => 'LEFT',
-  p_display_when=>'P32_AGENT_ID',
-  p_display_when_type=>'ITEM_IS_NOT_NULL',
+  p_display_when=>':P32_AGENT_COMT_CODE is not null and :P32_AGENT_COMT_CODE <> ''%''||''null%''',
+  p_display_when_type=>'PLSQL_EXPRESSION',
   p_read_only_when=>'return #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'')',
   p_read_only_when_type=>'FUNCTION_BODY',
   p_field_template => 24749138532526789+wwv_flow_api.g_id_offset,
@@ -3142,7 +3140,7 @@ wwv_flow_api.create_page_item(
   p_prompt=>'Agent',
   p_source=>'SELECT prty_id FROM v_latest_rt_code_for_enro where rt_code=''ENQ OWN'' and enqu_id=:P32_ID;',
   p_source_type=> 'QUERY',
-  p_display_as=> 'COMBOBOX',
+  p_display_as=> 'COMBOBOX_WITH_SUBMIT',
   p_lov => 'select FIRST_NAME || '' '' || LAST_NAME display_value, ID return_value'||chr(10)||
 '  from PARTIES, PARTY_RELATIONSHIPS'||chr(10)||
 ' where from_parl_prty_id = id'||chr(10)||
@@ -3165,7 +3163,7 @@ wwv_flow_api.create_page_item(
   p_rowspan => 1,
   p_label_alignment  => 'RIGHT',
   p_field_alignment  => 'LEFT',
-  p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) <> ''AGENT''',
+  p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) <> ''AGENT'' and :P32_MKTP_REF is not null and :P32_MKTP_REF<> ''%''||''null%''',
   p_display_when_type=>'PLSQL_EXPRESSION',
   p_read_only_when=>'return #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'')',
   p_read_only_when_type=>'FUNCTION_BODY',
@@ -3413,6 +3411,8 @@ wwv_flow_api.create_page_item(
   p_rowspan => 1,
   p_label_alignment  => 'RIGHT',
   p_field_alignment  => 'LEFT',
+  p_display_when=>'(#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) <> ''AGENT'' and :P32_AGENT_ID is not null and :P32_AGENT_ID<> ''%''||''null%'') or (#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) =''AGENT'')',
+  p_display_when_type=>'PLSQL_EXPRESSION',
   p_read_only_when=>'return #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'')',
   p_read_only_when_type=>'FUNCTION_BODY',
   p_field_template => 24749138532526789+wwv_flow_api.g_id_offset,
diff --git a/Application/application/set_environment.sql b/Application/application/set_environment.sql
index 4788922..37c0900 100644
--- a/Application/application/set_environment.sql
+++ b/Application/application/set_environment.sql
@@ -4,7 +4,7 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   17:12 Thursday November 29, 2007
+--   Date and Time:   17:48 Thursday November 29, 2007
 --   Exported By:     
 --   Flashback:       0
 --   Export Type:     Application Export