[ofbiz-framework] branch trunk updated: Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated: Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"

jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ec2b843  Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
ec2b843 is described below

commit ec2b84341e8062d02a5da6a50d1b3551d18ba13b
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Fri Dec 18 11:04:33 2020 +0100

    Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
   
    This reverts commit 17eb2e4cf7bfba4e6a6b62117aa8d64cd5774c5e.
   
    It does not work when using <<target="javascript:........>>
    I could change those cases but it's easier and safer to simply revert back to
    target-type!
   
    Thanks: James for report
---
 applications/accounting/widget/AgreementForms.xml  |  4 +-
 .../accounting/widget/BillingAccountForms.xml      |  4 +-
 applications/accounting/widget/BudgetForms.xml     |  8 ++--
 .../accounting/widget/FieldLookupForms.xml         | 22 +++++------
 applications/accounting/widget/FinAccountForms.xml |  6 +--
 applications/accounting/widget/FixedAssetForms.xml |  6 +--
 applications/accounting/widget/GlForms.xml         | 30 +++++++-------
 applications/accounting/widget/GlSetupForms.xml    |  6 +--
 .../accounting/widget/GlobalGlAccountsForms.xml    |  2 +-
 applications/accounting/widget/InvoiceForms.xml    | 24 +++++------
 applications/accounting/widget/PaymentForms.xml    |  8 ++--
 .../accounting/widget/PaymentGroupForms.xml        |  8 ++--
 .../accounting/widget/TaxAuthorityForms.xml        | 12 +++---
 .../accounting/widget/TransactionForms.xml         |  6 +--
 .../accounting/widget/ap/forms/InvoiceForms.xml    |  4 +-
 .../accounting/widget/ar/forms/InvoiceForms.xml    |  4 +-
 applications/commonext/widget/SystemInfoForms.xml  |  4 +-
 applications/content/widget/LookupForms.xml        |  6 +--
 applications/content/widget/cms/CMSForms.xml       |  8 ++--
 .../content/widget/content/ContentForms.xml        | 14 +++----
 .../content/widget/content/DataResourceForms.xml   |  8 ++--
 .../content/widget/datasetup/DataSetupForms.xml    |  2 +-
 applications/content/widget/layout/LayoutForms.xml |  4 +-
 applications/content/widget/survey/SurveyForms.xml |  4 +-
 .../content/widget/website/WebSiteForms.xml        |  6 +--
 .../humanres/widget/forms/EmplLeaveForms.xml       |  8 ++--
 .../humanres/widget/forms/EmplPositionForms.xml    |  4 +-
 .../humanres/widget/forms/EmployeeForms.xml        |  4 +-
 .../humanres/widget/forms/EmploymentForms.xml      |  2 +-
 applications/humanres/widget/forms/LookupForms.xml | 28 ++++++-------
 .../humanres/widget/forms/PartyQualForms.xml       |  2 +-
 .../humanres/widget/forms/PartyResumeForms.xml     |  2 +-
 .../humanres/widget/forms/PayGradeForms.xml        |  2 +-
 .../humanres/widget/forms/PersonTrainingForms.xml  | 10 ++---
 .../humanres/widget/forms/RecruitmentForms.xml     | 14 +++----
 .../widget/manufacturing/FieldLookupForms.xml      |  4 +-
 .../widget/manufacturing/ProductionRunForms.xml    | 16 ++++----
 .../widget/manufacturing/RoutingTaskForms.xml      |  2 +-
 applications/marketing/widget/ContactListForms.xml | 18 ++++-----
 applications/marketing/widget/DataSourceForms.xml  |  6 +--
 applications/marketing/widget/LookupForms.xml      |  6 +--
 .../marketing/widget/MarketingCampaignForms.xml    |  4 +-
 applications/marketing/widget/SegmentForms.xml     |  4 +-
 .../marketing/widget/TrackingCodeForms.xml         | 12 +++---
 .../marketing/widget/sfa/forms/EventForms.xml      |  6 +--
 .../marketing/widget/sfa/forms/LookupForms.xml     |  6 +--
 .../order/widget/ordermgr/AllocationPlanForms.xml  |  2 +-
 .../order/widget/ordermgr/CustRequestForms.xml     | 16 ++++----
 .../order/widget/ordermgr/FieldLookupForms.xml     | 22 +++++------
 .../order/widget/ordermgr/OrderEntryForms.xml      |  6 +--
 applications/order/widget/ordermgr/OrderForms.xml  |  2 +-
 .../order/widget/ordermgr/QuoteWorkEffortForms.xml |  2 +-
 .../order/widget/ordermgr/RequirementForms.xml     | 14 +++----
 applications/order/widget/ordermgr/ReturnForms.xml |  6 +--
 .../widget/partymgr/CommunicationEventForms.xml    | 38 +++++++++---------
 applications/party/widget/partymgr/LookupForms.xml | 26 ++++++------
 .../widget/partymgr/PartyContactListForms.xml      |  4 +-
 applications/party/widget/partymgr/PartyForms.xml  | 16 ++++----
 .../party/widget/partymgr/PartyInvitationForms.xml |  2 +-
 .../product/widget/catalog/CategoryForms.xml       |  6 +--
 .../product/widget/catalog/FeatureForms.xml        |  2 +-
 .../product/widget/catalog/FieldLookupForms.xml    | 22 +++++------
 .../widget/catalog/ImageManagementForms.xml        | 24 +++++------
 .../product/widget/catalog/ProdCatalogForms.xml    |  2 +-
 .../product/widget/catalog/ProductForms.xml        | 30 +++++++-------
 applications/product/widget/catalog/PromoForms.xml |  2 +-
 applications/product/widget/catalog/StoreForms.xml | 14 +++----
 .../product/widget/catalog/SubscriptionForms.xml   | 30 +++++++-------
 .../product/widget/facility/FacilityForms.xml      | 46 +++++++++++-----------
 .../product/widget/facility/FieldLookupForms.xml   |  8 ++--
 .../product/widget/facility/InventoryForms.xml     |  6 +--
 .../product/widget/facility/ShipmentForms.xml      |  6 +--
 .../workeffort/widget/CustRequestForms.xml         |  2 +-
 applications/workeffort/widget/LookupForms.xml     |  4 +-
 applications/workeffort/widget/TimesheetForms.xml  |  2 +-
 .../workeffort/widget/WorkEffortCommEventForms.xml |  2 +-
 applications/workeffort/widget/WorkEffortForms.xml | 30 +++++++-------
 .../widget/WorkEffortOrderHeaderForms.xml          |  2 +-
 .../widget/WorkEffortPartyAssignForms.xml          |  2 +-
 .../workeffort/widget/WorkEffortQuoteForms.xml     |  6 +--
 .../workeffort/widget/WorkEffortRequestForms.xml   |  4 +-
 .../widget/WorkEffortRequirementForms.xml          |  2 +-
 .../workeffort/widget/WorkEffortShopListForms.xml  |  2 +-
 framework/common/widget/LookupForms.xml            | 10 ++---
 framework/common/widget/PortalPageForms.xml        |  2 +-
 framework/common/widget/SecurityForms.xml          |  2 +-
 framework/webtools/widget/GeoManagementForms.xml   |  6 +--
 framework/webtools/widget/tempExprForms.xml        |  2 +-
 framework/widget/dtd/widget-form.xsd               | 16 ++++++--
 89 files changed, 414 insertions(+), 406 deletions(-)

diff --git a/applications/accounting/widget/AgreementForms.xml b/applications/accounting/widget/AgreementForms.xml
index 4b11a92..6807c2a 100644
--- a/applications/accounting/widget/AgreementForms.xml
+++ b/applications/accounting/widget/AgreementForms.xml
@@ -72,12 +72,12 @@ under the License.
         </field>
         <field name="productId" sort-field="true"></field>
         <field name="partyIdFrom" sort-field="true">
-            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyIdFrom"/>
             </hyperlink>
         </field>
         <field name="partyIdTo" sort-field="true">
-            <hyperlink description="${partyNameResultTo.fullName} [${partyIdTo}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyIdTo"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/BillingAccountForms.xml b/applications/accounting/widget/BillingAccountForms.xml
index a10cf71..3dd531b 100644
--- a/applications/accounting/widget/BillingAccountForms.xml
+++ b/applications/accounting/widget/BillingAccountForms.xml
@@ -173,7 +173,7 @@ under the License.
         <field name="billingAccountId"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -329,7 +329,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="billingAccountId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" also-hidden="false">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/BudgetForms.xml b/applications/accounting/widget/BudgetForms.xml
index dcf7e15..3f74d37 100644
--- a/applications/accounting/widget/BudgetForms.xml
+++ b/applications/accounting/widget/BudgetForms.xml
@@ -92,7 +92,7 @@ under the License.
         <!--auto-fields-entity entity-name="InvoiceRole" default-field-type="display"/-->
         <field name="budgetId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
-            <hyperlink description="${partyId}" url-mode="inter-app" target="/partymgr/control/viewprofile">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -119,7 +119,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="budgetReviewId"><display/></field>
         <field name="partyId" widget-style="buttontext">
-            <hyperlink description="${partyId}" url-mode="inter-app" target="/partymgr/control/viewprofile">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -200,7 +200,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="budgetId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
-            <hyperlink description="${partyId}" url-mode="inter-app" target="/partymgr/control/viewprofile">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -241,7 +241,7 @@ under the License.
         <field name="budgetId"><hidden/></field>
         <field name="budgetReviewId"><display/></field>
         <field name="partyId" widget-style="buttontext">
-            <hyperlink description="${partyId}" url-mode="inter-app" target="/partymgr/control/viewprofile">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/FieldLookupForms.xml b/applications/accounting/widget/FieldLookupForms.xml
index 507bb62..f1a5f98 100644
--- a/applications/accounting/widget/FieldLookupForms.xml
+++ b/applications/accounting/widget/FieldLookupForms.xml
@@ -47,7 +47,7 @@ under the License.
             </service>
         </actions>
         <field name="fixedAssetId" widget-style="buttontext">
-            <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
@@ -79,7 +79,7 @@ under the License.
             </service>
         </actions>
         <field name="fixedAssetId" widget-style="buttontext">
-            <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
@@ -106,7 +106,7 @@ under the License.
             </service>
         </actions>
         <field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}" widget-style="buttontext">
-            <hyperlink description="${billingAccountId}" target="javascript:set_value('${billingAccountId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${billingAccountId}" target="javascript:set_value('${billingAccountId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
         <field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><display/></field>
@@ -146,7 +146,7 @@ under the License.
             </service>
         </actions>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}" widget-style="buttontext">
-            <hyperlink description="${glAccountId}" target="javascript:set_value('${glAccountId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${glAccountId}" target="javascript:set_value('${glAccountId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="accountName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="GlAccountType"/></field>
@@ -176,7 +176,7 @@ under the License.
             </service>
         </actions>
         <field name="paymentId" widget-style="buttontext">
-            <hyperlink description="${paymentId}" target="javascript:set_value('${paymentId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${paymentId}" target="javascript:set_value('${paymentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
         <field name="partyIdTo"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
@@ -221,7 +221,7 @@ under the License.
             </service>
         </actions>
         <field name="invoiceId" widget-style="buttontext">
-            <hyperlink description="${invoiceId}" target="javascript:set_value('${invoiceId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${invoiceId}" target="javascript:set_value('${invoiceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
@@ -252,7 +252,7 @@ under the License.
             </service>
         </actions>
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink description="${agreementId}" target="javascript:set_value('${agreementId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${agreementId}" target="javascript:set_value('${agreementId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="productId"><display/></field>
         <field name="partyIdFrom"><display/></field>
@@ -287,7 +287,7 @@ under the License.
         </actions>
         <field name="agreementId"><display/></field>
         <field name="agreementItemSeqId" widget-style="buttontext">
-            <hyperlink description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="agreementItemTypeId"><display/></field>
         <field name="currencyUomId"><display/></field>
@@ -314,7 +314,7 @@ under the License.
             </service>
         </actions>
         <field name="paymentGroupId" widget-style="buttontext">
-            <hyperlink description="${paymentGroupId}" target="javascript:set_value('${paymentGroupId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${paymentGroupId}" target="javascript:set_value('${paymentGroupId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="paymentId"><display/></field>
         <field name="sequenceNum"><display/></field>
@@ -341,7 +341,7 @@ under the License.
             </service>
         </actions>
         <field name="glReconciliationId" widget-style="buttontext">
-            <hyperlink description="${glReconciliationId}" target="javascript:set_value('${glReconciliationId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${glReconciliationId}" target="javascript:set_value('${glReconciliationId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="glReconciliationName"><display/></field>
         <field name="organizationPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}[${partyId}]"/></field>
@@ -384,7 +384,7 @@ under the License.
             </service>
         </actions>
         <field name="customTimePeriodId" widget-style="buttontext">
-            <hyperlink description="${customTimePeriodId}" target="javascript:set_value('${customTimePeriodId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${customTimePeriodId}" target="javascript:set_value('${customTimePeriodId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="parentPeriodId"><display/></field>
         <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
diff --git a/applications/accounting/widget/FinAccountForms.xml b/applications/accounting/widget/FinAccountForms.xml
index bd03aa6..f2e2922 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -64,12 +64,12 @@ under the License.
             </hyperlink>
         </field>
         <field name="organizationPartyId">
-            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="organizationPartyId"/>
             </hyperlink>
         </field>
         <field name="ownerPartyId">
-            <hyperlink description="${ownerPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${ownerPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="ownerPartyId"/>
             </hyperlink>
         </field>
@@ -431,7 +431,7 @@ under the License.
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="organizationPartyId" title="${uiLabelMap.PartyParty}">
-            <hyperlink description="${partyName.firstName} ${partyName.lastName}${partyName.groupName} [${partyName.partyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyName.firstName} ${partyName.lastName}${partyName.groupName} [${partyName.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyName.partyId"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/FixedAssetForms.xml b/applications/accounting/widget/FixedAssetForms.xml
index bd92bbf..289a871 100644
--- a/applications/accounting/widget/FixedAssetForms.xml
+++ b/applications/accounting/widget/FixedAssetForms.xml
@@ -411,7 +411,7 @@ under the License.
             </drop-down>
         </field>
         <field name="scheduleWorkEffortId" widget-style="buttontext">
-            <hyperlink description="${fixedAssetMaint.scheduleWorkEffortId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${fixedAssetMaint.scheduleWorkEffortId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/>
             </hyperlink>
         </field>
@@ -487,7 +487,7 @@ under the License.
         <field name="fixedAssetId"><hidden/></field>
         <field name="maintHistSeqId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -525,7 +525,7 @@ under the License.
         <field name="fixedAssetId"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/accounting/widget/GlForms.xml b/applications/accounting/widget/GlForms.xml
index faf314a..1f7d935 100644
--- a/applications/accounting/widget/GlForms.xml
+++ b/applications/accounting/widget/GlForms.xml
@@ -123,13 +123,13 @@ under the License.
         </field>
         <field name="paymentId" use-when="paymentId==null"><display/></field>
         <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="workEffortId" use-when="workEffortId==null"><display/></field>
         <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
-            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
@@ -310,25 +310,25 @@ under the License.
         </field>
         <field name="paymentId" position="2" use-when="paymentId==null"><display/></field>
         <field name="workEffortId" position="2" use-when="workEffortId!=null" widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="workEffortId" position="2" use-when="workEffortId==null"><display/></field>
         <field name="shipmentId" position="2" use-when="shipmentId!=null" widget-style="buttontext">
-            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="shipmentId" position="2" use-when="shipmentId==null"><display/></field>
         <field name="partyId" position="2" use-when="partyId!=null" widget-style="buttontext">
-            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="partyId" position="2" use-when="partyId==null"><display/></field>
         <field name="productId" position="2" use-when="productId!=null" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -393,25 +393,25 @@ under the License.
         </field>
         <field name="paymentId" use-when="paymentId==null"><display/></field>
         <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="workEffortId" use-when="workEffortId==null"><display/></field>
         <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
-            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="shipmentId" use-when="shipmentId==null"><display/></field>
         <field name="partyId" use-when="partyId!=null" widget-style="buttontext">
-            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="partyId" use-when="partyId==null"><display/></field>
         <field name="productId" use-when="productId!=null" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -831,13 +831,13 @@ under the License.
             </hyperlink>
         </field>
         <field name="partyId">
-            <hyperlink description="${partyIdTo}" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyIdTo}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="productId"><display/></field>
         <field name="organizationPartyId">
-            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="organizationPartyId"/>
             </hyperlink>
         </field>
@@ -925,7 +925,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="organizationPartyId">
-            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="organizationPartyId"/>
             </hyperlink>
         </field>
@@ -1015,14 +1015,14 @@ under the License.
         <field name="voucherRef"><display/></field>
         <field name="partyId" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="productId" widget-style="buttontext">
             <display-entity entity-name="Product" description="${internalName}">
-                <sub-hyperlink target="/catalog/control/EditProduct" url-mode="inter-app" description="${productId}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}" link-style="buttontext">
                     <parameter param-name="productId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/accounting/widget/GlSetupForms.xml b/applications/accounting/widget/GlSetupForms.xml
index c3b9989..c10b4c8 100644
--- a/applications/accounting/widget/GlSetupForms.xml
+++ b/applications/accounting/widget/GlSetupForms.xml
@@ -1075,7 +1075,7 @@ under the License.
         </field>
         <field name="taxAuthPartyId" title="${uiLabelMap.AccountingTaxAuthorityParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId" from-field="taxAuthPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1104,7 +1104,7 @@ under the License.
         </field>
         <field name="taxAuthPartyId" title="${uiLabelMap.AccountingTaxAuthorityParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId" from-field="taxAuthPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1125,7 +1125,7 @@ under the License.
         <auto-fields-service service-name="updatePartyGlAccount" default-field-type="display"/>
         <field name="organizationPartyId"><hidden/></field>
         <field name="partyId">
-            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/GlobalGlAccountsForms.xml b/applications/accounting/widget/GlobalGlAccountsForms.xml
index e548deb..dc46b82 100644
--- a/applications/accounting/widget/GlobalGlAccountsForms.xml
+++ b/applications/accounting/widget/GlobalGlAccountsForms.xml
@@ -245,7 +245,7 @@ under the License.
         <field name="rateDescription"><display/></field>
         <field name="periodTypeId"><display description="${periodDescription}"/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" sort-field="true">
-            <hyperlink description="${groupName}${lastName} ${firstName} ${middleName}" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${groupName}${lastName} ${firstName} ${middleName}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/InvoiceForms.xml b/applications/accounting/widget/InvoiceForms.xml
index 26f85f1..b2bf804 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -86,12 +86,12 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
         <field name="description" sort-field="true"><display/></field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" sort-field="true">
-            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/PartyFinancialHistory" url-mode="inter-app">
+            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/PartyFinancialHistory" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyIdFrom"/>
             </hyperlink>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" parameter-name="partyId">
-            <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/PartyFinancialHistory" url-mode="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/PartyFinancialHistory" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -120,12 +120,12 @@ under the License.
         <field position="1" name="description"><display/></field>
         <field position="2" name="invoiceMessage"><display/></field>
         <field position="1" name="partyIdFrom">
-            <hyperlink description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="invoice.partyIdFrom"/>
             </hyperlink>
         </field>
         <field position="2" name="partyIdTo" entry-name="partyId">
-            <hyperlink description="${partyNameResultTo.fullName} [${invoice.partyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${invoice.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="invoice.partyId"/>
             </hyperlink>
         </field>
@@ -150,7 +150,7 @@ under the License.
         <field name="invoiceItemSeqId"><display/></field>
         <field name="invoiceItemTypeId"><display-entity entity-name="InvoiceItemType"/></field>
         <field name="orderId" widget-style="linktext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -160,7 +160,7 @@ under the License.
         <field name="amount" title="${uiLabelMap.AccountingUnitPrice}" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
         <field name="total"><display type="currency" currency="${invoice.currencyUomId}"/></field>
         <field name="productId" widget-style="linktext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -176,7 +176,7 @@ under the License.
         <!--auto-fields-entity entity-name="InvoiceRole" default-field-type="display"/-->
         <field name="invoiceId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
-            <hyperlink description="${partyId}" url-mode="inter-app" target="/partymgr/control/viewprofile">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -561,7 +561,7 @@ under the License.
         <!--auto-fields-entity entity-name="InvoiceRole" default-field-type="display"/-->
         <field name="invoiceId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
-            <hyperlink description="${partyId}" url-mode="inter-app" target="/partymgr/control/viewprofile">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -647,20 +647,20 @@ under the License.
         <field name="invoiceItemSeqId"><display/></field>
         <field name="timeEntryId"><display/></field>
         <field name="timesheetId" entry-name="timesheet.timesheetId">
-            <hyperlink description="${timesheetId}" target="/workeffort/control/EditTimesheet" url-mode="inter-app">
+            <hyperlink description="${timesheetId}" target="/workeffort/control/EditTimesheet" target-type="inter-app">
                 <parameter param-name="timesheetId"/>
             </hyperlink>
         </field>
         <field name="partyId" entry-name="partyId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app"  description=" [${partyId}]">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app"  description=" [${partyId}]">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="timesheetPartyId" entry-name="timesheet.partyId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description=" [${timesheet.partyId}]">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description=" [${timesheet.partyId}]">
                     <parameter param-name="partyId" from-field="timesheet.partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -669,7 +669,7 @@ under the License.
         <field name="rateTypeId"><display-entity entity-name="RateType"/></field>
         <field name="workEffortId">
             <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]">
-                <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" url-mode="inter-app">
+                <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app">
                     <parameter param-name="workEffortId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/accounting/widget/PaymentForms.xml b/applications/accounting/widget/PaymentForms.xml
index 0dc5b55..cea81c4 100644
--- a/applications/accounting/widget/PaymentForms.xml
+++ b/applications/accounting/widget/PaymentForms.xml
@@ -72,14 +72,14 @@ under the License.
         <field name="comments"><display/></field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdFrom}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]" >
                     <parameter param-name="partyId" from-field="partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdTo}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]" >
                     <parameter param-name="partyId" from-field="partyIdTo"/>
                 </sub-hyperlink>
             </display-entity>
@@ -379,12 +379,12 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1"><display-entity entity-name="StatusItem"/></field>
         <field name="paymentMethodId" position="2"><display-entity entity-name="PaymentMethod" description="${description} [${paymentMethodId}]"/></field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="1">
-            <hyperlink description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="payment.partyIdFrom"/>
             </hyperlink>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="2">
-            <hyperlink description="${partyNameResultTo.fullName} [${payment.partyIdTo}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${payment.partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="payment.partyIdTo"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/PaymentGroupForms.xml b/applications/accounting/widget/PaymentGroupForms.xml
index 05dff7e..421057a 100644
--- a/applications/accounting/widget/PaymentGroupForms.xml
+++ b/applications/accounting/widget/PaymentGroupForms.xml
@@ -126,14 +126,14 @@ under the License.
         <field name="paymentRefNum" title="${uiLabelMap.AccountingReferenceNumber}"><display/></field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${lastName} ${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdFrom}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]" >
                     <parameter param-name="partyId" from-field="partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${lastName} ${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdTo}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]" >
                     <parameter param-name="partyId" from-field="partyIdTo"/>
                 </sub-hyperlink>
             </display-entity>
@@ -182,14 +182,14 @@ under the License.
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${lastName} ${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdFrom}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]" >
                     <parameter param-name="partyId" from-field="partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${lastName} ${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdTo}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]" >
                     <parameter param-name="partyId" from-field="partyIdTo"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/accounting/widget/TaxAuthorityForms.xml b/applications/accounting/widget/TaxAuthorityForms.xml
index d5d2611..be50476 100644
--- a/applications/accounting/widget/TaxAuthorityForms.xml
+++ b/applications/accounting/widget/TaxAuthorityForms.xml
@@ -33,7 +33,7 @@ under the License.
         <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoCode}] [${geoId}]"/></field>
         <field name="taxAuthPartyId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId" from-field="taxAuthPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -87,7 +87,7 @@ under the License.
         <field name="taxAuthGeoId"><hidden/></field>
         <field name="productCategoryId" title="${uiLabelMap.ProductCategory}">
             <display-entity entity-name="ProductCategory">
-                <sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="productCategoryId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -128,7 +128,7 @@ under the License.
 
         <field name="toTaxAuthPartyId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${toTaxAuthPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${toTaxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId" from-field="toTaxAuthPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -197,7 +197,7 @@ under the License.
         </field>
         <field name="organizationPartyId" title="${uiLabelMap.PartyOrganizationParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId" from-field="organizationPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -349,7 +349,7 @@ under the License.
 
         <field name="partyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -387,7 +387,7 @@ under the License.
 
         <field use-when="partyTaxAuthInfo!=null" name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/accounting/widget/TransactionForms.xml b/applications/accounting/widget/TransactionForms.xml
index af4378f..c1303cb 100644
--- a/applications/accounting/widget/TransactionForms.xml
+++ b/applications/accounting/widget/TransactionForms.xml
@@ -97,7 +97,7 @@ under the License.
     <form name="ViewGatewayResponseRelations" type="single" target="" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -115,14 +115,14 @@ under the License.
         <field name="comments"><display/></field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdFrom}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]" >
                     <parameter param-name="partyId" from-field="partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyIdTo}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]" >
                     <parameter param-name="partyId" from-field="partyIdTo"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/accounting/widget/ap/forms/InvoiceForms.xml b/applications/accounting/widget/ap/forms/InvoiceForms.xml
index e88fbbe..578b71c 100644
--- a/applications/accounting/widget/ap/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ap/forms/InvoiceForms.xml
@@ -50,12 +50,12 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="description"><display/></field>
         <field name="partyIdFrom">
-            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyIdFrom"/>
             </hyperlink>
         </field>
         <field name="partyIdTo" parameter-name="partyId">
-            <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyId"/>
             </hyperlink>
         </field>
diff --git a/applications/accounting/widget/ar/forms/InvoiceForms.xml b/applications/accounting/widget/ar/forms/InvoiceForms.xml
index d20970e..ab6f255 100644
--- a/applications/accounting/widget/ar/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ar/forms/InvoiceForms.xml
@@ -51,12 +51,12 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="description"><display/></field>
         <field name="partyIdFrom">
-            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyIdFrom"/>
             </hyperlink>
         </field>
         <field name="partyIdTo">
-            <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
diff --git a/applications/commonext/widget/SystemInfoForms.xml b/applications/commonext/widget/SystemInfoForms.xml
index e6dbb99..35ff138 100644
--- a/applications/commonext/widget/SystemInfoForms.xml
+++ b/applications/commonext/widget/SystemInfoForms.xml
@@ -24,7 +24,7 @@ under the License.
     <form name="SystemInfoNotes" type="list" list-name="systemInfoNotes"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="noteDateTime" title="${uiLabelMap.CommonExtDateInfoCreated}"><display type="date-time"/></field>
-        <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}${groovy: if (moreInfoItemName &amp;&amp;moreInfoItemId)&quot;?&quot; + moreInfoItemName + &quot;=&quot; + moreInfoItemId + &quot;&amp;id=&quot; + moreInfoItemId;}" url-mode="inter-app"></hyperlink></field>
+        <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}${groovy: if (moreInfoItemName &amp;&amp;moreInfoItemId)&quot;?&quot; + moreInfoItemName + &quot;=&quot; + moreInfoItemId + &quot;&amp;id=&quot; + moreInfoItemId;}" target-type="inter-app"></hyperlink></field>
         <field name="deleteLink" title=" " widget-style="buttontext" >
             <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSystemInfoNote">
                 <parameter param-name="noteId"/>
@@ -46,7 +46,7 @@ under the License.
     <form name="SystemInfoStatus" type="list" list-name="systemInfoStatus"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="noteDateTime" title="${uiLabelMap.CommonExtDateLastChanged}"><display type="date-time"/></field>
-        <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}" url-mode="inter-app"></hyperlink></field>
+        <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}" target-type="inter-app"></hyperlink></field>
     </form>
     
     <form name="CreateSystemInfoNote" type="single" target="createSystemInfoNote">
diff --git a/applications/content/widget/LookupForms.xml b/applications/content/widget/LookupForms.xml
index 45d7956..0d97e5a 100644
--- a/applications/content/widget/LookupForms.xml
+++ b/applications/content/widget/LookupForms.xml
@@ -29,7 +29,7 @@ under the License.
             </entity-condition>
         </actions>
         <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink description="${contentId}" url-mode="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')" also-hidden="false"/>
+            <hyperlink description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')" also-hidden="false"/>
         </field>
         <field name="contentName"><display/></field>
         <field name="description"><display/></field>
@@ -84,12 +84,12 @@ under the License.
             </service>
         </actions>
         <field name="replace" widget-style="buttontext" >
-            <hyperlink also-hidden="false" url-mode="plain" description="${uiLabelMap.FormFieldTitle_replace} [${dataResourceId}/${coContentId}]"
+            <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.FormFieldTitle_replace} [${dataResourceId}/${coContentId}]"
                target="javascript:execRemoteCall('replaceSubContent','${dataResourceId}','${coContentId}', '${contentIdTo}', '${mapKey}')"
             />
         </field>
         <field name="pasteContent" widget-style="buttontext" >
-            <hyperlink also-hidden="false" url-mode="plain" description="${uiLabelMap.ContentPaste} [${dataResourceId}/${coContentId}]"
+            <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ContentPaste} [${dataResourceId}/${coContentId}]"
                target="javascript:execRemoteCall('pasteContent','${dataResourceId}','${coContentId}')"/>
         </field>
         <field name="dataResourceName" widget-style="buttontext">
diff --git a/applications/content/widget/cms/CMSForms.xml b/applications/content/widget/cms/CMSForms.xml
index 0124a75..9fe93a7 100644
--- a/applications/content/widget/cms/CMSForms.xml
+++ b/applications/content/widget/cms/CMSForms.xml
@@ -280,7 +280,7 @@ under the License.
         </field>
 <!--
         <field name="submitContentEdit" title=" ">
-            <hyperlink description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" also-hidden="false" target-type="plain"/>
         </field>
 -->
        <field name="deactivateExisting" >
@@ -483,14 +483,14 @@ under the License.
         </field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}">
             <lookup target-form-name="LookupDataResource">
-            <sub-hyperlink use-when="&quot;${currentValue.dataResourceId}&quot;.length()>0" link-style="buttontext" url-mode="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}">
+            <sub-hyperlink use-when="&quot;${currentValue.dataResourceId}&quot;.length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}">
                 <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/>
             </sub-hyperlink>
 <!--
-            <sub-hyperlink link-style="buttontext" url-mode="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}">
+            <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}">
                 <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/>
             </sub-hyperlink>
-            <sub-hyperlink use-when="&quot;${currentValue.dataResourceId}&quot;.length()>0" link-style="buttontext" url-mode="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}">
+            <sub-hyperlink use-when="&quot;${currentValue.dataResourceId}&quot;.length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}">
                 <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/>
             </sub-hyperlink>
 -->
diff --git a/applications/content/widget/content/ContentForms.xml b/applications/content/widget/content/ContentForms.xml
index e593d25..d13f7a2 100644
--- a/applications/content/widget/content/ContentForms.xml
+++ b/applications/content/widget/content/ContentForms.xml
@@ -130,7 +130,7 @@ under the License.
             </service>
         </actions>
         <field name="contentId" widget-style="smallSubmit">
-            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentName"><display/></field>
         <field name="description"><display/></field>
@@ -240,7 +240,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
 
         <field name="contentId" widget-style="buttontext">
-            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentName" widget-style="buttontext"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}" widget-style="buttontext"><display/></field>
@@ -504,7 +504,7 @@ under the License.
     <form name="MruLookupPerson" list-name="mruList" target="" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="partyId" title=" " widget-style="buttontext">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="firstName" title=" " widget-style="buttontext"><display/></field>
         <field name="lastName" title=" " widget-style="buttontext"><display/></field>
@@ -512,7 +512,7 @@ under the License.
     <form name="MruLookupPartyAndUserLoginAndPerson" list-name="mruList" target="" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="partyId" title=" " widget-style="buttontext">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}', '${userLoginId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}', '${userLoginId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="firstName" title=" " widget-style="buttontext"><display/></field>
         <field name="lastName" title=" " widget-style="buttontext"><display/></field>
@@ -546,7 +546,7 @@ under the License.
         <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit"/>
         <field name="workEffortId">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true">
-                <sub-hyperlink target="/workeffort/control/EditWorkEffort"  description="${workEffortId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/workeffort/control/EditWorkEffort"  description="${workEffortId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="workEffortId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -625,7 +625,7 @@ under the License.
     </form>
     <form name="ViewContentDetail" type="single" default-map-name="lookupContentDetail">
         <field name="contentId" widget-style="buttontext">
-            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentName"><display/></field>
         <field name="contentTypeId"><display/></field>
@@ -633,7 +633,7 @@ under the License.
         <field name="mimeTypeId"><display/></field>
         <field name="select" widget-style="buttontext" title=" " use-when="contentId!=null">
             <hyperlink also-hidden="true"
-                url-mode="plain" description="${uiLabelMap.CommonSelect}"
+                target-type="plain" description="${uiLabelMap.CommonSelect}"
                 target="javascript:set_value('${contentId}')"/>            
         </field>
     </form>
diff --git a/applications/content/widget/content/DataResourceForms.xml b/applications/content/widget/content/DataResourceForms.xml
index abf4eb5..9ef9fc2 100644
--- a/applications/content/widget/content/DataResourceForms.xml
+++ b/applications/content/widget/content/DataResourceForms.xml
@@ -141,7 +141,7 @@ under the License.
             </service>
         </actions>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" widget-style="smallSubmit">
-            <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="dataResourceName"><display/></field>
         <field name="dataResourceTypeId"><display-entity entity-name="DataResourceType"></display-entity></field>
@@ -154,7 +154,7 @@ under the License.
     <form name="MruLookupDataResource" default-entity-name="DataResource" list-name="mruList" target="" title="" type="list" default-widget-style="display"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" widget-style="buttontext">
-            <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="dataResourceName" widget-style="buttontext"><display/></field>
         <field name="dataCategoryId" widget-style="buttontext"><display/></field>
@@ -474,13 +474,13 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
         <field name="productFeatureId" title=" " widget-style="buttontext">
-            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
     <form name="MruLookupProductFeature" default-entity-name="ProductFeature" list-name="mruList" target="" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" widget-style="buttontext">
-            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.FormFieldTitle_contentName}" widget-style="buttontext"><display/></field>
         <field name="productFeatureTypeId" title="${uiLabelMap.CommonType}" widget-style="buttontext"><display/></field>
diff --git a/applications/content/widget/datasetup/DataSetupForms.xml b/applications/content/widget/datasetup/DataSetupForms.xml
index 2067905..3344343 100644
--- a/applications/content/widget/datasetup/DataSetupForms.xml
+++ b/applications/content/widget/datasetup/DataSetupForms.xml
@@ -260,7 +260,7 @@ under the License.
         </actions>
         <auto-fields-service service-name="updateMimeTypeHtmlTemplate"/>
         <field name="mimeTypeId">
-            <hyperlink url-mode="intra-app" target="editMimeType" description="${mimeTypeId}">
+            <hyperlink target-type="intra-app" target="editMimeType" description="${mimeTypeId}">
                 <parameter param-name="mimeTypeId"/>
             </hyperlink>
         </field>
diff --git a/applications/content/widget/layout/LayoutForms.xml b/applications/content/widget/layout/LayoutForms.xml
index d251788..8e40f3c 100644
--- a/applications/content/widget/layout/LayoutForms.xml
+++ b/applications/content/widget/layout/LayoutForms.xml
@@ -447,13 +447,13 @@ under the License.
 <!--
         <field name="paste" title=" " widget-style="buttontext"
             use-when="!&quot;${contentIdTo}&quot;.equals(&quot;TEMPLATE_MASTER&quot;)" >
-            <hyperlink url-mode="plain"
+            <hyperlink target-type="plain"
               target="javascript:call_fieldlookup2(document.AddLayoutSubContent.drDataResourceId, 'ClipBoardContent')"
               description="${uiLabelMap.ContentPaste}"/>
         </field>
         <field name="paste" title=" " widget-style="buttontext"
             use-when="&quot;${contentIdTo}&quot;.equals(&quot;TEMPLATE_MASTER&quot;)" >
-            <hyperlink url-mode="plain"
+            <hyperlink target-type="plain"
               target="javascript:call_fieldlookup2(document.AddLayoutSubContent.drDataResourceId, 'LookupListLayout')"
               description="${uiLabelMap.ContentPaste}"/>
         </field>
diff --git a/applications/content/widget/survey/SurveyForms.xml b/applications/content/widget/survey/SurveyForms.xml
index 1250c94..94bf01a 100644
--- a/applications/content/widget/survey/SurveyForms.xml
+++ b/applications/content/widget/survey/SurveyForms.xml
@@ -299,7 +299,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="Survey" default-field-type="display"/>
         <field name="surveyId" title=" " widget-style="buttontext">
-            <hyperlink description="${surveyId}" target="javascript:set_value('${surveyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${surveyId}" target="javascript:set_value('${surveyId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 
@@ -322,7 +322,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/>
         <field name="surveyResponseId" title=" " widget-style="buttontext">
-            <hyperlink description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 </forms>
diff --git a/applications/content/widget/website/WebSiteForms.xml b/applications/content/widget/website/WebSiteForms.xml
index 68335b2..01f233d 100644
--- a/applications/content/widget/website/WebSiteForms.xml
+++ b/applications/content/widget/website/WebSiteForms.xml
@@ -43,7 +43,7 @@ under the License.
                 <entity-options entity-name="ProductStore" description="${storeName}">
                     <entity-order-by field-name="storeName"/>
                 </entity-options>
-                <sub-hyperlink use-when="&quot;${webSite.productStoreId}&quot;.length()>0" link-style="buttontext" url-mode="inter-app" target="/catalog/control/EditProductStore" description="${uiLabelMap.ContentEditProductStore}">
+                <sub-hyperlink use-when="&quot;${webSite.productStoreId}&quot;.length()>0" link-style="buttontext" target-type="inter-app" target="/catalog/control/EditProductStore" description="${uiLabelMap.ContentEditProductStore}">
                 <parameter param-name="productStoreId" from-field="webSite.productStoreId"/>
             </sub-hyperlink>
             </drop-down>
@@ -218,7 +218,7 @@ under the License.
         <field name="webSiteId"><hidden/></field>
         <!-- three possibilities for the Party: person, partyGroup, neither... just print everything and if it's empty, no biggie -->
         <field name="partyId" widget-style="buttontext">
-            <hyperlink url-mode="inter-app" target="/partymgr/control/viewprofile" description="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName} ${person.suffix} ${partyGroup.groupName} [${webSiteRole.partyId}]">
+            <hyperlink target-type="inter-app" target="/partymgr/control/viewprofile" description="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName} ${person.suffix} ${partyGroup.groupName} [${webSiteRole.partyId}]">
                 <parameter param-name="partyId" from-field="webSiteRole.partyId"/>
             </hyperlink>
         </field>
@@ -304,7 +304,7 @@ under the License.
         <field name="webSiteId"><hidden/></field>
         <field name="contactListName">
             <display-entity entity-name="ContactList" description="${contactListName}" key-field-name="contactListId">
-                <sub-hyperlink target="/marketing/control/EditContactList" url-mode="inter-app" link-style="linktext" description="[${contactListId}]">
+                <sub-hyperlink target="/marketing/control/EditContactList" target-type="inter-app" link-style="linktext" description="[${contactListId}]">
                     <parameter param-name="contactListId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/humanres/widget/forms/EmplLeaveForms.xml b/applications/humanres/widget/forms/EmplLeaveForms.xml
index c5725ec..58ffc91 100644
--- a/applications/humanres/widget/forms/EmplLeaveForms.xml
+++ b/applications/humanres/widget/forms/EmplLeaveForms.xml
@@ -61,7 +61,7 @@
         <auto-fields-entity entity-name="EmplLeave" default-field-type="display"/>
         <field name="partyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -70,7 +70,7 @@
         <field name="emplLeaveReasonTypeId"><display-entity entity-name="EmplLeaveReasonType"/></field>
         <field name="approverPartyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${approverPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="approverPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -142,7 +142,7 @@
         <auto-fields-entity entity-name="EmplLeave" default-field-type="display"/>
         <field name="partyId" field-name="partyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -151,7 +151,7 @@
         <field name="emplLeaveReasonTypeId"><display-entity entity-name="EmplLeaveReasonType"/></field>
         <field name="approverPartyId" field-name="approverPartyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${approverPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="approverPartyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/humanres/widget/forms/EmplPositionForms.xml b/applications/humanres/widget/forms/EmplPositionForms.xml
index cb52d61..e7e284c 100644
--- a/applications/humanres/widget/forms/EmplPositionForms.xml
+++ b/applications/humanres/widget/forms/EmplPositionForms.xml
@@ -39,7 +39,7 @@ under the License.
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
-                <sub-hyperlink target="viewprofile" link-style="smallSubmit" url-mode="inter-app" description="${partyId}">
+                <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -73,7 +73,7 @@ under the License.
         </field>
         <!--<field name="partyId" title="Organization PartyId">
             <display-entity description="${groupName}" entity-name="PartyNameView">
-                <sub-hyperlink target="viewprofile" link-style="smallSubmit" url-mode="inter-app" description="${partyId}">
+                <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/humanres/widget/forms/EmployeeForms.xml b/applications/humanres/widget/forms/EmployeeForms.xml
index f5ddd68..3ef981a 100644
--- a/applications/humanres/widget/forms/EmployeeForms.xml
+++ b/applications/humanres/widget/forms/EmployeeForms.xml
@@ -223,7 +223,7 @@
     <form name="CurrentEmploymentData" default-map-name="employmentData" type="single">
         <field name="company" entry-name="employment.partyIdFrom">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ">
-                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${employmentData.employment.partyIdFrom}]" url-mode="inter-app">
+                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${employmentData.employment.partyIdFrom}]" target-type="inter-app">
                     <parameter param-name="partyId" from-field="employmentData.employment.partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
@@ -239,7 +239,7 @@
     </form>
     <form name="PayrollHistoryList" type="list" list-name="payroll" extends="ListInvoices" extends-resource="component://accounting/widget/InvoiceForms.xml" paginate-target="PayrollHistory">
         <field name="invoiceId" widget-style="buttontext" sort-field="true">
-            <hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" url-mode="inter-app">
+            <hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" target-type="inter-app">
                 <parameter param-name="invoiceId"/>
             </hyperlink>
         </field>
diff --git a/applications/humanres/widget/forms/EmploymentForms.xml b/applications/humanres/widget/forms/EmploymentForms.xml
index 3196ec9..70dd33c 100644
--- a/applications/humanres/widget/forms/EmploymentForms.xml
+++ b/applications/humanres/widget/forms/EmploymentForms.xml
@@ -348,7 +348,7 @@
         <auto-fields-service default-field-type="display" service-name="updatePerformanceNote"/>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
            <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
-               <sub-hyperlink target="/partymgr/control/viewprofile" link-style="smallSubmit" url-mode="inter-app" description="${partyId}">
+               <sub-hyperlink target="/partymgr/control/viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
                 <parameter param-name="partyId"/>
             </sub-hyperlink>
            </display-entity>
diff --git a/applications/humanres/widget/forms/LookupForms.xml b/applications/humanres/widget/forms/LookupForms.xml
index 30eeb08..821329c 100644
--- a/applications/humanres/widget/forms/LookupForms.xml
+++ b/applications/humanres/widget/forms/LookupForms.xml
@@ -46,7 +46,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="Budget" default-field-type="display"/>
         <field name="budgetId" widget-style="buttontext">
-            <hyperlink description="${budgetId}" target="javascript:set_value('${budgetId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${budgetId}" target="javascript:set_value('${budgetId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
     <form name="LookupBudgetItem" type="single" target="LookupBudgetItem"
@@ -74,7 +74,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="BudgetItem" default-field-type="display"/>
         <field name="budgetItemSeqId" widget-style="buttontext">
-            <hyperlink description="${budgetItemSeqId}" target="javascript:set_value('${budgetItemSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${budgetItemSeqId}" target="javascript:set_value('${budgetItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
     <form name="LookupEmplPosition" type="single" target="LookupEmplPosition"
@@ -108,7 +108,7 @@ under the License.
             </service>
         </actions>
         <field name="emplPositionId" widget-style="buttontext">
-            <hyperlink description="${emplPositionId}" target="javascript:set_value('${emplPositionId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${emplPositionId}" target="javascript:set_value('${emplPositionId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="statusId"><display/></field>
         <field name="partyId"><display/></field>
@@ -134,7 +134,7 @@ under the License.
             </service>
         </actions>
         <field name="terminationReasonId" widget-style="buttontext">
-            <hyperlink description="${terminationReasonId}" target="javascript:set_value('${terminationReasonId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${terminationReasonId}" target="javascript:set_value('${terminationReasonId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -157,7 +157,7 @@ under the License.
             </service>
         </actions>
         <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext">
-            <hyperlink description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field>
@@ -181,7 +181,7 @@ under the License.
             </service>
         </actions>
         <field name="payGradeId" widget-style="buttontext">
-            <hyperlink description="${payGradeId}" target="javascript:set_value('${payGradeId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${payGradeId}" target="javascript:set_value('${payGradeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -203,7 +203,7 @@ under the License.
             </service>
         </actions>
         <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResLookupPayrollPreferenceSeqId}" widget-style="buttontext">
-            <hyperlink description="${payrollPreferenceSeqId}" target="javascript:set_value('${payrollPreferenceSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${payrollPreferenceSeqId}" target="javascript:set_value('${payrollPreferenceSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -225,7 +225,7 @@ under the License.
             </service>
         </actions>
         <field name="unemploymentClaimId" widget-style="buttontext">
-            <hyperlink description="${unemploymentClaimId}" target="javascript:set_value('${unemploymentClaimId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${unemploymentClaimId}" target="javascript:set_value('${unemploymentClaimId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -247,7 +247,7 @@ under the License.
             </service>
         </actions>
         <field name="agreementItemSeqId" widget-style="buttontext">
-            <hyperlink description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -269,7 +269,7 @@ under the License.
             </service>
         </actions>
         <field name="perfReviewId" widget-style="buttontext">
-            <hyperlink description="${perfReviewId}" target="javascript:set_value('${perfReviewId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${perfReviewId}" target="javascript:set_value('${perfReviewId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -291,7 +291,7 @@ under the License.
             </service>
         </actions>
         <field name="resumeId" widget-style="buttontext">
-            <hyperlink description="${resumeId}" target="javascript:set_value('${resumeId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${resumeId}" target="javascript:set_value('${resumeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -313,7 +313,7 @@ under the License.
             </service>
         </actions>
         <field name="applicationId" widget-style="buttontext">
-            <hyperlink description="${applicationId}" target="javascript:set_value('${applicationId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${applicationId}" target="javascript:set_value('${applicationId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -349,7 +349,7 @@ under the License.
             </service>
         </actions>
         <field name="jobRequisitionId" widget-style="buttontext">
-            <hyperlink description="${jobRequisitionId}" target="javascript:set_value('${jobRequisitionId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${jobRequisitionId}" target="javascript:set_value('${jobRequisitionId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="jobPostingTypeEnumId"><display/></field>
         <field name="qualification"><display/></field>
@@ -373,7 +373,7 @@ under the License.
             </service>
         </actions>
         <field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}" widget-style="buttontext">
-             <hyperlink description="${trainingClassTypeId}" target="javascript:set_value('${trainingClassTypeId}')" also-hidden="false" url-mode="plain"/>
+             <hyperlink description="${trainingClassTypeId}" target="javascript:set_value('${trainingClassTypeId}')" also-hidden="false" target-type="plain"/>
         </field>        
         <field name="parentTypeId" title="${uiLabelMap.HumanResPreRequisiteSkill}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
diff --git a/applications/humanres/widget/forms/PartyQualForms.xml b/applications/humanres/widget/forms/PartyQualForms.xml
index a2c8f26..56e8787 100644
--- a/applications/humanres/widget/forms/PartyQualForms.xml
+++ b/applications/humanres/widget/forms/PartyQualForms.xml
@@ -65,7 +65,7 @@ under the License.
         <auto-fields-service service-name="updatePartyQual"/>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
-                <sub-hyperlink target="viewprofile" link-style="smallSubmit" url-mode="inter-app" description="${partyId}">
+                <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/humanres/widget/forms/PartyResumeForms.xml b/applications/humanres/widget/forms/PartyResumeForms.xml
index c324616..fa7327d 100644
--- a/applications/humanres/widget/forms/PartyResumeForms.xml
+++ b/applications/humanres/widget/forms/PartyResumeForms.xml
@@ -48,7 +48,7 @@ under the License.
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
            <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
-               <sub-hyperlink target="viewprofile" link-style="smallSubmit" url-mode="inter-app" description="${partyId}">
+               <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
                 <parameter param-name="partyId"/>
             </sub-hyperlink>
            </display-entity>
diff --git a/applications/humanres/widget/forms/PayGradeForms.xml b/applications/humanres/widget/forms/PayGradeForms.xml
index 8084bc3..4b2d69d 100644
--- a/applications/humanres/widget/forms/PayGradeForms.xml
+++ b/applications/humanres/widget/forms/PayGradeForms.xml
@@ -39,7 +39,7 @@
         </actions>
         <auto-fields-service default-field-type="display" service-name="updatePayGrade"/>
         <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}" widget-style="linktext">
-            <hyperlink also-hidden="true" target="EditPayGrade" url-mode="plain" description="${payGradeId}">
+            <hyperlink also-hidden="true" target="EditPayGrade" target-type="plain" description="${payGradeId}">
                 <parameter param-name="payGradeId"/>
             </hyperlink>
         </field>
diff --git a/applications/humanres/widget/forms/PersonTrainingForms.xml b/applications/humanres/widget/forms/PersonTrainingForms.xml
index 8381a92..7984c82 100644
--- a/applications/humanres/widget/forms/PersonTrainingForms.xml
+++ b/applications/humanres/widget/forms/PersonTrainingForms.xml
@@ -75,7 +75,7 @@ under the License.
         <auto-fields-entity entity-name="PersonTraining" default-field-type="hidden"/>
         <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -111,14 +111,14 @@ under the License.
         <auto-fields-entity entity-name="PersonTraining" default-field-type="display"/>
         <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="approverId" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${approverId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="approverId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -181,14 +181,14 @@ under the License.
         <auto-fields-entity entity-name="PersonTraining" default-field-type="display"/>
         <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="approverId" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${approverId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="approverId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/humanres/widget/forms/RecruitmentForms.xml b/applications/humanres/widget/forms/RecruitmentForms.xml
index e85dff5..7447a11 100644
--- a/applications/humanres/widget/forms/RecruitmentForms.xml
+++ b/applications/humanres/widget/forms/RecruitmentForms.xml
@@ -181,7 +181,7 @@ under the License.
 
         <field name="approverPartyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${approverPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="approverPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -189,7 +189,7 @@ under the License.
 
         <field name="applyingPartyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${applyingPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${applyingPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="applyingPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -272,14 +272,14 @@ under the License.
         </field>
         <field name="jobIntervieweePartyId" field-name="jobIntervieweePartyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${jobIntervieweePartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${jobIntervieweePartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="jobIntervieweePartyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="jobIntervieweePartyId" field-name="jobIntervieweePartyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${jobInterviewerPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${jobInterviewerPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="jobInterviewerPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -358,14 +358,14 @@ under the License.
         <auto-fields-entity entity-name="EmploymentApp" default-field-type="display"/>
         <field name="applyingPartyId" field-name="partyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${applyingPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${applyingPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="applyingPartyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="approverPartyId" field-name="partyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${approverPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="approverPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -429,7 +429,7 @@ under the License.
        </actions>
         <field name="partyId" title="Employee Name">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">              
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">              
                     <parameter param-name="partyId" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml b/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
index 19b4150..b00ab07 100644
--- a/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
+++ b/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
@@ -41,7 +41,7 @@ under the License.
             </service>
         </actions>
         <field name="workEffortId" title=" " widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="workEffortName" title="${uiLabelMap.ManufacturingRoutingName}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -76,7 +76,7 @@ under the License.
             </service>
         </actions>
         <field name="workEffortId" title=" " widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="workEffortName" title="${uiLabelMap.ManufacturingTaskName}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
diff --git a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
index 881c54d..7035068 100644
--- a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
+++ b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
@@ -154,7 +154,7 @@ under the License.
     <form name="ListProductionRunOrderItems" type="list" target="EditProductionRun" title="" list-name="orderItems"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}/${orderItemSeqId}" target="/ordermgr/control/orderview" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${orderId}/${orderItemSeqId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -180,7 +180,7 @@ under the License.
             <set field="quantityOnHandDiff" from-field="inventoryItemDetails[0].quantityOnHandDiff"/>
         </row-actions>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="/facility/control/EditInventoryItem"  description="${inventoryItemId}" also-hidden="false" url-mode="inter-app">
+            <hyperlink target="/facility/control/EditInventoryItem"  description="${inventoryItemId}" also-hidden="false" target-type="inter-app">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
@@ -525,7 +525,7 @@ under the License.
     <form name="ProductionRunTaskInventoryProducedList" type="list" title="" list-name="prunInventoryProduced"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="inventoryItemId" title="${uiLabelMap.ProductInventoryItem}" widget-style="buttontext">
-            <hyperlink target="/facility/control/EditInventoryItem"  description="${inventoryItemId}" also-hidden="false" url-mode="inter-app">
+            <hyperlink target="/facility/control/EditInventoryItem"  description="${inventoryItemId}" also-hidden="false" target-type="inter-app">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
@@ -558,7 +558,7 @@ under the License.
             <display description="default ${drObjectInfo}"/>
         </field>
         <field name="drObjectInfo" title="${uiLabelMap.CommonContent}" use-when="${groovy: drDataResourceTypeId != null &amp;&amp; (drDataResourceTypeId.contains(&quot;FILE&quot;) || drDataResourceTypeId.equals(&quot;IMAGE_OBJECT&quot;))}">
-            <hyperlink description="${drObjectInfo}" target="/content/control/ViewBinaryDataResource" url-mode="content" target-window="productionRunContentWindow">
+            <hyperlink description="${drObjectInfo}" target="/content/control/ViewBinaryDataResource" target-type="content" target-window="productionRunContentWindow">
                 <parameter param-name="dataResourceId" from-field="drDataResourceId"/>
             </hyperlink>
         </field>
@@ -590,7 +590,7 @@ under the License.
             <display description="default ${drObjectInfo}"/>
         </field>
         <field name="drObjectInfo" title="${uiLabelMap.CommonContent}" use-when="${groovy: drDataResourceTypeId != null &amp;&amp; (drDataResourceTypeId.contains(&quot;FILE&quot;) || drDataResourceTypeId.equals(&quot;IMAGE_OBJECT&quot;))}">
-            <hyperlink description="${drObjectInfo}" target="/content/control/ViewBinaryDataResource" url-mode="content" target-window="productionRunContentWindow">
+            <hyperlink description="${drObjectInfo}" target="/content/control/ViewBinaryDataResource" target-type="content" target-window="productionRunContentWindow">
                 <parameter param-name="dataResourceId" from-field="drDataResourceId"/>
             </hyperlink>
         </field>
@@ -733,7 +733,7 @@ under the License.
     <form name="ListShipmentPlan" type="list" target="" title="" list-name="shipmentPlan"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId" from-field="orderId"/>
             </hyperlink>
         </field>
@@ -764,7 +764,7 @@ under the License.
     <form name="ListShipmentPlans" type="list" target="" title="" list-name="shipmentPlans"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
         <field name="shipmentId" widget-style="buttontext" sort-field="true">
-            <hyperlink description="${shipmentId}" target="/facility/control/ViewShipment" url-mode="inter-app">
+            <hyperlink description="${shipmentId}" target="/facility/control/ViewShipment" target-type="inter-app">
                 <parameter param-name="shipmentId" from-field="shipmentId"/>
             </hyperlink>
         </field>
@@ -981,7 +981,7 @@ under the License.
             <set field="quantityOnHandDiff" value="${groovy:-1*quantityOnHandDiff}" type="BigDecimal"/>
         </row-actions>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink description="${inventoryItemId}" target="/facility/control/EditInventoryItem" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${inventoryItemId}" target="/facility/control/EditInventoryItem" also-hidden="false" target-type="inter-app">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
diff --git a/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml b/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
index 88865bf..c3c0247 100644
--- a/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
+++ b/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
@@ -308,7 +308,7 @@ under the License.
    <grid name="ListRoutingProductLink" target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/ViewProductManufacturing" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/ViewProductManufacturing" also-hidden="false" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
diff --git a/applications/marketing/widget/ContactListForms.xml b/applications/marketing/widget/ContactListForms.xml
index 78c516c..ae512b8 100644
--- a/applications/marketing/widget/ContactListForms.xml
+++ b/applications/marketing/widget/ContactListForms.xml
@@ -78,7 +78,7 @@ under the License.
         
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="button"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" url-mode="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <form name="FindContactLists" target="FindContactLists" title="" type="single"
@@ -214,7 +214,7 @@ under the License.
         <field name="contactListId"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -298,7 +298,7 @@ under the License.
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
         <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -385,7 +385,7 @@ under the License.
         <!--
         <field name="custRequestId">
             <lookup size="20" target-form-name="/ordermgr/control/LookupCustRequest">
-                <sub-hyperlink target="/ordermgr/control/EditRequest" url-mode="inter-app" link-style="buttontext" description="[Edit]" use-when="communicationEvent!=null&amp;&amp;communicationEvent.get(&quot;custRequestId&quot;)!= null">
+                <sub-hyperlink target="/ordermgr/control/EditRequest" target-type="inter-app" link-style="buttontext" description="[Edit]" use-when="communicationEvent!=null&amp;&amp;communicationEvent.get(&quot;custRequestId&quot;)!= null">
                 <parameter param-name="custRequestId" from-field="communicationEvent.custRequestId"/>
             </sub-hyperlink>
             </lookup>
@@ -461,7 +461,7 @@ under the License.
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}">
-            <hyperlink description="${communicationEventId}" target="EditContactListCommEvent" url-mode="intra-app">
+            <hyperlink description="${communicationEventId}" target="EditContactListCommEvent" target-type="intra-app">
                 <parameter param-name="contactListId"/>
                 <parameter param-name="communicationEventId"/>
                 <parameter param-name="DONE_PAGE" from-field="donePage"/>
@@ -522,7 +522,7 @@ under the License.
             </service>
         </actions>
         <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" widget-style="buttontext">
-            <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field>
         <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
@@ -569,7 +569,7 @@ under the License.
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext">
-            <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
@@ -594,7 +594,7 @@ under the License.
         </actions>
 
         <field name="contactMechId"  widget-style="buttontext">
-            <hyperlink description="${contactMechId}" url-mode="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
+            <hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
         </field>
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
         <field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field>
@@ -650,7 +650,7 @@ under the License.
         <field name="webSiteId"><hidden/></field>
         <field name="siteName">
             <display-entity entity-name="WebSite" key-field-name="webSiteId">
-                <sub-hyperlink target="/content/control/EditWebSite" url-mode="inter-app" description="[${webSiteId}]" link-style="linktext">
+                <sub-hyperlink target="/content/control/EditWebSite" target-type="inter-app" description="[${webSiteId}]" link-style="linktext">
                     <parameter param-name="webSiteId"/>
                 </sub-hyperlink>
             </display-entity></field>
diff --git a/applications/marketing/widget/DataSourceForms.xml b/applications/marketing/widget/DataSourceForms.xml
index ee24c64..b006e29 100644
--- a/applications/marketing/widget/DataSourceForms.xml
+++ b/applications/marketing/widget/DataSourceForms.xml
@@ -39,7 +39,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="button"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" url-mode="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <form name="ListDataSource" target="ListDataSource" title="" type="list"
@@ -130,7 +130,7 @@ under the License.
             </service>
         </actions>
         <field name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" widget-style="buttontext">
-            <hyperlink description="${dataSourceId}" target="javascript:set_value('${dataSourceId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${dataSourceId}" target="javascript:set_value('${dataSourceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field>
@@ -153,7 +153,7 @@ under the License.
             </service>
         </actions>
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" widget-style="buttontext">
-            <hyperlink description="${dataSourceTypeId}" target="javascript:set_value('${dataSourceTypeId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${dataSourceTypeId}" target="javascript:set_value('${dataSourceTypeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
     </form>
diff --git a/applications/marketing/widget/LookupForms.xml b/applications/marketing/widget/LookupForms.xml
index f74bed3..0daf835 100644
--- a/applications/marketing/widget/LookupForms.xml
+++ b/applications/marketing/widget/LookupForms.xml
@@ -41,7 +41,7 @@ under the License.
             </service>
         </actions>
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
-            <hyperlink description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -56,7 +56,7 @@ under the License.
             </entity-and>
         </actions>
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
-            <hyperlink description="${segmentGroupId}" target="viewSegmentGroup" also-hidden="false" url-mode="intra-app">
+            <hyperlink description="${segmentGroupId}" target="viewSegmentGroup" also-hidden="false" target-type="intra-app">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
@@ -97,7 +97,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/>
         <field name="salesForecastId"  widget-style="buttontext">
-            <hyperlink description="${salesForecastId}" target="javascript:set_value('${salesForecastId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${salesForecastId}" target="javascript:set_value('${salesForecastId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 </forms>
diff --git a/applications/marketing/widget/MarketingCampaignForms.xml b/applications/marketing/widget/MarketingCampaignForms.xml
index 282cc40..7c8fa46 100644
--- a/applications/marketing/widget/MarketingCampaignForms.xml
+++ b/applications/marketing/widget/MarketingCampaignForms.xml
@@ -60,7 +60,7 @@ under the License.
             <hidden value="${donePage}"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" widget-style="buttontext" title=" "><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" url-mode="inter-app"/></field>
+        <field name="cancelLink" widget-style="buttontext" title=" "><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field>
     </form>
 
    <form name="ListMarketingCampaign" type="list" paginate-target="FindMarketingCampaign"
@@ -92,7 +92,7 @@ under the License.
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="&quot;${lastName}&quot;!=null">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" also-hidden="true">
-                <sub-hyperlink target="/partymgr/control/viewprofile" description="${partyId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/partymgr/control/viewprofile" description="${partyId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/marketing/widget/SegmentForms.xml b/applications/marketing/widget/SegmentForms.xml
index 4a473f0..e8e0c44 100644
--- a/applications/marketing/widget/SegmentForms.xml
+++ b/applications/marketing/widget/SegmentForms.xml
@@ -67,7 +67,7 @@ under the License.
                 <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
                     <entity-order-by field-name="storeName"/>
                 </entity-options>
-                <sub-hyperlink target="/catalog/control/EditProductStore" url-mode="inter-app" description="${segmentGroup.productStoreId}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProductStore" target-type="inter-app" description="${segmentGroup.productStoreId}" link-style="buttontext">
                 <parameter param-name="productStoreId" from-field="segmentGroup.productStoreId"/>
             </sub-hyperlink>
             </drop-down>
@@ -161,7 +161,7 @@ under the License.
         <field name="segmentGroupId"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" description="${partyId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/partymgr/control/viewprofile" description="${partyId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/marketing/widget/TrackingCodeForms.xml b/applications/marketing/widget/TrackingCodeForms.xml
index 502cd27..227dbdb 100644
--- a/applications/marketing/widget/TrackingCodeForms.xml
+++ b/applications/marketing/widget/TrackingCodeForms.xml
@@ -64,7 +64,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" url-mode="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <grid name="ListTrackingCode" target="ListTrackingCode" title=""
@@ -195,7 +195,7 @@ under the License.
             </service>
         </actions>
         <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}">
-            <hyperlink description="${visitId}" target="/partymgr/control/visitdetail" url-mode="inter-app">
+            <hyperlink description="${visitId}" target="/partymgr/control/visitdetail" target-type="inter-app">
                 <parameter param-name="visitId"/>
                 <parameter param-name="DONE_PAGE" from-field="donePage"/>
             </hyperlink>
@@ -244,7 +244,7 @@ under the License.
             </service>
         </actions>
         <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext">
-            <hyperlink description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
@@ -272,7 +272,7 @@ under the License.
             </service>
         </actions>
         <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext">
-            <hyperlink description="${visitId}" target="javascript:set_value('${visitId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${visitId}" target="javascript:set_value('${visitId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyId" title="${uiLabelMap.MarketingTrackingCodeVisitPartyId}">
             <display-entity description="${partyId}" entity-name="Party" key-field-name="partyId"/>
@@ -302,7 +302,7 @@ under the License.
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" url-mode="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <grid name="ListTrackingCodeType" target="ListTrackingCodeType" title=""
@@ -342,7 +342,7 @@ under the License.
             </service>
         </actions>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext">
-            <hyperlink description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
     </grid>
diff --git a/applications/marketing/widget/sfa/forms/EventForms.xml b/applications/marketing/widget/sfa/forms/EventForms.xml
index 845ccc2..2e2e188 100644
--- a/applications/marketing/widget/sfa/forms/EventForms.xml
+++ b/applications/marketing/widget/sfa/forms/EventForms.xml
@@ -33,12 +33,12 @@ under the License.
         <field name="deleteLink"><hidden/></field>
         <field name="currentStatusId"><hidden/></field>
         <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
-            <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="assignedByUserLoginId" title="${uiLabelMap.SfaAssignedBy}">
-            <hyperlink description="${assignByPartyName.firstName} ${assignByPartyName.middleName} ${assignByPartyName.lastName} ${assignByPartyName.groupName} [${assignByPartyName.partyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${assignByPartyName.firstName} ${assignByPartyName.middleName} ${assignByPartyName.lastName} ${assignByPartyName.groupName} [${assignByPartyName.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="assignByPartyName.partyId"/>
             </hyperlink>
         </field>
@@ -53,7 +53,7 @@ under the License.
         <field name="assignedByUserLoginId"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.FormFieldTitle_toPartyId}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="[${partyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+                <sub-hyperlink description="[${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/marketing/widget/sfa/forms/LookupForms.xml b/applications/marketing/widget/sfa/forms/LookupForms.xml
index 62f9337..661ae3d 100644
--- a/applications/marketing/widget/sfa/forms/LookupForms.xml
+++ b/applications/marketing/widget/sfa/forms/LookupForms.xml
@@ -23,19 +23,19 @@ under the License.
 
     <form name="ListLookupAccount" extends="ListAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
         <field name="partyId">
-            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="relatedCompany"><hidden/></field>
     </form>
     <form name="ListLookupLead" extends="listLeads" extends-resource="component://marketing/widget/sfa/forms/LeadForms.xml">
         <field name="partyId">
-            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="relatedCompany"><hidden/></field>
     </form>
     <form name="ListLookupAccountLead" extends="ListAccountLeads" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
         <field name="partyId">
-            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="relatedCompany"><hidden/></field>
     </form>
diff --git a/applications/order/widget/ordermgr/AllocationPlanForms.xml b/applications/order/widget/ordermgr/AllocationPlanForms.xml
index cf7259e..0dd70b1 100644
--- a/applications/order/widget/ordermgr/AllocationPlanForms.xml
+++ b/applications/order/widget/ordermgr/AllocationPlanForms.xml
@@ -52,7 +52,7 @@ under the License.
     <grid name="ListAllocationPlan" list-name="allocationPlans" target="" title="" paginate-target="FindAllocationPlan"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
         <field name="planId" widget-style="buttontext" sort-field="true">
-            <hyperlink url-mode="inter-app" description="${planId}" target="/ordermgr/control/ViewAllocationPlan">
+            <hyperlink target-type="inter-app" description="${planId}" target="/ordermgr/control/ViewAllocationPlan">
                 <parameter param-name="planId"/>
             </hyperlink>
         </field>
diff --git a/applications/order/widget/ordermgr/CustRequestForms.xml b/applications/order/widget/ordermgr/CustRequestForms.xml
index 547ddaf..e85c156 100644
--- a/applications/order/widget/ordermgr/CustRequestForms.xml
+++ b/applications/order/widget/ordermgr/CustRequestForms.xml
@@ -124,7 +124,7 @@ under the License.
         <field name="custRequestTypeId"><display-entity entity-name="CustRequestType"/></field>
         <field name="productStoreId">
             <display-entity entity-name="ProductStore" description="${storeName}">
-                <sub-hyperlink description="[${productStoreId}]" target="/catalog/control/EditProductStore" url-mode="inter-app">
+                <sub-hyperlink description="[${productStoreId}]" target="/catalog/control/EditProductStore" target-type="inter-app">
                     <parameter param-name="productStoreId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -135,7 +135,7 @@ under the License.
         <field name="responseRequiredDate" sort-field="true"><display/></field>
         <field name="fromPartyId" sort-field="true">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink description="[${fromPartyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+                <sub-hyperlink description="[${fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                     <parameter param-name="partyId" from-field="fromPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -219,7 +219,7 @@ under the License.
     <form name="ViewRequestCommunicationEvents" type="list" extends="ListCommEvents"
             extends-resource="component://party/widget/partymgr/CommunicationEventForms.xml">
         <field name="subject">
-            <hyperlink description="${subject}" target="/partymgr/control/ViewCommunicationEvent" url-mode="inter-app" link-type="hidden-form">
+            <hyperlink description="${subject}" target="/partymgr/control/ViewCommunicationEvent" target-type="inter-app" link-type="hidden-form">
                 <parameter param-name="communicationEventId"/>
             </hyperlink>
         </field>
@@ -257,7 +257,7 @@ under the License.
     <form name="ViewRequestWorkEfforts" type="list" list-name="requestWorkEfforts"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="workEffortId">
-            <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" url-mode="inter-app">
+            <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -485,7 +485,7 @@ under the License.
         <field name="custRequestId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
             <display-entity also-hidden="true" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}">
-                <sub-hyperlink description="${partyId}" url-mode="inter-app" target="/partymgr/control/viewprofile">
+                <sub-hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -544,7 +544,7 @@ under the License.
         <field name="custRequestItemSeqId"><hidden/></field>
         <field name="workEffortId">
             <display-entity entity-name="WorkEffort" description="${workEffortName}">
-                <sub-hyperlink description="[${workEffortId}]" target="/workeffort/control/EditWorkEffort" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink description="[${workEffortId}]" target="/workeffort/control/EditWorkEffort" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="workEffortId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -583,7 +583,7 @@ under the License.
         <field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="fromPartyId" title="${uiLabelMap.PartyPartyId}">
-            <hyperlink description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="custRequest.fromPartyId"/>
             </hyperlink>
         </field>
@@ -664,7 +664,7 @@ under the License.
         <field name="custRequestId"><hidden/></field>
         <field name="contentId">
             <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true">
-                <sub-hyperlink target="/content/control/ViewSimpleContent" description="[${contentId}]" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/content/control/ViewSimpleContent" description="[${contentId}]" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="contentId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/order/widget/ordermgr/FieldLookupForms.xml b/applications/order/widget/ordermgr/FieldLookupForms.xml
index 3de8a40..dec99c6 100644
--- a/applications/order/widget/ordermgr/FieldLookupForms.xml
+++ b/applications/order/widget/ordermgr/FieldLookupForms.xml
@@ -72,7 +72,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="OrderHeader" default-field-type="display"/>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink url-mode="plain" also-hidden="true" description="${orderId}" target="javascript:set_value('${orderId}')"/>
+            <hyperlink target-type="plain" also-hidden="true" description="${orderId}" target="javascript:set_value('${orderId}')"/>
         </field>
         <field name="orderTypeId"><display-entity entity-name="OrderType" also-hidden="true"/></field>
     </form>
@@ -129,7 +129,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden"/>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="javascript:set_value('${orderId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${orderId}" target="javascript:set_value('${orderId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="orderTypeId"><display-entity entity-name="OrderType"/></field>
         <field name="partyId"><display/></field>
@@ -245,7 +245,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/>
         <field name="custRequestId" widget-style="buttontext">
-            <hyperlink description="${custRequestId}" target="javascript:set_value('${custRequestId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${custRequestId}" target="javascript:set_value('${custRequestId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="custRequestName"><display/></field>
         <field name="priority"><display/></field>
@@ -291,7 +291,7 @@ under the License.
         <auto-fields-entity entity-name="CustRequestItem" default-field-type="hidden"/>
         <field name="custRequestId"><display/></field>
         <field name="custRequestItemSeqId" widget-style="buttontext" >
-            <hyperlink description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="priority"><display/></field>
         <field name="custRequestResolutionId"><display-entity also-hidden="false" entity-name="CustRequestResolution"/></field>
@@ -351,7 +351,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="Quote" default-field-type="display"/>
         <field name="quoteId" widget-style="buttontext">
-            <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}"><display-entity entity-name="QuoteType"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity also-hidden="false" entity-name="StatusItem"/></field>
@@ -418,15 +418,15 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/>
         <field name="quoteId" widget-style="buttontext">
-            <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteId"><hidden/></field>
         <field name="quoteItemSeqId"><hidden/></field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo==null}">
-            <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">
-            <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy: 'Y'.equals(isPromo)}"><display/></field>
         <field name="productId">
@@ -487,7 +487,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="Requirement" default-field-type="hidden"/>
         <field name="requirementId" widget-style="buttontext">
-            <hyperlink url-mode="plain" also-hidden="true" description="${requirementId}" target="javascript:set_value('${requirementId}')"/>
+            <hyperlink target-type="plain" also-hidden="true" description="${requirementId}" target="javascript:set_value('${requirementId}')"/>
         </field>
         <field name="requirementTypeId">
             <display-entity entity-name="RequirementType" also-hidden="true"/>
@@ -525,7 +525,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="ShoppingList" default-field-type="hidden"/>
         <field name="shoppingListId" widget-style="buttontext">
-            <hyperlink url-mode="plain" also-hidden="true" description="${shoppingListId}" target="javascript:set_value('${shoppingListId}')"/>
+            <hyperlink target-type="plain" also-hidden="true" description="${shoppingListId}" target="javascript:set_value('${shoppingListId}')"/>
         </field>
         <field name="shoppingListTypeId"><display-entity entity-name="ShoppingListType" also-hidden="true"/></field>
     </form>
@@ -572,7 +572,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="ReturnHeader" default-field-type="display"/>
         <field name="returnId" widget-style="buttontext">
-            <hyperlink url-mode="plain" also-hidden="true" description="${returnId}" target="javascript:set_value('${returnId}')"/>
+            <hyperlink target-type="plain" also-hidden="true" description="${returnId}" target="javascript:set_value('${returnId}')"/>
         </field>
         <field name="returnHeaderTypeId"><display-entity entity-name="ReturnHeaderType" also-hidden="true"/></field>
     </form>
diff --git a/applications/order/widget/ordermgr/OrderEntryForms.xml b/applications/order/widget/ordermgr/OrderEntryForms.xml
index b01eac2..f46badd 100644
--- a/applications/order/widget/ordermgr/OrderEntryForms.xml
+++ b/applications/order/widget/ordermgr/OrderEntryForms.xml
@@ -157,7 +157,7 @@ under the License.
             <set field="hasAmount" value="${groovy:product.getString('requireAmount')?:'N'}"/>
         </row-actions>
         <field name="productId"  title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -182,7 +182,7 @@ under the License.
     <form name="LookupBulkAddSupplierProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddSupplierProducts" view-size="5">
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -207,7 +207,7 @@ under the License.
     <form name="LookupAssociatedProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts"
         paginate-target="LookupAssociatedProducts" default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="productId"  title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" url-mode="inter-app"/>
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-type="inter-app"/>
         </field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
         <field name="internalName"><display/></field>
diff --git a/applications/order/widget/ordermgr/OrderForms.xml b/applications/order/widget/ordermgr/OrderForms.xml
index 418ce9c..a48481c 100644
--- a/applications/order/widget/ordermgr/OrderForms.xml
+++ b/applications/order/widget/ordermgr/OrderForms.xml
@@ -141,7 +141,7 @@ under the License.
         <field name="orderId"><hidden/></field>
         <field name="shipGroupSeqId"><hidden/></field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
diff --git a/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml b/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
index 4a2c633..8181301 100644
--- a/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
+++ b/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
@@ -47,7 +47,7 @@ under the License.
         </field>
     </form>
 
-    <form name="AddQuoteWorkEffort" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml" target="/ordermgr/control/createQuoteWorkEffort" url-mode="inter-app" title="" type="single"
+    <form name="AddQuoteWorkEffort" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml" target="/ordermgr/control/createQuoteWorkEffort" target-type="inter-app" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
 
         <field name="quoteId" map-name="parameters"><display/></field>
diff --git a/applications/order/widget/ordermgr/RequirementForms.xml b/applications/order/widget/ordermgr/RequirementForms.xml
index aeb199f..45f4235 100644
--- a/applications/order/widget/ordermgr/RequirementForms.xml
+++ b/applications/order/widget/ordermgr/RequirementForms.xml
@@ -77,7 +77,7 @@ under the License.
             <set field="quantityOnHandTotal" from-field="resultQohTotal.quantityOnHandTotal"/>
         </row-actions>
         <field name="requirementId" widget-style="buttontext">
-            <hyperlink url-mode="inter-app" description="${requirementId}" target="/ordermgr/control/EditRequirement">
+            <hyperlink target-type="inter-app" description="${requirementId}" target="/ordermgr/control/EditRequirement">
                 <parameter param-name="requirementId"/>
             </hyperlink>
         </field>
@@ -164,7 +164,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="OrderRequirementCommitment" default-field-type="display"/>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" url-mode="inter-app" target="/ordermgr/control/orderview">
+            <hyperlink description="${orderId}" target-type="inter-app" target="/ordermgr/control/orderview">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -305,7 +305,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -315,11 +315,11 @@ under the License.
         <field name="facilityId"><display/></field>
         <field name="partyId" title="${uiLabelMap.ProductSupplier}">
             <display-entity entity-name="PartyNameView" description="${LastName} ${firstName} ${middleName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="[${partyId}]" url-mode="inter-app"/>
+                <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="[${partyId}]" target-type="inter-app"/>
             </display-entity>
         </field>
         <field name="supplierProductId" title="${uiLabelMap.ProductSupplierProductId}">
-            <hyperlink description="${supplierProductId}" target="/catalog/control/EditProductSuppliers?productId=${productId}" url-mode="inter-app"/>
+            <hyperlink description="${supplierProductId}" target="/catalog/control/EditProductSuppliers?productId=${productId}" target-type="inter-app"/>
         </field>
         <field name="idValue" title="${uiLabelMap.ProductUPCA}"><display/></field>
         <field name="minimumOrderQuantity" widget-area-style="align-text"><display type="number" format="quantity"/></field>
@@ -339,7 +339,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -367,7 +367,7 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <field name="orderId" id-name="orderId_o_0"><text/></field>
         <field name="submitButton" title=" " widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.OrderInputQuickPurchaseOrder}" target="javascript:document.ApprovedProductRequirements.orderId_o_0.value=document.ApprovedProductRequirementsSubmit.orderId_o_0.value;document.ApprovedProductRequirements.submit()" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${uiLabelMap.OrderInputQuickPurchaseOrder}" target="javascript:document.ApprovedProductRequirements.orderId_o_0.value=document.ApprovedProductRequirementsSubmit.orderId_o_0.value;document.ApprovedProductRequirements.submit()" also-hidden="false" target-type="plain"/>
         </field>
     </form>
     <form name="ApprovedProductRequirementsSummary" type="single" default-map-name="quantityReport" target="ApprovedProductRequirements"
diff --git a/applications/order/widget/ordermgr/ReturnForms.xml b/applications/order/widget/ordermgr/ReturnForms.xml
index b8d6476..d8a7ccc 100644
--- a/applications/order/widget/ordermgr/ReturnForms.xml
+++ b/applications/order/widget/ordermgr/ReturnForms.xml
@@ -98,7 +98,7 @@ under the License.
             </drop-down>
         </field>
         <field name="newCreditCard" widget-style="buttontext" use-when="returnHeader!=null&amp;&amp;returnHeader.getString(&quot;fromPartyId&quot;)!=null">
-            <hyperlink also-hidden="false" target="/partymgr/control/editcreditcard" target-window="partymgr" description="${uiLabelMap.AccountingAddNewCreditCard}" url-mode="inter-app">
+            <hyperlink also-hidden="false" target="/partymgr/control/editcreditcard" target-window="partymgr" description="${uiLabelMap.AccountingAddNewCreditCard}" target-type="inter-app">
                 <parameter param-name="partyId" from-field="returnHeader.fromPartyId"/>
             </hyperlink>
         </field>
@@ -171,13 +171,13 @@ under the License.
         </field>
         <field name="fromPartyId" title="${uiLabelMap.OrderReturnFromParty}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}">
-                <sub-hyperlink link-style="buttontext" url-mode="inter-app" description="${fromPartyId}" target="/partymgr/control/viewprofile">
+                <sub-hyperlink link-style="buttontext" target-type="inter-app" description="${fromPartyId}" target="/partymgr/control/viewprofile">
                     <parameter param-name="partyId" from-field="fromPartyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="destinationFacilityId" widget-style="buttontext" title="${uiLabelMap.OrderReturnDestinationFacility}">
-            <hyperlink url-mode="inter-app" description="${destinationFacilityId}" target="/facility/control/EditFacility">
+            <hyperlink target-type="inter-app" description="${destinationFacilityId}" target="/facility/control/EditFacility">
                 <parameter param-name="facilityId" from-field="destinationFacilityId"/>
             </hyperlink>
         </field>
diff --git a/applications/party/widget/partymgr/CommunicationEventForms.xml b/applications/party/widget/partymgr/CommunicationEventForms.xml
index 8459451..5413346 100644
--- a/applications/party/widget/partymgr/CommunicationEventForms.xml
+++ b/applications/party/widget/partymgr/CommunicationEventForms.xml
@@ -90,7 +90,7 @@ under the License.
         <!-- contact list -->
         <field name="contactListId">
             <lookup size="20" target-form-name="LookupContactList">
-                <sub-hyperlink target="/marketing/control/EditContactList" url-mode="inter-app" link-style="smallSubmit">
+                <sub-hyperlink target="/marketing/control/EditContactList" target-type="inter-app" link-style="smallSubmit">
                 <parameter param-name="contactListId" from-field="communicationEvent.contactListId"/>
             </sub-hyperlink>
             </lookup>
@@ -174,10 +174,10 @@ under the License.
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
         <field name="content" title="${uiLabelMap.CommonContent}" encode-output="false"><textarea cols="72" rows="15" default-value="${parameters.content}"/></field>
         <field name="send" title=" " position="1" use-when="communicationEvent!=null">
-            <hyperlink description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.submit())" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.submit())" also-hidden="false" target-type="plain"/>
         </field>
         <field name="save" title=" " position="2" use-when="communicationEvent!=null">
-            <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.statusId.value='COM_PENDING'),(document.EditEmail.submit())" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.statusId.value='COM_PENDING'),(document.EditEmail.submit())" also-hidden="false" target-type="plain"/>
         </field>
         <field name="createButton" use-when="communicationEvent==null"><submit/></field>
         <field name="dummy" position="320"><hidden/></field>
@@ -207,11 +207,11 @@ under the License.
         <field name="content" title="${uiLabelMap.CommonContent}" encode-output="false"><textarea cols="72" rows="15" default-value="${parameters.content}"/></field>
         <field name="send" title=" " position="1" use-when="communicationEvent!=null">
             <hyperlink also-hidden="true"
-                url-mode="plain" description="${uiLabelMap.CommonSend}"
+                target-type="plain" description="${uiLabelMap.CommonSend}"
                 target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.statusId.value='COM_ENTERED'),(document.EditInternalNote.datetimeStarted.value='${nowDate}'),(document.EditInternalNote.submit())"/>
         </field>
         <field name="save" title=" " position="2" use-when="communicationEvent!=null">
-            <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.submit())" also-hidden="true" url-mode="plain"/>
+            <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.submit())" also-hidden="true" target-type="plain"/>
         </field>
         <field name="createButton" use-when="communicationEvent==null"><submit/></field>
         <field name="dummy" position="320"><hidden/></field>
@@ -235,14 +235,14 @@ under the License.
         <field name="contactListId" use-when="communicationEvent.get(&quot;contactListId&quot;)!=null"><display/></field>
         <field name="partyIdFrom" use-when="communicationEvent.get(&quot;partyIdFrom&quot;)!=null">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechFrom.infoString})">
-                <sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+                <sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                     <parameter param-name="partyId" from-field="communicationEvent.partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="partyIdTo">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechTo.infoString})">
-                <sub-hyperlink description=" [${communicationEvent.partyIdTo}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+                <sub-hyperlink description=" [${communicationEvent.partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                     <parameter param-name="partyId" from-field="communicationEvent.partyIdTo"/>
                 </sub-hyperlink>
             </display-entity>
@@ -287,7 +287,7 @@ under the License.
         <field name="communicationEventId"><display/></field>
         <field name="contactListId" use-when="contactListId!=null">
             <display-entity entity-name="ContactList" description="${contactListName}">
-                <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${communicationEvent.contactListId}" description="[${communicationEvent.contactListId}]" url-mode="inter-app"/>
+                <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${communicationEvent.contactListId}" description="[${communicationEvent.contactListId}]" target-type="inter-app"/>
             </display-entity>
         </field>
         <field name="partyIdFrom" use-when="&quot;my&quot;==void" title="${uiLabelMap.PartyPartyFrom}">
@@ -421,7 +421,7 @@ under the License.
         </field>
         <field name="partyId" title="${uiLabelMap.CommonPartyId}" sort-field="true">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" url-mode="inter-app">
+                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" target-type="inter-app">
                     <parameter param-name="partyId" from-field="partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
@@ -470,7 +470,7 @@ under the License.
             </service>
         </actions>
         <field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" url-mode="inter-app"/>
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/>
         </field>
         <field name="communicationEventId">
             <hyperlink description="${communicationEventId}" target="ViewCommunicationEvent">
@@ -526,14 +526,14 @@ under the License.
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}" sort-field="true">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" url-mode="inter-app">
+                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" target-type="inter-app">
                     <parameter param-name="partyId" from-field="partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}" sort-field="true">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdTo}]" url-mode="inter-app">
+                <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdTo}]" target-type="inter-app">
                     <parameter param-name="partyId" from-field="partyIdTo"/>
                 </sub-hyperlink>
             </display-entity>
@@ -624,7 +624,7 @@ under the License.
         </actions>
         <field name="workEffortId" title="${uiLabelMap.WorkEffort}">
             <display-entity entity-name="WorkEffort" description="${workEffortName}">
-                <sub-hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" url-mode="inter-app" link-style="smallSubmit">
+                <sub-hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" link-style="smallSubmit">
                     <parameter param-name="workEffortId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -633,7 +633,7 @@ under the License.
 
     <form name="AddCommEventWorkEffort" type="single" extends="EditWorkEffort"
         extends-resource="component://workeffort/widget/WorkEffortForms.xml"
-        target="/partymgr/control/createCommEventWorkEffort" url-mode="inter-app"
+        target="/partymgr/control/createCommEventWorkEffort" target-type="inter-app"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="communicationEventId"><display/></field>
         <field name="workEffortId"  use-when="workEffort==null&amp;&amp;workEffortId==null" ><lookup target-form-name="LookupWorkEffort"/></field>
@@ -688,7 +688,7 @@ under the License.
         <field name="communicationEventId"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
-                <sub-hyperlink description=" [${partyId}]" target="/partymgr/control/viewprofile" url-mode="inter-app">
+                <sub-hyperlink description=" [${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -963,7 +963,7 @@ under the License.
     </form>
     <form name="ListRequests" extends="ListRequests" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
         <field name="custRequestName">
-            <hyperlink description="${custRequestName} [${custRequestId}]" target="/ordermgr/control/ViewRequest" url-mode="inter-app">
+            <hyperlink description="${custRequestName} [${custRequestId}]" target="/ordermgr/control/ViewRequest" target-type="inter-app">
                 <parameter param-name="custRequestId"/>
             </hyperlink>
         </field>
@@ -1010,7 +1010,7 @@ under the License.
             <set field="orderTypeId" from-field="orderHeader.orderTypeId"/>
         </row-actions>
         <field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" url-mode="inter-app"/>
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/>
         </field>
         <field name="communicationEventId"><hidden/></field>
         <field name="orderTypeId" title="${uiLabelMap.OrderOrderType}">
@@ -1082,7 +1082,7 @@ under the License.
             </service>
         </actions>
         <field name="returnId" title="${uiLabelMap.FormFieldTitle_returnId}">
-            <hyperlink description="${returnId}" target="/ordermgr/control/returnMain?returnId=${returnId}" url-mode="inter-app"/>
+            <hyperlink description="${returnId}" target="/ordermgr/control/returnMain?returnId=${returnId}" target-type="inter-app"/>
         </field>
         <field name="communicationEventId">
             <hyperlink description="${communicationEventId}" target="ViewCommunicationEvent">
@@ -1115,7 +1115,7 @@ under the License.
             <set field="returnHeaderTypeId" from-field="returnHeader.returnHeaderTypeId"/>
         </row-actions>
         <field name="returnId" title="${uiLabelMap.FormFieldTitle_returnId}" widget-style="buttontext">
-            <hyperlink description="${returnId}" target="/ordermgr/control/returnMain?returnId=${returnId}" url-mode="inter-app"/>
+            <hyperlink description="${returnId}" target="/ordermgr/control/returnMain?returnId=${returnId}" target-type="inter-app"/>
         </field>
         <field name="communicationEventId"><hidden/></field>
         <field name="returnHeaderTypeId" title="${uiLabelMap.OrderReturnHeaderType}">
diff --git a/applications/party/widget/partymgr/LookupForms.xml b/applications/party/widget/partymgr/LookupForms.xml
index 8dcba53..8081ed0 100644
--- a/applications/party/widget/partymgr/LookupForms.xml
+++ b/applications/party/widget/partymgr/LookupForms.xml
@@ -47,7 +47,7 @@ under the License.
         </actions>
         <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <display-entity also-hidden="false" entity-name="PartyType"/>
@@ -87,7 +87,7 @@ under the License.
         </row-actions>
         <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
-            <hyperlink description="${partyId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="name" title="${uiLabelMap.PartyName}"><display/></field>
         <field name="infoString" title="${uiLabelMap.PartyEmailAddress}"><display/></field>
@@ -117,7 +117,7 @@ under the License.
             <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <display-entity also-hidden="false" entity-name="PartyType"/>
@@ -158,7 +158,7 @@ under the License.
             </service>
         </actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <display-entity also-hidden="false" entity-name="PartyType"/>
@@ -186,7 +186,7 @@ under the License.
         </actions>
         <!--<auto-fields-entity entity-name="Person" default-field-type="display"/>-->
         <field name="partyId"  widget-style="smallSubmit" title="${uiLabelMap.PartyPartyId}">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
         <field name="middleName" title="${uiLabelMap.PartyMiddleInitial}"><display/></field>
@@ -222,7 +222,7 @@ under the License.
             <display description="${partyId}"/>
         </field>
         <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
-            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="lastName" title="${uiLabelMap.PartyName}"><display description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
     </form>
@@ -248,7 +248,7 @@ under the License.
             <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
-            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display description="${partyId}"/>
@@ -276,7 +276,7 @@ under the License.
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><display/></field>
         <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 
@@ -307,7 +307,7 @@ under the License.
         </actions>
 
         <field name="partyClassificationGroupId" title=" " widget-style="smallSubmit">
-            <hyperlink description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyClassificationTypeId"><display/></field>
         <field name="parentGroupId"><display/></field>
@@ -367,7 +367,7 @@ under the License.
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="smallSubmit">
-            <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
@@ -417,7 +417,7 @@ under the License.
         </actions>
 
         <field name="contactMechId"  widget-style="buttontext">
-            <hyperlink description="${contactMechId}" url-mode="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
+            <hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <display-entity also-hidden="false" entity-name="PartyType"/>
@@ -458,7 +458,7 @@ under the License.
             <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <display-entity also-hidden="false" entity-name="PartyType"/>
@@ -485,7 +485,7 @@ under the License.
             <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
-            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <display-entity also-hidden="false" entity-name="PartyType"/>
diff --git a/applications/party/widget/partymgr/PartyContactListForms.xml b/applications/party/widget/partymgr/PartyContactListForms.xml
index d0329fe..b0ee0e8 100644
--- a/applications/party/widget/partymgr/PartyContactListForms.xml
+++ b/applications/party/widget/partymgr/PartyContactListForms.xml
@@ -29,7 +29,7 @@ under the License.
         <field name="partyId"><hidden/></field>
         <field name="contactListId" title="${uiLabelMap.PartyContactLists}">
             <display-entity entity-name="ContactList" description="${contactListName}">
-                <sub-hyperlink target="/marketing/control/EditContactList" description="${contactListId}" url-mode="inter-app" link-style="smallSubmit">
+                <sub-hyperlink target="/marketing/control/EditContactList" description="${contactListId}" target-type="inter-app" link-style="smallSubmit">
                     <parameter param-name="contactListId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -98,7 +98,7 @@ under the License.
             <entity-condition entity-name="ContactList"/>
         </actions>
         <field name="contactListId"  widget-style="smallSubmit">
-            <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contactListName"><display/></field>
         <field name="contactListTypeId"><display-entity entity-name="ContactListType"/></field>
diff --git a/applications/party/widget/partymgr/PartyForms.xml b/applications/party/widget/partymgr/PartyForms.xml
index a5c517d..ce4e743 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -678,7 +678,7 @@ under the License.
         </actions>
         <field name="segmentGroupId" title="${uiLabelMap.PartySegmentGroupId}">
             <display-entity entity-name="SegmentGroup">
-                <sub-hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup" url-mode="inter-app" link-style="smallSubmit">
+                <sub-hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup" target-type="inter-app" link-style="smallSubmit">
                     <parameter param-name="segmentGroupId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -934,7 +934,7 @@ under the License.
     <form name="ListSubscriptions" type="list" list-name="subscriptionList" default-table-style="basic-table">
         <field name="subscriptionId">
             <display-entity entity-name="Subscription">
-                <sub-hyperlink description="[${subscriptionId}]" target="/catalog/control/EditSubscription" url-mode="inter-app">
+                <sub-hyperlink description="[${subscriptionId}]" target="/catalog/control/EditSubscription" target-type="inter-app">
                     <parameter param-name="subscriptionId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -948,7 +948,7 @@ under the License.
         <field name="description"><display/></field>
         <field name="productId">
             <display-entity entity-name="Product" description="${productName}">
-                <sub-hyperlink target="/catalog/control/EditProduct" url-mode="inter-app" description="${productId}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}" link-style="buttontext">
                     <parameter param-name="productId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1096,7 +1096,7 @@ under the License.
         </row-actions>
         <field name="invoiceId">
             <display-entity entity-name="Invoice" description=" " also-hidden="true">
-                <sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" url-mode="inter-app">
+                <sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" target-type="inter-app">
                     <parameter param-name="invoiceId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1108,7 +1108,7 @@ under the License.
         <field name="amountApplied"><display type="currency" currency="${actualCurrencyUomId}"/></field>
         <field name="paymentId">
             <display-entity entity-name="Payment" description=" " also-hidden="true">
-                <sub-hyperlink target="/accounting/control/paymentOverview" description="[${paymentId}]" url-mode="inter-app">
+                <sub-hyperlink target="/accounting/control/paymentOverview" description="[${paymentId}]" target-type="inter-app">
                     <parameter param-name="paymentId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1127,7 +1127,7 @@ under the License.
         </actions>
         <field name="invoiceId">
             <display-entity entity-name="Invoice">
-                <sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" url-mode="inter-app">
+                <sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" target-type="inter-app">
                     <parameter param-name="invoiceId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1150,7 +1150,7 @@ under the License.
         <field name="paymentId"><hidden/></field>
         <field name="paymentId">
             <display-entity entity-name="Payment" description=" ">
-                <sub-hyperlink target="/accounting/control/paymentOverview" description="[${paymentId}]" url-mode="inter-app">
+                <sub-hyperlink target="/accounting/control/paymentOverview" description="[${paymentId}]" target-type="inter-app">
                     <parameter param-name="paymentId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1362,7 +1362,7 @@ under the License.
         </actions>
         <field name="productStoreId" title="${uiLabelMap.ProductStoreId}">
             <display-entity entity-name="ProductStore" key-field-name="productStoreId" description="${storeName}">
-                <sub-hyperlink target="/catalog/control/EditProductStore" url-mode="inter-app" description="${storeName} (${productStoreId})" >
+                <sub-hyperlink target="/catalog/control/EditProductStore" target-type="inter-app" description="${storeName} (${productStoreId})" >
                     <parameter param-name="productStoreId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/party/widget/partymgr/PartyInvitationForms.xml b/applications/party/widget/partymgr/PartyInvitationForms.xml
index fef8530..6a2cc3f 100644
--- a/applications/party/widget/partymgr/PartyInvitationForms.xml
+++ b/applications/party/widget/partymgr/PartyInvitationForms.xml
@@ -113,7 +113,7 @@ under the License.
         </field>
         <field name="partyId" widget-style="buttontext" entry-name="partyIdTo">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyIdTo}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyIdTo}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="partyIdTo"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/product/widget/catalog/CategoryForms.xml b/applications/product/widget/catalog/CategoryForms.xml
index 27596d8..2dcb7a0 100644
--- a/applications/product/widget/catalog/CategoryForms.xml
+++ b/applications/product/widget/catalog/CategoryForms.xml
@@ -102,7 +102,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         -->
         <field name="editLink" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
-            <hyperlink description="${contentId}" target="/content/control/EditContent" url-mode="inter-app">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -206,7 +206,7 @@ under the License.
         <field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
         <field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="clearFormButton" title=" " use-when="productCategoryLink!=null">
-            <hyperlink description="${uiLabelMap.CommonClear}" target="EditProductCategoryLinks" url-mode="intra-app">
+            <hyperlink description="${uiLabelMap.CommonClear}" target="EditProductCategoryLinks" target-type="intra-app">
                 <parameter param-name="productCategoryId"/>
             </hyperlink>
         </field>
@@ -305,7 +305,7 @@ under the License.
         <field name="description" title="${uiLabelMap.ProductCategoryDescription}" map-name="content"><text size="40"/></field>
         <field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field>
         <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" >
-            <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" url-mode="inter-app">
+            <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" target-type="inter-app">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
diff --git a/applications/product/widget/catalog/FeatureForms.xml b/applications/product/widget/catalog/FeatureForms.xml
index e46cad1..7092dba 100644
--- a/applications/product/widget/catalog/FeatureForms.xml
+++ b/applications/product/widget/catalog/FeatureForms.xml
@@ -48,7 +48,7 @@
             </drop-down>
         </field>
         <field use-when="productFeature!=null&amp;&amp;productFeature.getString(&quot;productFeatureCategoryId&quot;)!=null" name="categoryLink" title=" " widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" target="/EditFeatureCategoryFeatures" url-mode="intra-app" also-hidden="false">
+            <hyperlink description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" target="/EditFeatureCategoryFeatures" target-type="intra-app" also-hidden="false">
                 <parameter param-name="productFeatureCategoryId" from-field="productFeature.productFeatureCategoryId"/>
             </hyperlink>
         </field>
diff --git a/applications/product/widget/catalog/FieldLookupForms.xml b/applications/product/widget/catalog/FieldLookupForms.xml
index b3d9ec5..3f8e093 100644
--- a/applications/product/widget/catalog/FieldLookupForms.xml
+++ b/applications/product/widget/catalog/FieldLookupForms.xml
@@ -59,13 +59,13 @@ under the License.
             <set field="hasVariants" value="${groovy: org.apache.ofbiz.entity.util.EntityUtil.filterByDate(delegator.findByAnd('ProductAssoc', org.apache.ofbiz.base.util.UtilMisc.toMap('productId', productId, 'productAssocTypeId', 'PRODUCT_VARIANT'), null, true)).size() > 0}" type="Boolean"/>
         </row-actions>
         <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
         <field name="searchVariants" title=" " widget-style="buttontext" use-when="hasVariants">
-            <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" url-mode="plain">
+            <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -97,7 +97,7 @@ under the License.
             </service>
         </actions>
         <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -122,7 +122,7 @@ under the License.
             </service>
         </actions>
         <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -191,12 +191,12 @@ under the License.
         </row-actions>
         <!--
         <field name="productId" title=" " widget-style="buttontext" use-when="isVirtual==null||&quot;${isVirtual}&quot;.equals(&quot;N&quot;)">
-            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="isVirtual!=null&amp;&amp;&quot;${isVirtual}&quot;.equals(&quot;Y&quot;)"><display/></field>
         -->
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
@@ -205,7 +205,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="searchVariants" title=" " widget-style="buttontext" use-when="hasVariants">
-            <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" url-mode="plain">
+            <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -261,7 +261,7 @@ under the License.
         <auto-fields-entity entity-name="ProductCategory" default-field-type="display"/>
         <field name="productCategoryTypeId"><display-entity entity-name="ProductCategoryType"/></field>
         <field name="productCategoryId" title=" " widget-style="buttontext">
-            <hyperlink description="${productCategoryId}" target="javascript:set_value('${productCategoryId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productCategoryId}" target="javascript:set_value('${productCategoryId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="longDescription"><ignored/></field>
         <field name="categoryImageUrl"><ignored/></field>
@@ -303,7 +303,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
         <field name="productFeatureId" title=" " widget-style="buttontext">
-            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 
@@ -333,7 +333,7 @@ under the License.
         <!-- <auto-fields-entity entity-name="ProductStore" default-field-type="display"/> -->
 
         <field name="productStoreId" widget-style="buttontext">
-            <hyperlink description="${productStoreId}" target="javascript:set_value('${productStoreId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${productStoreId}" target="javascript:set_value('${productStoreId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="primaryStoreGroupId"><display/></field>
         <field name="storeName"><display/></field>
@@ -371,7 +371,7 @@ under the License.
             </service>
         </actions>
         <field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}" widget-style="buttontext">
-            <hyperlink description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"><display/></field>
diff --git a/applications/product/widget/catalog/ImageManagementForms.xml b/applications/product/widget/catalog/ImageManagementForms.xml
index 66cc5cd..3891973 100644
--- a/applications/product/widget/catalog/ImageManagementForms.xml
+++ b/applications/product/widget/catalog/ImageManagementForms.xml
@@ -59,7 +59,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -119,7 +119,7 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field>
         <field name="fromDate" position="2"><display/></field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -159,7 +159,7 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field>
         <field name="fromDate" position="2"><display/></field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -209,7 +209,7 @@ under the License.
             </drop-down>
         </field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -259,7 +259,7 @@ under the License.
         <field name="rejectedBy" position="2" title="${uiLabelMap.ImageManagementRejectedBy}"><display/></field>
         <field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"><display/></field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </form>
     
@@ -338,7 +338,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
         <field name="deleteButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonRemove}" target="removeImage" also-hidden="false" confirmation-message="Do you want to remove this image?">
@@ -596,7 +596,7 @@ under the License.
         </row-actions>
         <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
         <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext">
-            <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentId"><display/></field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
@@ -605,7 +605,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -654,7 +654,7 @@ under the License.
         </field>
         <field name="purchaseFromDate" title="${uiLabelMap.ImageManagementApprovedDate}"><display/></field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -695,7 +695,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -738,7 +738,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" url-mode="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -750,7 +750,7 @@ under the License.
         </actions>
         <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
         <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext">
-            <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentId"><display/></field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
diff --git a/applications/product/widget/catalog/ProdCatalogForms.xml b/applications/product/widget/catalog/ProdCatalogForms.xml
index 6b5cece..56b98fc 100644
--- a/applications/product/widget/catalog/ProdCatalogForms.xml
+++ b/applications/product/widget/catalog/ProdCatalogForms.xml
@@ -108,7 +108,7 @@ under the License.
         <!-- three possibilities for the Party: person, partyGroup, neither... just print everything and if it's empty, no biggie -->
         <field name="partyId" title="${uiLabelMap.PartyParty}">
             <display-entity entity-name="PartyNameView" description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}" also-hidden="true" cache="false">
-                <sub-hyperlink url-mode="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile" description="${partyId}">
+                <sub-hyperlink target-type="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile" description="${partyId}">
                     <parameter param-name="party_id" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml
index 62bf177..69c989c 100644
--- a/applications/product/widget/catalog/ProductForms.xml
+++ b/applications/product/widget/catalog/ProductForms.xml
@@ -614,7 +614,7 @@ under the License.
         <field name="useRoleTypeId"><display/></field>
         <field name="sequenceNum"><display/></field>
         <field name="editContent" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
-            <hyperlink description="${contentId}" target="/content/control/EditContent" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -719,12 +719,12 @@ under the License.
             <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false"/>
         </field>
         <field name="editDataResource" widget-style="buttontext">
-            <hyperlink description="${dataResourceId}" target="/content/control/EditDataResource" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${dataResourceId}" target="/content/control/EditDataResource" target-type="inter-app" also-hidden="false">
                 <parameter param-name="dataResourceId"/>
             </hyperlink>
         </field>
         <field name="editContent" widget-style="buttontext">
-            <hyperlink description="${contentId}" target="/content/control/EditContent" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -791,7 +791,7 @@ under the License.
         <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field>
         <field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field>
         <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" >
-            <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" url-mode="inter-app">
+            <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" target-type="inter-app">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -953,7 +953,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="partyId" title="${uiLabelMap.ProductSupplier}">
             <display-entity entity-name="PartyNameView" also-hidden="true" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1297,7 +1297,7 @@ under the License.
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/>
         </field>
         <field name="workEffortId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -1360,7 +1360,7 @@ under the License.
             <display-entity entity-name="CostComponentType"/>
         </field>
         <field name="costComponentCalcId" widget-style="buttontext">
-            <hyperlink description="${costComponentCalcId}" target="/manufacturing/control/EditCostCalcs" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${costComponentCalcId}" target="/manufacturing/control/EditCostCalcs" also-hidden="false" target-type="inter-app">
                 <parameter param-name="costComponentCalcId"/>
             </hyperlink>
         </field>
@@ -1454,7 +1454,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="orderDate"><display/></field>
         <field name="orderId">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -1856,7 +1856,7 @@ under the License.
             <entity-one entity-name="Agreement" value-field="agreement"/>
         </row-actions>
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink description="${agreementId}" target="/accounting/control/EditAgreement" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${agreementId}" target="/accounting/control/EditAgreement" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
             </hyperlink>
         </field>
@@ -1871,7 +1871,7 @@ under the License.
     <form name="ListSalesAgreements" type="list" list-name="salesAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="productId"/>
@@ -1888,7 +1888,7 @@ under the License.
     <form name="ListProductAgreements" type="list" list-name="productAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="productId"/>
@@ -1905,7 +1905,7 @@ under the License.
     <form name="ListCommissionAgreements" type="list" list-name="commissionAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="productId"/>
@@ -1956,7 +1956,7 @@ under the License.
         <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit"/>
         <field name="workEffortId">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true">
-                <sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="workEffortId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -2246,7 +2246,7 @@ under the License.
 
     <form name="ListCommEvents" list-name="communicationEvents" type="list" header-row-style="header-row" default-table-style="basic-table">
         <field name="communicationEventId" widget-style="buttontext">
-            <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}" url-mode="inter-app"/>
+            <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="inter-app"/>
         </field>
         <field name="subject"><display/></field>
         <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
@@ -2276,7 +2276,7 @@ under the License.
         <!-- three possibilities for the Party: person, partyGroup, neither... just print everything and if it's empty, no biggie -->
         <field name="partyId" title="${uiLabelMap.PartyParty}">
             <display-entity entity-name="PartyNameView" description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}" also-hidden="true" cache="false">
-                <sub-hyperlink url-mode="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile" description="${partyId}">
+                <sub-hyperlink target-type="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile" description="${partyId}">
                     <parameter param-name="party_id" from-field="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/product/widget/catalog/PromoForms.xml b/applications/product/widget/catalog/PromoForms.xml
index 8b474d9..317609c 100644
--- a/applications/product/widget/catalog/PromoForms.xml
+++ b/applications/product/widget/catalog/PromoForms.xml
@@ -148,7 +148,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
         <field name="editContent" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
-            <hyperlink description="${contentId}" target="/content/control/EditContent" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
diff --git a/applications/product/widget/catalog/StoreForms.xml b/applications/product/widget/catalog/StoreForms.xml
index 445c0f3..d338f28 100644
--- a/applications/product/widget/catalog/StoreForms.xml
+++ b/applications/product/widget/catalog/StoreForms.xml
@@ -66,7 +66,7 @@ under the License.
             </drop-down>
         </field>
         <field use-when="productStore!=null&amp;&amp;productStore.getString(&quot;inventoryFacilityId&quot;)!=null" name="inventoryFacilityLink" title=" " widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}" target="/facility/control/EditFacility" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}" target="/facility/control/EditFacility" target-type="inter-app" also-hidden="false">
                 <parameter param-name="facilityId" from-field="productStore.inventoryFacilityId"/>
             </hyperlink>
         </field>
@@ -521,7 +521,7 @@ under the License.
         </actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="[${partyId}]" >
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyId}]" >
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -585,12 +585,12 @@ under the License.
         
         <field name="submitButton" title=" " >
             <hyperlink target="javascript:ajaxUpdateArea('ProductStoreFacilityEditArea', 'editProductStoreFacility', 'productStoreId=${productStoreId}&amp;facilityId=${facilityId}&amp;fromDate=${fromDate}');"
-                url-mode="plain" image-location="/images/mini-edit.png" image-title="${uiLabelMap.CommonEdit}"/>
+                target-type="plain" image-location="/images/mini-edit.png" image-title="${uiLabelMap.CommonEdit}"/>
         </field>
         <field name="productStoreId"><hidden /></field>
         <field name="facilityId">
             <display-entity entity-name="Facility"  description="${facilityName}">
-                <sub-hyperlink link-style="link" description="[${facilityId}]"  target="/facility/control/EditFacility" url-mode="inter-app">
+                <sub-hyperlink link-style="link" description="[${facilityId}]"  target="/facility/control/EditFacility" target-type="inter-app">
                     <parameter param-name="facilityId"/>
                 </sub-hyperlink>
             </display-entity>    
@@ -600,7 +600,7 @@ under the License.
         <field name="thruDate" ><display type="date-time" /></field>
         <field name="deleteLink" title=" " >
             <hyperlink target="javascript:ajaxUpdateArea('PP_ProductStoreFacilityPrdStoreFacilityMgmt00001', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&amp;facilityId=${facilityId}&amp;fromDate=${fromDate}');"
-               url-mode="plain" request-confirmation="true" image-location="/images/mini-trash.png" image-title="${uiLabelMap.CommonRemove}">
+               target-type="plain" request-confirmation="true" image-location="/images/mini-trash.png" image-title="${uiLabelMap.CommonRemove}">
             </hyperlink>
         </field>
      </form>
@@ -907,14 +907,14 @@ under the License.
             </entity-and>
         </actions>
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.ProductSegmentGroupId}">
-            <hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup" also-hidden="false" target-type="inter-app">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
         <field name="segmentGroupTypeId" title="${uiLabelMap.ProductSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonDelete}" target="/marketing/control/deleteSegmentGroup" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="/marketing/control/deleteSegmentGroup" also-hidden="false" target-type="inter-app">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
diff --git a/applications/product/widget/catalog/SubscriptionForms.xml b/applications/product/widget/catalog/SubscriptionForms.xml
index 5ef6e35..081def2 100644
--- a/applications/product/widget/catalog/SubscriptionForms.xml
+++ b/applications/product/widget/catalog/SubscriptionForms.xml
@@ -119,7 +119,7 @@ under the License.
 
         <field name="originatedFromPartyId">
             <display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}" key-field-name="partyId">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${originatedFromPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${originatedFromPartyId}" link-style="buttontext">
                     <parameter param-name="partyId" from-field="originatedFromPartyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -128,7 +128,7 @@ under the License.
 
         <field name="partyId">
             <display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -136,20 +136,20 @@ under the License.
         <field name="roleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
 
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
         <field name="productId">
             <display-entity entity-name="Product" description="${productName}">
-                <sub-hyperlink target="/catalog/control/EditProduct" url-mode="inter-app" description="${productId}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}" link-style="buttontext">
                     <parameter param-name="productId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="productCategoryId">
             <display-entity entity-name="ProductCategory" description="${categoryName}">
-                <sub-hyperlink target="/catalog/control/EditProductCategory" url-mode="inter-app" description="${productCategoryId}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProductCategory" target-type="inter-app" description="${productCategoryId}" link-style="buttontext">
                     <parameter param-name="productCategoryId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -209,7 +209,7 @@ under the License.
 
         <field name="originatedFromPartyId">
             <lookup target-form-name="LookupPartyName">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${subscription.originatedFromPartyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.originatedFromPartyId}" link-style="buttontext">
                 <parameter param-name="partyId" from-field="subscription.originatedFromPartyId"/>
             </sub-hyperlink>
             </lookup>
@@ -224,7 +224,7 @@ under the License.
 
         <field name="partyId">
             <lookup target-form-name="LookupPartyName">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${subscription.partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext">
                 <parameter param-name="partyId" from-field="subscription.partyId"/>
             </sub-hyperlink>
             </lookup>
@@ -239,7 +239,7 @@ under the License.
 
         <field name="partyNeedId">
             <lookup target-form-name="LookupPartyName">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${subscription.partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext">
                 <parameter param-name="partyId" from-field="subscription.partyNeedId"/>
             </sub-hyperlink>
             </lookup>
@@ -254,21 +254,21 @@ under the License.
 
         <field name="orderId">
             <lookup target-form-name="LookupOrderHeader">
-                <sub-hyperlink target="/ordermgr/control/orderview" url-mode="inter-app" description="${subscription.orderId}" link-style="buttontext">
+                <sub-hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${subscription.orderId}" link-style="buttontext">
                 <parameter param-name="orderId" from-field="subscription.orderId"/>
             </sub-hyperlink>
             </lookup>
         </field>
         <field name="productId">
             <lookup target-form-name="LookupProduct">
-                <sub-hyperlink target="/catalog/control/EditProduct" url-mode="inter-app" description="${subscription.productId}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${subscription.productId}" link-style="buttontext">
                 <parameter param-name="productId" from-field="subscription.productId"/>
             </sub-hyperlink>
             </lookup>
         </field>
         <field name="productCategoryId">
             <lookup target-form-name="LookupProductCategory">
-                <sub-hyperlink target="/catalog/control/EditProductCategory" url-mode="inter-app" description="${subscription.productCategoryId}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProductCategory" target-type="inter-app" description="${subscription.productCategoryId}" link-style="buttontext">
                 <parameter param-name="productCategoryId" from-field="subscription.productCategoryId"/>
             </sub-hyperlink>
             </lookup>
@@ -323,14 +323,14 @@ under the License.
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="contentId">
             <display-entity entity-name="Content" description="${contentName}">
-                <sub-hyperlink target="/content/control/EditContent" url-mode="inter-app" description="${contentId}" link-style="buttontext">
+                <sub-hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" link-style="buttontext">
                     <parameter param-name="contentId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="webSiteId">
             <display-entity entity-name="WebSite" description="${siteName}">
-                <sub-hyperlink target="/content/control/EditWebSite" url-mode="inter-app" description="${webSiteId}" link-style="buttontext">
+                <sub-hyperlink target="/content/control/EditWebSite" target-type="inter-app" description="${webSiteId}" link-style="buttontext">
                     <parameter param-name="webSiteId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -480,7 +480,7 @@ under the License.
         </actions>
         <field name="subscriptionId"><hidden/></field>
         <field name="communicationEventId" widget-style="buttontext">
-            <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" also-hidden="false" target-type="inter-app">
                 <parameter param-name="communicationEventId"/>
             </hyperlink>
         </field>
@@ -510,7 +510,7 @@ under the License.
         <field name="subscriptionId"><hidden value="${parameters.subscriptionId}"/></field>
         <field name="communicationEventId">
             <lookup target-form-name="LookupCommEvent">
-                <sub-hyperlink target="/partymgr/control/ViewCommunicationEvent" url-mode="inter-app" link-type="hidden-form" description="${subscription.communicationEventId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/ViewCommunicationEvent" target-type="inter-app" link-type="hidden-form" description="${subscription.communicationEventId}" link-style="buttontext">
                 <parameter param-name="communicationEventId" from-field="subscription.communicationEventId"/>
             </sub-hyperlink>
             </lookup>
diff --git a/applications/product/widget/facility/FacilityForms.xml b/applications/product/widget/facility/FacilityForms.xml
index b814905..c0b9c09 100644
--- a/applications/product/widget/facility/FacilityForms.xml
+++ b/applications/product/widget/facility/FacilityForms.xml
@@ -118,7 +118,7 @@ under the License.
         <field name="datetimeReceived"><display/></field>
         <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field>
         <field name="productId">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -161,7 +161,7 @@ under the License.
         <field name="datetimeReceived"><display/></field>
         <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field>
         <field name="productId">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -236,7 +236,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -259,7 +259,7 @@ under the License.
         </field>
         <field name="description" position="2"><display/></field>
         <field name="orderId" widget-style="buttontext" position="2">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -271,7 +271,7 @@ under the License.
         </field>
         <field name="shipmentItemSeqId" position="2"><display/></field>
         <field name="workEffortId" widget-style="buttontext" position="2">
-            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" url-mode="inter-app" >
+            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -294,7 +294,7 @@ under the License.
         </row-actions>
 
         <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -315,7 +315,7 @@ under the License.
         </field>
         <field name="description" position="2"><display/></field>
         <field name="orderId" widget-style="buttontext" position="2">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -327,7 +327,7 @@ under the License.
         </field>
         <field name="shipmentItemSeqId" position="2"><display/></field>
         <field name="workEffortId" widget-style="buttontext" position="2">
-            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" url-mode="inter-app" >
+            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -348,7 +348,7 @@ under the License.
 
         <field name="effectiveDate"><display/></field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -367,7 +367,7 @@ under the License.
         </field>
         <field name="description"><display/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -379,7 +379,7 @@ under the License.
         </field>
         <field name="shipmentItemSeqId"><display/></field>
         <field name="workEffortId" widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" url-mode="inter-app" >
+            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -452,7 +452,7 @@ under the License.
         </field>
         <field name="productId" title="${uiLabelMap.CommonDescription}">
             <display-entity entity-name="Product" description="${internalName}">
-                <sub-hyperlink target="/catalog/control/EditProduct" url-mode="inter-app" description="${uiLabelMap.ProductCatalog}" link-style="buttontext">
+                <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${uiLabelMap.ProductCatalog}" link-style="buttontext">
                     <parameter param-name="productId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -487,7 +487,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}">
-            <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" url-mode="inter-app">
+            <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId" from-field="primaryOrderId"/>
             </hyperlink>
         </field>
@@ -529,7 +529,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}">
-            <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" url-mode="inter-app">
+            <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId" from-field="primaryOrderId"/>
             </hyperlink>
         </field>
@@ -575,7 +575,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -687,7 +687,7 @@ under the License.
             odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
             paginate-target="InventoryAverageCosts" override-list-size="${overrideListSize}">
         <field name="productId2" title="${uiLabelMap.ProductProductId}" entry-name="productId" widget-style="buttontext">
-            <hyperlink description="${productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -753,7 +753,7 @@ under the License.
         </field>
         <field name="locationSeqId"><display/></field>
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
-            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId" from-field="product.productId"/>
             </hyperlink>
         </field>
@@ -797,7 +797,7 @@ under the License.
         </field>
         <field name="locationSeqIdTo"><display/></field>
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
-            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId" from-field="product.productId"/>
             </hyperlink>
         </field>
@@ -842,7 +842,7 @@ under the License.
         </field>
         <field name="locationSeqIdTo"><display also-hidden="false"/></field>
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
-            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="productId" from-field="product.productId"/>
             </hyperlink>
         </field>
@@ -890,7 +890,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="facilityId"><hidden/></field>
         <field name="contentId" title="${uiLabelMap.CommonView}">
-            <hyperlink description="[${contentId}]" target="/content/control/ViewSimpleContent" url-mode="inter-app">
+            <hyperlink description="[${contentId}]" target="/content/control/ViewSimpleContent" target-type="inter-app">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -937,7 +937,7 @@ under the License.
     <form name="ListFacilityAgreements" type="list" list-name="facilityAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemFacility" url-mode="inter-app" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemFacility" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="faclityId"/>
@@ -972,13 +972,13 @@ under the License.
         <alt-target use-when="${groovy: inventoryItem==null}" target="createInventoryTransfersForProduct"/>
         <alt-target use-when="${groovy: inventoryTransferId!=null}" target="UpdateInventoryTransfer"/>
         <field name="inventoryItemId" widget-style="buttontext" use-when="${groovy: inventoryItem != null}">
-            <hyperlink description="${inventoryItemId}" target="/catalog/control/EditInventoryItem" url-mode="inter-app">
+            <hyperlink description="${inventoryItemId}" target="/catalog/control/EditInventoryItem" target-type="inter-app">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
         <field name="inventoryItemTypeId" use-when="${groovy: inventoryItem != null}"><display description="${inventoryItemType.description}"/></field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink description="${groovy: if(inventoryItem) inventoryItem.productId else parameters.productId}" target="/catalog/control/EditProduct" url-mode="inter-app">
+            <hyperlink description="${groovy: if(inventoryItem) inventoryItem.productId else parameters.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
diff --git a/applications/product/widget/facility/FieldLookupForms.xml b/applications/product/widget/facility/FieldLookupForms.xml
index b45053e..57a5d6d 100644
--- a/applications/product/widget/facility/FieldLookupForms.xml
+++ b/applications/product/widget/facility/FieldLookupForms.xml
@@ -48,7 +48,7 @@ under the License.
             </service>
         </actions>
         <field name="facilityId" title=" " widget-style="buttontext">
-            <hyperlink description="${facilityId}" target="javascript:set_values('${facilityId}', '${facilityName}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${facilityId}" target="javascript:set_values('${facilityId}', '${facilityName}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="facilityName"><display/></field>
         <field name="facilityTypeId"><display/></field>
@@ -88,7 +88,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="FacilityLocation" default-field-type="display"/>
         <field name="locationSeqId" title=" " widget-style="buttontext">
-            <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="facilityId"><hidden/></field>
         <field name="locationTypeEnumId">
@@ -129,7 +129,7 @@ under the License.
             </service>
         </actions>
         <field name="shipmentId" widget-style="buttontext">
-            <hyperlink description="${shipmentId}" target="javascript:set_value('${shipmentId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${shipmentId}" target="javascript:set_value('${shipmentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="shipmentTypeId"><display-entity entity-name="ShipmentType"/></field>
         <field name="statusId"><display-entity entity-name="StatusItem"/></field>
@@ -140,7 +140,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="20">
         <field name="inventoryItemId"><display/></field>
         <field name="locationSeqId" title=" " widget-style="buttontext" >
-            <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="locationTypeEnumId">
             <display-entity entity-name="Enumeration" key-field-name="enumId"/>
diff --git a/applications/product/widget/facility/InventoryForms.xml b/applications/product/widget/facility/InventoryForms.xml
index 7c88e37..d624884 100644
--- a/applications/product/widget/facility/InventoryForms.xml
+++ b/applications/product/widget/facility/InventoryForms.xml
@@ -49,7 +49,7 @@ under the License.
         </field>
         <field name="productId" required-field="true" position="1">
             <lookup target-form-name="LookupProduct">
-                <sub-hyperlink target="/catalog/control/EditProduct" url-mode="inter-app" description="${uiLabelMap.ProductEditProduct} [${productId}]">
+                <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${uiLabelMap.ProductEditProduct} [${productId}]">
                     <parameter param-name="productId"/>
                 </sub-hyperlink>
             </lookup>
@@ -192,7 +192,7 @@ under the License.
         <auto-fields-entity entity-name="InventoryItemDetail" map-name="inventoryItemDetail" default-field-type="display"/>
         <field name="inventoryItemId"><hidden/></field> <!-- this field is redundant -->
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -212,7 +212,7 @@ under the License.
         <auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/>
         <field name="inventoryItemId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
diff --git a/applications/product/widget/facility/ShipmentForms.xml b/applications/product/widget/facility/ShipmentForms.xml
index 3555580..75171d9 100644
--- a/applications/product/widget/facility/ShipmentForms.xml
+++ b/applications/product/widget/facility/ShipmentForms.xml
@@ -144,13 +144,13 @@ under the License.
         </field>
 
         <field name="estimatedShipWorkEffId" title="${uiLabelMap.ProductEstimatedShipWorkEffId}" widget-style="buttontext">
-            <hyperlink description="${shipment.estimatedShipWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${shipment.estimatedShipWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId" from-field="shipment.estimatedShipWorkEffId"/>
             </hyperlink>
         </field>
         <field name="estimatedArrivalDate" title="${uiLabelMap.ProductEstimatedArrivalDate}"><date-time/></field>
         <field name="estimatedArrivalWorkEffId" title="${uiLabelMap.ProductEstimatedArrivalWorkEffId}" widget-style="buttontext">
-            <hyperlink description="${shipment.estimatedArrivalWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" url-mode="inter-app">
+            <hyperlink description="${shipment.estimatedArrivalWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId" from-field="shipment.estimatedArrivalWorkEffId"/>
             </hyperlink>
         </field>
@@ -283,7 +283,7 @@ under the License.
         <field name="shipmentId"><hidden/></field>
         <field name="orderItemSeqId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId} - ${orderItemSeqId}" target="/ordermgr/control/orderview" url-mode="inter-app" >
+            <hyperlink description="${orderId} - ${orderItemSeqId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
diff --git a/applications/workeffort/widget/CustRequestForms.xml b/applications/workeffort/widget/CustRequestForms.xml
index 15c4d1e..9f2f026 100644
--- a/applications/workeffort/widget/CustRequestForms.xml
+++ b/applications/workeffort/widget/CustRequestForms.xml
@@ -23,7 +23,7 @@ under the License.
     <grid name="ListRequests" use-row-submit="true" title="" list-name="custRequestAndRoles" paginate-target="requestlist"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="custRequestId" widget-style="buttontext">
-            <hyperlink description="${custRequestId}" url-mode="inter-app" target="/ordermgr/control/ViewRequest">
+            <hyperlink description="${custRequestId}" target-type="inter-app" target="/ordermgr/control/ViewRequest">
                 <parameter param-name="custRequestId"/>
             </hyperlink>
         </field>
diff --git a/applications/workeffort/widget/LookupForms.xml b/applications/workeffort/widget/LookupForms.xml
index 8e43759..4d61d75 100644
--- a/applications/workeffort/widget/LookupForms.xml
+++ b/applications/workeffort/widget/LookupForms.xml
@@ -145,7 +145,7 @@ under the License.
             </service>
         </actions>
         <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
-            <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="workEffortName"><display/></field>
         <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
@@ -177,7 +177,7 @@ under the License.
             </service>
         </actions>
         <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
-            <hyperlink description="${timesheetId}" target="javascript:set_value('${timesheetId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${timesheetId}" target="javascript:set_value('${timesheetId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
         <field name="clientPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
diff --git a/applications/workeffort/widget/TimesheetForms.xml b/applications/workeffort/widget/TimesheetForms.xml
index b2c2e03..adb0d5b 100644
--- a/applications/workeffort/widget/TimesheetForms.xml
+++ b/applications/workeffort/widget/TimesheetForms.xml
@@ -144,7 +144,7 @@ under the License.
             </display-entity>
         </field>
         <field name="invoiceId" widget-style="buttontext">
-            <hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" url-mode="inter-app">
+            <hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" target-type="inter-app">
                 <parameter param-name="invoiceId"/>
             </hyperlink>
         </field>
diff --git a/applications/workeffort/widget/WorkEffortCommEventForms.xml b/applications/workeffort/widget/WorkEffortCommEventForms.xml
index 78da69c..a2dd82f 100644
--- a/applications/workeffort/widget/WorkEffortCommEventForms.xml
+++ b/applications/workeffort/widget/WorkEffortCommEventForms.xml
@@ -31,7 +31,7 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="communicationEventId"  widget-style="buttontext">
-            <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" url-mode="inter-app">
+            <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app">
                 <parameter param-name="communicationEventId"/>
             </hyperlink>
         </field>
diff --git a/applications/workeffort/widget/WorkEffortForms.xml b/applications/workeffort/widget/WorkEffortForms.xml
index 35995c0..324ce5d 100644
--- a/applications/workeffort/widget/WorkEffortForms.xml
+++ b/applications/workeffort/widget/WorkEffortForms.xml
@@ -277,7 +277,7 @@ under the License.
             </service>
         </actions>
         <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
-            <hyperlink description="${workEffortName}[${workEffortId}]" target="javascript:set_value('${workEffortId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${workEffortName}[${workEffortId}]" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
         <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
@@ -536,7 +536,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="partyId" title="${uiLabelMap.PartyParty}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -617,7 +617,7 @@ under the License.
 <!--
         <field name="custRequestId">
             <lookup size="20" target-form-name="LookupCustRequest">
-                <sub-hyperlink target="/ordermgr/control/EditRequest" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink target="/ordermgr/control/EditRequest" target-type="inter-app" link-style="buttontext">
                 <parameter param-name="custRequestId" from-field="communicationEvent.custRequestId"/>
             </sub-hyperlink>
             </lookup>
@@ -625,7 +625,7 @@ under the License.
 -->
         <field name="workEffortId">
             <lookup size="20" target-form-name="LookupWorkEffort">
-                <sub-hyperlink target="/marketing/control/EditWorkEffort" url-mode="inter-app" link-style="buttontext">
+                <sub-hyperlink target="/marketing/control/EditWorkEffort" target-type="inter-app" link-style="buttontext">
                 <parameter param-name="workEffortId" from-field="communicationEvent.workEffortId"/>
             </sub-hyperlink>
             </lookup>
@@ -657,7 +657,7 @@ under the License.
             </service>
         </actions>
         <field name="communicationEventId">
-            <hyperlink description="${communicationEventId}" target="EditWorkEffortCommEvent" url-mode="intra-app">
+            <hyperlink description="${communicationEventId}" target="EditWorkEffortCommEvent" target-type="intra-app">
                 <parameter param-name="communicationEventId"/>
                 <parameter param-name="DONE_PAGE" from-field="donePage"/>
             </hyperlink>
@@ -694,7 +694,7 @@ under the License.
             </entity-and>
         </actions>
         <field name="contactMechId" widget-style="buttontext">
-            <hyperlink description="${contactMechId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${contactMechId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
     </form>
@@ -741,7 +741,7 @@ under the License.
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.WorkEffortCommEventId}" widget-style="buttontext">
-            <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}">
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
@@ -1020,7 +1020,7 @@ under the License.
         <field name="workEffortId"><hidden/></field>
         <field name="contentId">
             <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true">
-                <sub-hyperlink target="/content/control/editContent" description="${contentId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/content/control/editContent" description="${contentId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="contentId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1076,7 +1076,7 @@ under the License.
         <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType"/></field>
         <field name="productId">
             <display-entity entity-name="Product" key-field-name="productId" description="${productName}" also-hidden="true">
-                <sub-hyperlink target="/catalog/control/EditProduct" description="${productId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/catalog/control/EditProduct" description="${productId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="productId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1132,7 +1132,7 @@ under the License.
         <field name="workEffortId" widget-style="buttontext"><hidden/></field>
         <field name="userLoginId" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}" also-hidden="true">
-                <sub-hyperlink target="/partymgr/control/viewprofile" description="${userLoginId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/partymgr/control/viewprofile" description="${userLoginId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1243,7 +1243,7 @@ under the License.
         </actions>
         <field name="agreementId">
             <display-entity entity-name="Agreement" key-field-name="agreementId"  also-hidden="true">
-                <sub-hyperlink target="/accounting/control/EditAgreement" description="${agreementId}" link-style="buttontext" url-mode="inter-app">
+                <sub-hyperlink target="/accounting/control/EditAgreement" description="${agreementId}" link-style="buttontext" target-type="inter-app">
                     <parameter param-name="agreementId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1270,7 +1270,7 @@ under the License.
         <field name="workEffortId"><hidden/></field>
         <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset}">
             <display-entity entity-name="FixedAsset" description="${fixedAssetName}">
-                <sub-hyperlink target="/accounting/control/EditFixedAsset" url-mode="inter-app" description="${fixedAssetId}" link-style="buttontext">
+                <sub-hyperlink target="/accounting/control/EditFixedAsset" target-type="inter-app" description="${fixedAssetId}" link-style="buttontext">
                     <parameter param-name="fixedAssetId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1309,7 +1309,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset}">
             <display-entity entity-name="FixedAsset" description="${fixedAssetName}">
-                <sub-hyperlink target="/accounting/control/EditFixedAsset" url-mode="inter-app" description="${fixedAssetId}" link-style="buttontext">
+                <sub-hyperlink target="/accounting/control/EditFixedAsset" target-type="inter-app" description="${fixedAssetId}" link-style="buttontext">
                     <parameter param-name="fixedAssetId"/>
                 </sub-hyperlink>
             </display-entity>
@@ -1470,12 +1470,12 @@ under the License.
             <set field="serverRootUrl" value="${groovy: org.apache.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
         </actions>
         <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}">
-            <hyperlink description="${workEffortId}" target="EditICalendar" also-hidden="false" url-mode="plain">
+            <hyperlink description="${workEffortId}" target="EditICalendar" also-hidden="false" target-type="plain">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="iCalendarUrl" title="${uiLabelMap.WorkEffortICalendarUrl}">
-            <hyperlink description="${serverRootUrl}/iCalendar/${workEffortId}/" target="${serverRootUrl}/iCalendar/${workEffortId}/" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${serverRootUrl}/iCalendar/${workEffortId}/" target="${serverRootUrl}/iCalendar/${workEffortId}/" also-hidden="false" target-type="plain"/>
         </field>
         <field name="workEffortName" title="${uiLabelMap.WorkEffortICalendarName}"><display/></field>
     </form>
diff --git a/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml b/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
index ce4b10b..1c6835a 100644
--- a/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
+++ b/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
@@ -30,7 +30,7 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" url-mode="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId"/>
                 <parameter param-name="workEffortId"/>
             </hyperlink>
diff --git a/applications/workeffort/widget/WorkEffortPartyAssignForms.xml b/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
index 2f3f4d6..86901ca 100644
--- a/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
+++ b/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
@@ -31,7 +31,7 @@ under the License.
         <field name="workEffortId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="/partymgr/control/viewprofile" url-mode="inter-app" description="${partyId}" link-style="buttontext">
+                <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
             </display-entity>
diff --git a/applications/workeffort/widget/WorkEffortQuoteForms.xml b/applications/workeffort/widget/WorkEffortQuoteForms.xml
index de047e0..0caa646 100644
--- a/applications/workeffort/widget/WorkEffortQuoteForms.xml
+++ b/applications/workeffort/widget/WorkEffortQuoteForms.xml
@@ -29,7 +29,7 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="quoteId" widget-style="buttontext">
-            <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" url-mode="inter-app">
+            <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app">
                 <parameter param-name="quoteId"/>
             </hyperlink>
         </field>
@@ -60,12 +60,12 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="quoteId" widget-style="buttontext">
-            <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" url-mode="inter-app">
+            <hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote" target-type="inter-app">
                 <parameter param-name="quoteId"/>
             </hyperlink>
         </field>
         <field name="quoteItemSeqId" widget-style="buttontext">
-            <hyperlink description="${quoteItemSeqId}" target="/ordermgr/control/EditQuoteItem" url-mode="inter-app">
+            <hyperlink description="${quoteItemSeqId}" target="/ordermgr/control/EditQuoteItem" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteItemSeqId"/>
diff --git a/applications/workeffort/widget/WorkEffortRequestForms.xml b/applications/workeffort/widget/WorkEffortRequestForms.xml
index dd45d09..9f50b0e 100644
--- a/applications/workeffort/widget/WorkEffortRequestForms.xml
+++ b/applications/workeffort/widget/WorkEffortRequestForms.xml
@@ -29,7 +29,7 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="custRequestId" widget-style="buttontext">
-            <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" url-mode="inter-app">
+            <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app">
                 <parameter param-name="custRequestId"/>
             </hyperlink>
         </field>
@@ -61,7 +61,7 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="custRequestId" widget-style="buttontext">
-            <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" url-mode="inter-app">
+            <hyperlink description="${custRequestId}" target="/ordermgr/control/EditRequest" target-type="inter-app">
                 <parameter param-name="custRequestId"/>
             </hyperlink>
         </field>
diff --git a/applications/workeffort/widget/WorkEffortRequirementForms.xml b/applications/workeffort/widget/WorkEffortRequirementForms.xml
index 264022a..828fa2c 100644
--- a/applications/workeffort/widget/WorkEffortRequirementForms.xml
+++ b/applications/workeffort/widget/WorkEffortRequirementForms.xml
@@ -30,7 +30,7 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="requirementId" widget-style="linktext">
-            <hyperlink description="${requirementId}" target="/ordermgr/control/EditRequirement" url-mode="inter-app">
+            <hyperlink description="${requirementId}" target="/ordermgr/control/EditRequirement" target-type="inter-app">
                 <parameter param-name="requirementId"/>
             </hyperlink>
         </field>
diff --git a/applications/workeffort/widget/WorkEffortShopListForms.xml b/applications/workeffort/widget/WorkEffortShopListForms.xml
index c5a98f8..69c845c 100644
--- a/applications/workeffort/widget/WorkEffortShopListForms.xml
+++ b/applications/workeffort/widget/WorkEffortShopListForms.xml
@@ -29,7 +29,7 @@ under the License.
         </actions>
         <field name="workEffortId"><hidden/></field>
         <field name="shoppingListId" title="${uiLabelMap.WorkEffortShopListId}" widget-style="buttontext">
-            <hyperlink description="${shoppingListId}" target="/partymgr/control/editShoppingList" url-mode="inter-app">
+            <hyperlink description="${shoppingListId}" target="/partymgr/control/editShoppingList" target-type="inter-app">
                 <parameter param-name="shoppingListId"/>
             </hyperlink>
         </field>
diff --git a/framework/common/widget/LookupForms.xml b/framework/common/widget/LookupForms.xml
index e020590..81be5b9 100644
--- a/framework/common/widget/LookupForms.xml
+++ b/framework/common/widget/LookupForms.xml
@@ -48,7 +48,7 @@ under the License.
             </service>
         </actions>
         <field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
-            <hyperlink also-hidden="false" url-mode="plain" description="${geoId}"  target="javascript:set_value('${geoId}')"/>
+            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="javascript:set_value('${geoId}')"/>
         </field>
         <field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
             <display-entity key-field-name="geoTypeId" entity-name="GeoType"/>
@@ -63,7 +63,7 @@ under the License.
     <form name="LookupGeoName" extends="LookupGeo" target="LookupGeoName"/>
     <form name="ListLookupGeoName" extends="ListLookupGeo" paginate-target="LookupGeoName">
         <field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
-            <hyperlink also-hidden="false" url-mode="plain" description="${geoId}"  target="javascript:set_values('${geoName}', '${geoId}')"/>
+            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="javascript:set_values('${geoName}', '${geoId}')"/>
         </field>
     </form>
 
@@ -85,7 +85,7 @@ under the License.
             </service>
         </actions>
         <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
-            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="enabled"><display/></field>
         <field name="hasLoggedOut"><display/></field>
@@ -111,7 +111,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="PortalPage" default-field-type="display"/>
         <field name="portalPageId" widget-style="smallSubmit">
-            <hyperlink description="${portalPageId}" target="javascript:set_value('${portalPageId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${portalPageId}" target="javascript:set_value('${portalPageId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 
@@ -124,7 +124,7 @@ under the License.
     <form name="ListLocales" type="list" list-name="locales" paginate-target="LookupLocale"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="localeString" widget-style="buttontext">
-            <hyperlink description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><display/></field>
     </form>
diff --git a/framework/common/widget/PortalPageForms.xml b/framework/common/widget/PortalPageForms.xml
index 47c83ae..a09faa1 100644
--- a/framework/common/widget/PortalPageForms.xml
+++ b/framework/common/widget/PortalPageForms.xml
@@ -137,7 +137,7 @@ under the License.
         <field name="description_op" ><hidden value="contains"/></field>
         <field name="description_ic" ><hidden value="Y"/></field>
         <field name="submitButton" title=" " widget-style="smallSubmit">
-            <hyperlink target="javascript:ajaxUpdateArea('List${entity}Area', 'list${entity}', $(FindGenericEntity).serialize());" url-mode="plain"  description="${uiLabelMap.CommonSearch}"/>
+            <hyperlink target="javascript:ajaxUpdateArea('List${entity}Area', 'list${entity}', $(FindGenericEntity).serialize());" target-type="plain"  description="${uiLabelMap.CommonSearch}"/>
         </field>
     </form>
 
diff --git a/framework/common/widget/SecurityForms.xml b/framework/common/widget/SecurityForms.xml
index a16b8ce..bddfe98 100644
--- a/framework/common/widget/SecurityForms.xml
+++ b/framework/common/widget/SecurityForms.xml
@@ -284,7 +284,7 @@ under the License.
             </service>
         </actions>
         <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
-            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="enabled"><display/></field>
         <field name="hasLoggedOut"><display/></field>
diff --git a/framework/webtools/widget/GeoManagementForms.xml b/framework/webtools/widget/GeoManagementForms.xml
index 2bdeb88..1078a31 100644
--- a/framework/webtools/widget/GeoManagementForms.xml
+++ b/framework/webtools/widget/GeoManagementForms.xml
@@ -54,7 +54,7 @@
     <form name="ListGeos" extends-resource="component://common/widget/LookupForms.xml" extends="ListLookupGeo" paginate-target="${currentUrl}"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true" >
         <field name="geoId"  widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
-            <hyperlink also-hidden="false" url-mode="plain" description="${geoId}"  target="EditGeo">
+            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="EditGeo">
                 <parameter param-name="geoId"/>
             </hyperlink>
         </field>
@@ -78,7 +78,7 @@
             </service>
         </actions>
         <field name="geoPointId" title="${uiLabelMap.CommonId}">
-            <hyperlink also-hidden="false" url-mode="plain" description="${geoPointId}"  target="geoPoint">
+            <hyperlink also-hidden="false" target-type="plain" description="${geoPointId}"  target="geoPoint">
                 <parameter param-name="geoPointId"/>
             </hyperlink>
         </field>
@@ -113,7 +113,7 @@
     </form>
     <form name="ListLookupGeo" extends="ListGeos">
         <field name="geoId" title="${uiLabelMap.CommonGeoId}" widget-style="buttontext">
-            <hyperlink description="${geoId}" target="javascript:set_value('${geoId}')" also-hidden="false" url-mode="plain"/>
+            <hyperlink description="${geoId}" target="javascript:set_value('${geoId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="deleteLink"><ignored/></field>
     </form>
diff --git a/framework/webtools/widget/tempExprForms.xml b/framework/webtools/widget/tempExprForms.xml
index f71b893..a81cbfb 100644
--- a/framework/webtools/widget/tempExprForms.xml
+++ b/framework/webtools/widget/tempExprForms.xml
@@ -40,7 +40,7 @@ under the License.
     <form name="BasicExpressionList" type="list"
          default-table-style="basic-table hover-bar" odd-row-style="alternate-row" header-row-style="header-row-2">
         <field name="tempExprId" title="${uiLabelMap.TemporalExpressionId}" sort-field="true">
-            <hyperlink description="${tempExprId}" target="editTemporalExpression" also-hidden="false" url-mode="plain">
+            <hyperlink description="${tempExprId}" target="editTemporalExpression" also-hidden="false" target-type="plain">
                 <parameter param-name="tempExprId"/>
             </hyperlink>
         </field>
diff --git a/framework/widget/dtd/widget-form.xsd b/framework/widget/dtd/widget-form.xsd
index 496d943..c989030 100644
--- a/framework/widget/dtd/widget-form.xsd
+++ b/framework/widget/dtd/widget-form.xsd
@@ -968,7 +968,7 @@ under the License.
             <xs:attribute type="xs:string" name="description">
                 <xs:annotation>
                     <xs:documentation>
-                        Specifies the string to display, can use the ${} syntax to insert context values;
+                        Specifies the string to display, can use the ${} syntax to insert context values;
                         if empty the value of the field will be printed for a default.
                     </xs:documentation>
                 </xs:annotation>
@@ -976,7 +976,7 @@ under the License.
             <xs:attribute type="xs:integer" name="size">
                 <xs:annotation>
                     <xs:documentation>
-                        Specifies the size of the field (as a number of characters),
+                        Specifies the size of the field (as a number of characters),
                         when the text to display exceed the given size it is truncated and add the complete text as a hint
                     </xs:documentation>
                 </xs:annotation>
@@ -1167,7 +1167,11 @@ under the License.
                 </xs:attribute>
                 <xs:attribute name="target-type" default="intra-app">
                     <xs:annotation>
-                        <xs:documentation>Deprecated - use the url-mode attribute.</xs:documentation>
+                        <xs:documentation>
+                            Deprecated - use the url-mode attribute.
+                            Actually url-mode does not work when a form like target="javascript: is used
+                            Better let it like it is, see OFBIZ-12091
+                        </xs:documentation>
                     </xs:annotation>
                     <xs:simpleType>
                         <xs:restriction base="xs:token">
@@ -1743,7 +1747,11 @@ under the License.
                 <xs:attribute type="xs:string" name="use-when" />
                 <xs:attribute name="target-type" default="intra-app">
                     <xs:annotation>
-                        <xs:documentation>Deprecated - use the url-mode attribute.</xs:documentation>
+                        <xs:documentation>
+                            Deprecated - use the url-mode attribute.
+                            Actually url-mode does not work when a form like target="javascript: is used
+                            Better let it like it is, see OFBIZ-12091
+                        </xs:documentation>
                     </xs:annotation>
                     <xs:simpleType>
                         <xs:restriction base="xs:token">